LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH v2 0/2] ARM: devicetree: Remove unused ti,codec property
@ 2015-03-13 20:40 Marek Belisko
  2015-03-13 20:40 ` [PATCH v2 1/2] ARM: dts: omap3: Remove all references to " Marek Belisko
                   ` (2 more replies)
  0 siblings, 3 replies; 5+ messages in thread
From: Marek Belisko @ 2015-03-13 20:40 UTC (permalink / raw)
  To: bcousson, tony, peter.ujfalusi
  Cc: eballetbo, javier, devicetree, linux-kernel, linux-omap,
	linux-arm-kernel, jarkko.nikula, hns, arnd, Marek Belisko

ti,codec in not parsed in omap-twl4030 sound driver. It's not necessary
to specify this property in DT because ti,twl4030-audio which ti,codec
was pointing to by phandle is mfd driver and device for ASoC ic created w/o
any DT property (codec name is hardcoded in ASoC driver).

Please see reply [1] from Peter Ujfalusi.

Changes from v1:
- keep ti,codec property in Documentation as optional that the
existing dtbs do not become noncompliant after the change

[1]: http://comments.gmane.org/gmane.linux.ports.arm.omap/124273

Marek Belisko (2):
  ARM: dts: omap3: Remove all references to ti,codec property
  Documentation: omap-twl4030: Move ti,codec property to optional

 Documentation/devicetree/bindings/sound/omap-twl4030.txt | 3 +--
 arch/arm/boot/dts/omap3-beagle-xm.dts                    | 1 -
 arch/arm/boot/dts/omap3-beagle.dts                       | 1 -
 arch/arm/boot/dts/omap3-cm-t3x30.dtsi                    | 1 -
 arch/arm/boot/dts/omap3-devkit8000.dts                   | 1 -
 arch/arm/boot/dts/omap3-gta04.dtsi                       | 1 -
 arch/arm/boot/dts/omap3-igep.dtsi                        | 1 -
 arch/arm/boot/dts/omap3-lilly-a83x.dtsi                  | 1 -
 arch/arm/boot/dts/omap3-overo-base.dtsi                  | 1 -
 arch/arm/boot/dts/omap3-tao3530.dtsi                     | 1 -
 10 files changed, 1 insertion(+), 11 deletions(-)

-- 
1.9.1


^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH v2 1/2] ARM: dts: omap3: Remove all references to ti,codec property
  2015-03-13 20:40 [PATCH v2 0/2] ARM: devicetree: Remove unused ti,codec property Marek Belisko
@ 2015-03-13 20:40 ` Marek Belisko
  2015-03-13 20:40 ` [PATCH v2 2/2] Documentation: omap-twl4030: Move ti,codec property to optional Marek Belisko
  2015-03-16  7:16 ` [PATCH v2 0/2] ARM: devicetree: Remove unused ti,codec property Peter Ujfalusi
  2 siblings, 0 replies; 5+ messages in thread
From: Marek Belisko @ 2015-03-13 20:40 UTC (permalink / raw)
  To: bcousson, tony, peter.ujfalusi
  Cc: eballetbo, javier, devicetree, linux-kernel, linux-omap,
	linux-arm-kernel, jarkko.nikula, hns, arnd, Marek Belisko

ti,codec property is not used (parsed) in omap-twl4030 driver. The ti,twl4030-audio
which ti,codec points by phandle is mfd driver and device for ASoC codec is created
w/o DT compatible string. Removing all references in DT files.

Signed-off-by: Marek Belisko <marek@goldelico.com>
---
 arch/arm/boot/dts/omap3-beagle-xm.dts   | 1 -
 arch/arm/boot/dts/omap3-beagle.dts      | 1 -
 arch/arm/boot/dts/omap3-cm-t3x30.dtsi   | 1 -
 arch/arm/boot/dts/omap3-devkit8000.dts  | 1 -
 arch/arm/boot/dts/omap3-gta04.dtsi      | 1 -
 arch/arm/boot/dts/omap3-igep.dtsi       | 1 -
 arch/arm/boot/dts/omap3-lilly-a83x.dtsi | 1 -
 arch/arm/boot/dts/omap3-overo-base.dtsi | 1 -
 arch/arm/boot/dts/omap3-tao3530.dtsi    | 1 -
 9 files changed, 9 deletions(-)

diff --git a/arch/arm/boot/dts/omap3-beagle-xm.dts b/arch/arm/boot/dts/omap3-beagle-xm.dts
index 25f7b0a..da1464b 100644
--- a/arch/arm/boot/dts/omap3-beagle-xm.dts
+++ b/arch/arm/boot/dts/omap3-beagle-xm.dts
@@ -60,7 +60,6 @@
 		ti,model = "omap3beagle";
 
 		ti,mcbsp = <&mcbsp2>;
-		ti,codec = <&twl_audio>;
 	};
 
 	gpio_keys {
diff --git a/arch/arm/boot/dts/omap3-beagle.dts b/arch/arm/boot/dts/omap3-beagle.dts
index c792391..4d30eaf 100644
--- a/arch/arm/boot/dts/omap3-beagle.dts
+++ b/arch/arm/boot/dts/omap3-beagle.dts
@@ -71,7 +71,6 @@
 		ti,model = "omap3beagle";
 
 		ti,mcbsp = <&mcbsp2>;
-		ti,codec = <&twl_audio>;
 	};
 
 	gpio_keys {
diff --git a/arch/arm/boot/dts/omap3-cm-t3x30.dtsi b/arch/arm/boot/dts/omap3-cm-t3x30.dtsi
index d9e92b6..046cd77 100644
--- a/arch/arm/boot/dts/omap3-cm-t3x30.dtsi
+++ b/arch/arm/boot/dts/omap3-cm-t3x30.dtsi
@@ -16,7 +16,6 @@
 		ti,model = "cm-t35";
 
 		ti,mcbsp = <&mcbsp2>;
-		ti,codec = <&twl_audio>;
 	};
 };
 
diff --git a/arch/arm/boot/dts/omap3-devkit8000.dts b/arch/arm/boot/dts/omap3-devkit8000.dts
index 169037e..134d3f2 100644
--- a/arch/arm/boot/dts/omap3-devkit8000.dts
+++ b/arch/arm/boot/dts/omap3-devkit8000.dts
@@ -48,7 +48,6 @@
 		ti,model = "devkit8000";
 
 		ti,mcbsp = <&mcbsp2>;
-		ti,codec = <&twl_audio>;
 		ti,audio-routing =
 			"Ext Spk", "PREDRIVEL",
 			"Ext Spk", "PREDRIVER",
diff --git a/arch/arm/boot/dts/omap3-gta04.dtsi b/arch/arm/boot/dts/omap3-gta04.dtsi
index fb3a696..b9f6881 100644
--- a/arch/arm/boot/dts/omap3-gta04.dtsi
+++ b/arch/arm/boot/dts/omap3-gta04.dtsi
@@ -46,7 +46,6 @@
 		ti,model = "gta04";
 
 		ti,mcbsp = <&mcbsp2>;
-		ti,codec = <&twl_audio>;
 	};
 
 	spi_lcd {
diff --git a/arch/arm/boot/dts/omap3-igep.dtsi b/arch/arm/boot/dts/omap3-igep.dtsi
index 8a63ad2..d5e5cd4 100644
--- a/arch/arm/boot/dts/omap3-igep.dtsi
+++ b/arch/arm/boot/dts/omap3-igep.dtsi
@@ -22,7 +22,6 @@
 		compatible = "ti,omap-twl4030";
 		ti,model = "igep2";
 		ti,mcbsp = <&mcbsp2>;
-		ti,codec = <&twl_audio>;
 	};
 
 	vdd33: regulator-vdd33 {
diff --git a/arch/arm/boot/dts/omap3-lilly-a83x.dtsi b/arch/arm/boot/dts/omap3-lilly-a83x.dtsi
index e81fb65..e631333 100644
--- a/arch/arm/boot/dts/omap3-lilly-a83x.dtsi
+++ b/arch/arm/boot/dts/omap3-lilly-a83x.dtsi
@@ -38,7 +38,6 @@
 		ti,model = "lilly-a83x";
 
 		ti,mcbsp = <&mcbsp2>;
-		ti,codec = <&twl_audio>;
 	};
 
 	reg_vcc3: vcc3 {
diff --git a/arch/arm/boot/dts/omap3-overo-base.dtsi b/arch/arm/boot/dts/omap3-overo-base.dtsi
index d36bf02..18e1649 100644
--- a/arch/arm/boot/dts/omap3-overo-base.dtsi
+++ b/arch/arm/boot/dts/omap3-overo-base.dtsi
@@ -27,7 +27,6 @@
 		ti,model = "overo";
 
 		ti,mcbsp = <&mcbsp2>;
-		ti,codec = <&twl_audio>;
 	};
 
 	/* HS USB Port 2 Power */
diff --git a/arch/arm/boot/dts/omap3-tao3530.dtsi b/arch/arm/boot/dts/omap3-tao3530.dtsi
index e89820a..b3b24a5 100644
--- a/arch/arm/boot/dts/omap3-tao3530.dtsi
+++ b/arch/arm/boot/dts/omap3-tao3530.dtsi
@@ -45,7 +45,6 @@
 
 		/* McBSP2 is used for onboard sound, same as on beagle */
 		ti,mcbsp = <&mcbsp2>;
-		ti,codec = <&twl_audio>;
 	};
 
 	/* Regulator to enable/switch the vcc of the Wifi module */
-- 
1.9.1


^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH v2 2/2] Documentation: omap-twl4030: Move ti,codec property to optional
  2015-03-13 20:40 [PATCH v2 0/2] ARM: devicetree: Remove unused ti,codec property Marek Belisko
  2015-03-13 20:40 ` [PATCH v2 1/2] ARM: dts: omap3: Remove all references to " Marek Belisko
@ 2015-03-13 20:40 ` Marek Belisko
  2015-03-16  7:16 ` [PATCH v2 0/2] ARM: devicetree: Remove unused ti,codec property Peter Ujfalusi
  2 siblings, 0 replies; 5+ messages in thread
From: Marek Belisko @ 2015-03-13 20:40 UTC (permalink / raw)
  To: bcousson, tony, peter.ujfalusi
  Cc: eballetbo, javier, devicetree, linux-kernel, linux-omap,
	linux-arm-kernel, jarkko.nikula, hns, arnd, Marek Belisko

ti,codec property is not used in omap-twl4030 driver in linux kernel but
we keep it as optional property, so that the existing dtbs do not
become noncompliant after the change on other OS.

Signed-off-by: Marek Belisko <marek@goldelico.com>
---
 Documentation/devicetree/bindings/sound/omap-twl4030.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Documentation/devicetree/bindings/sound/omap-twl4030.txt b/Documentation/devicetree/bindings/sound/omap-twl4030.txt
index 1ab6bc8..f6a715e 100644
--- a/Documentation/devicetree/bindings/sound/omap-twl4030.txt
+++ b/Documentation/devicetree/bindings/sound/omap-twl4030.txt
@@ -4,9 +4,9 @@ Required properties:
 - compatible: "ti,omap-twl4030"
 - ti,model: Name of the sound card (for example "omap3beagle")
 - ti,mcbsp: phandle for the McBSP node
-- ti,codec: phandle for the twl4030 audio node
 
 Optional properties:
+- ti,codec: phandle for the twl4030 audio node
 - ti,mcbsp-voice: phandle for the McBSP node connected to the voice port of twl
 - ti, jack-det-gpio: Jack detect GPIO
 - ti,audio-routing: List of connections between audio components.
@@ -59,5 +59,4 @@ sound {
 	ti,model = "omap3beagle";
 
 	ti,mcbsp = <&mcbsp2>;
-	ti,codec = <&twl_audio>;
 };
-- 
1.9.1


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH v2 0/2] ARM: devicetree: Remove unused ti,codec property
  2015-03-13 20:40 [PATCH v2 0/2] ARM: devicetree: Remove unused ti,codec property Marek Belisko
  2015-03-13 20:40 ` [PATCH v2 1/2] ARM: dts: omap3: Remove all references to " Marek Belisko
  2015-03-13 20:40 ` [PATCH v2 2/2] Documentation: omap-twl4030: Move ti,codec property to optional Marek Belisko
@ 2015-03-16  7:16 ` Peter Ujfalusi
  2015-03-16 22:20   ` Tony Lindgren
  2 siblings, 1 reply; 5+ messages in thread
From: Peter Ujfalusi @ 2015-03-16  7:16 UTC (permalink / raw)
  To: Marek Belisko, bcousson, tony
  Cc: eballetbo, javier, devicetree, linux-kernel, linux-omap,
	linux-arm-kernel, jarkko.nikula, hns, arnd

On 03/13/2015 10:40 PM, Marek Belisko wrote:
> ti,codec in not parsed in omap-twl4030 sound driver. It's not necessary
> to specify this property in DT because ti,twl4030-audio which ti,codec
> was pointing to by phandle is mfd driver and device for ASoC ic created w/o
> any DT property (codec name is hardcoded in ASoC driver).
> 
> Please see reply [1] from Peter Ujfalusi.

All:
Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>

> 
> Changes from v1:
> - keep ti,codec property in Documentation as optional that the
> existing dtbs do not become noncompliant after the change
> 
> [1]: http://comments.gmane.org/gmane.linux.ports.arm.omap/124273
> 
> Marek Belisko (2):
>   ARM: dts: omap3: Remove all references to ti,codec property
>   Documentation: omap-twl4030: Move ti,codec property to optional
> 
>  Documentation/devicetree/bindings/sound/omap-twl4030.txt | 3 +--
>  arch/arm/boot/dts/omap3-beagle-xm.dts                    | 1 -
>  arch/arm/boot/dts/omap3-beagle.dts                       | 1 -
>  arch/arm/boot/dts/omap3-cm-t3x30.dtsi                    | 1 -
>  arch/arm/boot/dts/omap3-devkit8000.dts                   | 1 -
>  arch/arm/boot/dts/omap3-gta04.dtsi                       | 1 -
>  arch/arm/boot/dts/omap3-igep.dtsi                        | 1 -
>  arch/arm/boot/dts/omap3-lilly-a83x.dtsi                  | 1 -
>  arch/arm/boot/dts/omap3-overo-base.dtsi                  | 1 -
>  arch/arm/boot/dts/omap3-tao3530.dtsi                     | 1 -
>  10 files changed, 1 insertion(+), 11 deletions(-)
> 


-- 
Péter

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH v2 0/2] ARM: devicetree: Remove unused ti,codec property
  2015-03-16  7:16 ` [PATCH v2 0/2] ARM: devicetree: Remove unused ti,codec property Peter Ujfalusi
@ 2015-03-16 22:20   ` Tony Lindgren
  0 siblings, 0 replies; 5+ messages in thread
From: Tony Lindgren @ 2015-03-16 22:20 UTC (permalink / raw)
  To: Peter Ujfalusi
  Cc: Marek Belisko, bcousson, eballetbo, javier, devicetree,
	linux-kernel, linux-omap, linux-arm-kernel, jarkko.nikula, hns,
	arnd

* Peter Ujfalusi <peter.ujfalusi@ti.com> [150316 00:16]:
> On 03/13/2015 10:40 PM, Marek Belisko wrote:
> > ti,codec in not parsed in omap-twl4030 sound driver. It's not necessary
> > to specify this property in DT because ti,twl4030-audio which ti,codec
> > was pointing to by phandle is mfd driver and device for ASoC ic created w/o
> > any DT property (codec name is hardcoded in ASoC driver).
> > 
> > Please see reply [1] from Peter Ujfalusi.
> 
> All:
> Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>

Applying both into omap-for-v4.1/dt thanks.

Tony 
 
> > Changes from v1:
> > - keep ti,codec property in Documentation as optional that the
> > existing dtbs do not become noncompliant after the change
> > 
> > [1]: http://comments.gmane.org/gmane.linux.ports.arm.omap/124273
> > 
> > Marek Belisko (2):
> >   ARM: dts: omap3: Remove all references to ti,codec property
> >   Documentation: omap-twl4030: Move ti,codec property to optional
> > 
> >  Documentation/devicetree/bindings/sound/omap-twl4030.txt | 3 +--
> >  arch/arm/boot/dts/omap3-beagle-xm.dts                    | 1 -
> >  arch/arm/boot/dts/omap3-beagle.dts                       | 1 -
> >  arch/arm/boot/dts/omap3-cm-t3x30.dtsi                    | 1 -
> >  arch/arm/boot/dts/omap3-devkit8000.dts                   | 1 -
> >  arch/arm/boot/dts/omap3-gta04.dtsi                       | 1 -
> >  arch/arm/boot/dts/omap3-igep.dtsi                        | 1 -
> >  arch/arm/boot/dts/omap3-lilly-a83x.dtsi                  | 1 -
> >  arch/arm/boot/dts/omap3-overo-base.dtsi                  | 1 -
> >  arch/arm/boot/dts/omap3-tao3530.dtsi                     | 1 -
> >  10 files changed, 1 insertion(+), 11 deletions(-)
> > 
> 
> 
> -- 
> Péter

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2015-03-16 22:25 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-03-13 20:40 [PATCH v2 0/2] ARM: devicetree: Remove unused ti,codec property Marek Belisko
2015-03-13 20:40 ` [PATCH v2 1/2] ARM: dts: omap3: Remove all references to " Marek Belisko
2015-03-13 20:40 ` [PATCH v2 2/2] Documentation: omap-twl4030: Move ti,codec property to optional Marek Belisko
2015-03-16  7:16 ` [PATCH v2 0/2] ARM: devicetree: Remove unused ti,codec property Peter Ujfalusi
2015-03-16 22:20   ` Tony Lindgren

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).