Commit 048e5a78 authored by Kevin Hilman's avatar Kevin Hilman
Browse files

Merge tag 'dt-3.13-3' of git://git.infradead.org/linux-mvebu into next/dt 

From Jason Cooper:
mvebu dt changes for v3.13 (round 3)

 - dove
    - add audio devices
    - fix bad properties of si5351 clkout2 for CuBox

* tag 'dt-3.13-3' of git://git.infradead.org/linux-mvebu:
  ARM: Dove: fix bad properties of the si5351 clkout2 used by Cubox audio
  ARM: Dove: Add the audio device to the Cubox DT
  ARM: Dove: Add the audio devices in DT
parents fd781337 1deb122c

arch/arm/boot/dts/dove-cubox.dts

+10 −8
Original line number Diff line number Diff line
@@ -99,18 +99,12 @@ 
			silabs,pll-master;

		};



		clkout1 {

			reg = <1>;

			silabs,drive-strength = <8>;

			silabs,multisynth-source = <1>;

			silabs,clock-source = <0>;

			silabs,pll-master;

		};



		clkout2 {

			reg = <2>;

			silabs,drive-strength = <8>;

			silabs,multisynth-source = <1>;

			silabs,clock-source = <0>;

			silabs,pll-master;

		};

	};

};
@@ -132,3 +126,11 @@ 
		reg = <0>;

	};

};



&audio1 {

	status = "okay";

	clocks = <&gate_clk 13>, <&si5351 2>;

	clock-names = "internal", "extclk";

	pinctrl-0 = <&pmx_audio1_i2s1_spdifo &pmx_audio1_extclk>;

	pinctrl-names = "default";

};

arch/arm/boot/dts/dove.dtsi

+28 −0
Original line number Diff line number Diff line
@@ -297,6 +297,11 @@ 
					marvell,function = "gpio";

				};



				pmx_audio1_extclk: pmx-audio1-extclk {

					marvell,pins = "mpp13";

					marvell,function = "audio1";

				};



				pmx_gpio_14: pmx-gpio-14 {

					marvell,pins = "mpp14";

					marvell,function = "gpio";
@@ -372,6 +377,11 @@ 
					marvell,function = "gpio";

				};



				pmx_audio1_i2s1_spdifo: pmx-audio1-i2s1-spdifo {

					marvell,pins = "mpp_audio1";

					marvell,function = "i2s1/spdifo";

				};



				pmx_spi0: pmx-spi0 {

					marvell,pins = "mpp_spi0";

					marvell,function = "spi0";
@@ -573,6 +583,24 @@ 
					phy-handle = <&ethphy>;

				};

			};



			audio0: audio-controller@b0000 {

				compatible = "marvell,dove-audio";

				reg = <0xb0000 0x2210>;

				interrupts = <19>, <20>;

				clocks = <&gate_clk 12>;

				clock-names = "internal";

				status = "disabled";

			};



			audio1: audio-controller@b4000 {

				compatible = "marvell,dove-audio";

				reg = <0xb4000 0x2210>;

				interrupts = <21>, <22>;

				clocks = <&gate_clk 13>;

				clock-names = "internal";

				status = "disabled";

			};

		};

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE