STM32 fixes for DM9161 PHY; Enhancements for ADS7843e touchscreen controller

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5199 42af7a65-404d-4744-a932-0658087f49c3

3 files changed, 26 insertions, 1 deletions

diff --git a/nuttx/configs/shenzhou/nsh/defconfig b/nuttx/configs/shenzhou/nsh/defconfig
index 3528f6d60..706881cc0 100644
--- a/nuttx/configs/shenzhou/nsh/defconfig
+++ b/nuttx/configs/shenzhou/nsh/defconfig
@@ -377,6 +377,11 @@ CONFIG_USART2_2STOP=0
 # Networking Support
 #
 CONFIG_NET=y
+CONFIG_ARCH_HAVE_PHY=y
+# CONFIG_PHY_KS8721 is not set
+# CONFIG_PHY_DP83848C is not set
+# CONFIG_PHY_LAN8720 is not set
+CONFIG_PHY_DM9161=y
 # CONFIG_NET_NOINTS is not set
 CONFIG_NET_MULTIBUFFER=y
 # CONFIG_NET_IPv6 is not set
diff --git a/nuttx/configs/shenzhou/nxwm/defconfig b/nuttx/configs/shenzhou/nxwm/defconfig
index 29c83730e..b529907c1 100644
--- a/nuttx/configs/shenzhou/nxwm/defconfig
+++ b/nuttx/configs/shenzhou/nxwm/defconfig
@@ -359,6 +359,13 @@ CONFIG_RTC=y
 CONFIG_INPUT=y
 # CONFIG_INPUT_TSC2007 is not set
 CONFIG_INPUT_ADS7843E=y
+# CONFIG_ADS7843E_MULTIPLE is not set
+CONFIG_ADS7843E_SPIMODE=0
+CONFIG_ADS7843E_FREQUENCY=100000
+# CONFIG_ADS7843E_SWAPXY is not set
+CONFIG_ADS7843E_THRESHX=12
+CONFIG_ADS7843E_THRESHY=12
+# CONFIG_INPUT_STMPE811 is not set
 CONFIG_LCD=y
 # CONFIG_LCD_NOGETRUN is not set
 CONFIG_LCD_MAXCONTRAST=1
@@ -418,6 +425,11 @@ CONFIG_USART2_2STOP=0
 # Networking Support
 #
 CONFIG_NET=y
+CONFIG_ARCH_HAVE_PHY=y
+# CONFIG_PHY_KS8721 is not set
+# CONFIG_PHY_DP83848C is not set
+# CONFIG_PHY_LAN8720 is not set
+CONFIG_PHY_DM9161=y
 # CONFIG_NET_NOINTS is not set
 CONFIG_NET_MULTIBUFFER=y
 # CONFIG_NET_IPv6 is not set
diff --git a/nuttx/configs/shenzhou/src/up_touchscreen.c b/nuttx/configs/shenzhou/src/up_touchscreen.c
index 7f6d49eb5..969b23be4 100644
--- a/nuttx/configs/shenzhou/src/up_touchscreen.c
+++ b/nuttx/configs/shenzhou/src/up_touchscreen.c
@@ -201,9 +201,17 @@ static void tsc_clear(FAR struct ads7843e_config_s *state)
 static bool tsc_busy(FAR struct ads7843e_config_s *state)
 {
   /* Hmmm... The ADS7843E BUSY pin is not brought out on the Shenzhou board.
-   * We will most certainly have to revisit this.
+   * We will most certainly have to revisit this.  There is this cryptic
+   * statement in the XPT2046 spec:  "No DCLK delay required with dedicated
+   * serial port."
+   *
+   * The busy state is used by the ADS7843E driver to control the delay
+   * between sending the command, then reading the returned data.
    */
 
+#if 0
+  up_udelay(1600); /* 1.6MS */
+#endif
   return false;
 }