From a7f311f133c94de020abbc98d9ac8017e8f9288d Mon Sep 17 00:00:00 2001 From: Caesar Wang Date: Wed, 18 Oct 2017 17:56:26 +0800 Subject: [PATCH] ARM: dts: rk3036: support wifi/bt for kylin In order to support the ap6212 module with rockchip wlan driver, the kylin dts has to change the below for working. 1) We should add the 'supports-sdio' property for mmc tuning, that's the rockchip private property, not on the upstream. 2) We should add the wifi power control pin and wifi/bt data for dts, Maybe the history issue, they like the old driver for power contronlling, the upstream didn't need these for working. we should remove it in the future. Change-Id: Id49de7ad77b8658a551a07659a8a2ddc9691874c Signed-off-by: Caesar Wang --- arch/arm/boot/dts/rk3036-kylin.dts | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/rk3036-kylin.dts b/arch/arm/boot/dts/rk3036-kylin.dts index 4fbb334e4a6f..072773b2bee5 100644 --- a/arch/arm/boot/dts/rk3036-kylin.dts +++ b/arch/arm/boot/dts/rk3036-kylin.dts @@ -36,9 +36,7 @@ * - SDIO_RESET_L_WL_RST * - SDIO_RESET_L_BT_EN */ - reset-gpios = <&gpio0 RK_PD2 GPIO_ACTIVE_LOW>, /* WL_REG_ON */ - <&gpio0 RK_PD3 GPIO_ACTIVE_LOW>, /* WL_RST */ - <&gpio2 RK_PB1 GPIO_ACTIVE_LOW>; /* BT_EN */ + reset-gpios = <&gpio0 26 GPIO_ACTIVE_LOW>; /* WL_REG_ON */ }; sound { @@ -95,6 +93,25 @@ #clock-cells = <0>; }; + wireless-bluetooth { + compatible = "bluetooth-platdata"; + uart_rts_gpios = <&gpio0 19 GPIO_ACTIVE_LOW>; + pinctrl-names = "default", "rts_gpio"; + pinctrl-0 = <&uart0_rts>; + pinctrl-1 = <&uart0_gpios>; + BT,reset_gpio = <&gpio2 9 GPIO_ACTIVE_HIGH>; + BT,wake_gpio = <&gpio2 8 GPIO_ACTIVE_HIGH>; + BT,wake_host_irq = <&gpio2 3 GPIO_ACTIVE_HIGH>; + status = "okay"; + }; + + wireless-wlan { + compatible = "wlan-platdata"; + rockchip,grf = <&grf>; + wifi_chip_type = "ap6212"; + WIFI,host_wake_irq = <&gpio0 27 GPIO_ACTIVE_HIGH>; + status = "okay"; + }; }; &acodec { @@ -353,6 +370,7 @@ sd-uhs-sdr25; sd-uhs-sdr50; sd-uhs-sdr104; + supports-sdio; }; &sdmmc { @@ -423,4 +441,10 @@ rockchip,pins = <2 RK_PA7 1 &pcfg_pull_none>; }; }; + + wireless-bluetooth { + uart0_gpios: uart0-gpios { + rockchip,pins = <0 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; };