Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12d28f94 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'sunxi-fixes-for-4.11-2' of... 

Merge tag 'sunxi-fixes-for-4.11-2' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into fixes

Allwinner fixes for 4.11, bis

Two fixes for the recent A33 cpufreq support, and one to fix a missing
register in the A64 USB PHY node.

* tag 'sunxi-fixes-for-4.11-2' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux

:
  arm64: allwinner: a64: add pmu0 regs for USB PHY
  ARM: sun8i: a33: add operating-points-v2 property to all nodes
  ARM: sun8i: a33: remove highest OPP to fix CPU crashes

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents d4ee21ef 0d984797

arch/arm/boot/dts/sun8i-a33.dtsi

+6 −6
Original line number Original line Diff line number Diff line
@@ -66,12 +66,6 @@ 
			opp-microvolt = <1200000>;

			opp-microvolt = <1200000>;

			clock-latency-ns = <244144>; /* 8 32k periods */

			clock-latency-ns = <244144>; /* 8 32k periods */

		};

		};



		opp@1200000000 {

			opp-hz = /bits/ 64 <1200000000>;

			opp-microvolt = <1320000>;

			clock-latency-ns = <244144>; /* 8 32k periods */

		};

	};

	};





	cpus {

	cpus {
@@ -81,16 +75,22 @@ 
			operating-points-v2 = <&cpu0_opp_table>;

			operating-points-v2 = <&cpu0_opp_table>;

		};

		};





		cpu@1 {

			operating-points-v2 = <&cpu0_opp_table>;

		};



		cpu@2 {

		cpu@2 {

			compatible = "arm,cortex-a7";

			compatible = "arm,cortex-a7";

			device_type = "cpu";

			device_type = "cpu";

			reg = <2>;

			reg = <2>;

			operating-points-v2 = <&cpu0_opp_table>;

		};

		};





		cpu@3 {

		cpu@3 {

			compatible = "arm,cortex-a7";

			compatible = "arm,cortex-a7";

			device_type = "cpu";

			device_type = "cpu";

			reg = <3>;

			reg = <3>;

			operating-points-v2 = <&cpu0_opp_table>;

		};

		};

	};

	};

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -179,8 +179,10 @@ 
		usbphy: phy@01c19400 {

		usbphy: phy@01c19400 {

			compatible = "allwinner,sun50i-a64-usb-phy";

			compatible = "allwinner,sun50i-a64-usb-phy";

			reg = <0x01c19400 0x14>,

			reg = <0x01c19400 0x14>,

			      <0x01c1a800 0x4>,

			      <0x01c1b800 0x4>;

			      <0x01c1b800 0x4>;

			reg-names = "phy_ctrl",

			reg-names = "phy_ctrl",

				    "pmu0",

				    "pmu1";

				    "pmu1";

			clocks = <&ccu CLK_USB_PHY0>,

			clocks = <&ccu CLK_USB_PHY0>,

				 <&ccu CLK_USB_PHY1>;

				 <&ccu CLK_USB_PHY1>;