Merge branch 'master' of git+ssh://openadk.org/git/openadk

34 files changed, 64 insertions, 39 deletions

diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio
index f9bea1260..7ff42afe9 100644
--- a/target/linux/config/Config.in.audio
+++ b/target/linux/config/Config.in.audio
@@ -74,15 +74,25 @@ config ADK_KERNEL_SND_SOC_I2C_AND_SPI
 	boolean
 
 config ADK_KERNEL_SND_SOC_WM8804
-	boolean
+	tristate
 	select ADK_KERNEL_SND_SOC_I2C_AND_SPI
 
 config ADK_KERNEL_SND_SOC_PCM5102A
-	boolean
+	tristate
+	select ADK_KERNEL_SND_SOC_I2C_AND_SPI
+
+config ADK_KERNEL_SND_SOC_PCM512x
+	tristate
 	select ADK_KERNEL_SND_SOC_I2C_AND_SPI
 
 config ADK_KERNEL_SND_SOC_PCM512x_I2C
-	boolean
+	tristate
+	select ADK_KERNEL_SND_SOC_PCM512x
+	select ADK_KERNEL_SND_SOC_I2C_AND_SPI
+
+config ADK_KERNEL_SND_SOC_PCM512x_SPI
+	tristate
+	select ADK_KERNEL_SND_SOC_PCM512x
 	select ADK_KERNEL_SND_SOC_I2C_AND_SPI
 
 config ADK_KERNEL_SND_PCM_DMAENGINE
@@ -162,10 +172,12 @@ config ADK_KERNEL_SND_BCM2835
 	default n
 
 config ADK_KERNEL_SND_BCM2708_SOC_I2S
-	boolean
+	tristate
 	select ADK_KERNEL_SND
 	select ADK_KERNEL_SND_ARM
 	select ADK_KERNEL_SND_SOC
+	select ADK_KERNEL_SND_BCM2835
+	select ADK_KERNEL_DMA_BCM2835
 	select ADK_KERNEL_SND_DMAENGINE_PCM
 	select ADK_KERNEL_SND_SOC_GENERIC_DMAENGINE_PCM
 	select ADK_KERNEL_REGMAP_MMIO
@@ -174,8 +186,7 @@ config ADK_KERNEL_SND_BCM2708_SOC_I2S
 
 config ADK_KERNEL_SND_BCM2708_SOC_HIFIBERRY_DAC
 	prompt "Raspberry PI hifiberry DAC"
-	boolean
-	select ADK_KERNEL_DMA_BCM2708
+	tristate
 	select ADK_KERNEL_SND_BCM2708_SOC_I2S
 	select ADK_KERNEL_SND_SOC_PCM5102A
 	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
@@ -183,8 +194,7 @@ config ADK_KERNEL_SND_BCM2708_SOC_HIFIBERRY_DAC
 
 config ADK_KERNEL_SND_BCM2708_SOC_HIFIBERRY_DIGI
 	prompt "Raspberry PI hifiberry DIGI"
-	boolean
-	select ADK_KERNEL_DMA_BCM2708
+	tristate
 	select ADK_KERNEL_SND_BCM2708_SOC_I2S
 	select ADK_KERNEL_SND_SOC_WM8804
 	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
@@ -192,16 +202,14 @@ config ADK_KERNEL_SND_BCM2708_SOC_HIFIBERRY_DIGI
 
 config ADK_KERNEL_SND_BCM2708_SOC_RPI_DAC
 	prompt "Raspberry PI RPI-DAC"
-	boolean
-	select ADK_KERNEL_DMA_BCM2708
+	tristate
 	select ADK_KERNEL_SND_BCM2708_SOC_I2S
 	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n
 
 config ADK_KERNEL_SND_BCM2708_SOC_IQAUDIO_DAC
 	prompt "Raspberry PI IQAudio-DAC"
-	boolean
-	select ADK_KERNEL_DMA_BCM2708
+	tristate
 	select ADK_KERNEL_SND_BCM2708_SOC_I2S
 	select ADK_KERNEL_SND_SOC_PCM512x_I2C
 	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
diff --git a/target/linux/config/Config.in.dma b/target/linux/config/Config.in.dma
index 9ea4a2e12..ce5a86f1e 100644
--- a/target/linux/config/Config.in.dma
+++ b/target/linux/config/Config.in.dma
@@ -4,6 +4,9 @@ config ADK_KERNEL_DMADEVICES
 config ADK_KERNEL_DMA_BCM2708
         boolean
         select ADK_KERNEL_DMADEVICES
+	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
+	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
+	default n
 
 config ADK_KERNEL_IMX_SDMA
 	boolean
diff --git a/target/linux/config/Config.in.gpio b/target/linux/config/Config.in.gpio
index 678b04674..64b4c46ab 100644
--- a/target/linux/config/Config.in.gpio
+++ b/target/linux/config/Config.in.gpio
@@ -13,6 +13,16 @@ config ADK_KERNEL_GPIO_SYSFS
 config ADK_KERNEL_GPIO_GENERIC
 	boolean
 
+config ADK_KERNEL_BCM2708_GPIO
+	boolean
+	select ADK_KERNEL_GPIOLIB
+	select ADK_KERNEL_GPIO_SYSFS
+	select ADK_KERNEL_GPIO_GENERIC
+	select ADK_KERNEL_RESET_CONTROLLER
+	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
+	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
+	default n
+
 config ADK_KERNEL_GPIO_MXC
 	boolean
 	select ADK_KERNEL_GPIOLIB
@@ -20,5 +30,6 @@ config ADK_KERNEL_GPIO_MXC
 	select ADK_KERNEL_GPIO_GENERIC
 	select ADK_KERNEL_RESET_CONTROLLER
 	select ADK_KERNEL_RESET_GPIO
+	depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default n
diff --git a/target/linux/config/Config.in.i2c b/target/linux/config/Config.in.i2c
index 83ef3a1fa..feb06eaea 100644
--- a/target/linux/config/Config.in.i2c
+++ b/target/linux/config/Config.in.i2c
@@ -7,7 +7,7 @@ config ADK_KERNEL_I2C
 config ADK_KERNEL_I2C_CHARDEV
  	tristate
 
-config ADK_KERNEL_I2C_BCM2835
+config ADK_KERNEL_I2C_BCM2708
 	prompt "I2C driver for Raspberry PI"
 	tristate
 	select ADK_KERNEL_I2C
diff --git a/target/linux/config/Config.in.misc b/target/linux/config/Config.in.misc
index 6823ee612..931bda8a8 100644
--- a/target/linux/config/Config.in.misc
+++ b/target/linux/config/Config.in.misc
@@ -31,6 +31,7 @@ source "target/linux/config/Config.in.leds"
 source "target/linux/config/Config.in.watchdog"
 source "target/linux/config/Config.in.i2c"
 source "target/linux/config/Config.in.spi"
+source "target/linux/config/Config.in.regmap"
 source "target/linux/config/Config.in.regulator"
 source "target/linux/config/Config.in.gpio"
 source "target/linux/config/Config.in.dma"
diff --git a/target/linux/config/Config.in.regmap b/target/linux/config/Config.in.regmap
new file mode 100644
index 000000000..44a8bcca0
--- /dev/null
+++ b/target/linux/config/Config.in.regmap
@@ -0,0 +1,25 @@
+config ADK_KERNEL_REGMAP
+	boolean
+	select ADK_KERNEL_LZO_COMPRESS
+	select ADK_KERNEL_LZO_DECOMPRESS
+	default n
+
+config ADK_KERNEL_REGMAP_I2C
+	boolean
+	select ADK_KERNEL_REGMAP
+	default n
+
+config ADK_KERNEL_REGMAP_SPI
+	boolean
+	select ADK_KERNEL_REGMAP
+	default n
+
+config ADK_KERNEL_REGMAP_MMIO
+	boolean
+	select ADK_KERNEL_REGMAP
+	default n
+
+config ADK_KERNEL_REGMAP_IRQ
+	boolean
+	select ADK_KERNEL_REGMAP
+	default n
diff --git a/target/linux/config/Config.in.regulator b/target/linux/config/Config.in.regulator
index 6e8f8dfd1..a6a6c90a7 100644
--- a/target/linux/config/Config.in.regulator
+++ b/target/linux/config/Config.in.regulator
@@ -37,28 +37,3 @@ config ADK_KERNEL_REGULATOR_PFUZE100
 	select ADK_KERNEL_REGULATOR
 	default n
 
-config ADK_KERNEL_REGMAP
-	boolean
-	select ADK_KERNEL_LZO_COMPRESS
-	select ADK_KERNEL_LZO_DECOMPRESS
-	default n
-
-config ADK_KERNEL_REGMAP_I2C
-	boolean
-	select ADK_KERNEL_REGMAP
-	default n
-
-config ADK_KERNEL_REGMAP_SPI
-	boolean
-	select ADK_KERNEL_REGMAP
-	default n
-
-config ADK_KERNEL_REGMAP_MMIO
-	boolean
-	select ADK_KERNEL_REGMAP
-	default n
-
-config ADK_KERNEL_REGMAP_IRQ
-	boolean
-	select ADK_KERNEL_REGMAP
-	default n
diff --git a/target/linux/config/Config.in.spi b/target/linux/config/Config.in.spi
index 9a6e6e337..d58215eab 100644
--- a/target/linux/config/Config.in.spi
+++ b/target/linux/config/Config.in.spi
@@ -26,12 +26,13 @@ config ADK_KERNEL_SPI_PXA2XX
 	tristate
 	select ADK_KERNEL_SPI
 
-config ADK_KERNEL_SPI_BCM2835
+config ADK_KERNEL_SPI_BCM2708
 	prompt "SPI driver for Raspberry PI"
 	tristate
 	select ADK_KERNEL_SPI
 	select ADK_KERNEL_SPI_MASTER
 	select ADK_KERNEL_SPI_BITBANG
+	select ADK_KERNEL_REGMAP_SPI
 	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n
@@ -42,6 +43,7 @@ config ADK_KERNEL_SPI_IMX
 	select ADK_KERNEL_SPI
 	select ADK_KERNEL_SPI_MASTER
 	select ADK_KERNEL_SPI_BITBANG
+	select ADK_KERNEL_REGMAP_SPI
 	depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default n
diff --git a/target/linux/patches/3.16.2/bsd-compatibility.patch b/target/linux/patches/3.16.4/bsd-compatibility.patch
index b954b658f..b954b658f 100644
--- a/target/linux/patches/3.16.2/bsd-compatibility.patch
+++ b/target/linux/patches/3.16.4/bsd-compatibility.patch
diff --git a/target/linux/patches/3.16.2/cleankernel.patch b/target/linux/patches/3.16.4/cleankernel.patch
index d8c055dc3..d8c055dc3 100644
--- a/target/linux/patches/3.16.2/cleankernel.patch
+++ b/target/linux/patches/3.16.4/cleankernel.patch
diff --git a/target/linux/patches/3.16.2/cris-header.patch b/target/linux/patches/3.16.4/cris-header.patch
index 3db07e530..3db07e530 100644
--- a/target/linux/patches/3.16.2/cris-header.patch
+++ b/target/linux/patches/3.16.4/cris-header.patch
diff --git a/target/linux/patches/3.16.2/defaults.patch b/target/linux/patches/3.16.4/defaults.patch
index 6cdca084e..6cdca084e 100644
--- a/target/linux/patches/3.16.2/defaults.patch
+++ b/target/linux/patches/3.16.4/defaults.patch
diff --git a/target/linux/patches/3.16.2/disable-netfilter.patch b/target/linux/patches/3.16.4/disable-netfilter.patch
index 7b1ca013a..7b1ca013a 100644
--- a/target/linux/patches/3.16.2/disable-netfilter.patch
+++ b/target/linux/patches/3.16.4/disable-netfilter.patch
diff --git a/target/linux/patches/3.16.2/export-symbol-for-exmap.patch b/target/linux/patches/3.16.4/export-symbol-for-exmap.patch
index 4f0fc8449..4f0fc8449 100644
--- a/target/linux/patches/3.16.2/export-symbol-for-exmap.patch
+++ b/target/linux/patches/3.16.4/export-symbol-for-exmap.patch
diff --git a/target/linux/patches/3.16.2/gemalto.patch b/target/linux/patches/3.16.4/gemalto.patch
index 65f7af1d7..65f7af1d7 100644
--- a/target/linux/patches/3.16.2/gemalto.patch
+++ b/target/linux/patches/3.16.4/gemalto.patch
diff --git a/target/linux/patches/3.16.2/initramfs-nosizelimit.patch b/target/linux/patches/3.16.4/initramfs-nosizelimit.patch
index 40d2f6bd8..40d2f6bd8 100644
--- a/target/linux/patches/3.16.2/initramfs-nosizelimit.patch
+++ b/target/linux/patches/3.16.4/initramfs-nosizelimit.patch
diff --git a/target/linux/patches/3.16.2/lemote-rfkill.patch b/target/linux/patches/3.16.4/lemote-rfkill.patch
index a61488434..a61488434 100644
--- a/target/linux/patches/3.16.2/lemote-rfkill.patch
+++ b/target/linux/patches/3.16.4/lemote-rfkill.patch
diff --git a/target/linux/patches/3.16.2/microblaze-axi.patch b/target/linux/patches/3.16.4/microblaze-axi.patch
index 1a4b17d8c..1a4b17d8c 100644
--- a/target/linux/patches/3.16.2/microblaze-axi.patch
+++ b/target/linux/patches/3.16.4/microblaze-axi.patch
diff --git a/target/linux/patches/3.16.2/microblaze-ethernet.patch b/target/linux/patches/3.16.4/microblaze-ethernet.patch
index 742ab477e..742ab477e 100644
--- a/target/linux/patches/3.16.2/microblaze-ethernet.patch
+++ b/target/linux/patches/3.16.4/microblaze-ethernet.patch
diff --git a/target/linux/patches/3.16.2/mkpiggy.patch b/target/linux/patches/3.16.4/mkpiggy.patch
index 751678b74..751678b74 100644
--- a/target/linux/patches/3.16.2/mkpiggy.patch
+++ b/target/linux/patches/3.16.4/mkpiggy.patch
diff --git a/target/linux/patches/3.16.2/mtd-rootfs.patch b/target/linux/patches/3.16.4/mtd-rootfs.patch
index 775d5fc80..775d5fc80 100644
--- a/target/linux/patches/3.16.2/mtd-rootfs.patch
+++ b/target/linux/patches/3.16.4/mtd-rootfs.patch
diff --git a/target/linux/patches/3.16.2/nfsv3-tcp.patch b/target/linux/patches/3.16.4/nfsv3-tcp.patch
index d5e07e1c2..d5e07e1c2 100644
--- a/target/linux/patches/3.16.2/nfsv3-tcp.patch
+++ b/target/linux/patches/3.16.4/nfsv3-tcp.patch
diff --git a/target/linux/patches/3.16.2/non-static.patch b/target/linux/patches/3.16.4/non-static.patch
index a967703d0..a967703d0 100644
--- a/target/linux/patches/3.16.2/non-static.patch
+++ b/target/linux/patches/3.16.4/non-static.patch
diff --git a/target/linux/patches/3.16.2/patch-fblogo b/target/linux/patches/3.16.4/patch-fblogo
index f1fad64c1..f1fad64c1 100644
--- a/target/linux/patches/3.16.2/patch-fblogo
+++ b/target/linux/patches/3.16.4/patch-fblogo
diff --git a/target/linux/patches/3.16.2/patch-yaffs2 b/target/linux/patches/3.16.4/patch-yaffs2
index bb244c7ca..bb244c7ca 100644
--- a/target/linux/patches/3.16.2/patch-yaffs2
+++ b/target/linux/patches/3.16.4/patch-yaffs2
diff --git a/target/linux/patches/3.16.2/ppc64-missing-zlib.patch b/target/linux/patches/3.16.4/ppc64-missing-zlib.patch
index c6e0616be..c6e0616be 100644
--- a/target/linux/patches/3.16.2/ppc64-missing-zlib.patch
+++ b/target/linux/patches/3.16.4/ppc64-missing-zlib.patch
diff --git a/target/linux/patches/3.16.2/regmap-boolean.patch b/target/linux/patches/3.16.4/regmap-boolean.patch
index b61c4792a..b61c4792a 100644
--- a/target/linux/patches/3.16.2/regmap-boolean.patch
+++ b/target/linux/patches/3.16.4/regmap-boolean.patch
diff --git a/target/linux/patches/3.16.2/relocs.patch b/target/linux/patches/3.16.4/relocs.patch
index 69a7c88a9..69a7c88a9 100644
--- a/target/linux/patches/3.16.2/relocs.patch
+++ b/target/linux/patches/3.16.4/relocs.patch
diff --git a/target/linux/patches/3.16.2/sgidefs.patch b/target/linux/patches/3.16.4/sgidefs.patch
index f00a284d9..f00a284d9 100644
--- a/target/linux/patches/3.16.2/sgidefs.patch
+++ b/target/linux/patches/3.16.4/sgidefs.patch
diff --git a/target/linux/patches/3.16.2/sortext.patch b/target/linux/patches/3.16.4/sortext.patch
index 8fd4e1d6b..8fd4e1d6b 100644
--- a/target/linux/patches/3.16.2/sortext.patch
+++ b/target/linux/patches/3.16.4/sortext.patch
diff --git a/target/linux/patches/3.16.2/sparc-memset.patch b/target/linux/patches/3.16.4/sparc-memset.patch
index 022c87b3a..022c87b3a 100644
--- a/target/linux/patches/3.16.2/sparc-memset.patch
+++ b/target/linux/patches/3.16.4/sparc-memset.patch
diff --git a/target/linux/patches/3.16.2/startup.patch b/target/linux/patches/3.16.4/startup.patch
index d396b75e4..d396b75e4 100644
--- a/target/linux/patches/3.16.2/startup.patch
+++ b/target/linux/patches/3.16.4/startup.patch
diff --git a/target/linux/patches/3.16.2/wlan-cf.patch b/target/linux/patches/3.16.4/wlan-cf.patch
index fc20759e2..fc20759e2 100644
--- a/target/linux/patches/3.16.2/wlan-cf.patch
+++ b/target/linux/patches/3.16.4/wlan-cf.patch
diff --git a/target/linux/patches/3.16.2/xargs.patch b/target/linux/patches/3.16.4/xargs.patch
index 2c7b3df59..2c7b3df59 100644
--- a/target/linux/patches/3.16.2/xargs.patch
+++ b/target/linux/patches/3.16.4/xargs.patch