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

Commit a1858df9 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'sunxi-fixes-for-4.12' of... 

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

Allwinner fixes for 4.12

A few fixes around the PRCM support that got in 4.12 with a wrong
compatible, and a missing clock in the binding.

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

:
  arm64: allwinner: a64: Add PLL_PERIPH0 clock to the R_CCU
  ARM: sunxi: h3-h5: Add PLL_PERIPH0 clock to the R_CCU
  arm64: allwinner: h5: Remove syslink to shared DTSI
  ARM: sunxi: h3/h5: fix the compatible of R_CCU

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 51b6e281 f74994a9

arch/arm/boot/dts/sunxi-h3-h5.dtsi

+4 −3
Original line number Diff line number Diff line
@@ -558,10 +558,11 @@ 
		};



		r_ccu: clock@1f01400 {

			compatible = "allwinner,sun50i-a64-r-ccu";

			compatible = "allwinner,sun8i-h3-r-ccu";

			reg = <0x01f01400 0x100>;

			clocks = <&osc24M>, <&osc32k>, <&iosc>;

			clock-names = "hosc", "losc", "iosc";

			clocks = <&osc24M>, <&osc32k>, <&iosc>,

				 <&ccu 9>;

			clock-names = "hosc", "losc", "iosc", "pll-periph";

			#clock-cells = <1>;

			#reset-cells = <1>;

		};

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

+3 −2
Original line number Diff line number Diff line
@@ -406,8 +406,9 @@ 
		r_ccu: clock@1f01400 {

			compatible = "allwinner,sun50i-a64-r-ccu";

			reg = <0x01f01400 0x100>;

			clocks = <&osc24M>, <&osc32k>, <&iosc>;

			clock-names = "hosc", "losc", "iosc";

			clocks = <&osc24M>, <&osc32k>, <&iosc>,

				 <&ccu 11>;

			clock-names = "hosc", "losc", "iosc", "pll-periph";

			#clock-cells = <1>;

			#reset-cells = <1>;

		};

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

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
 *     OTHER DEALINGS IN THE SOFTWARE.

 */



#include "sunxi-h3-h5.dtsi"

#include <arm/sunxi-h3-h5.dtsi>



/ {

	cpus {

arch/arm64/boot/dts/allwinner/sunxi-h3-h5.dtsi

deleted120000 → 0
+0 −1
Original line number Diff line number Diff line 
../../../../arm/boot/dts/sunxi-h3-h5.dtsi
 
 No newline at end of file