add 3.15.rc4 for cubox, revert some module conversion, breaks fb and usb

4 files changed, 26 insertions, 19 deletions

diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics
index 5bd34cf9d..874e81017 100644
--- a/target/linux/config/Config.in.graphics
+++ b/target/linux/config/Config.in.graphics
@@ -140,6 +140,7 @@ config ADK_KERNEL_DRM_IMX
 	select ADK_KERNEL_STAGING
 	select ADK_KERNEL_FRAMEBUFFER_CONSOLE
 	select ADK_KERNEL_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY
+	select ADK_KERNEL_I2C_IMX
 	default y if ADK_TARGET_SYSTEM_CUBOX_I
  	default n
 	depends on ADK_TARGET_SYSTEM_CUBOX_I
diff --git a/target/linux/config/Config.in.i2c b/target/linux/config/Config.in.i2c
index f4e08fd18..e8998a18a 100644
--- a/target/linux/config/Config.in.i2c
+++ b/target/linux/config/Config.in.i2c
@@ -1,5 +1,8 @@
 config ADK_KERNEL_I2C
  	boolean
+
+config ADK_KERNEL_I2C_CHARDEV
+	boolean
  
 config ADK_KPACKAGE_KMOD_I2C_CHARDEV
  	tristate
@@ -7,12 +10,12 @@ config ADK_KPACKAGE_KMOD_I2C_CHARDEV
 menu "I2C driver support"
 depends on ADK_TARGET_WITH_I2C
 
-config ADK_KPACKAGE_KMOD_I2C_IMX
+config ADK_KERNEL_I2C_IMX
 	prompt "I2C driver for Cubox-i"
-	tristate
+	boolean
 	depends on ADK_TARGET_SYSTEM_CUBOX_I
 	select ADK_KERNEL_I2C
-	select ADK_KPACKAGE_KMOD_I2C_CHARDEV
+	select ADK_KERNEL_I2C_CHARDEV
 	default y if ADK_TARGET_SYSTEM_CUBOX_I
 	default n
 	help
diff --git a/target/linux/config/Config.in.regulator b/target/linux/config/Config.in.regulator
index ede860c7b..266957fd5 100644
--- a/target/linux/config/Config.in.regulator
+++ b/target/linux/config/Config.in.regulator
@@ -2,37 +2,37 @@ config ADK_KERNEL_REGULATOR
 	boolean
 	default n
 
-config ADK_KPACKAGE_KMOD_REGULATOR_FIXED_VOLTAGE
+config ADK_KERNEL_REGULATOR_FIXED_VOLTAGE
 	boolean
 	select ADK_KERNEL_REGULATOR
 	default n
 
-config ADK_KPACKAGE_KMOD_REGULATOR_ANATOP
+config ADK_KERNEL_REGULATOR_ANATOP
 	boolean
 	select ADK_KERNEL_REGULATOR
 	default n
 
-config ADK_KPACKAGE_KMOD_REGULATOR_MC13XXX_CORE
+config ADK_KERNEL_REGULATOR_MC13XXX_CORE
 	boolean
 	select ADK_KERNEL_REGULATOR
 	default n
 
-config ADK_KPACKAGE_KMOD_REGULATOR_DA9052
+config ADK_KERNEL_REGULATOR_DA9052
 	boolean
 	select ADK_KERNEL_REGULATOR
 	default n
 
-config ADK_KPACKAGE_KMOD_REGULATOR_MC13783
+config ADK_KERNEL_REGULATOR_MC13783
 	boolean
 	select ADK_KERNEL_REGULATOR
 	default n
 
-config ADK_KPACKAGE_KMOD_REGULATOR_MC13892
+config ADK_KERNEL_REGULATOR_MC13892
 	boolean
 	select ADK_KERNEL_REGULATOR
 	default n
 	
-config ADK_KPACKAGE_KMOD_REGULATOR_PFUZE100
+config ADK_KERNEL_REGULATOR_PFUZE100
 	boolean
 	select ADK_KERNEL_REGULATOR
 	default n
@@ -41,22 +41,22 @@ config ADK_KERNEL_REGMAP
 	boolean
 	default n
 
-config ADK_KPACKAGE_KMOD_REGMAP_I2C
-	tristate
+config ADK_KERNEL_REGMAP_I2C
+	boolean
 	select ADK_KERNEL_REGMAP
 	default n
 
-config ADK_KPACKAGE_KMOD_REGMAP_SPI
-	tristate
+config ADK_KERNEL_REGMAP_SPI
+	boolean
 	select ADK_KERNEL_REGMAP
 	default n
 
 config ADK_KERNEL_REGMAP_MMIO
-	tristate
+	boolean
 	select ADK_KERNEL_REGMAP
 	default n
 
-config ADK_KPACKAGE_KMOD_REGMAP_IRQ
-	tristate
+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 1999241d6..1b66bbcf8 100644
--- a/target/linux/config/Config.in.spi
+++ b/target/linux/config/Config.in.spi
@@ -4,6 +4,9 @@ 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
 
@@ -29,12 +32,12 @@ config ADK_KPACKAGE_KMOD_SPI_PXA2XX
 	tristate
 	select ADK_KERNEL_SPI
 
-config ADK_KPACKAGE_KMOD_SPI_IMX
+config ADK_KERNEL_SPI_IMX
 	prompt "SPI driver for Solidrun Cubox-i"
 	tristate
 	select ADK_KERNEL_SPI
 	select ADK_KERNEL_SPI_MASTER
-	select ADK_KPACKAGE_KMOD_SPI_BITBANG
+	select ADK_KERNEL_SPI_BITBANG
 	default y if ADK_TARGET_SYSTEM_CUBOX_I
 	default n