diff options
| author | Joonas Kylmälä <joonas.kylmala@iki.fi> | 2018-02-08 15:01:41 +0300 |
|---|---|---|
| committer | Maxime Ripard <maxime.ripard@bootlin.com> | 2018-02-15 11:27:38 +0300 |
| commit | 8566df712b5bb7b35d292f3b6b9216f511607e1f (patch) | |
| tree | d59d33080dffe03e5462f59e3689085e582080e6 /arch/arm/boot/dts | |
| parent | e607b605be46a44f50e3b48597188477e52eeff8 (diff) | |
| download | linux-8566df712b5bb7b35d292f3b6b9216f511607e1f.tar.xz | |
ARM: dts: sunxi: h3-h5: rename mmc0_pins_a and mmc1_pins_a
There is only one pinctrl configuration for mmc0 and mmc1 so let's
drop the _a suffix from both of them.
Signed-off-by: Joonas Kylmälä <joonas.kylmala@iki.fi>
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Diffstat (limited to 'arch/arm/boot/dts')
| -rw-r--r-- | arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/sunxi-h3-h5.dtsi | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts index 73978853bb4c..f868cf197c8e 100644 --- a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts +++ b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts @@ -134,7 +134,7 @@ }; }; -&mmc1_pins_a { +&mmc1_pins { bias-pull-up; }; diff --git a/arch/arm/boot/dts/sunxi-h3-h5.dtsi b/arch/arm/boot/dts/sunxi-h3-h5.dtsi index b4a4b3cb6c4e..7741166d34d8 100644 --- a/arch/arm/boot/dts/sunxi-h3-h5.dtsi +++ b/arch/arm/boot/dts/sunxi-h3-h5.dtsi @@ -142,7 +142,7 @@ /* compatible and clocks are in per SoC .dtsi file */ reg = <0x01c0f000 0x1000>; pinctrl-names = "default"; - pinctrl-0 = <&mmc0_pins_a>; + pinctrl-0 = <&mmc0_pins>; resets = <&ccu RST_BUS_MMC0>; reset-names = "ahb"; interrupts = <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>; @@ -155,7 +155,7 @@ /* compatible and clocks are in per SoC .dtsi file */ reg = <0x01c10000 0x1000>; pinctrl-names = "default"; - pinctrl-0 = <&mmc1_pins_a>; + pinctrl-0 = <&mmc1_pins>; resets = <&ccu RST_BUS_MMC1>; reset-names = "ahb"; interrupts = <GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>; @@ -352,7 +352,7 @@ function = "i2c2"; }; - mmc0_pins_a: mmc0 { + mmc0_pins: mmc0 { pins = "PF0", "PF1", "PF2", "PF3", "PF4", "PF5"; function = "mmc0"; @@ -360,7 +360,7 @@ bias-pull-up; }; - mmc1_pins_a: mmc1 { + mmc1_pins: mmc1 { pins = "PG0", "PG1", "PG2", "PG3", "PG4", "PG5"; function = "mmc1"; |