Unverified Commit 4b278447 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'sunxi-dt-for-5.15-1' of... 

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: default avatarArnd Bergmann <arnd@arndb.de>
parents c872138c 9d3ef21d

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

+25 −2
Original line number Diff line number Diff line
@@ -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";