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

Commit 4f0c2c75 authored by Jagan Teki's avatar Jagan Teki Committed by Shawn Guo
Browse files

ARM: dts: imx6qdl-icore-rqs: Move Sound nodes to dtsi 



imx6q, imx6dl icore-rqs modules share common sound nodes,
so move the sound nodes from imx6q-icore-rqs into dtsi so-that
both can share the common node details.

And also replace codec: sgtl5000@0a => sgtl5000: codec@a
on imx6q-icore-rqs.dts to [label:] node-name[@unit-address]
according to devicetree specification from ePAPER v1.1

Cc: Matteo Lisi <matteo.lisi@engicam.com>
Cc: Michael Trimarchi <michael@amarulasolutions.com>
Signed-off-by: default avatarJagan Teki <jagan@amarulasolutions.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent bf04a32b

arch/arm/boot/dts/imx6q-icore-rqs.dts

+0 −24
Original line number Diff line number Diff line
@@ -47,30 +47,6 @@ 
/ {

	model = "Engicam i.CoreM6 Quad/Dual RQS Starter Kit";

	compatible = "engicam,imx6-icore-rqs", "fsl,imx6q";



	sound {

		compatible = "fsl,imx-audio-sgtl5000";

		model = "imx-audio-sgtl5000";

		ssi-controller = <&ssi1>;

		audio-codec = <&codec>;

		audio-routing =

			"MIC_IN", "Mic Jack",

			"Mic Jack", "Mic Bias",

			"Headphone Jack", "HP_OUT";

		mux-int-port = <1>;

		mux-ext-port = <4>;

	};

};



&i2c3 {

	codec: sgtl5000@0a {

		compatible = "fsl,sgtl5000";

		reg = <0x0a>;

		clocks = <&clks IMX6QDL_CLK_CKO>;

		VDDA-supply = <&reg_2p5v>;

		VDDIO-supply = <&reg_3p3v>;

		VDDD-supply = <&reg_1p8v>;

	};

};



&sata {

arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi

+22 −0
Original line number Diff line number Diff line
@@ -118,6 +118,19 @@ 
		clocks = <&clks IMX6QDL_CLK_LVDS2_GATE>;

		clock-names = "refclk";

	};



	sound {

		compatible = "fsl,imx-audio-sgtl5000";

		model = "imx-audio-sgtl5000";

		ssi-controller = <&ssi1>;

		audio-codec = <&sgtl5000>;

		audio-routing =

			"MIC_IN", "Mic Jack",

			"Mic Jack", "Mic Bias",

			"Headphone Jack", "HP_OUT";

		mux-int-port = <1>;

		mux-ext-port = <4>;

	};

};



&clks {
@@ -174,6 +187,15 @@ 
	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_i2c3>;

	status = "okay";



	sgtl5000: codec@a {

		compatible = "fsl,sgtl5000";

		reg = <0x0a>;

		clocks = <&clks IMX6QDL_CLK_CKO>;

		VDDA-supply = <&reg_2p5v>;

		VDDIO-supply = <&reg_3p3v>;

		VDDD-supply = <&reg_1p8v>;

	};

};



&pcie {