Merge branch 'work.init' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-microblaze.git] / arch / arm64 / boot / dts / allwinner / sun50i-h6-tanix-tx6.dts

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-tanix-tx6.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-tanix-tx6.dts
index be81330..8f2a80f 100644 (file)
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6-tanix-tx6.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-tanix-tx6.dts
@@ -32,14 +32,21 @@
                };
        };
 
-       reg_vcc3v3: vcc3v3 {
+       reg_vcc1v8: regulator-vcc1v8 {
+               compatible = "regulator-fixed";
+               regulator-name = "vcc1v8";
+               regulator-min-microvolt = <1800000>;
+               regulator-max-microvolt = <1800000>;
+       };
+
+       reg_vcc3v3: regulator-vcc3v3 {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3";
                regulator-min-microvolt = <3300000>;
                regulator-max-microvolt = <3300000>;
        };
 
-       reg_vdd_cpu_gpu: vdd-cpu-gpu {
+       reg_vdd_cpu_gpu: regulator-vdd-cpu-gpu {
                compatible = "regulator-fixed";
                regulator-name = "vdd-cpu-gpu";
                regulator-min-microvolt = <1135000>;
@@ -91,6 +98,16 @@
        status = "okay";
 };
 
+&mmc2 {
+       vmmc-supply = <&reg_vcc3v3>;
+       vqmmc-supply = <&reg_vcc1v8>;
+       bus-width = <8>;
+       non-removable;
+       cap-mmc-hw-reset;
+       mmc-hs200-1_8v;
+       status = "okay";
+};
+
 &ohci0 {
        status = "okay";
 };
@@ -99,6 +116,12 @@
        status = "okay";
 };
 
+&pio {
+       vcc-pc-supply = <&reg_vcc1v8>;
+       vcc-pd-supply = <&reg_vcc3v3>;
+       vcc-pg-supply = <&reg_vcc1v8>;
+};
+
 &r_ir {
        linux,rc-map-name = "rc-tanix-tx5max";
        status = "okay";