From: Caesar Wang <wxt@rock-chips.com> To: heiko@sntech.de Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, keescook@google.com, leozwang@google.com, leecam@google.com, Caesar Wang <wxt@rock-chips.com> Subject: [PATCH 4/5] ARM: dts: add the wifi/bt regulator for kylin board Date: Tue, 22 Dec 2015 17:33:52 +0800 [thread overview] Message-ID: <1450776833-27639-5-git-send-email-wxt@rock-chips.com> (raw) In-Reply-To: <1450776833-27639-1-git-send-email-wxt@rock-chips.com> Without this the wifi/bluetooth module doesn't work properly at bootup. Signed-off-by: Caesar Wang <wxt@rock-chips.com> Patchset: Rockchip kylin board Patch[6/6], bring up kylin board. We need add the wifi regulator to control the power. (am https://patchwork.kernel.org/patch/7873721/) --- arch/arm/boot/dts/rk3036-kylin.dts | 43 +++++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/rk3036-kylin.dts b/arch/arm/boot/dts/rk3036-kylin.dts index 2ef38be..ed0466f 100644 --- a/arch/arm/boot/dts/rk3036-kylin.dts +++ b/arch/arm/boot/dts/rk3036-kylin.dts @@ -76,6 +76,32 @@ regulator-always-on; regulator-boot-on; }; + + bt_regulator: bt-regulator { + compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio2 9 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&bt_rst_l>; + regulator-name = "bt_regulator"; + }; + + wifi_regulator: wifi-regulator { + /* + * On the module itself this is one of these (depending + * on the actual card populated): + * - SDIO_RESET_L_WL_REG_ON + * - PDN (power down when low) + */ + + compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio0 26 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&wifi_enable_h>; + regulator-name = "wifi_regulator"; + vin-supply = <&bt_regulator>; + }; }; &acodec { @@ -303,12 +329,13 @@ sd-uhs-sdr50; sd-uhs-sdr104; cap-sdio-irq; + card-external-vcc-supply = <&wifi_regulator>; default-sample-phase = <90>; keep-power-in-suspend; non-removable; num-slots = <1>; pinctrl-names = "default"; - pinctrl-0 = <&sdio_clk &sdio_cmd &sdio_bus4>; + pinctrl-0 = <&sdio_clk &sdio_cmd &sdio_bus4 &bt_wake_h>; }; &uart2 { @@ -330,6 +357,20 @@ }; }; + sdio { + wifi_enable_h: wifienable-h { + rockchip,pins = <0 26 RK_FUNC_GPIO &pcfg_pull_none>; + }; + + bt_rst_l: bt-rst-l { + rockchip,pins = <2 9 RK_FUNC_GPIO &pcfg_pull_none>; + }; + + bt_wake_h: bt-wake-h { + rockchip,pins = <2 8 RK_FUNC_GPIO &pcfg_pull_default>; + }; + }; + sleep { global_pwroff: global-pwroff { rockchip,pins = <2 7 RK_FUNC_1 &pcfg_pull_none>; -- 1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: wxt@rock-chips.com (Caesar Wang) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 4/5] ARM: dts: add the wifi/bt regulator for kylin board Date: Tue, 22 Dec 2015 17:33:52 +0800 [thread overview] Message-ID: <1450776833-27639-5-git-send-email-wxt@rock-chips.com> (raw) In-Reply-To: <1450776833-27639-1-git-send-email-wxt@rock-chips.com> Without this the wifi/bluetooth module doesn't work properly at bootup. Signed-off-by: Caesar Wang <wxt@rock-chips.com> Patchset: Rockchip kylin board Patch[6/6], bring up kylin board. We need add the wifi regulator to control the power. (am https://patchwork.kernel.org/patch/7873721/) --- arch/arm/boot/dts/rk3036-kylin.dts | 43 +++++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/rk3036-kylin.dts b/arch/arm/boot/dts/rk3036-kylin.dts index 2ef38be..ed0466f 100644 --- a/arch/arm/boot/dts/rk3036-kylin.dts +++ b/arch/arm/boot/dts/rk3036-kylin.dts @@ -76,6 +76,32 @@ regulator-always-on; regulator-boot-on; }; + + bt_regulator: bt-regulator { + compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio2 9 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&bt_rst_l>; + regulator-name = "bt_regulator"; + }; + + wifi_regulator: wifi-regulator { + /* + * On the module itself this is one of these (depending + * on the actual card populated): + * - SDIO_RESET_L_WL_REG_ON + * - PDN (power down when low) + */ + + compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio0 26 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&wifi_enable_h>; + regulator-name = "wifi_regulator"; + vin-supply = <&bt_regulator>; + }; }; &acodec { @@ -303,12 +329,13 @@ sd-uhs-sdr50; sd-uhs-sdr104; cap-sdio-irq; + card-external-vcc-supply = <&wifi_regulator>; default-sample-phase = <90>; keep-power-in-suspend; non-removable; num-slots = <1>; pinctrl-names = "default"; - pinctrl-0 = <&sdio_clk &sdio_cmd &sdio_bus4>; + pinctrl-0 = <&sdio_clk &sdio_cmd &sdio_bus4 &bt_wake_h>; }; &uart2 { @@ -330,6 +357,20 @@ }; }; + sdio { + wifi_enable_h: wifienable-h { + rockchip,pins = <0 26 RK_FUNC_GPIO &pcfg_pull_none>; + }; + + bt_rst_l: bt-rst-l { + rockchip,pins = <2 9 RK_FUNC_GPIO &pcfg_pull_none>; + }; + + bt_wake_h: bt-wake-h { + rockchip,pins = <2 8 RK_FUNC_GPIO &pcfg_pull_default>; + }; + }; + sleep { global_pwroff: global-pwroff { rockchip,pins = <2 7 RK_FUNC_1 &pcfg_pull_none>; -- 1.9.1
next prev parent reply other threads:[~2015-12-22 9:34 UTC|newest] Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-12-22 9:33 [PATCH 0/5] Support the codec and wifi/bt for rk3036 Kylin board Caesar Wang 2015-12-22 9:33 ` Caesar Wang 2015-12-22 9:33 ` [PATCH 1/5] ARM: dts: set the pinctrl default setting for i2s Caesar Wang 2015-12-22 9:33 ` Caesar Wang 2015-12-22 9:33 ` [PATCH 2/5] ARM: dts: add the sound codec for kylin board Caesar Wang 2015-12-22 9:33 ` Caesar Wang 2015-12-22 9:33 ` Caesar Wang 2015-12-22 9:33 ` [PATCH 3/5] ARM: dts: rockchip: enable the high speed on sdio " Caesar Wang 2015-12-22 9:33 ` Caesar Wang 2015-12-22 9:33 ` Caesar Wang [this message] 2015-12-22 9:33 ` [PATCH 4/5] ARM: dts: add the wifi/bt regulator " Caesar Wang 2015-12-22 9:50 ` Heiko Stübner 2015-12-22 9:50 ` Heiko Stübner 2015-12-22 9:50 ` Heiko Stübner 2015-12-22 9:33 ` [PATCH 5/5] ARM: dts: enable the uart0 for bluetooth module Caesar Wang 2015-12-22 9:33 ` Caesar Wang
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1450776833-27639-5-git-send-email-wxt@rock-chips.com \ --to=wxt@rock-chips.com \ --cc=devicetree@vger.kernel.org \ --cc=heiko@sntech.de \ --cc=keescook@google.com \ --cc=leecam@google.com \ --cc=leozwang@google.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-rockchip@lists.infradead.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.