diff options
| author | Srinivas Kandagatla <srinivas.kandagatla@linaro.org> | 2016-06-10 10:38:34 +0100 |
|---|---|---|
| committer | Andy Gross <andy.gross@linaro.org> | 2016-06-27 17:36:51 -0500 |
| commit | ccd140b574e28a8f622fa53d8bac99e585d7ced6 (patch) | |
| tree | 283d7719dd4373d9216d504bdb9b9aa03755439d /arch/arm/boot | |
| parent | c49e9e95f4d1f771e25cf6540503a4ab88798325 (diff) | |
| download | lwn-ccd140b574e28a8f622fa53d8bac99e585d7ced6.tar.gz lwn-ccd140b574e28a8f622fa53d8bac99e585d7ced6.zip | |
ARM: dts: apq8064: move sdcc1 pinctrl nodes to soc file
This patch moves out the sdcc1 pinctrl nodes out of board files to soc file,
so that it will be duplicated in other board files.
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Andy Gross <andy.gross@linaro.org>
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/qcom-apq8064-pins.dtsi | 20 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts | 22 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom-apq8064.dtsi | 2 |
3 files changed, 22 insertions, 22 deletions
diff --git a/arch/arm/boot/dts/qcom-apq8064-pins.dtsi b/arch/arm/boot/dts/qcom-apq8064-pins.dtsi index 4102a98f475b..ca683e56b887 100644 --- a/arch/arm/boot/dts/qcom-apq8064-pins.dtsi +++ b/arch/arm/boot/dts/qcom-apq8064-pins.dtsi @@ -7,6 +7,26 @@ }; }; + sdcc1_pins: sdcc1-pin-active { + clk { + pins = "sdc1_clk"; + drive-strengh = <16>; + bias-disable; + }; + + cmd { + pins = "sdc1_cmd"; + drive-strengh = <10>; + bias-pull-up; + }; + + data { + pins = "sdc1_data"; + drive-strengh = <10>; + bias-pull-up; + }; + }; + ps_hold: ps_hold { mux { pins = "gpio78"; diff --git a/arch/arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts b/arch/arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts index 06b3c76c3e41..93d08b9a77c9 100644 --- a/arch/arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts +++ b/arch/arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts @@ -70,25 +70,6 @@ }; }; - sdcc1_pin_a: sdcc1-pin-active { - clk { - pins = "sdc1_clk"; - drive-strengh = <16>; - bias-disable; - }; - - cmd { - pins = "sdc1_cmd"; - drive-strengh = <10>; - bias-pull-up; - }; - - data { - pins = "sdc1_data"; - drive-strengh = <10>; - bias-pull-up; - }; - }; sdcc3_pin_a: sdcc3-pin-active { clk { @@ -417,9 +398,6 @@ vmmc-supply = <&pm8921_l5>; vqmmc-supply = <&pm8921_s4>; - - pinctrl-names = "default"; - pinctrl-0 = <&sdcc1_pin_a>; }; sdcc3: sdcc@12180000 { diff --git a/arch/arm/boot/dts/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom-apq8064.dtsi index cf37d55f6e74..ce7ce846615e 100644 --- a/arch/arm/boot/dts/qcom-apq8064.dtsi +++ b/arch/arm/boot/dts/qcom-apq8064.dtsi @@ -859,6 +859,8 @@ sdcc1: sdcc@12400000 { status = "disabled"; compatible = "arm,pl18x", "arm,primecell"; + pinctrl-names = "default"; + pinctrl-0 = <&sdcc1_pins>; arm,primecell-periphid = <0x00051180>; reg = <0x12400000 0x2000>; interrupts = <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>; |