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>

diff --git a/arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi b/arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi
index 4bd385fc83d2029384f264d42a3d36a6c524eec8..e1c5f8c7050a4cb4c991f12903edcca717e27d72 100644 (file)
--- 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 db863111790720723b5893a1e0cd0381269e8e27..32e9c104af8c6e11e1e2df56774471f7f83e5f01 100644 (file)
--- 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 1c97aad7a5f0f56df00bb79507c21f616b9d02ba..901d50ba8618ef2050c29908fd224ab489bb6eeb 100644 (file)
--- 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 f710eaf05c36ab9432477e1b2090c286eba81cbc..e59f7d9a4400ed863fb94e106b18410a0b04e869 100644 (file)
--- 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 {