Commit 190b05d7 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'sunxi-fixes-for-5.9-1' of... 

Merge tag 'sunxi-fixes-for-5.9-1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into arm/fixes

Two fixes for the Allwinner SoCs, one for the H5 GPU support and one for
a misconfigured regulator on the Bananapi M2 Ultra.

* tag 'sunxi-fixes-for-5.9-1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  arm64: dts: allwinner: h5: remove Mali GPU PMU module
  ARM: dts: sun8i: r40: bananapi-m2-ultra: Fix dcdc1 regulator

Link: https://lore.kernel.org/r/8a436328-b844-4599-8695-ab2088a00ade.lettre@localhost


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents abc7220b 2933bf35

arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts

+5 −5
Original line number Diff line number Diff line
@@ -223,16 +223,16 @@ 
};



&reg_dc1sw {

	regulator-min-microvolt = <3000000>;

	regulator-max-microvolt = <3000000>;

	regulator-min-microvolt = <3300000>;

	regulator-max-microvolt = <3300000>;

	regulator-name = "vcc-gmac-phy";

};



&reg_dcdc1 {

	regulator-always-on;

	regulator-min-microvolt = <3000000>;

	regulator-max-microvolt = <3000000>;

	regulator-name = "vcc-3v0";

	regulator-min-microvolt = <3300000>;

	regulator-max-microvolt = <3300000>;

	regulator-name = "vcc-3v3";

};



&reg_dcdc2 {

arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi

+2 −4
Original line number Diff line number Diff line
@@ -139,8 +139,7 @@ 
				     <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;

				     <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "gp",

					  "gpmmu",

					  "pp",
@@ -151,8 +150,7 @@ 
					  "pp2",

					  "ppmmu2",

					  "pp3",

					  "ppmmu3",

					  "pmu";

					  "ppmmu3";

			clocks = <&ccu CLK_BUS_GPU>, <&ccu CLK_GPU>;

			clock-names = "bus", "core";

			resets = <&ccu RST_BUS_GPU>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE