1 files changed, 59 insertions, 0 deletions

diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig
index 40866c643f1..033bfede6b6 100644
--- a/arch/arm/mach-davinci/Kconfig
+++ b/arch/arm/mach-davinci/Kconfig
@@ -32,11 +32,13 @@ config ARCH_DAVINCI_DA830
         bool "DA830/OMAP-L137 based system"
         select CP_INTC
         select ARCH_DAVINCI_DA8XX
+        select CPU_DCACHE_WRITETHROUGH # needed on silicon revs 1.0, 1.1
 
 config ARCH_DAVINCI_DA850
         bool "DA850/OMAP-L138 based system"
         select CP_INTC
         select ARCH_DAVINCI_DA8XX
+        select ARCH_HAS_CPUFREQ
 
 config ARCH_DAVINCI_DA8XX
         bool
@@ -63,6 +65,13 @@ config MACH_SFFSDR
           Say Y here to select the Lyrtech Small Form Factor
           Software Defined Radio (SFFSDR) board.
 
+config MACH_NEUROS_OSD2
+        bool "Neuros OSD2 Open Television Set Top Box"
+        depends on ARCH_DAVINCI_DM644x
+        help
+          Configure this option to specify the whether the board used
+          for development is a Neuros OSD2 Open Set Top Box.
+
 config MACH_DAVINCI_DM355_EVM
         bool "TI DM355 EVM"
         default ARCH_DAVINCI_DM355
@@ -98,16 +107,66 @@ config MACH_DAVINCI_DA830_EVM
         bool "TI DA830/OMAP-L137 Reference Platform"
         default ARCH_DAVINCI_DA830
         depends on ARCH_DAVINCI_DA830
+        select GPIO_PCF857X
         help
           Say Y here to select the TI DA830/OMAP-L137 Evaluation Module.
 
+choice
+        prompt "Select DA830/OMAP-L137 UI board peripheral"
+        depends on MACH_DAVINCI_DA830_EVM
+        help
+          The presence of UI card on the DA830/OMAP-L137 EVM is detected
+          automatically based on successful probe of the I2C based GPIO
+          expander on that board. This option selected in this menu has
+          an effect only in case of a successful UI card detection.
+
+config DA830_UI_LCD
+        bool "LCD"
+        help
+          Say Y here to use the LCD as a framebuffer or simple character
+          display.
+
+config DA830_UI_NAND
+        bool "NAND flash"
+        help
+          Say Y here to use the NAND flash.  Do not forget to setup
+          the switch correctly.
+endchoice
+
 config MACH_DAVINCI_DA850_EVM
         bool "TI DA850/OMAP-L138 Reference Platform"
         default ARCH_DAVINCI_DA850
         depends on ARCH_DAVINCI_DA850
+        select GPIO_PCA953X
         help
           Say Y here to select the TI DA850/OMAP-L138 Evaluation Module.
 
+choice
+        prompt "Select peripherals connected to expander on UI board"
+        depends on MACH_DAVINCI_DA850_EVM
+        help
+          The presence of User Interface (UI) card on the DA850/OMAP-L138
+          EVM is detected automatically based on successful probe of the I2C
+          based GPIO expander on that card. This option selected in this
+          menu has an effect only in case of a successful UI card detection.
+
+config DA850_UI_NONE
+        bool "No peripheral is enabled"
+        help
+          Say Y if you do not want to enable any of the peripherals connected
+          to TCA6416 expander on DA850/OMAP-L138 EVM UI card
+
+config DA850_UI_RMII
+        bool "RMII Ethernet PHY"
+        help
+          Say Y if you want to use the RMII PHY on the DA850/OMAP-L138 EVM.
+          This PHY is found on the UI daughter card that is supplied with
+          the EVM.
+          NOTE: Please take care while choosing this option, MII PHY will
+          not be functional if RMII mode is selected.
+
+endchoice
+
 config DAVINCI_MUX
         bool "DAVINCI multiplexing support"
         depends on ARCH_DAVINCI