From 6a9212e025181084b0b250d16241d33d832e7aea Mon Sep 17 00:00:00 2001 From: li bing Date: Mon, 20 Oct 2014 11:41:19 +0800 Subject: [PATCH] rk3036: 1.add uart0 & bluetooth. 2.add 'wifi_chip_type' note. rk3128: 2.add 'wifi_chip_type' note. --- arch/arm/boot/dts/rk3036-rk88.dts | 77 ++++++++++++++------------- arch/arm/boot/dts/rk3036-sdk.dts | 25 +++++++++ arch/arm/boot/dts/rk3128-box-rk88.dts | 7 +++ arch/arm/boot/dts/rk3128-box.dts | 9 +++- 4 files changed, 81 insertions(+), 37 deletions(-) diff --git a/arch/arm/boot/dts/rk3036-rk88.dts b/arch/arm/boot/dts/rk3036-rk88.dts index 744a1a94e11d..e28e56b25864 100755 --- 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 4e2328893005..d79fe7dc6b6c 100755 --- 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 f129781174ab..940cf1b004e7 100755 --- 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 14938de91059..857634e0fe5a 100755 --- 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 { -- 2.34.1