Skip to content

Commit 659757c

Browse files
wensmripard
authored andcommitted
ARM: dts: sun9i: a80-optimus: Order nodes by alphabetical order
Move the mmc nodes above the ohci nodes for proper ordering by name. Signed-off-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
1 parent 08ff3e4 commit 659757c

File tree

1 file changed

+25
-25
lines changed

1 file changed

+25
-25
lines changed

arch/arm/boot/dts/sun9i-a80-optimus.dts

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,31 @@
119119
status = "okay";
120120
};
121121

122+
&mmc0 {
123+
pinctrl-names = "default";
124+
pinctrl-0 = <&mmc0_pins>, <&mmc0_cd_pin_optimus>;
125+
vmmc-supply = <&reg_dcdc1>;
126+
bus-width = <4>;
127+
cd-gpios = <&pio 7 18 GPIO_ACTIVE_HIGH>; /* PH8 */
128+
cd-inverted;
129+
status = "okay";
130+
};
131+
132+
&mmc2 {
133+
pinctrl-names = "default";
134+
pinctrl-0 = <&mmc2_8bit_pins>;
135+
vmmc-supply = <&reg_dcdc1>;
136+
bus-width = <8>;
137+
non-removable;
138+
cap-mmc-hw-reset;
139+
status = "okay";
140+
};
141+
142+
&mmc2_8bit_pins {
143+
/* Increase drive strength for DDR modes */
144+
allwinner,drive = <SUN4I_PINCTRL_40_MA>;
145+
};
146+
122147
&ohci0 {
123148
status = "okay";
124149
};
@@ -157,31 +182,6 @@
157182
};
158183
};
159184

160-
&mmc0 {
161-
pinctrl-names = "default";
162-
pinctrl-0 = <&mmc0_pins>, <&mmc0_cd_pin_optimus>;
163-
vmmc-supply = <&reg_dcdc1>;
164-
bus-width = <4>;
165-
cd-gpios = <&pio 7 18 GPIO_ACTIVE_HIGH>; /* PH8 */
166-
cd-inverted;
167-
status = "okay";
168-
};
169-
170-
&mmc2 {
171-
pinctrl-names = "default";
172-
pinctrl-0 = <&mmc2_8bit_pins>;
173-
vmmc-supply = <&reg_dcdc1>;
174-
bus-width = <8>;
175-
non-removable;
176-
cap-mmc-hw-reset;
177-
status = "okay";
178-
};
179-
180-
&mmc2_8bit_pins {
181-
/* Increase drive strength for DDR modes */
182-
allwinner,drive = <SUN4I_PINCTRL_40_MA>;
183-
};
184-
185185
&r_ir {
186186
status = "okay";
187187
};

0 commit comments

Comments
 (0)