1 files changed, 67 insertions, 183 deletions

diff --git a/arch/cris/arch-v10/drivers/Kconfig b/arch/cris/arch-v10/drivers/Kconfig
index 748374f25b87..8b50e8402954 100644
--- a/arch/cris/arch-v10/drivers/Kconfig
+++ b/arch/cris/arch-v10/drivers/Kconfig
@@ -1,17 +1,11 @@
 config ETRAX_ETHERNET
         bool "Ethernet support"
         depends on ETRAX_ARCH_V10
+        select NET_ETHERNET
         help
           This option enables the ETRAX 100LX built-in 10/100Mbit Ethernet
           controller.
 
-# this is just so that the user does not have to go into the
-# normal ethernet driver section just to enable ethernetworking
-config NET_ETHERNET
-        bool
-        depends on ETRAX_ETHERNET
-        default y
-
 choice
         prompt "Network LED behavior"
         depends on ETRAX_ETHERNET
@@ -20,26 +14,26 @@ choice
 config ETRAX_NETWORK_LED_ON_WHEN_LINK
         bool "LED_on_when_link"
         help
-          Selecting LED_on_when_link will light the LED when there is a 
-          connection and will flash off when there is activity. 
+          Selecting LED_on_when_link will light the LED when there is a
+          connection and will flash off when there is activity.
 
-          Selecting LED_on_when_activity will light the LED only when 
+          Selecting LED_on_when_activity will light the LED only when
           there is activity.
 
-          This setting will also affect the behaviour of other activity LEDs 
-          e.g. Bluetooth. 
+          This setting will also affect the behaviour of other activity LEDs
+          e.g. Bluetooth.
 
 config ETRAX_NETWORK_LED_ON_WHEN_ACTIVITY
         bool "LED_on_when_activity"
         help
-          Selecting LED_on_when_link will light the LED when there is a 
-          connection and will flash off when there is activity. 
+          Selecting LED_on_when_link will light the LED when there is a
+          connection and will flash off when there is activity.
 
-          Selecting LED_on_when_activity will light the LED only when 
+          Selecting LED_on_when_activity will light the LED only when
           there is activity.
 
-          This setting will also affect the behaviour of other activity LEDs 
-          e.g. Bluetooth. 
+          This setting will also affect the behaviour of other activity LEDs
+          e.g. Bluetooth.
 
 endchoice
 
@@ -91,11 +85,11 @@ choice
         depends on ETRAX_SERIAL_PORT0
         default ETRAX_SERIAL_PORT0_DMA6_OUT
 
-config CONFIG_ETRAX_SERIAL_PORT0_NO_DMA_OUT
-       bool "No DMA out"
+config ETRAX_SERIAL_PORT0_NO_DMA_OUT
+        bool "No DMA out"
 
-config CONFIG_ETRAX_SERIAL_PORT0_DMA6_OUT
-       bool "DMA 6"
+config ETRAX_SERIAL_PORT0_DMA6_OUT
+        bool "DMA 6"
 
 endchoice
 
@@ -104,11 +98,11 @@ choice
         depends on ETRAX_SERIAL_PORT0
         default ETRAX_SERIAL_PORT0_DMA7_IN
 
-config CONFIG_ETRAX_SERIAL_PORT0_NO_DMA_IN
-       bool "No DMA in"
+config ETRAX_SERIAL_PORT0_NO_DMA_IN
+        bool "No DMA in"
 
-config CONFIG_ETRAX_SERIAL_PORT0_DMA7_IN
-       bool "DMA 7"
+config ETRAX_SERIAL_PORT0_DMA7_IN
+        bool "DMA 7"
 
 endchoice
 
@@ -205,11 +199,11 @@ choice
         depends on ETRAX_SERIAL_PORT1
         default ETRAX_SERIAL_PORT1_DMA8_OUT
 
-config CONFIG_ETRAX_SERIAL_PORT1_NO_DMA_OUT
-       bool "No DMA out"
+config ETRAX_SERIAL_PORT1_NO_DMA_OUT
+        bool "No DMA out"
 
-config CONFIG_ETRAX_SERIAL_PORT1_DMA8_OUT
-       bool "DMA 8"
+config ETRAX_SERIAL_PORT1_DMA8_OUT
+        bool "DMA 8"
 
 endchoice
 
@@ -218,11 +212,11 @@ choice
         depends on ETRAX_SERIAL_PORT1
         default ETRAX_SERIAL_PORT1_DMA9_IN
 
-config CONFIG_ETRAX_SERIAL_PORT1_NO_DMA_IN
-       bool "No DMA in"
+config ETRAX_SERIAL_PORT1_NO_DMA_IN
+        bool "No DMA in"
 
-config CONFIG_ETRAX_SERIAL_PORT1_DMA9_IN
-       bool "DMA 9"
+config ETRAX_SERIAL_PORT1_DMA9_IN
+        bool "DMA 9"
 
 endchoice
 
@@ -308,7 +302,7 @@ config ETRAX_SER1_CD_ON_PB_BIT
           Specify the pin of the PB port to carry the CD signal for serial
           port 1.
 
-comment "Make sure you dont have the same PB bits more than once!"
+comment "Make sure you do not have the same PB bits more than once!"
         depends on ETRAX_SERIAL && ETRAX_SER0_DTR_RI_DSR_CD_ON_PB && ETRAX_SER1_DTR_RI_DSR_CD_ON_PB
 
 config ETRAX_SERIAL_PORT2
@@ -322,11 +316,11 @@ choice
         depends on ETRAX_SERIAL_PORT2
         default ETRAX_SERIAL_PORT2_DMA2_OUT
 
-config CONFIG_ETRAX_SERIAL_PORT2_NO_DMA_OUT
-       bool "No DMA out"
+config ETRAX_SERIAL_PORT2_NO_DMA_OUT
+        bool "No DMA out"
 
-config CONFIG_ETRAX_SERIAL_PORT2_DMA2_OUT
-       bool "DMA 2"
+config ETRAX_SERIAL_PORT2_DMA2_OUT
+        bool "DMA 2"
 
 endchoice
 
@@ -335,11 +329,11 @@ choice
         depends on ETRAX_SERIAL_PORT2
         default ETRAX_SERIAL_PORT2_DMA3_IN
 
-config CONFIG_ETRAX_SERIAL_PORT2_NO_DMA_IN
-       bool "No DMA in"
+config ETRAX_SERIAL_PORT2_NO_DMA_IN
+        bool "No DMA in"
 
-config CONFIG_ETRAX_SERIAL_PORT2_DMA3_IN
-       bool "DMA 3"
+config ETRAX_SERIAL_PORT2_DMA3_IN
+        bool "DMA 3"
 
 endchoice
 
@@ -436,11 +430,11 @@ choice
         depends on ETRAX_SERIAL_PORT3
         default ETRAX_SERIAL_PORT3_DMA4_OUT
 
-config CONFIG_ETRAX_SERIAL_PORT3_NO_DMA_OUT
-       bool "No DMA out"
+config ETRAX_SERIAL_PORT3_NO_DMA_OUT
+        bool "No DMA out"
 
-config CONFIG_ETRAX_SERIAL_PORT3_DMA4_OUT
-       bool "DMA 4"
+config ETRAX_SERIAL_PORT3_DMA4_OUT
+        bool "DMA 4"
 
 endchoice
 
@@ -449,11 +443,11 @@ choice
         depends on ETRAX_SERIAL_PORT3
         default ETRAX_SERIAL_PORT3_DMA5_IN
 
-config CONFIG_ETRAX_SERIAL_PORT3_NO_DMA_IN
-       bool "No DMA in"
+config ETRAX_SERIAL_PORT3_NO_DMA_IN
+        bool "No DMA in"
 
-config CONFIG_ETRAX_SERIAL_PORT3_DMA5_IN
-       bool "DMA 5"
+config ETRAX_SERIAL_PORT3_DMA5_IN
+        bool "DMA 5"
 
 endchoice
 
@@ -554,7 +548,6 @@ config ETRAX_IDE
         select BLK_DEV_IDEDISK
         select BLK_DEV_IDECD
         select BLK_DEV_IDEDMA
-        select DMA_NONPCI
         help
           Enable this to get support for ATA/IDE.
           You can't use paralell ports or SCSI ports
@@ -579,7 +572,7 @@ config ETRAX_IDE_PB7_RESET
           IDE reset on pin 7 on port B
 
 config ETRAX_IDE_G27_RESET
-        bool "Port_G_Bit_27"
+        bool "Port_G_Bit_27"
         help
           IDE reset on pin 27 on port G
 
@@ -588,30 +581,36 @@ endchoice
 
 config ETRAX_USB_HOST
         bool "USB host"
+        select USB
         help
            This option enables the host functionality of the ETRAX 100LX
            built-in USB controller. In host mode the controller is designed
            for CTRL and BULK traffic only, INTR traffic may work as well
            however (depending on the requirements of timeliness).
 
-config USB
-       tristate
-       depends on ETRAX_USB_HOST
-       default y
-
 config ETRAX_USB_HOST_PORT1
-       bool "  USB port 1 enabled"
-       depends on ETRAX_USB_HOST
-       default n
+        bool "USB port 1 enabled"
+        depends on ETRAX_USB_HOST
+        default n
 
 config ETRAX_USB_HOST_PORT2
-       bool "  USB port 2 enabled"
-       depends on ETRAX_USB_HOST
-       default n
+        bool "USB port 2 enabled"
+        depends on ETRAX_USB_HOST
+        default n
 
 config ETRAX_AXISFLASHMAP
         bool "Axis flash-map support"
         depends on ETRAX_ARCH_V10
+        select MTD
+        select MTD_CFI
+        select MTD_CFI_AMDSTD
+        select MTD_OBSOLETE_CHIPS
+        select MTD_AMDSTD
+        select MTD_CHAR
+        select MTD_BLOCK
+        select MTD_PARTITIONS
+        select MTD_CONCAT
+        select MTD_COMPLEX_MAPPINGS
         help
           This option enables MTD mapping of flash devices.  Needed to use
           flash memories.  If unsure, say Y.
@@ -627,119 +626,6 @@ config ETRAX_PTABLE_SECTOR
           for changing this is when the flash block size is bigger
           than 64kB (e.g. when using two parallel 16 bit flashes).
 
-# here we define the CONFIG_'s necessary to enable MTD support
-# for the flash
-config MTD
-        tristate
-        depends on ETRAX_AXISFLASHMAP
-        default y
-        help
-          Memory Technology Devices are flash, RAM and similar chips, often
-          used for solid state file systems on embedded devices. This option
-          will provide the generic support for MTD drivers to register
-          themselves with the kernel and for potential users of MTD devices
-          to enumerate the devices which are present and obtain a handle on
-          them. It will also allow you to select individual drivers for 
-          particular hardware and users of MTD devices. If unsure, say N.
-
-config MTD_CFI
-        tristate
-        depends on ETRAX_AXISFLASHMAP
-        default y
-        help
-          The Common Flash Interface specification was developed by Intel,
-          AMD and other flash manufactures that provides a universal method
-          for probing the capabilities of flash devices. If you wish to
-          support any device that is CFI-compliant, you need to enable this
-          option. Visit <http://www.amd.com/products/nvd/overview/cfi.html>
-          for more information on CFI.
-
-config MTD_CFI_AMDSTD
-        tristate
-        depends on ETRAX_AXISFLASHMAP
-        default y
-        help
-          The Common Flash Interface defines a number of different command
-          sets which a CFI-compliant chip may claim to implement. This code
-          provides support for one of those command sets, used on chips 
-          chips including the AMD Am29LV320.
-
-config MTD_OBSOLETE_CHIPS
-        bool
-        depends on ETRAX_AXISFLASHMAP
-        default y
-        help
-          This option does not enable any code directly, but will allow you to
-          select some other chip drivers which are now considered obsolete,
-          because the generic CONFIG_JEDEC_PROBE code above should now detect
-          the chips which are supported by these drivers, and allow the generic
-          CFI-compatible drivers to drive the chips. Say 'N' here unless you have
-          already tried the CONFIG_JEDEC_PROBE method and reported its failure
-          to the MTD mailing list at <linux-mtd@lists.infradead.org>
-
-config MTD_AMDSTD
-        tristate
-        depends on ETRAX_AXISFLASHMAP
-        default y
-        help
-          This option enables support for flash chips using AMD-compatible
-          commands, including some which are not CFI-compatible and hence 
-          cannot be used with the CONFIG_MTD_CFI_AMDSTD option.
-
-          It also works on AMD compatible chips that do conform to CFI.
-
-config MTD_CHAR
-        tristate
-        depends on ETRAX_AXISFLASHMAP
-        default y
-        help
-          This provides a character device for each MTD device present in
-          the system, allowing the user to read and write directly to the
-          memory chips, and also use ioctl() to obtain information about
-          the device, or to erase parts of it.
-
-config MTD_BLOCK
-        tristate
-        depends on ETRAX_AXISFLASHMAP
-        default y
-        ---help---
-          Although most flash chips have an erase size too large to be useful
-          as block devices, it is possible to use MTD devices which are based
-          on RAM chips in this manner. This block device is a user of MTD
-          devices performing that function.
-
-          At the moment, it is also required for the Journalling Flash File
-          System(s) to obtain a handle on the MTD device when it's mounted
-          (although JFFS and JFFS2 don't actually use any of the functionality
-          of the mtdblock device).
-
-          Later, it may be extended to perform read/erase/modify/write cycles
-          on flash chips to emulate a smaller block size. Needless to say,
-          this is very unsafe, but could be useful for file systems which are
-          almost never written to.
-
-          You do not need this option for use with the DiskOnChip devices. For
-          those, enable NFTL support (CONFIG_NFTL) instead.
-
-config MTD_PARTITIONS
-        tristate
-        depends on ETRAX_AXISFLASHMAP
-        default y
-        help
-          If you have a device which needs to divide its flash chip(s) up
-          into multiple 'partitions', each of which appears to the user as
-          a separate MTD device, you require this option to be enabled. If
-          unsure, say 'Y'.
-
-          Note, however, that you don't need this option for the DiskOnChip
-          devices. Partitioning on NFTL 'devices' is a different - that's the
-          'normal' form of partitioning used on a block device.
-
-config MTD_CONCAT
-        tristate
-        depends on ETRAX_AXISFLASHMAP
-        default y
-
 config ETRAX_I2C
         bool "I2C support"
         depends on ETRAX_ARCH_V10
@@ -752,7 +638,7 @@ config ETRAX_I2C
           val = ioctl(fd, _IO(ETRAXI2C_IOCTYPE, I2C_READREG), i2c_arg);
 
 # this is true for most products since PB-I2C seems to be somewhat
-# flawed.. 
+# flawed..
 config ETRAX_I2C_USES_PB_NOT_PB_I2C
         bool "I2C uses PB not PB-I2C"
         depends on ETRAX_I2C
@@ -886,7 +772,7 @@ config ETRAX_RTC
         bool "Real Time Clock support"
         depends on ETRAX_ARCH_V10
         help
-          Enables drivers for the Real-Time Clock battery-backed chips on 
+          Enables drivers for the Real-Time Clock battery-backed chips on
           some products. The kernel reads the time when booting, and
           the date can be set using ioctl(fd, RTC_SET_TIME, &rt) with rt a
           rtc_time struct (see <file:include/asm-cris/rtc.h>) on the /dev/rtc
@@ -903,13 +789,13 @@ config ETRAX_DS1302
         bool "DS1302"
         help
           Enables the driver for the DS1302 Real-Time Clock battery-backed
-          chip on some products. 
+          chip on some products.
 
 config ETRAX_PCF8563
         bool "PCF8563"
         help
           Enables the driver for the PCF8563 Real-Time Clock battery-backed
-          chip on some products.  
+          chip on some products.
 
 endchoice
 
@@ -954,10 +840,8 @@ config ETRAX_DS1302_TRICKLE_CHARGE
         help
           This controls the initial value of the trickle charge register.
           0 = disabled (use this if you are unsure or have a non rechargable battery)
-          Otherwise the following values can be OR:ed together to control the 
+          Otherwise the following values can be OR:ed together to control the
           charge current:
           1 = 2kohm, 2 = 4kohm, 3 = 4kohm
           4 = 1 diode, 8 = 2 diodes
           Allowed values are (increasing current): 0, 11, 10, 9, 7, 6, 5
-
-