Message ID | 1442993914-20295-5-git-send-email-plaes@plaes.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Wed, Sep 23, 2015 at 10:38:34AM +0300, Priit Laes wrote: > Gemei G9 has internal speakers and headphone jack. Audio switching > from internal speakers to headphones is automatically handled by > extra FT2012Q audio amplifier chip that works out of the box. > > Signed-off-by: Priit Laes <plaes@plaes.org> > --- > arch/arm/boot/dts/sun4i-a10-gemei-g9.dts | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) > > diff --git a/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts b/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts > index b7cab72..2db75c4 100644 > --- a/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts > +++ b/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts > @@ -65,12 +65,19 @@ > /* > * TODO: > * 2x cameras via CSI > - * audio > + * audio input > * AXP battery management > * NAND > * OTG > * Touchscreen - gt801_2plus1 @ i2c adapter 2 @ 0x48 > */ > +&codec { > + routing = > + "Headphone Jack", "HP Left", > + "Headphone Jack", "HP Right"; > + /* TODO: input configuration */ > + status = "okay"; > +}; This doesn't compile, the codec node doesn't exist. Please always base your patches on top of sunxi/for-next, linux-next or some earlier rc, or mention the dependency in your cover letter. Thanks! Maxime
diff --git a/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts b/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts index b7cab72..2db75c4 100644 --- a/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts +++ b/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts @@ -65,12 +65,19 @@ /* * TODO: * 2x cameras via CSI - * audio + * audio input * AXP battery management * NAND * OTG * Touchscreen - gt801_2plus1 @ i2c adapter 2 @ 0x48 */ +&codec { + routing = + "Headphone Jack", "HP Left", + "Headphone Jack", "HP Right"; + /* TODO: input configuration */ + status = "okay"; +}; &cpu0 { cpu-supply = <®_dcdc2>;
Gemei G9 has internal speakers and headphone jack. Audio switching from internal speakers to headphones is automatically handled by extra FT2012Q audio amplifier chip that works out of the box. Signed-off-by: Priit Laes <plaes@plaes.org> --- arch/arm/boot/dts/sun4i-a10-gemei-g9.dts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)