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

Commit fb326e98 authored by Igal Liberman's avatar Igal Liberman Committed by Scott Wood
Browse files

powerpc/dts: Unify B4 mux nodes 



Signed-off-by: default avatarIgal Liberman <Igal.Liberman@freescale.com>
Change-Id: Ic5f28f7b492b708f00a5ff74dda723ce5e1da0ba
Signed-off-by: default avatarScott Wood <scottwood@freescale.com>
parent 763d2d8d

arch/powerpc/boot/dts/fsl/b4420si-post.dtsi

+2 −13
Original line number Diff line number Diff line
@@ -80,20 +80,9 @@ 
		compatible = "fsl,b4420-device-config", "fsl,qoriq-device-config-2.0";

	};



/include/ "qoriq-clockgen2.dtsi"

	global-utilities@e1000 {

		compatible = "fsl,b4420-clockgen", "fsl,qoriq-clockgen-2.0";



		mux0: mux0@0 {

			#clock-cells = <0>;

			reg = <0x0 0x4>;

			compatible = "fsl,qoriq-core-mux-2.0";

			clocks = <&pll0 0>, <&pll0 1>, <&pll0 2>,

				<&pll1 0>, <&pll1 1>, <&pll1 2>;

			clock-names = "pll0", "pll0-div2", "pll0-div4",

				"pll1", "pll1-div2", "pll1-div4";

			clock-output-names = "cmux0";

		};

		compatible = "fsl,b4420-clockgen", "fsl,b4-clockgen",

			      "fsl,qoriq-clockgen-2.0";

	};



	rcpm: global-utilities@e2000 {

arch/powerpc/boot/dts/fsl/b4860si-post.dtsi

+2 −13
Original line number Diff line number Diff line
@@ -182,20 +182,9 @@ 
		compatible = "fsl,b4860-device-config", "fsl,qoriq-device-config-2.0";

	};



/include/ "qoriq-clockgen2.dtsi"

	global-utilities@e1000 {

		compatible = "fsl,b4860-clockgen", "fsl,qoriq-clockgen-2.0";



		mux0: mux0@0 {

			#clock-cells = <0>;

			reg = <0x0 0x4>;

			compatible = "fsl,qoriq-core-mux-2.0";

			clocks = <&pll0 0>, <&pll0 1>, <&pll0 2>,

				<&pll1 0>, <&pll1 1>, <&pll1 2>;

			clock-names = "pll0", "pll0-div2", "pll0-div4",

				"pll1", "pll1-div2", "pll1-div4";

			clock-output-names = "cmux0";

		};

		compatible = "fsl,b4860-clockgen", "fsl,b4-clockgen",

			      "fsl,qoriq-clockgen-2.0";

	};



	rcpm: global-utilities@e2000 {

arch/powerpc/boot/dts/fsl/b4si-post.dtsi

+12 −0
Original line number Diff line number Diff line
@@ -296,9 +296,21 @@ 
		fsl,liodn-bits = <12>;

	};



/include/ "qoriq-clockgen2.dtsi"

	clockgen: global-utilities@e1000 {

		compatible = "fsl,b4-clockgen", "fsl,qoriq-clockgen-2.0";

		reg = <0xe1000 0x1000>;



		mux0: mux0@0 {

			#clock-cells = <0>;

			reg = <0x0 0x4>;

			compatible = "fsl,qoriq-core-mux-2.0";

			clocks = <&pll0 0>, <&pll0 1>, <&pll0 2>,

				<&pll1 0>, <&pll1 1>, <&pll1 2>;

			clock-names = "pll0", "pll0-div2", "pll0-div4",

				"pll1", "pll1-div2", "pll1-div4";

			clock-output-names = "cmux0";

		};

	};



	rcpm: global-utilities@e2000 {