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

Commit 88cf9c5e authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'sunxi-dt-for-3.10-4' of git://github.com/mripard/linux into next/dt 

From Maxime Ripard:
Fourth round of dt additions for 3.10

There's only one late patch that merge together two clocks that were
already defined in a previous patch.

* tag 'sunxi-dt-for-3.10-4' of git://github.com/mripard/linux

:
  ARM: sunxi: unify osc24M_fixed and osc24M

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents da0851fe 92fd6e06

arch/arm/boot/dts/sun4i-a10.dtsi

+1 −7
Original line number Diff line number Diff line
@@ -42,17 +42,11 @@ 
			clock-frequency = <0>;

		};



		osc24M_fixed: osc24M_fixed {

			#clock-cells = <0>;

			compatible = "fixed-clock";

			clock-frequency = <24000000>;

		};



		osc24M: osc24M@01c20050 {

			#clock-cells = <0>;

			compatible = "allwinner,sun4i-osc-clk";

			reg = <0x01c20050 0x4>;

			clocks = <&osc24M_fixed>;

			clock-frequency = <24000000>;

		};



		osc32k: osc32k {

arch/arm/boot/dts/sun5i-a13.dtsi

+1 −7
Original line number Diff line number Diff line
@@ -43,17 +43,11 @@ 
			clock-frequency = <0>;

		};



		osc24M_fixed: osc24M_fixed {

			#clock-cells = <0>;

			compatible = "fixed-clock";

			clock-frequency = <24000000>;

		};



		osc24M: osc24M@01c20050 {

			#clock-cells = <0>;

			compatible = "allwinner,sun4i-osc-clk";

			reg = <0x01c20050 0x4>;

			clocks = <&osc24M_fixed>;

			clock-frequency = <24000000>;

		};



		osc32k: osc32k {