leolas changes to make work QX1

README.md

@@ -1,6 +1,6 @@
 Linux kernel for Rockchip SOCs - www.omegamoon.com
 --------------
-
+QX1 work on progress (not ended yet)
 **Build instructions:**
 - Run "make mrproper" to make sure you have no stale .o files and dependencies lying around
 - Run "./build_omegamoon_mk908" to compile the kernel for the MK908 using the prebuild toolchain

arch/arm/mach-rk30/board-rk30-sdk-sdmmc.c

@@ -138,7 +138,7 @@
         #define RK30SDK_WIFI_GPIO_POWER_PIN_NAME        "wifi_power"
         #define RK30SDK_WIFI_GPIO_POWER_IOMUX_FGPIO     GPIO3_D0
 
-    #elif defined(CONFIG_BCM4329) || defined(CONFIG_BCM4319) || defined(CONFIG_RKWIFI)
+    #elif defined(CONFIG_BCM4329) || defined(CONFIG_BCM4319) || defined(CONFIG_RKWIFI) || defined(CONFIG_RTL8189ES)//leolas
         #define RK30SDK_WIFI_GPIO_POWER_N               RK30_PIN3_PD0                 
         #define RK30SDK_WIFI_GPIO_POWER_ENABLE_VALUE    GPIO_HIGH                   
         #define RK30SDK_WIFI_GPIO_POWER_PIN_NAME        "wifi_power"
@@ -178,7 +178,7 @@
 #elif defined(CONFIG_ARCH_RK2928) //refer to file ./arch/arm/mach-rk2928/include/mach/iomux.h
     #define WIFI_HOST_WAKE RK2928_PIN3_PC0 
 
-	#if defined(CONFIG_RKWIFI) || defined(CONFIG_BCM4329) || defined(CONFIG_BCM4319)
+	#if defined(CONFIG_RKWIFI) || defined(CONFIG_BCM4329) || defined(CONFIG_BCM4319) || defined(CONFIG_RTL8189ES)//leolas
         #define RK30SDK_WIFI_GPIO_POWER_N               RK2928_PIN0_PD6
         #define RK30SDK_WIFI_GPIO_POWER_ENABLE_VALUE    GPIO_HIGH
         #define RK30SDK_WIFI_GPIO_POWER_PIN_NAME        GPIO0D6_MMC1_PWREN_NAME
@@ -214,7 +214,8 @@
     // refer to file /arch/arm/mach-rk30/include/mach/Iomux.h
     #define WIFI_HOST_WAKE RK30_PIN3_PD2
 
-    #if defined(CONFIG_RKWIFI) || defined(CONFIG_RTL8192CU) || defined(CONFIG_RTL8188EU)
+    #if defined(CONFIG_RKWIFI) || defined(CONFIG_RTL8192CU) || defined(CONFIG_RTL8188EU) \
+		|| defined(CONFIG_RTL8189ES)//leolas
     //power
     #define RK30SDK_WIFI_GPIO_POWER_N               RK30_PIN3_PD0            
     #define RK30SDK_WIFI_GPIO_POWER_ENABLE_VALUE    GPIO_HIGH        

arch/arm/mach-rk3188/Kconfig

@@ -33,19 +33,9 @@ endchoice
 menu "RK3188 Custom Tweaks"
  	depends on ARCH_RK3188 && MACH_RK3188_BOX
 
-config TCC_BT_DEV_POWER_PIN3_PD1
-	depends on TCC_BT_DEV
-	bool "Set TCC BT dev pwer to pin3 pd1"
-	default n
-
-config ACT8846_DCDC4_30V
-	depends on REGULATOR_ACT8846
-	bool "Set ACT8846 DCDC4 to 3.0V"
-	default n
-
-config ACT8846_LDO6_18V
+config IMITO_QX1
 	depends on REGULATOR_ACT8846
-	bool "Set ACT8846 LDO6 to 1.8V"
+	bool "Configure voltages for Imito QX1"
 	default n
 
 config POWERON_LED_ENABLE

arch/arm/mach-rk3188/board-rk3188-box.c

@@ -1271,7 +1271,45 @@ static struct platform_device rockchip_hdmi_audio = {
 };
 #endif
 /*$_rbox_$_modify_$_zhengyang_end$_20130407_$*/
+//leolas RDA5876 BT chip support (QX1 and old MK802IV)
+#if defined CONFIG_TCC_BT_DEV
+static struct tcc_bt_platform_data tcc_bt_platdata = {
+
+    .power_gpio   = { // ldoon
+//SAW QX1 setting thanks to Leolas
+#ifdef CONFIG_IMITO_QX1
+        .io             = RK30_PIN3_PD1,//leolas:for QX1
+#else
+        .io             = RK30_PIN3_PC7,//leolas:not absolutely sure but I think this value must work for old MK802IV
+#endif
+        .enable         = GPIO_HIGH,
+        .iomux          = {
+            .name       = NULL,
+            },
+        },
 
+    .wake_host_gpio  = { // BT_HOST_WAKE, for bt wakeup host when it is in deep sleep
+#ifdef CONFIG_IMITO_QX1
+        .io             = RK30_PIN3_PC6, //leolas:for QX1
+#else
+        .io             = RK30_PIN3_PD0, //leolas:not absolutely sure but I think this value must work for old MK802IV
+#endif
+        .enable     = IRQF_TRIGGER_RISING,// set IRQF_TRIGGER_FALLING for falling, set IRQF_TRIGGER_RISING for rising
+        .iomux      = {
+            .name       = NULL,
+        },
+    },
+};
+
+static struct platform_device device_tcc_bt = {
+    .name   = "tcc_bt_dev",
+    .id     = -1,
+    .dev    = {
+        .platform_data = &tcc_bt_platdata,
+        },
+};
+#endif
+//leolas RDA5876 BT chip support end
 static struct platform_device *devices[] __initdata = {
 
 #ifdef CONFIG_ION
@@ -1313,6 +1351,11 @@ static struct platform_device *devices[] __initdata = {
 	&rockchip_hdmi_audio,
 #endif
 /*$_rbox_$_modify_$_zhengyang_end$_20130407_$*/
+
+//leolas RDA5876 BT chip support
+#ifdef CONFIG_TCC_BT_DEV
+        &device_tcc_bt,
+#endif //leolas end RDA5876 BT chip support
 };
 
 
@@ -1495,13 +1538,14 @@ static struct pmu_info  act8846_dcdc_info[] = {
 	{
 		.name          = "act_dcdc4",   //vccio 
 //SAW special voltage for QX1, from Leolas
-#ifdef CONFIG_ACT8846_DCDC4_30V
+#ifdef CONFIG_IMITO_QX1
 		.min_uv		= 3000000,
 		.max_uv		= 3000000,
 #else
 		.min_uv         = 3300000,
 		.max_uv         = 3300000,
 #endif
+
 		#ifdef CONFIG_ACT8846_SUPPORT_RESET
 		.suspend_vol  =  3000000,
 		#else
@@ -1538,14 +1582,13 @@ static  struct pmu_info  act8846_ldo_info[] = {
 	},
 	{
 		.name          = "act_ldo6",   //vcc_jetta
-//SAW volt set via kernel config, default 3300000, mk908 and some others
-//need 1800000 to get wifi/bt working properly
-#ifdef CONFIG_ACT8846_LDO6_18V
-		.min_uv         = 1800000, 
-		.max_uv         = 1800000, 
-#else
+//SAW volt set via kernel config, default 1800000 for all devices except QX1
+#ifdef CONFIG_IMITO_QX1
 		.min_uv		= 3300000,
 		.max_uv		= 3300000,
+#else
+		.min_uv         = 1800000, 
+		.max_uv         = 1800000, 
 #endif
 	},
 	{
@@ -1756,7 +1799,11 @@ static struct i2c_board_info __initdata i2c1_info[] = {
 		.type                   = "rtc_hym8563",
 		.addr           = 0x51,
 		.flags                  = 0,
-		.irq            = RK30_PIN0_PB5,
+#ifdef CONFIG_IMITO_QX1
+		.irq            = RK30_PIN1_PA4,//for imito QX1
+#else
+		.irq            = RK30_PIN0_PB5,//leolas:for the rest of devices
+#endif
 	},
 #endif
 #if defined (CONFIG_MFD_WM831X_I2C)