| Message ID | 20171108171300.15068-1-l.stach@pengutronix.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Reviewed-by: Chris Healy <cphealy@gmail.com> On Wed, Nov 8, 2017 at 9:13 AM, Lucas Stach <l.stach@pengutronix.de> wrote: > This renames the audio device to "Front" in order to match the RDU2 > naming, which makes it easier for a unified userspace to deal with > both boards. > > Also rename the phandle for the headphone amplifier to more closely > resemble the RDU2 DTS. > > Signed-off-by: Lucas Stach <l.stach@pengutronix.de> > --- > arch/arm/boot/dts/imx51-zii-rdu1.dts | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/arch/arm/boot/dts/imx51-zii-rdu1.dts b/arch/arm/boot/dts/imx51-zii-rdu1.dts > index 2628dbe4174b..31c35919c580 100644 > --- a/arch/arm/boot/dts/imx51-zii-rdu1.dts > +++ b/arch/arm/boot/dts/imx51-zii-rdu1.dts > @@ -243,7 +243,7 @@ > > sound { > compatible = "simple-audio-card"; > - simple-audio-card,name = "RDU1 audio"; > + simple-audio-card,name = "Front"; > simple-audio-card,format = "i2s"; > simple-audio-card,bitclock-master = <&sound_codec>; > simple-audio-card,frame-master = <&sound_codec>; > @@ -252,7 +252,7 @@ > simple-audio-card,routing = > "Headphone Jack", "HPLEFT", > "Headphone Jack", "HPRIGHT"; > - simple-audio-card,aux-devs = <&tpa6130a2>; > + simple-audio-card,aux-devs = <&hpa1>; > > sound_cpu: simple-audio-card,cpu { > sound-dai = <&ssi2>; > @@ -480,7 +480,7 @@ > reg = <0x50>; > }; > > - tpa6130a2: amp@60 { > + hpa1: amp@60 { > compatible = "ti,tpa6130a2"; > reg = <0x60>; > pinctrl-names = "default"; > -- > 2.11.0 >
On Wed, Nov 08, 2017 at 06:13:00PM +0100, Lucas Stach wrote: > This renames the audio device to "Front" in order to match the RDU2 > naming, which makes it easier for a unified userspace to deal with > both boards. > > Also rename the phandle for the headphone amplifier to more closely > resemble the RDU2 DTS. > > Signed-off-by: Lucas Stach <l.stach@pengutronix.de> Applied, thanks.
diff --git a/arch/arm/boot/dts/imx51-zii-rdu1.dts b/arch/arm/boot/dts/imx51-zii-rdu1.dts index 2628dbe4174b..31c35919c580 100644 --- a/arch/arm/boot/dts/imx51-zii-rdu1.dts +++ b/arch/arm/boot/dts/imx51-zii-rdu1.dts @@ -243,7 +243,7 @@ sound { compatible = "simple-audio-card"; - simple-audio-card,name = "RDU1 audio"; + simple-audio-card,name = "Front"; simple-audio-card,format = "i2s"; simple-audio-card,bitclock-master = <&sound_codec>; simple-audio-card,frame-master = <&sound_codec>; @@ -252,7 +252,7 @@ simple-audio-card,routing = "Headphone Jack", "HPLEFT", "Headphone Jack", "HPRIGHT"; - simple-audio-card,aux-devs = <&tpa6130a2>; + simple-audio-card,aux-devs = <&hpa1>; sound_cpu: simple-audio-card,cpu { sound-dai = <&ssi2>; @@ -480,7 +480,7 @@ reg = <0x50>; }; - tpa6130a2: amp@60 { + hpa1: amp@60 { compatible = "ti,tpa6130a2"; reg = <0x60>; pinctrl-names = "default";
This renames the audio device to "Front" in order to match the RDU2 naming, which makes it easier for a unified userspace to deal with both boards. Also rename the phandle for the headphone amplifier to more closely resemble the RDU2 DTS. Signed-off-by: Lucas Stach <l.stach@pengutronix.de> --- arch/arm/boot/dts/imx51-zii-rdu1.dts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)