diff options
| author | Seung-Woo Kim <sw0312.kim@samsung.com> | 2016-08-18 10:08:59 +0900 |
|---|---|---|
| committer | Hoegeun Kwon <hoegeun.kwon@samsung.com> | 2016-08-19 15:20:13 +0900 |
| commit | dd681644fce2574f48307149709c49c869c306de (patch) | |
| tree | 1e3436412b2faf30dcf3419efd23e876c31534b7 | |
| parent | b0231d332bbf4acc1f9d95362bfb97c906559915 (diff) | |
| download | linux-exynos-dd681644fce2574f48307149709c49c869c306de.tar.gz linux-exynos-dd681644fce2574f48307149709c49c869c306de.tar.bz2 linux-exynos-dd681644fce2574f48307149709c49c869c306de.zip | |
arm64: dts: exynos5433: move tm2/tm2e specific wlan nodes to board dts
The wlan and related pinctrl dt nodes are only proper for tm2/tm2e
boards, so it should not be in exynos5433. So this patch moves the
bodes to speicifc board dts files.
Change-Id: Idd0a5bdb34aa4f61ac41c492c9bde2797d26e3af
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
| -rw-r--r-- | arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi | 7 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/exynos/exynos5433-tm2.dts | 15 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/exynos/exynos5433-tm2e.dts | 15 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/exynos/exynos5433.dtsi | 8 |
4 files changed, 30 insertions, 15 deletions
diff --git a/arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi b/arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi index 4bd385fc83d2..e1c5f8c7050a 100644 --- a/arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi +++ b/arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi @@ -216,13 +216,6 @@ interrupt-controller; #interrupt-cells = <2>; }; - - cfg_wlanen: cfg-wlanen { - samsung,pins = "gpj2-0"; - samsung,pin-function = <1>; - samsung,pin-drv = <3>; - samsung,pin-con-pdn = <3>; - }; }; &pinctrl_finger { diff --git a/arch/arm64/boot/dts/exynos/exynos5433-tm2.dts b/arch/arm64/boot/dts/exynos/exynos5433-tm2.dts index db8631117907..32e9c104af8c 100644 --- a/arch/arm64/boot/dts/exynos/exynos5433-tm2.dts +++ b/arch/arm64/boot/dts/exynos/exynos5433-tm2.dts @@ -286,6 +286,14 @@ thermal-sensors = <&thermistor_battery>; }; }; + + wlan { + compatible = "samsung,brcm-wlan"; + gpios = <&gpj2 0 0x1 &gpf3 1 0x1>; + pinctrl-names = "default"; + pinctrl-0 = <&cfg_wlanen &wlan_host_wake>; + status = "okay"; + }; }; &cpu0 { @@ -1389,6 +1397,13 @@ sleep2: sleep-state { PIN_SLP(gpj2-0, PREV, DOWN); /* WLAN_EN */ }; + + cfg_wlanen: cfg-wlanen { + samsung,pins = "gpj2-0"; + samsung,pin-function = <1>; + samsung,pin-drv = <3>; + samsung,pin-con-pdn = <3>; + }; }; &pinctrl_fsys { diff --git a/arch/arm64/boot/dts/exynos/exynos5433-tm2e.dts b/arch/arm64/boot/dts/exynos/exynos5433-tm2e.dts index 1c97aad7a5f0..901d50ba8618 100644 --- a/arch/arm64/boot/dts/exynos/exynos5433-tm2e.dts +++ b/arch/arm64/boot/dts/exynos/exynos5433-tm2e.dts @@ -286,6 +286,14 @@ thermal-sensors = <&thermistor_battery>; }; }; + + wlan { + compatible = "samsung,brcm-wlan"; + gpios = <&gpj2 0 0x1 &gpf3 1 0x1>; + pinctrl-names = "default"; + pinctrl-0 = <&cfg_wlanen &wlan_host_wake>; + status = "okay"; + }; }; &cpu0 { @@ -1375,6 +1383,13 @@ sleep2: sleep-state { PIN_SLP(gpj2-0, PREV, DOWN); /* WLAN_EN */ }; + + cfg_wlanen: cfg-wlanen { + samsung,pins = "gpj2-0"; + samsung,pin-function = <1>; + samsung,pin-drv = <3>; + samsung,pin-con-pdn = <3>; + }; }; &pinctrl_fsys { diff --git a/arch/arm64/boot/dts/exynos/exynos5433.dtsi b/arch/arm64/boot/dts/exynos/exynos5433.dtsi index f710eaf05c36..e59f7d9a4400 100644 --- a/arch/arm64/boot/dts/exynos/exynos5433.dtsi +++ b/arch/arm64/boot/dts/exynos/exynos5433.dtsi @@ -2639,14 +2639,6 @@ 0x81000000 0 0 0x0c001000 0 0x00010000 /* downstream I/O */ 0x82000000 0 0x0c011000 0x0c011000 0 0x3feefff>; /* non-prefetchable memory */ }; - - wlan { - compatible = "samsung,brcm-wlan"; - gpios = <&gpj2 0 0x1 &gpf3 1 0x1>; - pinctrl-names = "default"; - pinctrl-0 = <&cfg_wlanen &wlan_host_wake>; - status = "okay"; - }; }; timer { |