Patchwork [6/6] ARM: imx6q-sabrelite: add audmux support

login
register
mail settings
Submitter Richard Zhao
Date Jan. 6, 2012, 3:25 a.m.
Message ID <1325820343-11875-7-git-send-email-richard.zhao@linaro.org>
Download mbox | patch
Permalink /patch/134591/
State New
Headers show

Comments

Richard Zhao - Jan. 6, 2012, 3:25 a.m.
- enable audmux in dts
- enable audmux in Kconfig

Signed-off-by: Richard Zhao <richard.zhao@linaro.org>
---
 arch/arm/boot/dts/imx6q-sabrelite.dts |    4 ++++
 arch/arm/boot/dts/imx6q.dtsi          |    2 ++
 arch/arm/mach-imx/Kconfig             |    1 +
 3 files changed, 7 insertions(+), 0 deletions(-)
Richard Zhao - Jan. 8, 2012, 2:58 p.m.
On Sun, Jan 08, 2012 at 11:02:36PM +0800, Shawn Guo wrote:
> On Fri, Jan 06, 2012 at 11:25:43AM +0800, Richard Zhao wrote:
> > --- a/arch/arm/boot/dts/imx6q.dtsi
> > +++ b/arch/arm/boot/dts/imx6q.dtsi
> > @@ -527,7 +527,9 @@
> >  			};
> >  
> >  			audmux@021d8000 {
> > +				compatible = "fsl,audmux-v2";
> 
> This is not a good compatible string, because the version number is
> not defined by hardware.  Even it is defined by hardware, the version
> number is not as stable as soc to identify specific hardware block.
> You can look at uart, cspi, sdma etc. for examples.
compatible = "fsl,imx6q-audmux", "fsl,imx25-audmux";
I forgot imx25 or imx31 is oldest. Is it ok for you?

Thanks
Richard
> 
> >  				reg = <0x021d8000 0x4000>;
> > +				status = "disabled";
> >  			};
> 
> -- 
> Regards,
> Shawn
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>
Shawn Guo - Jan. 8, 2012, 3:02 p.m.
On Fri, Jan 06, 2012 at 11:25:43AM +0800, Richard Zhao wrote:
> --- a/arch/arm/boot/dts/imx6q.dtsi
> +++ b/arch/arm/boot/dts/imx6q.dtsi
> @@ -527,7 +527,9 @@
>  			};
>  
>  			audmux@021d8000 {
> +				compatible = "fsl,audmux-v2";

This is not a good compatible string, because the version number is
not defined by hardware.  Even it is defined by hardware, the version
number is not as stable as soc to identify specific hardware block.
You can look at uart, cspi, sdma etc. for examples.

>  				reg = <0x021d8000 0x4000>;
> +				status = "disabled";
>  			};
Shawn Guo - Jan. 9, 2012, 1:19 a.m.
On Sun, Jan 08, 2012 at 10:58:14PM +0800, Richard Zhao wrote:
> On Sun, Jan 08, 2012 at 11:02:36PM +0800, Shawn Guo wrote:
> > On Fri, Jan 06, 2012 at 11:25:43AM +0800, Richard Zhao wrote:
> > > --- a/arch/arm/boot/dts/imx6q.dtsi
> > > +++ b/arch/arm/boot/dts/imx6q.dtsi
> > > @@ -527,7 +527,9 @@
> > >  			};
> > >  
> > >  			audmux@021d8000 {
> > > +				compatible = "fsl,audmux-v2";
> > 
> > This is not a good compatible string, because the version number is
> > not defined by hardware.  Even it is defined by hardware, the version
> > number is not as stable as soc to identify specific hardware block.
> > You can look at uart, cspi, sdma etc. for examples.
> compatible = "fsl,imx6q-audmux", "fsl,imx25-audmux";
> I forgot imx25 or imx31 is oldest. Is it ok for you?
> 
Yes.
Shawn Guo - Jan. 9, 2012, 5:27 a.m.
On Mon, Jan 09, 2012 at 09:19:50AM +0800, Shawn Guo wrote:
> On Sun, Jan 08, 2012 at 10:58:14PM +0800, Richard Zhao wrote:
> > On Sun, Jan 08, 2012 at 11:02:36PM +0800, Shawn Guo wrote:
> > > On Fri, Jan 06, 2012 at 11:25:43AM +0800, Richard Zhao wrote:
> > > > --- a/arch/arm/boot/dts/imx6q.dtsi
> > > > +++ b/arch/arm/boot/dts/imx6q.dtsi
> > > > @@ -527,7 +527,9 @@
> > > >  			};
> > > >  
> > > >  			audmux@021d8000 {
> > > > +				compatible = "fsl,audmux-v2";
> > > 
> > > This is not a good compatible string, because the version number is
> > > not defined by hardware.  Even it is defined by hardware, the version
> > > number is not as stable as soc to identify specific hardware block.
> > > You can look at uart, cspi, sdma etc. for examples.
> > compatible = "fsl,imx6q-audmux", "fsl,imx25-audmux";
> > I forgot imx25 or imx31 is oldest. Is it ok for you?
> > 
> Yes.

Forgot mentioning that imx31 was born earlier than imx25, so I would
expect it be: 

	compatible = "fsl,imx6q-audmux", "fsl,imx31-audmux";

Patch

diff --git a/arch/arm/boot/dts/imx6q-sabrelite.dts b/arch/arm/boot/dts/imx6q-sabrelite.dts
index 567b664..cae7151 100644
--- a/arch/arm/boot/dts/imx6q-sabrelite.dts
+++ b/arch/arm/boot/dts/imx6q-sabrelite.dts
@@ -41,6 +41,10 @@ 
 				status = "okay";
 			};
 
+			audmux@021d8000 {
+				status = "okay";
+			};
+
 			uart2: uart@021e8000 {
 				status = "okay";
 			};
diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi
index 263e8f3..12ed20c 100644
--- a/arch/arm/boot/dts/imx6q.dtsi
+++ b/arch/arm/boot/dts/imx6q.dtsi
@@ -527,7 +527,9 @@ 
 			};
 
 			audmux@021d8000 {
+				compatible = "fsl,audmux-v2";
 				reg = <0x021d8000 0x4000>;
+				status = "disabled";
 			};
 
 			mipi@021dc000 { /* MIPI-CSI */
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 6538972..67f0fe7 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -836,6 +836,7 @@  comment "i.MX6 family:"
 config SOC_IMX6Q
 	bool "i.MX6 Quad support"
 	select ARM_CPU_SUSPEND if PM
+	select ARCH_MXC_AUDMUX_V2
 	select ARM_GIC
 	select CACHE_L2X0
 	select CPU_V7