diff options
| author | Guodong Xu <guodong.xu@linaro.org> | 2015-08-17 17:39:44 +0800 |
|---|---|---|
| committer | Guodong Xu <guodong.xu@linaro.org> | 2015-11-10 20:59:58 +0800 |
| commit | 64e2d0a2b7b5713e77acd564e9c185f1af6d17a3 (patch) | |
| tree | d682585bab133a01bbc36367d62dd5844388fa70 | |
| parent | 93b06a6d4bc77a3d01b47b023498e6fbdf031b7d (diff) | |
dts: hikey: add nodes for dwmmc2 and wlcore
Signed-off-by: Guodong Xu <guodong.xu@linaro.org>
| -rw-r--r-- | arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 11 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/hisilicon/hi6220.dtsi | 53 |
2 files changed, 41 insertions, 23 deletions
diff --git a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts index a84cf3065234..136bc04399df 100644 --- a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts +++ b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts @@ -87,15 +87,4 @@ pinctrl-0 = <&sd_pmx_func &sd_clk_cfg_func &sd_cfg_func>; pinctrl-1 = <&sd_pmx_idle &sd_clk_cfg_idle &sd_cfg_idle>; }; - - dwmmc_2: dwmmc2@f723f000 { - bus-width = <0x4>; - broken-cd; - non-removable; - /* WL_EN */ - pinctrl-names = "default", "idle"; - pinctrl-0 = <&sdio_pmx_func &sdio_clk_cfg_func &sdio_cfg_func>; - pinctrl-1 = <&sdio_pmx_idle &sdio_clk_cfg_idle &sdio_cfg_idle>; - }; - }; diff --git a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi index 44c6d6cef347..873325605243 100644 --- a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi +++ b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi @@ -3,7 +3,7 @@ * * Copyright (C) 2014, Hisilicon Ltd. */ - +#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/clock/hi6220-clock.h> / { @@ -837,17 +837,46 @@ vmmc-supply = <&ldo10>; }; - dwmmc_2: dwmmc2@f723f000 { - compatible = "hisilicon,hisi-dw-mshc"; - num-slots = <0x1>; - board-mmc-bus-clk = <0x0>; - reg = <0x0 0xf723f000 0x0 0x1000>; - interrupts = <0x0 0x4a 0x4>; - #address-cells = <0x1>; - #size-cells = <0x0>; - clocks = <&clock_sys HI6220_MMC2_CIUCLK>, <&clock_sys HI6220_MMC2_CLK>; - clock-names = "ciu", "biu"; - }; + dwmmc_2: dwmmc2@f723f000 { + compatible = "hisilicon,hi6220-dw-mshc"; + status = "okay"; + num-slots = <0x1>; + reg = <0x0 0xf723f000 0x0 0x1000>; + interrupts = <0x0 0x4a 0x4>; + clocks = <&clock_sys HI6220_MMC2_CIUCLK>, <&clock_sys HI6220_MMC2_CLK>; + clock-names = "ciu", "biu"; + bus-width = <0x4>; + broken-cd; + ti,non-removable; + non-removable; + /* WL_EN */ + vmmc-supply = <&wlan_en_reg>; + pinctrl-names = "default", "idle"; + pinctrl-0 = <&sdio_pmx_func &sdio_clk_cfg_func &sdio_cfg_func>; + pinctrl-1 = <&sdio_pmx_idle &sdio_clk_cfg_idle &sdio_cfg_idle>; + + #address-cells = <0x1>; + #size-cells = <0x0>; + wlcore: wlcore@2 { + compatible = "ti,wl1835"; + reg = <2>; /* sdio func num */ + /* WL_IRQ, WL_HOST_WAKE_GPIO1_3 */ + interrupt-parent = <&gpio1>; + interrupts = <3 IRQ_TYPE_EDGE_RISING>; + }; + }; + + wlan_en_reg: fixedregulator@1 { + compatible = "regulator-fixed"; + regulator-name = "wlan-en-regulator"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + /* WLAN_EN GPIO */ + gpio = <&gpio0 5 0>; + /* WLAN card specific delay */ + startup-delay-us = <70000>; + enable-active-high; + }; mtcmos { compatible = "hisilicon,hi6220-mtcmos-driver"; |