On Oct 27, 2013, at 4:24 PM, Sebastian Reichel wrote: > This patch adds device tree support to the Nokia N900 audio driver. > It also removes GPIO defines and gets them from platform data / > device tree, since some GPIO numbers may be different with DT boot. > > The binding also changes a helper function in omap-mcbsp, which > is currently only used by the Nokia N900. This change is needed, > because DT instanced omap-mcbsp driver has no valid id assigned. > > Last but not least the DT binding is documented. > > Signed-off-by: Sebastian Reichel <sre@xxxxxxxxxx> > --- > .../devicetree/bindings/sound/nokia,rx51.txt | 28 ++++ > .../devicetree/bindings/vendor-prefixes.txt | 1 + > include/sound/rx51.h | 18 +++ > sound/soc/omap/omap-mcbsp.c | 5 +- > sound/soc/omap/omap-mcbsp.h | 2 +- > sound/soc/omap/rx51.c | 175 ++++++++++++++++----- > 6 files changed, 184 insertions(+), 45 deletions(-) > create mode 100644 Documentation/devicetree/bindings/sound/nokia,rx51.txt > create mode 100644 include/sound/rx51.h > > diff --git a/Documentation/devicetree/bindings/sound/nokia,rx51.txt b/Documentation/devicetree/bindings/sound/nokia,rx51.txt > new file mode 100644 > index 0000000..4f985ca > --- /dev/null > +++ b/Documentation/devicetree/bindings/sound/nokia,rx51.txt > @@ -0,0 +1,28 @@ > +* Nokia N900 audio setup This needs more description > + > +Required properties: > +- compatible: "nokia,rx51-audio" > +- ti,mcbsp: phandle for the McBSP node > +- ti,codec: phandle for the main TLV320AIC3X node > +- ti,codec_aux: phandle for the main TLV320AIC3X auxiliary node > +- ti,headset_amp: phandle for the TPA6130A2 node Hmm, I don't think these should be ti prefixed but nokia. > +- tvout-selection-gpio: GPIO for tvout selection > +- jack-detection-gpio: GPIO for jack detection > +- eci-sw-gpio: GPIO for ECI SW > +- speaker-amp-gpio: GPIO for Speaker Amp why aren't the gpio properties vendor prefixed? > + > +Example: > + > +sound { > + compatible = "nokia,rx51-audio"; > + > + ti,mcbsp = <&mcbsp2>; > + ti,codec = <&tlv320aic3x>; > + ti,codec_aux = <&tlv320aic3x_aux>; > + ti,headset_amp = <&tpa6130a2>; > + > + tvout-selection-gpio = <&gpio2 8 GPIO_ACTIVE_HIGH>; /* 40 */ > + jack-detection-gpio = <&gpio6 17 GPIO_ACTIVE_HIGH>; /* 177 */ > + eci-sw-gpio = <&gpio6 22 GPIO_ACTIVE_HIGH>; /* 182 */ > + speaker-amp-gpio = <&twl_gpio 7 GPIO_ACTIVE_HIGH>; > +}; -- Employee of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line "unsubscribe linux-doc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html