Skip to content

Commit 4b27844

Browse files
committed
Merge tag 'sunxi-dt-for-5.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into arm/dt
Our usual round of DT patches for the 5.15 merge window, with some Tanix TX6 improvements this time. * tag 'sunxi-dt-for-5.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: arm64: dts: allwinner: h6: tanix-tx6: enable emmc arm64: dts: allwinner: h6: tanix-tx6: Add PIO power supplies arm64: dts: allwinner: h6: tanix-tx6: Fix regulator node names Link: https://lore.kernel.org/r/39cd7be5-a9a7-42b6-bc29-f895b9a3448a.lettre@localhost Signed-off-by: Arnd Bergmann <[email protected]>
2 parents c872138 + 9d3ef21 commit 4b27844

File tree

1 file changed

+25
-2
lines changed

1 file changed

+25
-2
lines changed

arch/arm64/boot/dts/allwinner/sun50i-h6-tanix-tx6.dts

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,21 @@
3232
};
3333
};
3434

35-
reg_vcc3v3: vcc3v3 {
35+
reg_vcc1v8: regulator-vcc1v8 {
36+
compatible = "regulator-fixed";
37+
regulator-name = "vcc1v8";
38+
regulator-min-microvolt = <1800000>;
39+
regulator-max-microvolt = <1800000>;
40+
};
41+
42+
reg_vcc3v3: regulator-vcc3v3 {
3643
compatible = "regulator-fixed";
3744
regulator-name = "vcc3v3";
3845
regulator-min-microvolt = <3300000>;
3946
regulator-max-microvolt = <3300000>;
4047
};
4148

42-
reg_vdd_cpu_gpu: vdd-cpu-gpu {
49+
reg_vdd_cpu_gpu: regulator-vdd-cpu-gpu {
4350
compatible = "regulator-fixed";
4451
regulator-name = "vdd-cpu-gpu";
4552
regulator-min-microvolt = <1135000>;
@@ -91,6 +98,16 @@
9198
status = "okay";
9299
};
93100

101+
&mmc2 {
102+
vmmc-supply = <&reg_vcc3v3>;
103+
vqmmc-supply = <&reg_vcc1v8>;
104+
bus-width = <8>;
105+
non-removable;
106+
cap-mmc-hw-reset;
107+
mmc-hs200-1_8v;
108+
status = "okay";
109+
};
110+
94111
&ohci0 {
95112
status = "okay";
96113
};
@@ -99,6 +116,12 @@
99116
status = "okay";
100117
};
101118

119+
&pio {
120+
vcc-pc-supply = <&reg_vcc1v8>;
121+
vcc-pd-supply = <&reg_vcc3v3>;
122+
vcc-pg-supply = <&reg_vcc1v8>;
123+
};
124+
102125
&r_ir {
103126
linux,rc-map-name = "rc-tanix-tx5max";
104127
status = "okay";

0 commit comments

Comments
 (0)