update to 3.14.3, convert some drivers to modules

37 files changed, 101 insertions, 79 deletions

diff --git a/Config.in b/Config.in
index 3c3687555..9b203f026 100644
--- a/Config.in
+++ b/Config.in
@@ -108,8 +108,8 @@ choice
 prompt "Kernel Version"
 default ADK_KERNEL_VERSION_3_13_11
 
-config ADK_KERNEL_VERSION_3_14_1
-	prompt "3.14.1"
+config ADK_KERNEL_VERSION_3_14_3
+	prompt "3.14.3"
 	boolean
 
 config ADK_KERNEL_VERSION_3_13_11
diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk
index 0f6ae1151..46ef60cc2 100644
--- a/mk/kernel-ver.mk
+++ b/mk/kernel-ver.mk
@@ -4,11 +4,11 @@ KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
 KERNEL_MD5SUM:=		d4e06af8b674ac74ba745d52e4382bd3
 endif
-ifeq ($(ADK_KERNEL_VERSION_3_14_1),y)
-KERNEL_VERSION:=	3.14.1
+ifeq ($(ADK_KERNEL_VERSION_3_14_3),y)
+KERNEL_VERSION:=	3.14.3
 KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
-KERNEL_MD5SUM:=		f53082540eed294f486a43fc67646ed2
+KERNEL_MD5SUM:=		99043433ad7368d2471b4743c9f562a2
 endif
 ifeq ($(ADK_KERNEL_VERSION_3_13_11),y)
 KERNEL_VERSION:=	3.13.11
diff --git a/mk/modules.mk b/mk/modules.mk
index 3dfffa548..017b39ecc 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -812,6 +812,17 @@ $(eval $(call KMOD_template,MD_RAID456,md-raid456,\
 ,35))
 
 #
+# Regmap
+# 
+$(eval $(call KMOD_template,REGMAP_I2C,regmap-i2c,\
+    $(MODULES_DIR)/kernel/drivers/base/regmap/regmap-i2c \
+,30))
+
+$(eval $(call KMOD_template,REGMAP_SPI,regmap-spi,\
+    $(MODULES_DIR)/kernel/drivers/base/regmap/regmap-spi \
+,30))
+
+#
 # Device Mapper
 #
 
@@ -1420,6 +1431,7 @@ $(eval $(call KMOD_template,SND_USB_AUDIO,snd-usb-audio,\
 #
 
 $(eval $(call KMOD_template,BT,bt,\
+	$(MODULES_DIR)/kernel/net/ieee802154/6lowpan_iphc \
 	$(MODULES_DIR)/kernel/net/bluetooth/bluetooth \
 ,70))
 
@@ -1791,14 +1803,28 @@ $(eval $(call KMOD_template,OPROFILE,oprofile,\
 ,10))
 
 #
+# SPI
+#
+$(eval $(call KMOD_template,SPI_BITBANG,spi-bitbang,\
+	$(MODULES_DIR)/kernel/drivers/spi/spi-bitbang \
+,20))
+
+$(eval $(call KMOD_template,SPI_IMX,spi-imx,\
+	$(MODULES_DIR)/kernel/drivers/spi/spi-imx \
+,25))
+
+#
 # I2C
 #
-$(eval $(call KMOD_template,I2C,i2c,\
-	$(MODULES_DIR)/kernel/drivers/i2c/i2c-core \
+$(eval $(call KMOD_template,I2C_DEV,i2c-dev,\
 	$(MODULES_DIR)/kernel/drivers/i2c/i2c-dev \
 ,20))
 
-$(eval $(call KMOD_template,SCx200_ACB,scx200-acb,\
+$(eval $(call KMOD_template,I2C_IMX,i2c-imx,\
+	$(MODULES_DIR)/kernel/drivers/i2c/busses/i2c-imx \
+,25))
+
+$(eval $(call KMOD_template,SCX200_ACB,scx200-acb,\
 	$(MODULES_DIR)/kernel/drivers/i2c/busses/scx200_acb \
 ,25))
 
diff --git a/target/linux/patches/3.14.1/sdma-firmware-cubox-i.patch b/target/arm/cubox-i/patches/3.14.3/sdma-firmware-cubox-i.patch
index 13f94a208..13f94a208 100644
--- a/target/linux/patches/3.14.1/sdma-firmware-cubox-i.patch
+++ b/target/arm/cubox-i/patches/3.14.3/sdma-firmware-cubox-i.patch
diff --git a/target/arm/sys-available/cubox-i b/target/arm/sys-available/cubox-i
index 5b58a56c8..46e37e75d 100644
--- a/target/arm/sys-available/cubox-i
+++ b/target/arm/sys-available/cubox-i
@@ -10,6 +10,7 @@ config ADK_TARGET_SYSTEM_CUBOX_I
 	select ADK_TARGET_WITH_VGA
 	select ADK_TARGET_WITH_USB
 	select ADK_TARGET_WITH_I2C
+	select ADK_TARGET_WITH_SPI
 	select ADK_TARGET_WITH_RTC
 	select ADK_TARGET_WITH_SDIO
 	select ADK_TARGET_WITH_SOUND
diff --git a/target/config/Config.in.hardware b/target/config/Config.in.hardware
index 0dd0c5f3d..ced7df690 100644
--- a/target/config/Config.in.hardware
+++ b/target/config/Config.in.hardware
@@ -5,6 +5,9 @@ config ADK_TARGET_WITH_USB
 config ADK_TARGET_WITH_I2C
 	boolean
 
+config ADK_TARGET_WITH_SPI
+	boolean
+
 config ADK_TARGET_WITH_PCI
 	boolean
 
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
diff --git a/target/linux/patches/3.14.1/bsd-compatibility.patch b/target/linux/patches/3.14.3/bsd-compatibility.patch
index b954b658f..b954b658f 100644
--- a/target/linux/patches/3.14.1/bsd-compatibility.patch
+++ b/target/linux/patches/3.14.3/bsd-compatibility.patch
diff --git a/target/linux/patches/3.14.1/defaults.patch b/target/linux/patches/3.14.3/defaults.patch
index 6cdca084e..6cdca084e 100644
--- a/target/linux/patches/3.14.1/defaults.patch
+++ b/target/linux/patches/3.14.3/defaults.patch
diff --git a/target/linux/patches/3.14.1/disable-netfilter.patch b/target/linux/patches/3.14.3/disable-netfilter.patch
index 7b1ca013a..7b1ca013a 100644
--- a/target/linux/patches/3.14.1/disable-netfilter.patch
+++ b/target/linux/patches/3.14.3/disable-netfilter.patch
diff --git a/target/linux/patches/3.14.1/export-symbol-for-exmap.patch b/target/linux/patches/3.14.3/export-symbol-for-exmap.patch
index 4f0fc8449..4f0fc8449 100644
--- a/target/linux/patches/3.14.1/export-symbol-for-exmap.patch
+++ b/target/linux/patches/3.14.3/export-symbol-for-exmap.patch
diff --git a/target/linux/patches/3.14.1/fblogo.patch b/target/linux/patches/3.14.3/fblogo.patch
index cbbb4216f..cbbb4216f 100644
--- a/target/linux/patches/3.14.1/fblogo.patch
+++ b/target/linux/patches/3.14.3/fblogo.patch
diff --git a/target/linux/patches/3.14.1/gemalto.patch b/target/linux/patches/3.14.3/gemalto.patch
index 65f7af1d7..65f7af1d7 100644
--- a/target/linux/patches/3.14.1/gemalto.patch
+++ b/target/linux/patches/3.14.3/gemalto.patch
diff --git a/target/linux/patches/3.14.1/initramfs-nosizelimit.patch b/target/linux/patches/3.14.3/initramfs-nosizelimit.patch
index 40d2f6bd8..40d2f6bd8 100644
--- a/target/linux/patches/3.14.1/initramfs-nosizelimit.patch
+++ b/target/linux/patches/3.14.3/initramfs-nosizelimit.patch
diff --git a/target/linux/patches/3.14.1/lemote-rfkill.patch b/target/linux/patches/3.14.3/lemote-rfkill.patch
index a61488434..a61488434 100644
--- a/target/linux/patches/3.14.1/lemote-rfkill.patch
+++ b/target/linux/patches/3.14.3/lemote-rfkill.patch
diff --git a/target/linux/patches/3.14.1/microblaze-axi.patch b/target/linux/patches/3.14.3/microblaze-axi.patch
index 1a4b17d8c..1a4b17d8c 100644
--- a/target/linux/patches/3.14.1/microblaze-axi.patch
+++ b/target/linux/patches/3.14.3/microblaze-axi.patch
diff --git a/target/linux/patches/3.14.1/microblaze-ethernet.patch b/target/linux/patches/3.14.3/microblaze-ethernet.patch
index 742ab477e..742ab477e 100644
--- a/target/linux/patches/3.14.1/microblaze-ethernet.patch
+++ b/target/linux/patches/3.14.3/microblaze-ethernet.patch
diff --git a/target/linux/patches/3.14.1/mtd-rootfs.patch b/target/linux/patches/3.14.3/mtd-rootfs.patch
index 775d5fc80..775d5fc80 100644
--- a/target/linux/patches/3.14.1/mtd-rootfs.patch
+++ b/target/linux/patches/3.14.3/mtd-rootfs.patch
diff --git a/target/linux/patches/3.14.1/non-static.patch b/target/linux/patches/3.14.3/non-static.patch
index a967703d0..a967703d0 100644
--- a/target/linux/patches/3.14.1/non-static.patch
+++ b/target/linux/patches/3.14.3/non-static.patch
diff --git a/target/linux/patches/3.14.1/ppc64-missing-zlib.patch b/target/linux/patches/3.14.3/ppc64-missing-zlib.patch
index c6e0616be..c6e0616be 100644
--- a/target/linux/patches/3.14.1/ppc64-missing-zlib.patch
+++ b/target/linux/patches/3.14.3/ppc64-missing-zlib.patch
diff --git a/target/linux/patches/3.14.1/startup.patch b/target/linux/patches/3.14.3/startup.patch
index d396b75e4..d396b75e4 100644
--- a/target/linux/patches/3.14.1/startup.patch
+++ b/target/linux/patches/3.14.3/startup.patch
diff --git a/target/linux/patches/3.14.1/uuid.patch b/target/linux/patches/3.14.3/uuid.patch
index e8d523074..e8d523074 100644
--- a/target/linux/patches/3.14.1/uuid.patch
+++ b/target/linux/patches/3.14.3/uuid.patch
diff --git a/target/linux/patches/3.14.1/wlan-cf.patch b/target/linux/patches/3.14.3/wlan-cf.patch
index fc20759e2..fc20759e2 100644
--- a/target/linux/patches/3.14.1/wlan-cf.patch
+++ b/target/linux/patches/3.14.3/wlan-cf.patch
diff --git a/target/linux/patches/3.14.1/xargs.patch b/target/linux/patches/3.14.3/xargs.patch
index 2c7b3df59..2c7b3df59 100644
--- a/target/linux/patches/3.14.1/xargs.patch
+++ b/target/linux/patches/3.14.3/xargs.patch
diff --git a/target/linux/patches/3.14.1/zlib-inflate.patch b/target/linux/patches/3.14.3/zlib-inflate.patch
index 58e1f6d21..58e1f6d21 100644
--- a/target/linux/patches/3.14.1/zlib-inflate.patch
+++ b/target/linux/patches/3.14.3/zlib-inflate.patch
diff --git a/toolchain/kernel-headers/patches/3.14.1/cleankernel.patch b/toolchain/kernel-headers/patches/3.14.3/cleankernel.patch
index d8c055dc3..d8c055dc3 100644
--- a/toolchain/kernel-headers/patches/3.14.1/cleankernel.patch
+++ b/toolchain/kernel-headers/patches/3.14.3/cleankernel.patch
diff --git a/toolchain/kernel-headers/patches/3.14.1/mkpiggy.patch b/toolchain/kernel-headers/patches/3.14.3/mkpiggy.patch
index 751678b74..751678b74 100644
--- a/toolchain/kernel-headers/patches/3.14.1/mkpiggy.patch
+++ b/toolchain/kernel-headers/patches/3.14.3/mkpiggy.patch
diff --git a/toolchain/kernel-headers/patches/3.14.1/relocs.patch b/toolchain/kernel-headers/patches/3.14.3/relocs.patch
index 69a7c88a9..69a7c88a9 100644
--- a/toolchain/kernel-headers/patches/3.14.1/relocs.patch
+++ b/toolchain/kernel-headers/patches/3.14.3/relocs.patch
diff --git a/toolchain/kernel-headers/patches/3.14.1/sgidefs.patch b/toolchain/kernel-headers/patches/3.14.3/sgidefs.patch
index f00a284d9..f00a284d9 100644
--- a/toolchain/kernel-headers/patches/3.14.1/sgidefs.patch
+++ b/toolchain/kernel-headers/patches/3.14.3/sgidefs.patch
diff --git a/toolchain/kernel-headers/patches/3.14.1/sortext.patch b/toolchain/kernel-headers/patches/3.14.3/sortext.patch
index 8fd4e1d6b..8fd4e1d6b 100644
--- a/toolchain/kernel-headers/patches/3.14.1/sortext.patch
+++ b/toolchain/kernel-headers/patches/3.14.3/sortext.patch