i.MX6UL does not have the audio multiplexer (AUDMUX) like the other
i.MX6 SoCs, but apart from that can use the same audio driver. Make
audmux optional for the imx-sgtl5000 driver, so it can be used on
i.MX6UL too. Furthermore i.MX6UL requires use of the SAI interface
rather than SSI. Change the DTS documentation accordingly.
The patch with the corresponding changes to the imx-sgtl5000 driver
will be sent separately.
Signed-off-by: Lothar Wa?mann <redacted>
---
.../bindings/sound/imx-audio-sgtl5000.txt | 26 +++++++++++++++++++++-
1 file changed, 25 insertions(+), 1 deletion(-)
@@ -6,7 +6,7 @@ Required properties: - model : The user-visible name of this sound complex- - ssi-controller : The phandle of the i.MX SSI controller+ - ssi-controller : The phandle of the i.MX SSI (or SAI) controller - audio-codec : The phandle of the SGTL5000 audio codec
@@ -39,6 +39,16 @@ Required properties: Note: The AUDMUX port numbering should start at 1, which is consistent with hardware manual.+Optional properties:+ - fsl,no-audmux : boolean+ Required for i.MX6UL (and maybe other SoCs)+ which don't have an AUDMUX, but still+ feature the same audio subsystem otherwise.++Note: Setting this property will make mux-int-port and mux-ext-port+obsolete.++ Example: sound {
imx6ul.dtsi references the macro 'KEY_POWER' from
dt-bindings/input/input.h. Thus, move the include statement for this
file from imx6ul-14x14-evk.dts to imx6ul.dtsi itself.
Signed-off-by: Lothar Wa?mann <redacted>
---
arch/arm/boot/dts/imx6ul-14x14-evk.dts | 1 -
arch/arm/boot/dts/imx6ul.dtsi | 1 +
2 files changed, 1 insertion(+), 1 deletion(-)
Since PWMs are only useful if they are actually connected to an output pin,
let users enable them explicitly in their device trees where they should
also set up the pin configuration.
Signed-off-by: Lothar Wa?mann <redacted>
---
arch/arm/boot/dts/imx6ul.dtsi | 4 ++++
1 file changed, 4 insertions(+)
Please always add a new chip specific compatible here, even if the units
are fully working with the compatible of an older chip. This allows to
implement chip specific workarounds in the respective drivers without
changing the DT again if any bugs are found in the integration later on.
So the above should be:
compatible = "fsl,imx6ul-kpp", "fsl,imx6q-kpp", "fsl,imx21-kpp";
This comment applies to most of the patches in this series following
this one.
Regards,
Lucas
From: Rob Herring <robh@kernel.org> Date: 2016-01-15 02:38:15
On Tue, Jan 12, 2016 at 06:21:31PM +0100, Lothar Wa?mann wrote:
quoted hunk
i.MX6UL does not have the audio multiplexer (AUDMUX) like the other
i.MX6 SoCs, but apart from that can use the same audio driver. Make
audmux optional for the imx-sgtl5000 driver, so it can be used on
i.MX6UL too. Furthermore i.MX6UL requires use of the SAI interface
rather than SSI. Change the DTS documentation accordingly.
The patch with the corresponding changes to the imx-sgtl5000 driver
will be sent separately.
Signed-off-by: Lothar Wa?mann <redacted>
---
.../bindings/sound/imx-audio-sgtl5000.txt | 26 +++++++++++++++++++++-
1 file changed, 25 insertions(+), 1 deletion(-)
@@ -6,7 +6,7 @@ Required properties: - model : The user-visible name of this sound complex- - ssi-controller : The phandle of the i.MX SSI controller+ - ssi-controller : The phandle of the i.MX SSI (or SAI) controller - audio-codec : The phandle of the SGTL5000 audio codec
@@ -39,6 +39,16 @@ Required properties: Note: The AUDMUX port numbering should start at 1, which is consistent with hardware manual.+Optional properties:+ - fsl,no-audmux : boolean+ Required for i.MX6UL (and maybe other SoCs)+ which don't have an AUDMUX, but still+ feature the same audio subsystem otherwise.
It would have been better if this was a phandle to the audmux and lack
of the property meant no audmux. Too late for that I guess.
Acked-by: Rob Herring <robh@kernel.org>
Rob
On Tue, Jan 12, 2016 at 06:21:31PM +0100, Lothar Wa?mann wrote:
quoted
i.MX6UL does not have the audio multiplexer (AUDMUX) like the other
i.MX6 SoCs, but apart from that can use the same audio driver. Make
audmux optional for the imx-sgtl5000 driver, so it can be used on
i.MX6UL too. Furthermore i.MX6UL requires use of the SAI interface
rather than SSI. Change the DTS documentation accordingly.
The patch with the corresponding changes to the imx-sgtl5000 driver
will be sent separately.
Signed-off-by: Lothar Wa?mann <redacted>
---
.../bindings/sound/imx-audio-sgtl5000.txt | 26 +++++++++++++++++++++-
1 file changed, 25 insertions(+), 1 deletion(-)
@@ -6,7 +6,7 @@ Required properties: - model : The user-visible name of this sound complex- - ssi-controller : The phandle of the i.MX SSI controller+ - ssi-controller : The phandle of the i.MX SSI (or SAI) controller - audio-codec : The phandle of the SGTL5000 audio codec
@@ -39,6 +39,16 @@ Required properties: Note: The AUDMUX port numbering should start at 1, which is consistent with hardware manual.+Optional properties:+ - fsl,no-audmux : boolean+ Required for i.MX6UL (and maybe other SoCs)+ which don't have an AUDMUX, but still+ feature the same audio subsystem otherwise.
It would have been better if this was a phandle to the audmux and lack
of the property meant no audmux. Too late for that I guess.
That would mean, that all existing dtbs would have to be changed, and
older DTBs with newer kernels wouldn't work.
But this patch is obsolete anyway. The simple-card driver can be used
instead of the imx-audio-sgtl5000 as Mark Brown suggested in
[off-list ref]. I'll post an updated patch series soon.
Lothar Wa?mann