rk3036:

      1.add uart0 & bluetooth.
      2.add 'wifi_chip_type' note.
rk3128:
      2.add 'wifi_chip_type' note.

diff --git a/arch/arm/boot/dts/rk3036-rk88.dts b/arch/arm/boot/dts/rk3036-rk88.dts
index 744a1a94e11d6b698cd7f408f980a8fe77160805..e28e56b25864f94c7168fd40d7806733e2b6c815 100755 (executable)
--- a/arch/arm/boot/dts/rk3036-rk88.dts
+++ b/arch/arm/boot/dts/rk3036-rk88.dts
@@ -33,47 +33,52 @@
                };
        };
 
-    wireless-wlan {
-        compatible = "wlan-platdata";
+       wireless-wlan {
+               compatible = "wlan-platdata";
+               /* wifi_chip_type - wifi chip define
+               * bcmwifi ==> like ap6xxx, rk90x, ...;
+               * rtkwifi ==> like rtl8188xx, rtl8723xx, ...;
+               * esp8089 ==> esp8089;
+               * other   ==> for other wifi;
+               */
+               wifi_chip_type = "esp8089";
+               sdio_vref = <1800>; //1800mv or 3300mv
+
+               //keep_wifi_power_on;
+               //power_ctrl_by_pmu;
+               //power_pmu_regulator = "act_ldo3";
+               //power_pmu_enable_level = <1>; //1->HIGH, 0->LOW
+
+               //vref_ctrl_enable;
+               //vref_ctrl_gpio = <&gpio0 GPIO_A2 GPIO_ACTIVE_HIGH>;
+               //vref_pmu_regulator = "act_ldo3";
+               //vref_pmu_enable_level = <1>; //1->HIGH, 0->LOW
+
+               //WIFI,poweren_gpio = <&gpio4 GPIO_D4 GPIO_ACTIVE_HIGH>;
+               //WIFI,host_wake_irq = <&gpio4 GPIO_D6 GPIO_ACTIVE_HIGH>;
+               //WIFI,reset_gpio = <&gpio0 GPIO_A2 GPIO_ACTIVE_LOW>;
 
-        wifi_chip_type = "";
-        sdio_vref = <1800>; //1800mv or 3300mv
-
-        //power_ctrl_by_pmu;
-        //power_pmu_regulator = "act_ldo3";
-        //power_pmu_enable_level = <1>; //1->HIGH, 0->LOW
-
-        //vref_ctrl_enable;
-        //vref_ctrl_gpio = <&gpio0 GPIO_A2 GPIO_ACTIVE_HIGH>;
-        //vref_pmu_regulator = "act_ldo3";
-        //vref_pmu_enable_level = <1>; //1->HIGH, 0->LOW
-
-        //WIFI,poweren_gpio = <&gpio4 GPIO_D4 GPIO_ACTIVE_HIGH>;
-        //WIFI,host_wake_irq = <&gpio4 GPIO_D6 GPIO_ACTIVE_HIGH>;
-        //WIFI,reset_gpio = <&gpio0 GPIO_A2 GPIO_ACTIVE_LOW>;
-
-        status = "okay";
+               status = "okay";
     };
 
-    wireless-bluetooth {
-        compatible = "bluetooth-platdata";
+/*    wireless-bluetooth {
+               compatible = "bluetooth-platdata";
+               //wifi-bt-power-toggle;
 
-        //wifi-bt-power-toggle;
+               uart_rts_gpios = <&gpio4 GPIO_C3 GPIO_ACTIVE_LOW>;
+               pinctrl-names = "default","rts_gpio";
+               pinctrl-0 = <&uart0_rts>;
+               pinctrl-1 = <&uart0_rts_gpio>;
 
-        //uart_rts_gpios = <&gpio4 GPIO_C3 GPIO_ACTIVE_LOW>;
-        //pinctrl-names = "default","rts_gpio";
-        //pinctrl-0 = <&uart0_rts>;
-        //pinctrl-1 = <&uart0_rts_gpio>;
+               //BT,power_gpio = <&gpio4 GPIO_D3 GPIO_ACTIVE_HIGH>;
+               BT,reset_gpio = <&gpio4 GPIO_D5 GPIO_ACTIVE_HIGH>;
+               BT,wake_gpio = <&gpio4 GPIO_D2 GPIO_ACTIVE_HIGH>;
+               BT,wake_host_irq = <&gpio4 GPIO_D7 GPIO_ACTIVE_LOW>;
 
-        //BT,power_gpio = <&gpio4 GPIO_D3 GPIO_ACTIVE_HIGH>;
-        //BT,reset_gpio = <&gpio4 GPIO_D5 GPIO_ACTIVE_HIGH>;
-        //BT,wake_gpio = <&gpio4 GPIO_D2 GPIO_ACTIVE_HIGH>;
-        //BT,wake_host_irq = <&gpio4 GPIO_D7 GPIO_ACTIVE_LOW>;
+               status = "okay";
 
-        status = "okay";
+       };*/
 
-    };
-};
 
 &nandc {
        status = "disabled"; // used nand set "disabled" ,used emmc set "okay"
@@ -124,9 +129,9 @@
 };
 
 &uart0 {
-        status = "okay";
-        dma-names = "!tx", "!rx";
-        //pinctrl-0 = <&uart0_xfer &uart0_cts>;
+       status = "okay";
+       dma-names = "!tx", "!rx";
+       //pinctrl-0 = <&uart0_xfer &uart0_cts>;
 };
 
 &rk_screen {

diff --git a/arch/arm/boot/dts/rk3036-sdk.dts b/arch/arm/boot/dts/rk3036-sdk.dts
index 4e2328893005bd360806be222933c4225236f547..d79fe7dc6b6cc6803232bd5e2c032bc66ae2a7d4 100755 (executable)
--- a/arch/arm/boot/dts/rk3036-sdk.dts
+++ b/arch/arm/boot/dts/rk3036-sdk.dts
@@ -44,10 +44,17 @@
        wireless-wlan {
                compatible = "wlan-platdata";
 
+               /* wifi_chip_type - wifi chip define
+               * bcmwifi ==> like ap6xxx, rk90x;
+               * rtkwifi ==> like rtl8188xx, rtl8723xx,rtl8812auv;
+               * esp8089 ==> esp8089;
+               * other   ==> for other wifi;
+               */
                wifi_chip_type = "esp8089";
                sdio_vref = <0>; //1800mv or 3300mv
 
                //power_ctrl_by_pmu;
+               //keep_wifi_power_on;
                //power_pmu_regulator = "act_ldo3";
                //power_pmu_enable_level = <1>; //1->HIGH, 0->LOW
 
@@ -63,6 +70,24 @@
                status = "okay";
     };
 
+       /* wireless-bluetooth {
+               compatible = "bluetooth-platdata";
+               //wifi-bt-power-toggle;
+
+               uart_rts_gpios = <&gpio4 GPIO_C3 GPIO_ACTIVE_LOW>;
+               pinctrl-names = "default","rts_gpio";
+               pinctrl-0 = <&uart0_rts>;
+               pinctrl-1 = <&uart0_rts_gpio>;
+
+               //BT,power_gpio = <&gpio4 GPIO_D3 GPIO_ACTIVE_HIGH>;
+               BT,reset_gpio = <&gpio4 GPIO_D5 GPIO_ACTIVE_HIGH>;
+               BT,wake_gpio = <&gpio4 GPIO_D2 GPIO_ACTIVE_HIGH>;
+               BT,wake_host_irq = <&gpio4 GPIO_D7 GPIO_ACTIVE_LOW>;
+
+               status = "okay";
+
+       };*/
+
        usb_control {
                compatible = "rockchip,rk3036-usb-control";
                host_drv_gpio = <&gpio2 GPIO_C7 GPIO_ACTIVE_LOW>;

diff --git a/arch/arm/boot/dts/rk3128-box-rk88.dts b/arch/arm/boot/dts/rk3128-box-rk88.dts
index f129781174ab0df68b7387ce6987d699071adc4b..940cf1b004e7c2530a4f8018d0a3bd9f5952e86f 100755 (executable)
--- a/arch/arm/boot/dts/rk3128-box-rk88.dts
+++ b/arch/arm/boot/dts/rk3128-box-rk88.dts
@@ -12,9 +12,16 @@
        wireless-wlan {
                compatible = "wlan-platdata";
 
+               /* wifi_chip_type - wifi chip define
+               * bcmwifi ==> like ap6xxx, rk90x, ...;
+               * rtkwifi ==> like rtl8188xx, rtl8723xx, ...;
+               * esp8089 ==> esp8089;
+               * other   ==> for other wifi;
+               */
                wifi_chip_type = "esp8089";
                sdio_vref = <0>; //1800mv or 3300mv
 
+               //keep_wifi_power_on;
                //power_ctrl_by_pmu;
                //power_pmu_regulator = "act_ldo3";
                //power_pmu_enable_level = <1>; //1->HIGH, 0->LOW

diff --git a/arch/arm/boot/dts/rk3128-box.dts b/arch/arm/boot/dts/rk3128-box.dts
index 14938de9105970359c033b00b3f01fe32ad20c19..857634e0fe5ac26d5f0a9076990c1831941b4333 100755 (executable)
--- a/arch/arm/boot/dts/rk3128-box.dts
+++ b/arch/arm/boot/dts/rk3128-box.dts
@@ -11,9 +11,16 @@
        wireless-wlan {
                compatible = "wlan-platdata";
 
+               /* wifi_chip_type - wifi chip define
+               * bcmwifi ==> like ap6xxx, rk90, ...x;
+               * rtkwifi ==> like rtl8188xx, rtl8723xx, ...;
+               * esp8089 ==> esp8089;
+               * other   ==> for other wifi;
+               */
                wifi_chip_type = "esp8089";
                sdio_vref = <0>; //1800mv or 3300mv
 
+               //keep_wifi_power_on;
                //power_ctrl_by_pmu;
                //power_pmu_regulator = "act_ldo3";
                //power_pmu_enable_level = <1>; //1->HIGH, 0->LOW
@@ -189,7 +196,7 @@
        &uart1{
                status = "okay";
                dma-names = "!tx", "!rx";
-       pinctrl-0 = <&uart1_xfer &uart1_cts>;
+               pinctrl-0 = <&uart1_xfer &uart1_cts>;
 };
 
 &pwm2 {