devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 0/9] ARM: DTS: OMAP: Audio related cleanups for dtsi and dts files
@ 2014-01-24  8:18 Peter Ujfalusi
  2014-01-24  8:18 ` [PATCH 1/9] ARM: DTS: omap4-panda-common: Move audio related pinmux to respective nodes Peter Ujfalusi
                   ` (9 more replies)
  0 siblings, 10 replies; 11+ messages in thread
From: Peter Ujfalusi @ 2014-01-24  8:18 UTC (permalink / raw)
  To: Benoit Cousson; +Cc: Tony Lindgren, linux-omap, linux-arm-kernel, devicetree

Hi Benoit,

OMAP: Put the audio nodes to disabled styate by default and board dts files should
enable the nodes which is used on the board.

am335x: correct the audio mclk clock. This patch has been marked to go to 3.13
	stable as well.

Regards,
Peter
---
Peter Ujfalusi (9):
  ARM: DTS: omap4-panda-common: Move audio related pinmux to respective
    nodes
  ARM: DTS: omap4-sdp: Move audio related pinmux to respective nodes
  ARM: DTS: omap4: Set all audio related IP's status to disabled as
    default
  ARM: DTS: omap4-panda-common: No need to disable the unused audio
    nodes
  ARM: DTS: omap4-sdp: No need to disable mcbsp3 node
  ARM: DTS: omap5: Set all audio related IP's status to disabled as
    default
  ARM: DTS: omap3: Set disabled status for McBSP instances as default
    state
  ARM: DTS: omap2: Set disabled status for McBSP instances as default
    state
  ARM: DTS: am335x-evmsk: Correct audio clock frequency

 arch/arm/boot/dts/am335x-evmsk.dts        |  2 +-
 arch/arm/boot/dts/omap2420.dtsi           |  2 ++
 arch/arm/boot/dts/omap2430.dtsi           |  5 +++++
 arch/arm/boot/dts/omap3-beagle-xm.dts     |  4 ++++
 arch/arm/boot/dts/omap3-beagle.dts        |  4 ++++
 arch/arm/boot/dts/omap3-devkit8000.dts    | 16 ++-------------
 arch/arm/boot/dts/omap3-igep.dtsi         |  1 +
 arch/arm/boot/dts/omap3-overo.dtsi        |  4 ++++
 arch/arm/boot/dts/omap3.dtsi              |  5 +++++
 arch/arm/boot/dts/omap4-panda-common.dtsi | 23 ++++++++++-----------
 arch/arm/boot/dts/omap4-sdp.dts           | 33 ++++++++++++++++++++++++-------
 arch/arm/boot/dts/omap4.dtsi              |  6 ++++++
 arch/arm/boot/dts/omap5.dtsi              |  5 +++++
 13 files changed, 77 insertions(+), 33 deletions(-)

-- 
1.8.5.3


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

* [PATCH 1/9] ARM: DTS: omap4-panda-common: Move audio related pinmux to respective nodes
  2014-01-24  8:18 [PATCH 0/9] ARM: DTS: OMAP: Audio related cleanups for dtsi and dts files Peter Ujfalusi
@ 2014-01-24  8:18 ` Peter Ujfalusi
  2014-01-24  8:19 ` [PATCH 2/9] ARM: DTS: omap4-sdp: " Peter Ujfalusi
                   ` (8 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: Peter Ujfalusi @ 2014-01-24  8:18 UTC (permalink / raw)
  To: Benoit Cousson; +Cc: Tony Lindgren, linux-omap, linux-arm-kernel, devicetree

Attach the pinctrl nodes to their respective device node:
mcbsp1, mcpdm and twl6040.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
 arch/arm/boot/dts/omap4-panda-common.dtsi | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/arch/arm/boot/dts/omap4-panda-common.dtsi b/arch/arm/boot/dts/omap4-panda-common.dtsi
index 88c6a05cab41..9067d4c0148d 100644
--- a/arch/arm/boot/dts/omap4-panda-common.dtsi
+++ b/arch/arm/boot/dts/omap4-panda-common.dtsi
@@ -109,9 +109,6 @@
 &omap4_pmx_core {
 	pinctrl-names = "default";
 	pinctrl-0 = <
-			&twl6040_pins
-			&mcpdm_pins
-			&mcbsp1_pins
 			&dss_dpi_pins
 			&tfp410_pins
 			&dss_hdmi_pins
@@ -300,6 +297,10 @@
 	twl6040: twl@4b {
 		compatible = "ti,twl6040";
 		reg = <0x4b>;
+
+		pinctrl-names = "default";
+		pinctrl-0 = <&twl6040_pins>;
+
 		/* IRQ# = 119 */
 		interrupts = <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH>; /* IRQ_SYS_2N cascaded to gic */
 		interrupt-parent = <&gic>;
@@ -380,6 +381,12 @@
 	device-handle = <&elpida_ECB240ABACN>;
 };
 
+&mcbsp1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&mcbsp1_pins>;
+	status = "okay";
+};
+
 &mcbsp2 {
 	status = "disabled";
 };
@@ -392,6 +399,12 @@
 	status = "disabled";
 };
 
+&mcpdm {
+	pinctrl-names = "default";
+	pinctrl-0 = <&mcpdm_pins>;
+	status = "okay";
+};
+
 &twl_usb_comparator {
 	usb-supply = <&vusb>;
 };
-- 
1.8.5.3


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

* [PATCH 2/9] ARM: DTS: omap4-sdp: Move audio related pinmux to respective nodes
  2014-01-24  8:18 [PATCH 0/9] ARM: DTS: OMAP: Audio related cleanups for dtsi and dts files Peter Ujfalusi
  2014-01-24  8:18 ` [PATCH 1/9] ARM: DTS: omap4-panda-common: Move audio related pinmux to respective nodes Peter Ujfalusi
@ 2014-01-24  8:19 ` Peter Ujfalusi
  2014-01-24  8:19 ` [PATCH 3/9] ARM: DTS: omap4: Set all audio related IP's status to disabled as default Peter Ujfalusi
                   ` (7 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: Peter Ujfalusi @ 2014-01-24  8:19 UTC (permalink / raw)
  To: Benoit Cousson; +Cc: Tony Lindgren, linux-omap, linux-arm-kernel, devicetree

Attach the pinctrl nodes to their respective device node:
mcbsp1, mcbsp2, dmic, mcpdm and twl6040.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
 arch/arm/boot/dts/omap4-sdp.dts | 33 ++++++++++++++++++++++++++++-----
 1 file changed, 28 insertions(+), 5 deletions(-)

diff --git a/arch/arm/boot/dts/omap4-sdp.dts b/arch/arm/boot/dts/omap4-sdp.dts
index dbc81fb6ef03..513b01774966 100644
--- a/arch/arm/boot/dts/omap4-sdp.dts
+++ b/arch/arm/boot/dts/omap4-sdp.dts
@@ -158,11 +158,6 @@
 &omap4_pmx_core {
 	pinctrl-names = "default";
 	pinctrl-0 = <
-			&twl6040_pins
-			&mcpdm_pins
-			&dmic_pins
-			&mcbsp1_pins
-			&mcbsp2_pins
 			&dss_hdmi_pins
 			&tpd12s015_pins
 	>;
@@ -326,6 +321,10 @@
 	twl6040: twl@4b {
 		compatible = "ti,twl6040";
 		reg = <0x4b>;
+
+		pinctrl-names = "default";
+		pinctrl-0 = <&twl6040_pins>;
+
 		/* SPI = 0, IRQ# = 119, 4 = active high level-sensitive */
 		interrupts = <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH>; /* IRQ_SYS_2N cascaded to gic */
 		interrupt-parent = <&gic>;
@@ -537,10 +536,34 @@
 	pinctrl-0 = <&uart4_pins>;
 };
 
+&mcbsp1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&mcbsp1_pins>;
+	status = "okay";
+};
+
+&mcbsp2 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&mcbsp2_pins>;
+	status = "okay";
+};
+
 &mcbsp3 {
 	status = "disabled";
 };
 
+&dmic {
+	pinctrl-names = "default";
+	pinctrl-0 = <&dmic_pins>;
+	status = "okay";
+};
+
+&mcpdm {
+	pinctrl-names = "default";
+	pinctrl-0 = <&mcpdm_pins>;
+	status = "okay";
+};
+
 &twl_usb_comparator {
 	usb-supply = <&vusb>;
 };
-- 
1.8.5.3


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

* [PATCH 3/9] ARM: DTS: omap4: Set all audio related IP's status to disabled as default
  2014-01-24  8:18 [PATCH 0/9] ARM: DTS: OMAP: Audio related cleanups for dtsi and dts files Peter Ujfalusi
  2014-01-24  8:18 ` [PATCH 1/9] ARM: DTS: omap4-panda-common: Move audio related pinmux to respective nodes Peter Ujfalusi
  2014-01-24  8:19 ` [PATCH 2/9] ARM: DTS: omap4-sdp: " Peter Ujfalusi
@ 2014-01-24  8:19 ` Peter Ujfalusi
  2014-01-24  8:19 ` [PATCH 4/9] ARM: DTS: omap4-panda-common: No need to disable the unused audio nodes Peter Ujfalusi
                   ` (6 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: Peter Ujfalusi @ 2014-01-24  8:19 UTC (permalink / raw)
  To: Benoit Cousson; +Cc: Tony Lindgren, linux-omap, linux-arm-kernel, devicetree

Board dts files will need to enable the IP nodes which they are using and
does not have to care about the not used ones (to disable them).

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
 arch/arm/boot/dts/omap4.dtsi | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
index a1e05853afcd..78c19e30eca0 100644
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -426,6 +426,7 @@
 			dmas = <&sdma 65>,
 			       <&sdma 66>;
 			dma-names = "up_link", "dn_link";
+			status = "disabled";
 		};
 
 		dmic: dmic@4012e000 {
@@ -437,6 +438,7 @@
 			ti,hwmods = "dmic";
 			dmas = <&sdma 67>;
 			dma-names = "up_link";
+			status = "disabled";
 		};
 
 		mcbsp1: mcbsp@40122000 {
@@ -451,6 +453,7 @@
 			dmas = <&sdma 33>,
 			       <&sdma 34>;
 			dma-names = "tx", "rx";
+			status = "disabled";
 		};
 
 		mcbsp2: mcbsp@40124000 {
@@ -465,6 +468,7 @@
 			dmas = <&sdma 17>,
 			       <&sdma 18>;
 			dma-names = "tx", "rx";
+			status = "disabled";
 		};
 
 		mcbsp3: mcbsp@40126000 {
@@ -479,6 +483,7 @@
 			dmas = <&sdma 19>,
 			       <&sdma 20>;
 			dma-names = "tx", "rx";
+			status = "disabled";
 		};
 
 		mcbsp4: mcbsp@48096000 {
@@ -492,6 +497,7 @@
 			dmas = <&sdma 31>,
 			       <&sdma 32>;
 			dma-names = "tx", "rx";
+			status = "disabled";
 		};
 
 		keypad: keypad@4a31c000 {
-- 
1.8.5.3


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

* [PATCH 4/9] ARM: DTS: omap4-panda-common: No need to disable the unused audio nodes
  2014-01-24  8:18 [PATCH 0/9] ARM: DTS: OMAP: Audio related cleanups for dtsi and dts files Peter Ujfalusi
                   ` (2 preceding siblings ...)
  2014-01-24  8:19 ` [PATCH 3/9] ARM: DTS: omap4: Set all audio related IP's status to disabled as default Peter Ujfalusi
@ 2014-01-24  8:19 ` Peter Ujfalusi
  2014-01-24  8:19 ` [PATCH 5/9] ARM: DTS: omap4-sdp: No need to disable mcbsp3 node Peter Ujfalusi
                   ` (5 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: Peter Ujfalusi @ 2014-01-24  8:19 UTC (permalink / raw)
  To: Benoit Cousson; +Cc: Tony Lindgren, linux-omap, linux-arm-kernel, devicetree

All audio nodes has been set to disabled state in omap4.dtsi file.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
 arch/arm/boot/dts/omap4-panda-common.dtsi | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/arch/arm/boot/dts/omap4-panda-common.dtsi b/arch/arm/boot/dts/omap4-panda-common.dtsi
index 9067d4c0148d..f83dd4c365c7 100644
--- a/arch/arm/boot/dts/omap4-panda-common.dtsi
+++ b/arch/arm/boot/dts/omap4-panda-common.dtsi
@@ -387,18 +387,6 @@
 	status = "okay";
 };
 
-&mcbsp2 {
-	status = "disabled";
-};
-
-&mcbsp3 {
-	status = "disabled";
-};
-
-&dmic {
-	status = "disabled";
-};
-
 &mcpdm {
 	pinctrl-names = "default";
 	pinctrl-0 = <&mcpdm_pins>;
-- 
1.8.5.3


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

* [PATCH 5/9] ARM: DTS: omap4-sdp: No need to disable mcbsp3 node
  2014-01-24  8:18 [PATCH 0/9] ARM: DTS: OMAP: Audio related cleanups for dtsi and dts files Peter Ujfalusi
                   ` (3 preceding siblings ...)
  2014-01-24  8:19 ` [PATCH 4/9] ARM: DTS: omap4-panda-common: No need to disable the unused audio nodes Peter Ujfalusi
@ 2014-01-24  8:19 ` Peter Ujfalusi
  2014-01-24  8:19 ` [PATCH 6/9] ARM: DTS: omap5: Set all audio related IP's status to disabled as default Peter Ujfalusi
                   ` (4 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: Peter Ujfalusi @ 2014-01-24  8:19 UTC (permalink / raw)
  To: Benoit Cousson; +Cc: Tony Lindgren, linux-omap, linux-arm-kernel, devicetree

All audio nodes has been set to disabled state in omap4.dtsi file.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
 arch/arm/boot/dts/omap4-sdp.dts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/arch/arm/boot/dts/omap4-sdp.dts b/arch/arm/boot/dts/omap4-sdp.dts
index 513b01774966..9bbbbec1d63d 100644
--- a/arch/arm/boot/dts/omap4-sdp.dts
+++ b/arch/arm/boot/dts/omap4-sdp.dts
@@ -548,10 +548,6 @@
 	status = "okay";
 };
 
-&mcbsp3 {
-	status = "disabled";
-};
-
 &dmic {
 	pinctrl-names = "default";
 	pinctrl-0 = <&dmic_pins>;
-- 
1.8.5.3


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

* [PATCH 6/9] ARM: DTS: omap5: Set all audio related IP's status to disabled as default
  2014-01-24  8:18 [PATCH 0/9] ARM: DTS: OMAP: Audio related cleanups for dtsi and dts files Peter Ujfalusi
                   ` (4 preceding siblings ...)
  2014-01-24  8:19 ` [PATCH 5/9] ARM: DTS: omap4-sdp: No need to disable mcbsp3 node Peter Ujfalusi
@ 2014-01-24  8:19 ` Peter Ujfalusi
  2014-01-24  8:19 ` [PATCH 7/9] ARM: DTS: omap3: Set disabled status for McBSP instances as default state Peter Ujfalusi
                   ` (3 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: Peter Ujfalusi @ 2014-01-24  8:19 UTC (permalink / raw)
  To: Benoit Cousson; +Cc: Tony Lindgren, linux-omap, linux-arm-kernel, devicetree

Board dts files will need to enable the IP nodes which they are using and
does not have to care about the not used ones (to disable them).

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
 arch/arm/boot/dts/omap5.dtsi | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
index fc3fad563861..84cee44f1fad 100644
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@ -467,6 +467,7 @@
 			dmas = <&sdma 65>,
 			       <&sdma 66>;
 			dma-names = "up_link", "dn_link";
+			status = "disabled";
 		};
 
 		dmic: dmic@4012e000 {
@@ -478,6 +479,7 @@
 			ti,hwmods = "dmic";
 			dmas = <&sdma 67>;
 			dma-names = "up_link";
+			status = "disabled";
 		};
 
 		mcbsp1: mcbsp@40122000 {
@@ -492,6 +494,7 @@
 			dmas = <&sdma 33>,
 			       <&sdma 34>;
 			dma-names = "tx", "rx";
+			status = "disabled";
 		};
 
 		mcbsp2: mcbsp@40124000 {
@@ -506,6 +509,7 @@
 			dmas = <&sdma 17>,
 			       <&sdma 18>;
 			dma-names = "tx", "rx";
+			status = "disabled";
 		};
 
 		mcbsp3: mcbsp@40126000 {
@@ -520,6 +524,7 @@
 			dmas = <&sdma 19>,
 			       <&sdma 20>;
 			dma-names = "tx", "rx";
+			status = "disabled";
 		};
 
 		timer1: timer@4ae18000 {
-- 
1.8.5.3


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

* [PATCH 7/9] ARM: DTS: omap3: Set disabled status for McBSP instances as default state
  2014-01-24  8:18 [PATCH 0/9] ARM: DTS: OMAP: Audio related cleanups for dtsi and dts files Peter Ujfalusi
                   ` (5 preceding siblings ...)
  2014-01-24  8:19 ` [PATCH 6/9] ARM: DTS: omap5: Set all audio related IP's status to disabled as default Peter Ujfalusi
@ 2014-01-24  8:19 ` Peter Ujfalusi
       [not found] ` <1390551547-12406-1-git-send-email-peter.ujfalusi-l0cyMroinI0@public.gmane.org>
                   ` (2 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: Peter Ujfalusi @ 2014-01-24  8:19 UTC (permalink / raw)
  To: Benoit Cousson; +Cc: Tony Lindgren, linux-omap, linux-arm-kernel, devicetree

In omap3.dtsi disable all mcbsp nodes and board dts files can explicitly
enable the mcbsp they are using.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
 arch/arm/boot/dts/omap3-beagle-xm.dts  |  4 ++++
 arch/arm/boot/dts/omap3-beagle.dts     |  4 ++++
 arch/arm/boot/dts/omap3-devkit8000.dts | 16 ++--------------
 arch/arm/boot/dts/omap3-igep.dtsi      |  1 +
 arch/arm/boot/dts/omap3-overo.dtsi     |  4 ++++
 arch/arm/boot/dts/omap3.dtsi           |  5 +++++
 6 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/arch/arm/boot/dts/omap3-beagle-xm.dts b/arch/arm/boot/dts/omap3-beagle-xm.dts
index df33a50bc070..d9ae3f4d0aa4 100644
--- a/arch/arm/boot/dts/omap3-beagle-xm.dts
+++ b/arch/arm/boot/dts/omap3-beagle-xm.dts
@@ -222,3 +222,7 @@
 	regulator-max-microvolt = <1800000>;
 	regulator-always-on;
 };
+
+&mcbsp2 {
+	status = "okay";
+};
diff --git a/arch/arm/boot/dts/omap3-beagle.dts b/arch/arm/boot/dts/omap3-beagle.dts
index 3ba4a625ea5b..c13449773def 100644
--- a/arch/arm/boot/dts/omap3-beagle.dts
+++ b/arch/arm/boot/dts/omap3-beagle.dts
@@ -199,3 +199,7 @@
 	regulator-max-microvolt = <1800000>;
 	regulator-always-on;
 };
+
+&mcbsp2 {
+	status = "okay";
+};
diff --git a/arch/arm/boot/dts/omap3-devkit8000.dts b/arch/arm/boot/dts/omap3-devkit8000.dts
index 4665421bb7bc..bf5a515a3247 100644
--- a/arch/arm/boot/dts/omap3-devkit8000.dts
+++ b/arch/arm/boot/dts/omap3-devkit8000.dts
@@ -101,20 +101,8 @@
 	status = "disabled";
 };
 
-&mcbsp1 {
-	status = "disabled";
-};
-
-&mcbsp3 {
-	status = "disabled";
-};
-
-&mcbsp4 {
-	status = "disabled";
-};
-
-&mcbsp5 {
-	status = "disabled";
+&mcbsp2 {
+	status = "okay";
 };
 
 &gpmc {
diff --git a/arch/arm/boot/dts/omap3-igep.dtsi b/arch/arm/boot/dts/omap3-igep.dtsi
index 165aaf7591ba..ced7aa0e503c 100644
--- a/arch/arm/boot/dts/omap3-igep.dtsi
+++ b/arch/arm/boot/dts/omap3-igep.dtsi
@@ -172,6 +172,7 @@
 &mcbsp2 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&mcbsp2_pins>;
+	status = "okay";
 };
 
 &mmc1 {
diff --git a/arch/arm/boot/dts/omap3-overo.dtsi b/arch/arm/boot/dts/omap3-overo.dtsi
index a461d2fd1fb0..b08142f755fd 100644
--- a/arch/arm/boot/dts/omap3-overo.dtsi
+++ b/arch/arm/boot/dts/omap3-overo.dtsi
@@ -95,3 +95,7 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&uart3_pins>;
 };
+
+&mcbsp2 {
+	status = "okay";
+};
diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi
index daabf99d402a..50767f339e2d 100644
--- a/arch/arm/boot/dts/omap3.dtsi
+++ b/arch/arm/boot/dts/omap3.dtsi
@@ -397,6 +397,7 @@
 			dmas = <&sdma 31>,
 			       <&sdma 32>;
 			dma-names = "tx", "rx";
+			status = "disabled";
 		};
 
 		mcbsp2: mcbsp@49022000 {
@@ -414,6 +415,7 @@
 			dmas = <&sdma 33>,
 			       <&sdma 34>;
 			dma-names = "tx", "rx";
+			status = "disabled";
 		};
 
 		mcbsp3: mcbsp@49024000 {
@@ -431,6 +433,7 @@
 			dmas = <&sdma 17>,
 			       <&sdma 18>;
 			dma-names = "tx", "rx";
+			status = "disabled";
 		};
 
 		mcbsp4: mcbsp@49026000 {
@@ -446,6 +449,7 @@
 			dmas = <&sdma 19>,
 			       <&sdma 20>;
 			dma-names = "tx", "rx";
+			status = "disabled";
 		};
 
 		mcbsp5: mcbsp@48096000 {
@@ -461,6 +465,7 @@
 			dmas = <&sdma 21>,
 			       <&sdma 22>;
 			dma-names = "tx", "rx";
+			status = "disabled";
 		};
 
 		sham: sham@480c3000 {
-- 
1.8.5.3


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

* [PATCH 8/9] ARM: DTS: omap2: Set disabled status for McBSP instances as default state
       [not found] ` <1390551547-12406-1-git-send-email-peter.ujfalusi-l0cyMroinI0@public.gmane.org>
@ 2014-01-24  8:19   ` Peter Ujfalusi
  0 siblings, 0 replies; 11+ messages in thread
From: Peter Ujfalusi @ 2014-01-24  8:19 UTC (permalink / raw)
  To: Benoit Cousson
  Cc: Tony Lindgren, linux-omap-u79uwXL29TY76Z2rM5mHXA,
	linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
	devicetree-u79uwXL29TY76Z2rM5mHXA

In omap2420.dtsi and omap2430.dtsi disable all mcbsp nodes and board dts
files can explicitly enable the mcbsp they are using.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi-l0cyMroinI0@public.gmane.org>
---
 arch/arm/boot/dts/omap2420.dtsi | 2 ++
 arch/arm/boot/dts/omap2430.dtsi | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/arch/arm/boot/dts/omap2420.dtsi b/arch/arm/boot/dts/omap2420.dtsi
index 60c605de22dd..85b1fb014c43 100644
--- a/arch/arm/boot/dts/omap2420.dtsi
+++ b/arch/arm/boot/dts/omap2420.dtsi
@@ -99,6 +99,7 @@
 			dmas = <&sdma 31>,
 			       <&sdma 32>;
 			dma-names = "tx", "rx";
+			status = "disabled";
 		};
 
 		mcbsp2: mcbsp@48076000 {
@@ -112,6 +113,7 @@
 			dmas = <&sdma 33>,
 			       <&sdma 34>;
 			dma-names = "tx", "rx";
+			status = "disabled";
 		};
 
 		msdi1: mmc@4809c000 {
diff --git a/arch/arm/boot/dts/omap2430.dtsi b/arch/arm/boot/dts/omap2430.dtsi
index d624345666f5..9d2f028fd687 100644
--- a/arch/arm/boot/dts/omap2430.dtsi
+++ b/arch/arm/boot/dts/omap2430.dtsi
@@ -113,6 +113,7 @@
 			dmas = <&sdma 31>,
 			       <&sdma 32>;
 			dma-names = "tx", "rx";
+			status = "disabled";
 		};
 
 		mcbsp2: mcbsp@48076000 {
@@ -128,6 +129,7 @@
 			dmas = <&sdma 33>,
 			       <&sdma 34>;
 			dma-names = "tx", "rx";
+			status = "disabled";
 		};
 
 		mcbsp3: mcbsp@4808c000 {
@@ -143,6 +145,7 @@
 			dmas = <&sdma 17>,
 			       <&sdma 18>;
 			dma-names = "tx", "rx";
+			status = "disabled";
 		};
 
 		mcbsp4: mcbsp@4808e000 {
@@ -158,6 +161,7 @@
 			dmas = <&sdma 19>,
 			       <&sdma 20>;
 			dma-names = "tx", "rx";
+			status = "disabled";
 		};
 
 		mcbsp5: mcbsp@48096000 {
@@ -173,6 +177,7 @@
 			dmas = <&sdma 21>,
 			       <&sdma 22>;
 			dma-names = "tx", "rx";
+			status = "disabled";
 		};
 
 		mmc1: mmc@4809c000 {
-- 
1.8.5.3

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

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

* [PATCH 9/9] ARM: DTS: am335x-evmsk: Correct audio clock frequency
  2014-01-24  8:18 [PATCH 0/9] ARM: DTS: OMAP: Audio related cleanups for dtsi and dts files Peter Ujfalusi
                   ` (7 preceding siblings ...)
       [not found] ` <1390551547-12406-1-git-send-email-peter.ujfalusi-l0cyMroinI0@public.gmane.org>
@ 2014-01-24  8:19 ` Peter Ujfalusi
  2014-02-28 22:20 ` [PATCH 0/9] ARM: DTS: OMAP: Audio related cleanups for dtsi and dts files Tony Lindgren
  9 siblings, 0 replies; 11+ messages in thread
From: Peter Ujfalusi @ 2014-01-24  8:19 UTC (permalink / raw)
  To: Benoit Cousson
  Cc: Tony Lindgren, linux-omap, linux-arm-kernel, devicetree, stable

The clock for audio is sourced from virt_24000000_ck, so the correct
frequency is 24000000.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
CC: <stable@vger.kernel.org> # 3.13.x
---
 arch/arm/boot/dts/am335x-evmsk.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts
index 4718ec4a4dbf..50abe53f6887 100644
--- a/arch/arm/boot/dts/am335x-evmsk.dts
+++ b/arch/arm/boot/dts/am335x-evmsk.dts
@@ -121,7 +121,7 @@
 		ti,model = "AM335x-EVMSK";
 		ti,audio-codec = <&tlv320aic3106>;
 		ti,mcasp-controller = <&mcasp1>;
-		ti,codec-clock-rate = <24576000>;
+		ti,codec-clock-rate = <24000000>;
 		ti,audio-routing =
 			"Headphone Jack",       "HPLOUT",
 			"Headphone Jack",       "HPROUT";
-- 
1.8.5.3


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

* Re: [PATCH 0/9] ARM: DTS: OMAP: Audio related cleanups for dtsi and dts files
  2014-01-24  8:18 [PATCH 0/9] ARM: DTS: OMAP: Audio related cleanups for dtsi and dts files Peter Ujfalusi
                   ` (8 preceding siblings ...)
  2014-01-24  8:19 ` [PATCH 9/9] ARM: DTS: am335x-evmsk: Correct audio clock frequency Peter Ujfalusi
@ 2014-02-28 22:20 ` Tony Lindgren
  9 siblings, 0 replies; 11+ messages in thread
From: Tony Lindgren @ 2014-02-28 22:20 UTC (permalink / raw)
  To: Peter Ujfalusi; +Cc: Benoit Cousson, linux-omap, linux-arm-kernel, devicetree

* Peter Ujfalusi <peter.ujfalusi@ti.com> [140124 00:21]:
> Hi Benoit,
> 
> OMAP: Put the audio nodes to disabled styate by default and board dts files should
> enable the nodes which is used on the board.
> 
> am335x: correct the audio mclk clock. This patch has been marked to go to 3.13
> 	stable as well.

Looks like these should get merged, assuming Benoit did not pick them
up yet so applying into omap-for-v3.15/dt.

Regards,

Tony


> Peter Ujfalusi (9):
>   ARM: DTS: omap4-panda-common: Move audio related pinmux to respective
>     nodes
>   ARM: DTS: omap4-sdp: Move audio related pinmux to respective nodes
>   ARM: DTS: omap4: Set all audio related IP's status to disabled as
>     default
>   ARM: DTS: omap4-panda-common: No need to disable the unused audio
>     nodes
>   ARM: DTS: omap4-sdp: No need to disable mcbsp3 node
>   ARM: DTS: omap5: Set all audio related IP's status to disabled as
>     default
>   ARM: DTS: omap3: Set disabled status for McBSP instances as default
>     state
>   ARM: DTS: omap2: Set disabled status for McBSP instances as default
>     state
>   ARM: DTS: am335x-evmsk: Correct audio clock frequency
> 
>  arch/arm/boot/dts/am335x-evmsk.dts        |  2 +-
>  arch/arm/boot/dts/omap2420.dtsi           |  2 ++
>  arch/arm/boot/dts/omap2430.dtsi           |  5 +++++
>  arch/arm/boot/dts/omap3-beagle-xm.dts     |  4 ++++
>  arch/arm/boot/dts/omap3-beagle.dts        |  4 ++++
>  arch/arm/boot/dts/omap3-devkit8000.dts    | 16 ++-------------
>  arch/arm/boot/dts/omap3-igep.dtsi         |  1 +
>  arch/arm/boot/dts/omap3-overo.dtsi        |  4 ++++
>  arch/arm/boot/dts/omap3.dtsi              |  5 +++++
>  arch/arm/boot/dts/omap4-panda-common.dtsi | 23 ++++++++++-----------
>  arch/arm/boot/dts/omap4-sdp.dts           | 33 ++++++++++++++++++++++++-------
>  arch/arm/boot/dts/omap4.dtsi              |  6 ++++++
>  arch/arm/boot/dts/omap5.dtsi              |  5 +++++
>  13 files changed, 77 insertions(+), 33 deletions(-)
> 
> -- 
> 1.8.5.3
> 

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

end of thread, other threads:[~2014-02-28 22:20 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-01-24  8:18 [PATCH 0/9] ARM: DTS: OMAP: Audio related cleanups for dtsi and dts files Peter Ujfalusi
2014-01-24  8:18 ` [PATCH 1/9] ARM: DTS: omap4-panda-common: Move audio related pinmux to respective nodes Peter Ujfalusi
2014-01-24  8:19 ` [PATCH 2/9] ARM: DTS: omap4-sdp: " Peter Ujfalusi
2014-01-24  8:19 ` [PATCH 3/9] ARM: DTS: omap4: Set all audio related IP's status to disabled as default Peter Ujfalusi
2014-01-24  8:19 ` [PATCH 4/9] ARM: DTS: omap4-panda-common: No need to disable the unused audio nodes Peter Ujfalusi
2014-01-24  8:19 ` [PATCH 5/9] ARM: DTS: omap4-sdp: No need to disable mcbsp3 node Peter Ujfalusi
2014-01-24  8:19 ` [PATCH 6/9] ARM: DTS: omap5: Set all audio related IP's status to disabled as default Peter Ujfalusi
2014-01-24  8:19 ` [PATCH 7/9] ARM: DTS: omap3: Set disabled status for McBSP instances as default state Peter Ujfalusi
     [not found] ` <1390551547-12406-1-git-send-email-peter.ujfalusi-l0cyMroinI0@public.gmane.org>
2014-01-24  8:19   ` [PATCH 8/9] ARM: DTS: omap2: " Peter Ujfalusi
2014-01-24  8:19 ` [PATCH 9/9] ARM: DTS: am335x-evmsk: Correct audio clock frequency Peter Ujfalusi
2014-02-28 22:20 ` [PATCH 0/9] ARM: DTS: OMAP: Audio related cleanups for dtsi and dts files 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).