update to 3.14.3, convert some drivers to modules

8 files changed, 63 insertions, 71 deletions

diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio
index 81a3d2ae9..3c0d02dbf 100644
--- a/target/linux/config/Config.in.audio
+++ b/target/linux/config/Config.in.audio
@@ -171,6 +171,8 @@ config ADK_KPACKAGE_KMOD_SND_IMX_SOC
 	select ADK_KERNEL_SND_SOC_IMX_HDMI_DMA
 	select ADK_KERNEL_SND_SOC_IMX_HDMI
 	select ADK_KERNEL_SND_SOC_IMX_SPDIF
+	select ADK_KPACKAGE_KMOD_REGMAP_SPI
+	select ADK_KPACKAGE_KMOD_REGMAP_I2C
 	default y if ADK_TARGET_SYSTEM_CUBOX_I
 	default n
 
diff --git a/target/linux/config/Config.in.dma b/target/linux/config/Config.in.dma
index 0bf761bd4..350299568 100644
--- a/target/linux/config/Config.in.dma
+++ b/target/linux/config/Config.in.dma
@@ -1,6 +1,10 @@
 config ADK_KERNEL_DMADEVICES
 	boolean
 
+config ADK_KPACKAGE_KMOD_DMA_BCM2708
+        tristate
+        select ADK_KERNEL_DMADEVICES
+
 config ADK_KERNEL_IMX_SDMA
 	boolean
 	depends on ADK_TARGET_SYSTEM_CUBOX_I
diff --git a/target/linux/config/Config.in.i2c b/target/linux/config/Config.in.i2c
index eee17ee8c..f4e08fd18 100644
--- a/target/linux/config/Config.in.i2c
+++ b/target/linux/config/Config.in.i2c
@@ -1,29 +1,30 @@
 config ADK_KERNEL_I2C
  	boolean
  
-config ADK_KERNEL_I2C_CHARDEV
- 	boolean
+config ADK_KPACKAGE_KMOD_I2C_CHARDEV
+ 	tristate
 
 menu "I2C driver support"
 depends on ADK_TARGET_WITH_I2C
 
-config ADK_KERNEL_I2C_IMX
+config ADK_KPACKAGE_KMOD_I2C_IMX
 	prompt "I2C driver for Cubox-i"
-	boolean
+	tristate
 	depends on ADK_TARGET_SYSTEM_CUBOX_I
 	select ADK_KERNEL_I2C
-	select ADK_KERNEL_I2C_CHARDEV
+	select ADK_KPACKAGE_KMOD_I2C_CHARDEV
 	default y if ADK_TARGET_SYSTEM_CUBOX_I
 	default n
 	help
-	  I2C driver for cubox-i.
+	  I2C driver for Cubox-i.
 	
-config ADK_KPACKAGE_KMOD_SCx200_ACB
+config ADK_KPACKAGE_KMOD_SCX200_ACB
 	prompt "I2C driver for Geode"
 	tristate
 	depends on ADK_CPU_GEODE
 	select ADK_KERNEL_I2C
-	select ADK_KERNEL_I2C_CHARDEV
+	select ADK_KPACKAGE_KMOD_I2C_CHARDEV
+	default y if ADK_CPU_GEODE
 	default n
 	help
 	  I2C driver for Geode boards.
diff --git a/target/linux/config/Config.in.misc b/target/linux/config/Config.in.misc
index 88b1e9692..175993155 100644
--- a/target/linux/config/Config.in.misc
+++ b/target/linux/config/Config.in.misc
@@ -11,14 +11,6 @@ config ADK_KERNEL_FW_LOADER_USER_HELPER
 	boolean
 	default n
 
-config ADK_KPACKAGE_KMOD_DMA_BCM2708
-	select ADK_KERNEL_DMADEVICES
-	boolean
-
-config ADK_KPACKAGE_KMOD_REGMAP_MMIO
-	select ADK_KERNEL_REGMAP
-	boolean
-
 config ADK_KERNEL_KEYS
 	boolean
 
diff --git a/target/linux/config/Config.in.netfilter.ip4 b/target/linux/config/Config.in.netfilter.ip4
index 046fe8254..ff374fc46 100644
--- a/target/linux/config/Config.in.netfilter.ip4
+++ b/target/linux/config/Config.in.netfilter.ip4
@@ -41,7 +41,7 @@ config ADK_KPACKAGE_KMOD_FULL_NAT
 	select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_11_10
 	select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_12_18
 	select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_13_11
-	select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_14_1
+	select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_14_3
 
 config ADK_KPACKAGE_KMOD_NF_NAT
 	tristate 'Full NAT'
@@ -59,7 +59,7 @@ config ADK_KPACKAGE_KMOD_NF_NAT_IPV4
 		|| ADK_KERNEL_VERSION_3_11_10 \
 		|| ADK_KERNEL_VERSION_3_12_18 \
 		|| ADK_KERNEL_VERSION_3_13_11 \
-		|| ADK_KERNEL_VERSION_3_14_1
+		|| ADK_KERNEL_VERSION_3_14_3
 	help
 	  The Full NAT option allows masquerading, port forwarding and other
 	  forms of full Network Address Port Translation.  It is controlled by
diff --git a/target/linux/config/Config.in.regulator b/target/linux/config/Config.in.regulator
index 80b3c9e69..ede860c7b 100644
--- a/target/linux/config/Config.in.regulator
+++ b/target/linux/config/Config.in.regulator
@@ -2,50 +2,61 @@ config ADK_KERNEL_REGULATOR
 	boolean
 	default n
 
-config ADK_KERNEL_REGULATOR_FIXED_VOLTAGE
+config ADK_KPACKAGE_KMOD_REGULATOR_FIXED_VOLTAGE
 	boolean
+	select ADK_KERNEL_REGULATOR
 	default n
 
-config ADK_KERNEL_REGULATOR_ANATOP
+config ADK_KPACKAGE_KMOD_REGULATOR_ANATOP
 	boolean
+	select ADK_KERNEL_REGULATOR
 	default n
 
-config ADK_KERNEL_REGULATOR_MC13XXX_CORE
+config ADK_KPACKAGE_KMOD_REGULATOR_MC13XXX_CORE
 	boolean
+	select ADK_KERNEL_REGULATOR
 	default n
 
-config ADK_KERNEL_REGULATOR_DA9052
+config ADK_KPACKAGE_KMOD_REGULATOR_DA9052
 	boolean
+	select ADK_KERNEL_REGULATOR
 	default n
 
-config ADK_KERNEL_REGULATOR_MC13783
+config ADK_KPACKAGE_KMOD_REGULATOR_MC13783
 	boolean
+	select ADK_KERNEL_REGULATOR
 	default n
 
-config ADK_KERNEL_REGULATOR_MC13892
+config ADK_KPACKAGE_KMOD_REGULATOR_MC13892
 	boolean
+	select ADK_KERNEL_REGULATOR
 	default n
 	
-config ADK_KERNEL_REGULATOR_PFUZE100
+config ADK_KPACKAGE_KMOD_REGULATOR_PFUZE100
 	boolean
+	select ADK_KERNEL_REGULATOR
 	default n
 
 config ADK_KERNEL_REGMAP
 	boolean
 	default n
 
-config ADK_KERNEL_REGMAP_I2C
-	boolean
+config ADK_KPACKAGE_KMOD_REGMAP_I2C
+	tristate
+	select ADK_KERNEL_REGMAP
 	default n
 
-config ADK_KERNEL_REGMAP_SPI
-	boolean
+config ADK_KPACKAGE_KMOD_REGMAP_SPI
+	tristate
+	select ADK_KERNEL_REGMAP
 	default n
 
 config ADK_KERNEL_REGMAP_MMIO
-	boolean
+	tristate
+	select ADK_KERNEL_REGMAP
 	default n
 
-config ADK_KERNEL_REGMAP_IRQ
-	boolean
+config ADK_KPACKAGE_KMOD_REGMAP_IRQ
+	tristate
+	select ADK_KERNEL_REGMAP
 	default n
diff --git a/target/linux/config/Config.in.sensors b/target/linux/config/Config.in.sensors
deleted file mode 100644
index 9a9b44f5f..000000000
--- a/target/linux/config/Config.in.sensors
+++ /dev/null
@@ -1,24 +0,0 @@
-menu "Sensors"
-
-config ADK_KERNEL_HWMON
-	boolean
-
-config ADK_KPACKAGE_KMOD_CORETEMP
-	prompt "Coretemp"
-	boolean
-	select ADK_KERNEL_EXPERIMENTAL
-	select ADK_KERNEL_I2C
-	select ADK_KERNEL_I2C_CHARDEV
-	select ADK_KERNEL_HWMON
-	default n
-	help
-	  Coretemp module
-
-config ADK_KPACKAGE_KMOD_IT87
-	prompt "IT87"
-	boolean
-	default n
-	help
-	  Module for IT87 smbus chipsets
-endmenu
-
diff --git a/target/linux/config/Config.in.spi b/target/linux/config/Config.in.spi
index 125a90344..1999241d6 100644
--- a/target/linux/config/Config.in.spi
+++ b/target/linux/config/Config.in.spi
@@ -4,32 +4,38 @@ config ADK_KERNEL_SPI
 config ADK_KERNEL_SPI_MASTER
 	boolean
 
-config ADK_KERNEL_SPI_BITBANG
-	boolean
+menu "SPI driver support"
+depends on ADK_TARGET_WITH_SPI
 
-config ADK_KERNEL_SPI_XILINX
-	boolean
+config ADK_KPACKAGE_KMOD_SPI_BITBANG
+	tristate
+
+config ADK_KPACKAGE_KMOD_SPI_XILINX
+	tristate
 
-config ADK_KERNEL_SPI_AR71XX
+config ADK_KPACKAGE_KMOD_SPI_AR71XX
+	tristate
 	select ADK_KERNEL_SPI
-	boolean
 
-config ADK_KERNEL_SPI_RB4XX
+config ADK_KPACKAGE_KMOD_SPI_RB4XX
+	tristate
 	select ADK_KERNEL_SPI
-	boolean
 
-config ADK_KERNEL_SPI_RB4XX_CPLD
+config ADK_KPACKAGE_KMOD_SPI_RB4XX_CPLD
+	tristate
 	select ADK_KERNEL_SPI
-	boolean
 
-config ADK_KERNEL_SPI_PXA2XX
+config ADK_KPACKAGE_KMOD_SPI_PXA2XX
+	tristate
 	select ADK_KERNEL_SPI
-	boolean
 
-config ADK_KERNEL_SPI_IMX
-	boolean
+config ADK_KPACKAGE_KMOD_SPI_IMX
+	prompt "SPI driver for Solidrun Cubox-i"
+	tristate
 	select ADK_KERNEL_SPI
 	select ADK_KERNEL_SPI_MASTER
-	select ADK_KERNEL_SPI_BITBANG
+	select ADK_KPACKAGE_KMOD_SPI_BITBANG
 	default y if ADK_TARGET_SYSTEM_CUBOX_I
 	default n
+
+endmenu