diff options
| author | Chen-Yu Tsai <wens@csie.org> | 2017-10-18 10:31:36 +0200 |
|---|---|---|
| committer | Maxime Ripard <maxime.ripard@free-electrons.com> | 2017-11-02 09:04:52 +0100 |
| commit | b5bc9ce3d47c9701433a385e4f17e928c8ca6c46 (patch) | |
| tree | f30c4f3793cc2eef4bd2cd02924c667f4923e3b8 /arch | |
| parent | ARM: dts: sun8i: a83t: allwinner-h8homlet-v2: Add AXP818 regulator nodes (diff) | |
| download | linux-b5bc9ce3d47c9701433a385e4f17e928c8ca6c46.tar.xz linux-b5bc9ce3d47c9701433a385e4f17e928c8ca6c46.zip | |
ARM: dts: sun8i: a83t: Move mmc1 pinctrl setting to dtsi file
mmc1 only has 1 possible pinmux setting.
Move any settings to the dtsi file and set it by default.
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/sun8i-a83t.dtsi | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts b/arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts index 723641f56a74..de0be140338b 100644 --- a/arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts +++ b/arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts @@ -115,8 +115,6 @@ &mmc1 { mmc-pwrseq = <&wifi_pwrseq>; bus-width = <4>; - pinctrl-names = "default"; - pinctrl-0 = <&mmc1_pins>; vmmc-supply = <®_vcc3v3>; vqmmc-supply = <®_vcc3v3>; non-removable; diff --git a/arch/arm/boot/dts/sun8i-a83t.dtsi b/arch/arm/boot/dts/sun8i-a83t.dtsi index ce6e887c8938..19acae1b4089 100644 --- a/arch/arm/boot/dts/sun8i-a83t.dtsi +++ b/arch/arm/boot/dts/sun8i-a83t.dtsi @@ -212,6 +212,8 @@ resets = <&ccu RST_BUS_MMC1>; reset-names = "ahb"; interrupts = <GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&mmc1_pins>; status = "disabled"; #address-cells = <1>; #size-cells = <0>; |