--- v1
+++ v2
@@ -1,34 +1,24 @@
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
+Acked-by: Rob Herring <robh@kernel.org>
---
- Documentation/devicetree/bindings/sound/davinci-mcbsp.txt | 2 +-
- drivers/dma/bcm2835-dma.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+v2:
+ - Add Acked-by.
+---
+ arch/powerpc/boot/dts/acadia.dts | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/Documentation/devicetree/bindings/sound/davinci-mcbsp.txt b/Documentation/devicetree/bindings/sound/davinci-mcbsp.txt
-index 55b53e1fd72c9d6e..e0b6165c9cfcec19 100644
---- a/Documentation/devicetree/bindings/sound/davinci-mcbsp.txt
-+++ b/Documentation/devicetree/bindings/sound/davinci-mcbsp.txt
-@@ -43,7 +43,7 @@ mcbsp0: mcbsp@1d10000 {
- <0x00310000 0x1000>;
- reg-names = "mpu", "dat";
- interrupts = <97 98>;
-- interrupts-names = "rx", "tx";
-+ interrupt-names = "rx", "tx";
- dmas = <&edma0 3 1
- &edma0 2 1>;
- dma-names = "tx", "rx";
-diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c
-index 974015193b93cdb3..d724393e904e9a41 100644
---- a/drivers/dma/bcm2835-dma.c
-+++ b/drivers/dma/bcm2835-dma.c
-@@ -974,7 +974,7 @@ static int bcm2835_dma_probe(struct platform_device *pdev)
+diff --git a/arch/powerpc/boot/dts/acadia.dts b/arch/powerpc/boot/dts/acadia.dts
+index 57291f61ffe7021a..86266159521edac2 100644
+--- a/arch/powerpc/boot/dts/acadia.dts
++++ b/arch/powerpc/boot/dts/acadia.dts
+@@ -183,7 +183,7 @@
+ usb@ef603000 {
+ compatible = "ohci-be";
+ reg = <0xef603000 0x80>;
+- interrupts-parent = <&UIC0>;
++ interrupt-parent = <&UIC0>;
+ interrupts = <0xd 0x4 0xe 0x4>;
+ };
- /* legacy device tree case handling */
- dev_warn_once(&pdev->dev,
-- "missing interrupts-names property in device tree - legacy interpretation is used");
-+ "missing interrupt-names property in device tree - legacy interpretation is used");
- /*
- * in case of channel >= 11
- * use the 11th interrupt and that is shared
--
1.9.1