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

88 files changed, 80 insertions, 225 deletions

diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio
index 7ff42afe9..d8888be5a 100644
--- a/target/linux/config/Config.in.audio
+++ b/target/linux/config/Config.in.audio
@@ -73,6 +73,10 @@ config ADK_KERNEL_SND_AC97_CODEC
 config ADK_KERNEL_SND_SOC_I2C_AND_SPI
 	boolean
 
+config ADK_KERNEL_SND_SOC_WM8731
+	tristate
+	select ADK_KERNEL_SND_SOC_I2C_AND_SPI
+
 config ADK_KERNEL_SND_SOC_WM8804
 	tristate
 	select ADK_KERNEL_SND_SOC_I2C_AND_SPI
@@ -185,7 +189,7 @@ config ADK_KERNEL_SND_BCM2708_SOC_I2S
 	default n
 
 config ADK_KERNEL_SND_BCM2708_SOC_HIFIBERRY_DAC
-	prompt "Raspberry PI hifiberry DAC"
+	prompt "Hifiberry DAC"
 	tristate
 	select ADK_KERNEL_SND_BCM2708_SOC_I2S
 	select ADK_KERNEL_SND_SOC_PCM5102A
@@ -193,7 +197,7 @@ config ADK_KERNEL_SND_BCM2708_SOC_HIFIBERRY_DAC
 	default n
 
 config ADK_KERNEL_SND_BCM2708_SOC_HIFIBERRY_DIGI
-	prompt "Raspberry PI hifiberry DIGI"
+	prompt "Hifiberry DIGI"
 	tristate
 	select ADK_KERNEL_SND_BCM2708_SOC_I2S
 	select ADK_KERNEL_SND_SOC_WM8804
@@ -201,20 +205,28 @@ config ADK_KERNEL_SND_BCM2708_SOC_HIFIBERRY_DIGI
 	default n
 
 config ADK_KERNEL_SND_BCM2708_SOC_RPI_DAC
-	prompt "Raspberry PI RPI-DAC"
+	prompt "RPI-DAC"
 	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"
+	prompt "IQAudio-DAC"
 	tristate
 	select ADK_KERNEL_SND_BCM2708_SOC_I2S
 	select ADK_KERNEL_SND_SOC_PCM512x_I2C
 	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n
 
+config ADK_KERNEL_SND_BCM2708_SOC_RPI_CODEC_PROTO
+	prompt "Rpi-Codec-Proto"
+	tristate
+	select ADK_KERNEL_SND_BCM2708_SOC_I2S
+	select ADK_KERNEL_SND_SOC_WM8731
+	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
+	default n
+
 config ADK_KERNEL_SND_IMX_SOC
 	prompt "Solidrun SoC sound chip"
 	boolean
diff --git a/target/linux/config/Config.in.bluetooth b/target/linux/config/Config.in.bluetooth
index 64226aba6..f9c8ea8b6 100644
--- a/target/linux/config/Config.in.bluetooth
+++ b/target/linux/config/Config.in.bluetooth
@@ -82,7 +82,6 @@ config ADK_KERNEL_BT_HCIBTSDIO
 	tristate
 	select ADK_KERNEL_BT
 	depends on ADK_TARGET_WITH_SDIO
-	default m if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default n
 	help
 	  Bluetooth HCI SDIO driver.
@@ -127,7 +126,6 @@ config ADK_KERNEL_BT_MRVL_SDIO
 	select ADK_KERNEL_BT_MRVL
 	select ADK_KERNEL_BT_HCIBTSDIO
 	depends on ADK_TARGET_WITH_SDIO
-	default m if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default n
 	help
 	  Bluetooth Marvell driver.
diff --git a/target/linux/config/Config.in.gpio b/target/linux/config/Config.in.gpio
index 64b4c46ab..c4ce4b2c1 100644
--- a/target/linux/config/Config.in.gpio
+++ b/target/linux/config/Config.in.gpio
@@ -1,6 +1,3 @@
-config ADK_KERNEL_RESET_CONTROLLER
-	boolean
-
 config ADK_KERNEL_RESET_GPIO
 	boolean
 
diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics
index ff5ab706e..7964a951b 100644
--- a/target/linux/config/Config.in.graphics
+++ b/target/linux/config/Config.in.graphics
@@ -60,6 +60,9 @@ config ADK_KERNEL_FB_MXC_HDMI
 config ADK_KERNEL_MXC_IPU
  	boolean
 
+config ADK_KERNEL_MXC_VPU
+ 	boolean
+
 config ADK_KERNEL_MXC_GPU_VIV
  	boolean
 
@@ -131,7 +134,7 @@ config ADK_KERNEL_DRM_IMX_LDB
 config ADK_KERNEL_DRM_IMX_TVE
 	boolean
 
-config ADK_KERNEL_DRM_IMX_IPUV3_CORE
+config ADK_KERNEL_IMX_IPUV3_CORE
 	boolean
 
 config ADK_KERNEL_DRM_IMX_IPUV3
@@ -140,9 +143,6 @@ config ADK_KERNEL_DRM_IMX_IPUV3
 config ADK_KERNEL_DRM_IMX_HDMI
 	boolean
 
-config ADK_KERNEL_RESET_CONTROLLER
-	boolean
-
 config ADK_KERNEL_AGP
 	boolean
 
@@ -202,8 +202,8 @@ config ADK_KERNEL_DRM_IMX
 	select ADK_KERNEL_DRM_IMX_LDB
 	select ADK_KERNEL_DRM_IMX_TVE
 	select ADK_KERNEL_DRM_IMX_PARALLEL_DISPLAY
+	select ADK_KERNEL_IMX_IPUV3_CORE
 	select ADK_KERNEL_DRM_IMX_IPUV3
-	select ADK_KERNEL_DRM_IMX_IPUV3_CORE
 	select ADK_KERNEL_DRM_IMX_HDMI
 	select ADK_KERNEL_FB
 	select ADK_KERNEL_STAGING
@@ -215,7 +215,7 @@ config ADK_KERNEL_DRM_IMX
 	default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
  	default n
  	help
-	 Framebuffer support for Cubox-i/Hummingboard
+	  Framebuffer support for Cubox-i/Hummingboard
 
 config ADK_KERNEL_DRM_VIVANTE
 	prompt "Framebuffer support for Cubox-i/Hummingboard (Vivante)"
@@ -240,6 +240,7 @@ config ADK_KERNEL_DRM_VIVANTE
 	select ADK_KERNEL_MXC_MIPI_CSI2
 	select ADK_KERNEL_MXC_MLB150
 	select ADK_KERNEL_FB_MXC_EDID
+	select ADK_KERNEL_MXC_VPU
 	depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	depends on ADK_KERNEL_VERSION_3_14
 	default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel
index 461605efd..b1a6d30f6 100644
--- a/target/linux/config/Config.in.kernel
+++ b/target/linux/config/Config.in.kernel
@@ -4,6 +4,9 @@ config ADK_KERNEL_STAGING
 config ADK_KERNEL_EXPERIMENTAL
 	boolean
 
+config ADK_KERNEL_RESET_CONTROLLER
+        boolean
+
 config ADK_KERNEL_BLK_DEV_INITRD
 	boolean
 
diff --git a/target/linux/config/Config.in.spi b/target/linux/config/Config.in.spi
index d58215eab..d57869c70 100644
--- a/target/linux/config/Config.in.spi
+++ b/target/linux/config/Config.in.spi
@@ -4,12 +4,18 @@ depends on ADK_TARGET_WITH_SPI
 config ADK_KERNEL_SPI
 	boolean
 
+config ADK_KERNEL_SPI_DEBUG
+	boolean
+
 config ADK_KERNEL_SPI_MASTER
 	boolean
 
 config ADK_KERNEL_SPI_BITBANG
 	tristate
 
+config ADK_KERNEL_BCM2708_SPIDEV
+	tristate
+
 config ADK_KERNEL_SPI_AR71XX
 	tristate
 	select ADK_KERNEL_SPI
@@ -33,6 +39,7 @@ config ADK_KERNEL_SPI_BCM2708
 	select ADK_KERNEL_SPI_MASTER
 	select ADK_KERNEL_SPI_BITBANG
 	select ADK_KERNEL_REGMAP_SPI
+	select ADK_KERNEL_BCM2708_SPIDEV
 	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n
@@ -48,4 +55,18 @@ config ADK_KERNEL_SPI_IMX
 	default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default n
 
+config ADK_KERNEL_SPI_SPIDEV
+	prompt "SPI userland driver"
+	tristate
+	select ADK_KERNEL_SPI
+	select ADK_KERNEL_SPI_MASTER
+	default n
+
+config ADK_KERNEL_SPI_GPIO
+	prompt "GPIO support"
+	tristate
+	select ADK_KERNEL_SPI
+	select ADK_KERNEL_SPI_MASTER
+	default n
+	
 endmenu
diff --git a/target/linux/config/Config.in.virtio b/target/linux/config/Config.in.virtio
index c7355ba4d..58ff339a9 100644
--- a/target/linux/config/Config.in.virtio
+++ b/target/linux/config/Config.in.virtio
@@ -3,6 +3,9 @@ menu "Virtio driver support"
 config ADK_KERNEL_VIRTIO
 	boolean
 
+config ADK_KERNEL_VIRTIO_CONSOLE
+	boolean
+
 config ADK_KERNEL_VIRTIO_PCI
 	boolean
 
diff --git a/target/linux/config/Config.in.watchdog b/target/linux/config/Config.in.watchdog
index 24c62dc5e..582977d52 100644
--- a/target/linux/config/Config.in.watchdog
+++ b/target/linux/config/Config.in.watchdog
@@ -15,6 +15,16 @@ config ADK_KERNEL_CS5535_CLOCK_EVENT_SRC
 
 menu "Watchdog driver support"