| Message ID | 1491501735-1649-4-git-send-email-jagan@openedev.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Apr 06, 2017 at 11:32:09PM +0530, Jagan Teki wrote: > From: Jagan Teki <jagan@amarulasolutions.com> > > Add support for Sound card and related codec(via i2c1) nodes > on below Engicam module boards. > - i.CoreM6 DualLite/Solo Starter kit > - i.CoreM6 Quad/Dual Starter kit > - i.CoreM6 Quad/Dual OpenFrame Cap touch 10.1 > - i.CoreM6 Quad/Dual OpenFrame Cap touch 12.3 > > Cc: Shawn Guo <shawnguo@kernel.org> > Cc: Matteo Lisi <matteo.lisi@engicam.com> > Cc: Michael Trimarchi <michael@amarulasolutions.com> > Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> > --- > Changes for v3: > - Replace fsl,imx-audio-sgtl5000 and use simple-audio-card > Changes for v2: > - Use proper [label:] node-name[@unit-address] for codec > > arch/arm/boot/dts/imx6dl-icore.dts | 11 +++++++ > arch/arm/boot/dts/imx6q-icore-ofcap10.dts | 11 +++++++ > arch/arm/boot/dts/imx6q-icore-ofcap12.dts | 11 +++++++ > arch/arm/boot/dts/imx6q-icore.dts | 11 +++++++ > arch/arm/boot/dts/imx6qdl-icore.dtsi | 48 +++++++++++++++++++++++++++++++ Why cannot you just add sgtl5000 node into dtsi rather than keeping the same copy for 4 dts files? Shawn > 5 files changed, 92 insertions(+) > > diff --git a/arch/arm/boot/dts/imx6dl-icore.dts b/arch/arm/boot/dts/imx6dl-icore.dts > index 6de83c7..0562ce4 100644 > --- a/arch/arm/boot/dts/imx6dl-icore.dts > +++ b/arch/arm/boot/dts/imx6dl-icore.dts > @@ -57,3 +57,14 @@ > &can2 { > status = "okay"; > }; > + > +&i2c3 { > + sgtl5000: codec@a { > + compatible = "fsl,sgtl5000"; > + reg = <0x0a>; > + clocks = <&clks IMX6QDL_CLK_CKO>; > + VDDA-supply = <®_2p5v>; > + VDDIO-supply = <®_3p3v>; > + VDDD-supply = <®_1p8v>; > + }; > +}; > diff --git a/arch/arm/boot/dts/imx6q-icore-ofcap10.dts b/arch/arm/boot/dts/imx6q-icore-ofcap10.dts > index 49b60ca..f63b87f 100644 > --- a/arch/arm/boot/dts/imx6q-icore-ofcap10.dts > +++ b/arch/arm/boot/dts/imx6q-icore-ofcap10.dts > @@ -50,6 +50,17 @@ > compatible = "engicam,imx6-icore", "fsl,imx6q"; > }; > > +&i2c3 { > + sgtl5000: codec@a { > + compatible = "fsl,sgtl5000"; > + reg = <0x0a>; > + clocks = <&clks IMX6QDL_CLK_CKO>; > + VDDA-supply = <®_2p5v>; > + VDDIO-supply = <®_3p3v>; > + VDDD-supply = <®_1p8v>; > + }; > +}; > + > &ldb { > status = "okay"; > > diff --git a/arch/arm/boot/dts/imx6q-icore-ofcap12.dts b/arch/arm/boot/dts/imx6q-icore-ofcap12.dts > index 9e230f5..68ca828 100644 > --- a/arch/arm/boot/dts/imx6q-icore-ofcap12.dts > +++ b/arch/arm/boot/dts/imx6q-icore-ofcap12.dts > @@ -50,6 +50,17 @@ > compatible = "engicam,imx6-icore", "fsl,imx6q"; > }; > > +&i2c3 { > + sgtl5000: codec@a { > + compatible = "fsl,sgtl5000"; > + reg = <0x0a>; > + clocks = <&clks IMX6QDL_CLK_CKO>; > + VDDA-supply = <®_2p5v>; > + VDDIO-supply = <®_3p3v>; > + VDDD-supply = <®_1p8v>; > + }; > +}; > + > &ldb { > status = "okay"; > > diff --git a/arch/arm/boot/dts/imx6q-icore.dts b/arch/arm/boot/dts/imx6q-icore.dts > index 5613dd9..1ae7294 100644 > --- a/arch/arm/boot/dts/imx6q-icore.dts > +++ b/arch/arm/boot/dts/imx6q-icore.dts > @@ -67,6 +67,17 @@ > }; > }; > > +&i2c3 { > + sgtl5000: codec@a { > + compatible = "fsl,sgtl5000"; > + reg = <0x0a>; > + clocks = <&clks IMX6QDL_CLK_CKO>; > + VDDA-supply = <®_2p5v>; > + VDDIO-supply = <®_3p3v>; > + VDDD-supply = <®_1p8v>; > + }; > +}; > + > &ldb { > status = "okay"; > > diff --git a/arch/arm/boot/dts/imx6qdl-icore.dtsi b/arch/arm/boot/dts/imx6qdl-icore.dtsi > index 56d0c5d..1bd7cdb 100644 > --- a/arch/arm/boot/dts/imx6qdl-icore.dtsi > +++ b/arch/arm/boot/dts/imx6qdl-icore.dtsi > @@ -55,6 +55,25 @@ > default-brightness-level = <7>; > }; > > + reg_1p8v: regulator-1p8v { > + compatible = "regulator-fixed"; > + regulator-name = "1P8V"; > + regulator-min-microvolt = <1800000>; > + regulator-max-microvolt = <1800000>; > + regulator-boot-on; > + regulator-always-on; > + }; > + > + > + reg_2p5v: regulator-3p3v { > + compatible = "regulator-fixed"; > + regulator-name = "2P5V"; > + regulator-min-microvolt = <2500000>; > + regulator-max-microvolt = <2500000>; > + regulator-boot-on; > + regulator-always-on; > + }; > + > reg_3p3v: regulator-3p3v { > compatible = "regulator-fixed"; > regulator-name = "3P3V"; > @@ -87,6 +106,31 @@ > #clock-cells = <0>; > clock-frequency = <25000000>; /* 25MHz for example */ > }; > + > + sound { > + compatible = "simple-audio-card"; > + simple-audio-card,name = "imx6qdl-icore-sgtl5000"; > + simple-audio-card,format = "i2s"; > + simple-audio-card,bitclock-master = <&dailink_master>; > + simple-audio-card,frame-master = <&dailink_master>; > + simple-audio-card,widgets = > + "Microphone", "Mic Jack", > + "Line", "Line In", > + "Line", "Line Out", > + "Headphone", "Headphone Jack"; > + simple-audio-card,routing = > + "MIC_IN", "Mic Jack", > + "Mic Jack", "Mic Bias", > + "Headphone Jack", "HP_OUT"; > + > + simple-audio-card,cpu { > + sound-dai = <&ssi1>; > + }; > + > + dailink_master: simple-audio-card,codec { > + sound-dai = <&sgtl5000>; > + }; > + }; > }; > > &can1 { > @@ -149,6 +193,10 @@ > status = "okay"; > }; > > +&ssi1 { > + status = "okay"; > +}; > + > &uart4 { > pinctrl-names = "default"; > pinctrl-0 = <&pinctrl_uart4>; > -- > 1.9.1 >
diff --git a/arch/arm/boot/dts/imx6dl-icore.dts b/arch/arm/boot/dts/imx6dl-icore.dts index 6de83c7..0562ce4 100644 --- a/arch/arm/boot/dts/imx6dl-icore.dts +++ b/arch/arm/boot/dts/imx6dl-icore.dts @@ -57,3 +57,14 @@ &can2 { status = "okay"; }; + +&i2c3 { + sgtl5000: codec@a { + compatible = "fsl,sgtl5000"; + reg = <0x0a>; + clocks = <&clks IMX6QDL_CLK_CKO>; + VDDA-supply = <®_2p5v>; + VDDIO-supply = <®_3p3v>; + VDDD-supply = <®_1p8v>; + }; +}; diff --git a/arch/arm/boot/dts/imx6q-icore-ofcap10.dts b/arch/arm/boot/dts/imx6q-icore-ofcap10.dts index 49b60ca..f63b87f 100644 --- a/arch/arm/boot/dts/imx6q-icore-ofcap10.dts +++ b/arch/arm/boot/dts/imx6q-icore-ofcap10.dts @@ -50,6 +50,17 @@ compatible = "engicam,imx6-icore", "fsl,imx6q"; }; +&i2c3 { + sgtl5000: codec@a { + compatible = "fsl,sgtl5000"; + reg = <0x0a>; + clocks = <&clks IMX6QDL_CLK_CKO>; + VDDA-supply = <®_2p5v>; + VDDIO-supply = <®_3p3v>; + VDDD-supply = <®_1p8v>; + }; +}; + &ldb { status = "okay"; diff --git a/arch/arm/boot/dts/imx6q-icore-ofcap12.dts b/arch/arm/boot/dts/imx6q-icore-ofcap12.dts index 9e230f5..68ca828 100644 --- a/arch/arm/boot/dts/imx6q-icore-ofcap12.dts +++ b/arch/arm/boot/dts/imx6q-icore-ofcap12.dts @@ -50,6 +50,17 @@ compatible = "engicam,imx6-icore", "fsl,imx6q"; }; +&i2c3 { + sgtl5000: codec@a { + compatible = "fsl,sgtl5000"; + reg = <0x0a>; + clocks = <&clks IMX6QDL_CLK_CKO>; + VDDA-supply = <®_2p5v>; + VDDIO-supply = <®_3p3v>; + VDDD-supply = <®_1p8v>; + }; +}; + &ldb { status = "okay"; diff --git a/arch/arm/boot/dts/imx6q-icore.dts b/arch/arm/boot/dts/imx6q-icore.dts index 5613dd9..1ae7294 100644 --- a/arch/arm/boot/dts/imx6q-icore.dts +++ b/arch/arm/boot/dts/imx6q-icore.dts @@ -67,6 +67,17 @@ }; }; +&i2c3 { + sgtl5000: codec@a { + compatible = "fsl,sgtl5000"; + reg = <0x0a>; + clocks = <&clks IMX6QDL_CLK_CKO>; + VDDA-supply = <®_2p5v>; + VDDIO-supply = <®_3p3v>; + VDDD-supply = <®_1p8v>; + }; +}; + &ldb { status = "okay"; diff --git a/arch/arm/boot/dts/imx6qdl-icore.dtsi b/arch/arm/boot/dts/imx6qdl-icore.dtsi index 56d0c5d..1bd7cdb 100644 --- a/arch/arm/boot/dts/imx6qdl-icore.dtsi +++ b/arch/arm/boot/dts/imx6qdl-icore.dtsi @@ -55,6 +55,25 @@ default-brightness-level = <7>; }; + reg_1p8v: regulator-1p8v { + compatible = "regulator-fixed"; + regulator-name = "1P8V"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-boot-on; + regulator-always-on; + }; + + + reg_2p5v: regulator-3p3v { + compatible = "regulator-fixed"; + regulator-name = "2P5V"; + regulator-min-microvolt = <2500000>; + regulator-max-microvolt = <2500000>; + regulator-boot-on; + regulator-always-on; + }; + reg_3p3v: regulator-3p3v { compatible = "regulator-fixed"; regulator-name = "3P3V"; @@ -87,6 +106,31 @@ #clock-cells = <0>; clock-frequency = <25000000>; /* 25MHz for example */ }; + + sound { + compatible = "simple-audio-card"; + simple-audio-card,name = "imx6qdl-icore-sgtl5000"; + simple-audio-card,format = "i2s"; + simple-audio-card,bitclock-master = <&dailink_master>; + simple-audio-card,frame-master = <&dailink_master>; + simple-audio-card,widgets = + "Microphone", "Mic Jack", + "Line", "Line In", + "Line", "Line Out", + "Headphone", "Headphone Jack"; + simple-audio-card,routing = + "MIC_IN", "Mic Jack", + "Mic Jack", "Mic Bias", + "Headphone Jack", "HP_OUT"; + + simple-audio-card,cpu { + sound-dai = <&ssi1>; + }; + + dailink_master: simple-audio-card,codec { + sound-dai = <&sgtl5000>; + }; + }; }; &can1 { @@ -149,6 +193,10 @@ status = "okay"; }; +&ssi1 { + status = "okay"; +}; + &uart4 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart4>;