[PATCH 0/5] ARM: DTS: OMAP/DRA7: dma property name correction

[PATCH 0/5] ARM: DTS: OMAP/DRA7: dma property name correction

[Peter Ujfalusi]

Hi,

While working on the DMA crossbar support for DRA7 typo of devices I have
noticed that the dma-channels and dma-requests properties of sdma wrongly
has # at the beginning.
According to the documentation, it should not have:
Documentation/devicetree/bindings/dma/dma.txt

Since these properties are not in use at the moment, but it is going to be needed
for the crossbar driver it is better to fix it right now so we do not need to
patch .dtsi and .c files at the same time later.

Tony: I would really appreciate if this could go in within the current merge
window.

Thanks,
Peter

Peter Ujfalusi (5):
  ARM: DTS: omap2: Correct the dma controller's property names
  ARM: DTS: omap3: Correct the dma controller's property names
  ARM: DTS: omap4: Correct the dma controller's property names
  ARM: DTS: omap5: Correct the dma controller's property names
  ARM: DTS: dra7: Correct the dma controller's property names

 arch/arm/boot/dts/dra7.dtsi  | 4 ++--
 arch/arm/boot/dts/omap2.dtsi | 4 ++--
 arch/arm/boot/dts/omap3.dtsi | 4 ++--
 arch/arm/boot/dts/omap4.dtsi | 4 ++--
 arch/arm/boot/dts/omap5.dtsi | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

-- 
2.3.0

[PATCH 1/5] ARM: DTS: omap2: Correct the dma controller's property names

[Peter Ujfalusi]

According to the Documentation/devicetree/bindings/dma/dma.txt the
dma-channels and dma-requests property should not have '#'.

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

diff --git a/arch/arm/boot/dts/omap2.dtsi b/arch/arm/boot/dts/omap2.dtsi
index 59d1c297bb30..578fa2a54dce 100644
--- a/arch/arm/boot/dts/omap2.dtsi
+++ b/arch/arm/boot/dts/omap2.dtsi
@@ -87,8 +87,8 @@
 				     <14>,
 				     <15>;
 			#dma-cells = <1>;
-			#dma-channels = <32>;
-			#dma-requests = <64>;
+			dma-channels = <32>;
+			dma-requests = <64>;
 		};
 
 		i2c1: i2c@48070000 {
-- 
2.3.0

[PATCH 2/5] ARM: DTS: omap3: Correct the dma controller's property names

[Peter Ujfalusi]

According to the Documentation/devicetree/bindings/dma/dma.txt the
dma-channels and dma-requests property should not have '#'.

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

diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi
index 01b71111bd55..f4f78c40b564 100644
--- a/arch/arm/boot/dts/omap3.dtsi
+++ b/arch/arm/boot/dts/omap3.dtsi
@@ -155,8 +155,8 @@
 				     <14>,
 				     <15>;
 			#dma-cells = <1>;
-			#dma-channels = <32>;
-			#dma-requests = <96>;
+			dma-channels = <32>;
+			dma-requests = <96>;
 		};
 
 		omap3_pmx_core: pinmux@48002030 {
-- 
2.3.0

[PATCH 3/5] ARM: DTS: omap4: Correct the dma controller's property names

[Peter Ujfalusi]

According to the Documentation/devicetree/bindings/dma/dma.txt the
dma-channels and dma-requests property should not have '#'.

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

diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
index 074147cebae4..87401d9f4d8b 100644
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -223,8 +223,8 @@
 				     <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>,
 				     <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
 			#dma-cells = <1>;
-			#dma-channels = <32>;
-			#dma-requests = <127>;
+			dma-channels = <32>;
+			dma-requests = <127>;
 		};
 
 		gpio1: gpio@4a310000 {
-- 
2.3.0

[PATCH 4/5] ARM: DTS: omap5: Correct the dma controller's property names

[Peter Ujfalusi]

According to the Documentation/devicetree/bindings/dma/dma.txt the
dma-channels and dma-requests property should not have '#'.

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

diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
index b321fdf42c9f..eb6653cbe3f8 100644
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@ -238,8 +238,8 @@
 				     <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>,
 				     <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
 			#dma-cells = <1>;
-			#dma-channels = <32>;
-			#dma-requests = <127>;
+			dma-channels = <32>;
+			dma-requests = <127>;
 		};
 
 		gpio1: gpio@4ae10000 {
-- 
2.3.0

[PATCH 5/5] ARM: DTS: dra7: Correct the dma controller's property names

[Peter Ujfalusi]

According to the Documentation/devicetree/bindings/dma/dma.txt the
dma-channels and dma-requests property should not have '#'.

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

diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
index 5827fedafd43..aefa4192533a 100644
--- a/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@ -249,8 +249,8 @@
 				     <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,
 				     <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
 			#dma-cells = <1>;
-			#dma-channels = <32>;
-			#dma-requests = <127>;
+			dma-channels = <32>;
+			dma-requests = <127>;
 		};
 
 		gpio1: gpio@4ae10000 {
-- 
2.3.0

Re: [PATCH 0/5] ARM: DTS: OMAP/DRA7: dma property name correction

[Tony Lindgren]

* Peter Ujfalusi <peter.ujfalusi@ti.com> [150220 05:45]:
> Hi,
> 
> While working on the DMA crossbar support for DRA7 typo of devices I have
> noticed that the dma-channels and dma-requests properties of sdma wrongly
> has # at the beginning.
> According to the documentation, it should not have:
> Documentation/devicetree/bindings/dma/dma.txt
> 
> Since these properties are not in use at the moment, but it is going to be needed
> for the crossbar driver it is better to fix it right now so we do not need to
> patch .dtsi and .c files at the same time later.
> 
> Tony: I would really appreciate if this could go in within the current merge
> window.

Yeah applying into omap-for-v4.0/fixes, let's get it out of the
way to avoid more cut-n-paste errors.

Regards,

Tony
 
> Peter Ujfalusi (5):
>   ARM: DTS: omap2: Correct the dma controller's property names
>   ARM: DTS: omap3: Correct the dma controller's property names
>   ARM: DTS: omap4: Correct the dma controller's property names
>   ARM: DTS: omap5: Correct the dma controller's property names
>   ARM: DTS: dra7: Correct the dma controller's property names
> 
>  arch/arm/boot/dts/dra7.dtsi  | 4 ++--
>  arch/arm/boot/dts/omap2.dtsi | 4 ++--
>  arch/arm/boot/dts/omap3.dtsi | 4 ++--
>  arch/arm/boot/dts/omap4.dtsi | 4 ++--
>  arch/arm/boot/dts/omap5.dtsi | 4 ++--
>  5 files changed, 10 insertions(+), 10 deletions(-)
> 
> -- 
> 2.3.0
>