[PATCH 1/5] dt/bindings: bcm2835: correct description for DMA-int

[PATCH 1/5] dt/bindings: bcm2835: correct description for DMA-int

[kernel-TqfNSX0MhmxHKSADF0wUEw]

From: Martin Sperl <kernel-TqfNSX0MhmxHKSADF0wUEw@public.gmane.org>

The description for interrupt DMA11 and DMA12 are wrong.

Interrupt DMA11 is the shared interrupt for DMA channels 11 to 14
Interrupt DMA12 is the shared interrupt triggering for any DMA channel
(this also includes DMA channel 15)

Signed-off-by: Martin Sperl <kernel-TqfNSX0MhmxHKSADF0wUEw@public.gmane.org>
---
 .../bindings/interrupt-controller/brcm,bcm2835-armctrl-ic.txt         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/devicetree/bindings/interrupt-controller/brcm,bcm2835-armctrl-ic.txt b/Documentation/devicetree/bindings/interrupt-controller/brcm,bcm2835-armctrl-ic.txt
index 2d6c8bb..b16fca8 100644
--- a/Documentation/devicetree/bindings/interrupt-controller/brcm,bcm2835-armctrl-ic.txt
+++ b/Documentation/devicetree/bindings/interrupt-controller/brcm,bcm2835-armctrl-ic.txt
@@ -71,8 +71,8 @@ Bank 1:
 24: DMA8
 25: DMA9
 26: DMA10
-27: DMA11
-28: DMA12
+27: DMA11-14 - shared interrupt for DMA 11 to 14
+28: DMAALL - triggers on all dma interrupts (including chanel 15)
 29: AUX
 30: ARM
 31: VPUDMA
-- 
2.1.4

--
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

[PATCH 2/5] ARM: bcm2835: add defines for each interrupt

[kernel-TqfNSX0MhmxHKSADF0wUEw]

From: Martin Sperl <kernel-TqfNSX0MhmxHKSADF0wUEw@public.gmane.org>

Define names for all interrupt "magic numbers" so that they
can get used inside the device tree.

Signed-off-by: Martin Sperl <kernel-TqfNSX0MhmxHKSADF0wUEw@public.gmane.org>
---
 include/dt-bindings/interrupt-controller/bcm2835.h | 95 ++++++++++++++++++++++
 1 file changed, 95 insertions(+)
 create mode 100644 include/dt-bindings/interrupt-controller/bcm2835.h

diff --git a/include/dt-bindings/interrupt-controller/bcm2835.h b/include/dt-bindings/interrupt-controller/bcm2835.h
new file mode 100644
index 0000000..b8723f6
--- /dev/null
+++ b/include/dt-bindings/interrupt-controller/bcm2835.h
@@ -0,0 +1,95 @@
+/*
+ * Copyright (C) 2016 Martin Sperl
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation version 2.
+ *
+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
+ * kind, whether express or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+/* the interrupt tables in the form <BANK> <ID> */
+
+/* ARM interrupts - bank 0 */
+#define BCM2835_INT_ARM_TIMER		0 0
+#define BCM2835_INT_ARM_MAILBOX		0 1
+#define BCM2835_INT_ARM_DORBELL0	0 2
+#define BCM2835_INT_ARM_DORBELL1	0 3
+#define BCM2835_INT_ARM_VPU0_HALTED	0 4
+#define BCM2835_INT_ARM_VPU1_HALTED	0 5
+#define BCM2835_INT_ARM_ILLEGAL_TYPE0	0 6
+#define BCM2835_INT_ARM_ILLEGAL_TYPE0	0 6
+
+/* peripheral interrupts - bank 1 */
+#define BCM2835_INT_TIMER0		1 0
+#define BCM2835_INT_TIMER1		1 1
+#define BCM2835_INT_TIMER2		1 2
+#define BCM2835_INT_TIMER3		1 3
+#define BCM2835_INT_CODEC0		1 4
+#define BCM2835_INT_CODEC1		1 5
+#define BCM2835_INT_CODEC2		1 6
+#define BCM2835_INT_JPEG		1 7
+#define BCM2835_INT_ISP			1 8
+#define BCM2835_INT_USB			1 9
+#define BCM2835_INT_3D			1 10
+#define BCM2835_INT_TRANSPOSER		1 11
+#define BCM2835_INT_MULTICORESYNC0	1 12
+#define BCM2835_INT_MULTICORESYNC1	1 13
+#define BCM2835_INT_MULTICORESYNC2	1 14
+#define BCM2835_INT_MULTICORESYNC3	1 15
+#define BCM2835_INT_DMA0		1 16
+#define BCM2835_INT_DMA1		1 17
+#define BCM2835_INT_DMA2		1 18
+#define BCM2835_INT_DMA3		1 19
+#define BCM2835_INT_DMA4		1 20
+#define BCM2835_INT_DMA5		1 21
+#define BCM2835_INT_DMA6		1 22
+#define BCM2835_INT_DMA7		1 23
+#define BCM2835_INT_DMA8		1 24
+#define BCM2835_INT_DMA9		1 25
+#define BCM2835_INT_DMA10		1 26
+#define BCM2835_INT_DMA11_12_13_14	1 27
+#define BCM2835_INT_DMA_ALL		1 28
+#define BCM2835_INT_AUX			1 29
+#define BCM2835_INT_AUX_UART		BCM2835_INT_AUX
+#define BCM2835_INT_AUX_SPI1		BCM2835_INT_AUX
+#define BCM2835_INT_AUX_SPI2		BCM2835_INT_AUX
+#define BCM2835_INT_ARM			1 30
+#define BCM2835_INT_DMA_VPU		1 31
+
+/* peripheral interrupts - bank 2 */
+#define BCM2835_INT_HOSTPORT		2 0
+#define BCM2835_INT_VIDEOSCALER		2 1
+#define BCM2835_INT_CCP2TX		2 2
+#define BCM2835_INT_SDC			2 3
+#define BCM2835_INT_DSI0		2 4
+#define BCM2835_INT_AVE			2 5
+#define BCM2835_INT_CAM0		2 6
+#define BCM2835_INT_CAM1		2 7
+#define BCM2835_INT_HDMI0		2 8
+#define BCM2835_INT_HDMI1		2 9
+#define BCM2835_INT_PIXELVALVE1		2 10
+#define BCM2835_INT_I2C_SLV		2 11
+#define BCM2835_INT_DSI1		2 12
+#define BCM2835_INT_PWA0		2 13
+#define BCM2835_INT_PWA1		2 14
+#define BCM2835_INT_CPR			2 15
+#define BCM2835_INT_SMI			2 16
+#define BCM2835_INT_GPIO0		2 17
+#define BCM2835_INT_GPIO1		2 18
+#define BCM2835_INT_GPIO2		2 19
+#define BCM2835_INT_GPIO3		2 20
+#define BCM2835_INT_I2C			2 21
+#define BCM2835_INT_SPI			2 22
+#define BCM2835_INT_I2SPCM		2 23
+#define BCM2835_INT_SDIO		2 24
+#define BCM2835_INT_UART		2 25
+#define BCM2835_INT_SLIMBUS		2 26
+#define BCM2835_INT_VEC			2 27
+#define BCM2835_INT_CPG			2 28
+#define BCM2835_INT_RNG			2 29
+#define BCM2835_INT_ARSANSDIO		2 30
+#define BCM2835_INT_AVSPMON		2 31
-- 
2.1.4

--
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

[PATCH 3/5] ARM: bcm2835: use defined INT names instead of magic numbers

[kernel-TqfNSX0MhmxHKSADF0wUEw]

From: Martin Sperl <kernel-TqfNSX0MhmxHKSADF0wUEw@public.gmane.org>

Change the device tree source so that instead of magic numbers
the corresponding BCM2835_INT_* names are used to ease readability.

Signed-off-by: Martin Sperl <kernel-TqfNSX0MhmxHKSADF0wUEw@public.gmane.org>
---
 arch/arm/boot/dts/bcm283x.dtsi | 59 +++++++++++++++++++++++-------------------
 1 file changed, 33 insertions(+), 26 deletions(-)

diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi
index 8aaf193..084eda7 100644
--- a/arch/arm/boot/dts/bcm283x.dtsi
+++ b/arch/arm/boot/dts/bcm283x.dtsi
@@ -1,6 +1,7 @@
 #include <dt-bindings/pinctrl/bcm2835.h>
 #include <dt-bindings/clock/bcm2835.h>
 #include <dt-bindings/clock/bcm2835-aux.h>
+#include <dt-bindings/interrupt-controller/bcm2835.h>
 #include "skeleton.dtsi"
 
 /* This include file covers the common peripherals and configuration between
@@ -25,7 +26,10 @@
 		timer@7e003000 {
 			compatible = "brcm,bcm2835-system-timer";
 			reg = <0x7e003000 0x1000>;
-			interrupts = <1 0>, <1 1>, <1 2>, <1 3>;
+			interrupts = <BCM2835_INT_TIMER0>,
+				     <BCM2835_INT_TIMER1>,
+				     <BCM2835_INT_TIMER2>,
+				     <BCM2835_INT_TIMER3>;
 			/* This could be a reference to BCM2835_CLOCK_TIMER,
 			 * but we don't have the driver using the common clock
 			 * support yet.
@@ -36,19 +40,19 @@
 		dma: dma@7e007000 {
 			compatible = "brcm,bcm2835-dma";
 			reg = <0x7e007000 0xf00>;
-			interrupts = <1 16>,
-				     <1 17>,
-				     <1 18>,
-				     <1 19>,
-				     <1 20>,
-				     <1 21>,
-				     <1 22>,
-				     <1 23>,
-				     <1 24>,
-				     <1 25>,
-				     <1 26>,
-				     <1 27>,
-				     <1 28>;
+			interrupts = <BCM2835_INT_DMA0>,
+				     <BCM2835_INT_DMA1>,
+				     <BCM2835_INT_DMA2>,
+				     <BCM2835_INT_DMA3>,
+				     <BCM2835_INT_DMA4>,
+				     <BCM2835_INT_DMA5>,
+				     <BCM2835_INT_DMA6>,
+				     <BCM2835_INT_DMA7>,
+				     <BCM2835_INT_DMA8>,
+				     <BCM2835_INT_DMA9>,
+				     <BCM2835_INT_DMA10>,
+				     <BCM2835_INT_DMA11_12_13_14>,
+				     <BCM2835_INT_DMA_ALL>;
 
 			#dma-cells = <1>;
 			brcm,dma-channel-mask = <0x7f35>;
@@ -85,7 +89,7 @@
 		mailbox: mailbox@7e00b800 {
 			compatible = "brcm,bcm2835-mbox";
 			reg = <0x7e00b880 0x40>;
-			interrupts = <0 1>;
+			interrupts = <BCM2835_INT_ARM_MAILBOX>;
 			#mbox-cells = <0>;
 		};
 
@@ -103,7 +107,10 @@
 			 * So, a bank0 interrupt shows up on 17, 20, and
 			 * a bank1 interrupt shows up on 18, 19, 20!
 			 */
-			interrupts = <2 17>, <2 18>, <2 19>, <2 20>;
+			interrupts = <BCM2835_INT_GPIO0>,
+				     <BCM2835_INT_GPIO1>,
+				     <BCM2835_INT_GPIO2>,
+				     <BCM2835_INT_GPIO3>;
 
 			gpio-controller;
 			#gpio-cells = <2>;
@@ -115,7 +122,7 @@
 		uart0: serial@7e201000 {
 			compatible = "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell";
 			reg = <0x7e201000 0x1000>;
-			interrupts = <2 25>;
+			interrupts = <BCM2835_INT_UART>;
 			clocks = <&clocks BCM2835_CLOCK_UART>,
 				 <&clocks BCM2835_CLOCK_VPU>;
 			clock-names = "uartclk", "apb_pclk";
@@ -136,7 +143,7 @@
 		spi: spi@7e204000 {
 			compatible = "brcm,bcm2835-spi";
 			reg = <0x7e204000 0x1000>;
-			interrupts = <2 22>;
+			interrupts = <BCM2835_INT_SPI>;
 			clocks = <&clocks BCM2835_CLOCK_VPU>;
 			#address-cells = <1>;
 			#size-cells = <0>;
@@ -146,7 +153,7 @@
 		i2c0: i2c@7e205000 {
 			compatible = "brcm,bcm2835-i2c";
 			reg = <0x7e205000 0x1000>;
-			interrupts = <2 21>;
+			interrupts = <BCM2835_INT_I2C>;
 			clocks = <&clocks BCM2835_CLOCK_VPU>;
 			#address-cells = <1>;
 			#size-cells = <0>;
@@ -163,7 +170,7 @@
 		uart1: serial@7e215040 {
 			compatible = "brcm,bcm2835-aux-uart";
 			reg = <0x7e215040 0x40>;
-			interrupts = <1 29>;
+			interrupts = <BCM2835_INT_AUX_UART>;
 			clocks = <&aux BCM2835_AUX_CLOCK_UART>;
 			status = "disabled";
 		};
@@ -171,7 +178,7 @@
 		spi1: spi@7e215080 {
 			compatible = "brcm,bcm2835-aux-spi";
 			reg = <0x7e215080 0x40>;
-			interrupts = <1 29>;
+			interrupts = <BCM2835_INT_AUX_SPI1>;
 			clocks = <&aux BCM2835_AUX_CLOCK_SPI1>;
 			#address-cells = <1>;
 			#size-cells = <0>;
@@ -181,7 +188,7 @@
 		spi2: spi@7e2150c0 {
 			compatible = "brcm,bcm2835-aux-spi";
 			reg = <0x7e2150c0 0x40>;
-			interrupts = <1 29>;
+			interrupts = <BCM2835_INT_AUX_SPI2>;
 			clocks = <&aux BCM2835_AUX_CLOCK_SPI2>;
 			#address-cells = <1>;
 			#size-cells = <0>;
@@ -201,7 +208,7 @@
 		sdhci: sdhci@7e300000 {
 			compatible = "brcm,bcm2835-sdhci";
 			reg = <0x7e300000 0x100>;
-			interrupts = <2 30>;
+			interrupts = <BCM2835_INT_ARSANSDIO>;
 			clocks = <&clocks BCM2835_CLOCK_EMMC>;
 			status = "disabled";
 		};
@@ -209,7 +216,7 @@
 		i2c1: i2c@7e804000 {
 			compatible = "brcm,bcm2835-i2c";
 			reg = <0x7e804000 0x1000>;
-			interrupts = <2 21>;
+			interrupts = <BCM2835_INT_I2C>;
 			clocks = <&clocks BCM2835_CLOCK_VPU>;
 			#address-cells = <1>;
 			#size-cells = <0>;
@@ -219,7 +226,7 @@
 		i2c2: i2c@7e805000 {
 			compatible = "brcm,bcm2835-i2c";
 			reg = <0x7e805000 0x1000>;
-			interrupts = <2 21>;
+			interrupts = <BCM2835_INT_I2C>;
 			clocks = <&clocks BCM2835_CLOCK_VPU>;
 			#address-cells = <1>;
 			#size-cells = <0>;
@@ -229,7 +236,7 @@
 		usb: usb@7e980000 {
 			compatible = "brcm,bcm2835-usb";
 			reg = <0x7e980000 0x10000>;
-			interrupts = <1 9>;
+			interrupts = <BCM2835_INT_USB>;
 		};
 	};
 
-- 
2.1.4

--
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

[PATCH 4/5] ARM: bcm2835: add defines for each DREQ

[kernel-TqfNSX0MhmxHKSADF0wUEw]

From: Martin Sperl <kernel-TqfNSX0MhmxHKSADF0wUEw@public.gmane.org>

Define names for each of the DMA DREQ values.

Signed-off-by: Martin Sperl <kernel-TqfNSX0MhmxHKSADF0wUEw@public.gmane.org>
---
 include/dt-bindings/dma/bcm2835.h | 46 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 include/dt-bindings/dma/bcm2835.h

diff --git a/include/dt-bindings/dma/bcm2835.h b/include/dt-bindings/dma/bcm2835.h
new file mode 100644
index 0000000..5bade32
--- /dev/null
+++ b/include/dt-bindings/dma/bcm2835.h
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2016 Martin Sperl
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation version 2.
+ *
+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
+ * kind, whether express or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+/* DREQ definitions */
+#define BCM2835_DMA_DREQ_NONE		0
+#define BCM2835_DMA_DREQ_DSI0		1
+#define BCM2835_DMA_DREQ_PCM_TX		2
+#define BCM2835_DMA_DREQ_PCM_RX		3
+#define BCM2835_DMA_DREQ_SMI		4
+#define BCM2835_DMA_DREQ_PWM		5
+#define BCM2835_DMA_DREQ_SPI_TX		6
+#define BCM2835_DMA_DREQ_SPI_RX		7
+#define BCM2835_DMA_DREQ_BSC_TX		8
+#define BCM2835_DMA_DREQ_BSC_RX		9
+#define BCM2835_DMA_DREQ_UNUSED		10
+#define BCM2835_DMA_DREQ_EMMC		11
+#define BCM2835_DMA_DREQ_UART_TX	12
+#define BCM2835_DMA_DREQ_SDHOST		13
+#define BCM2835_DMA_DREQ_UART_RX	14
+#define BCM2835_DMA_DREQ_DSI1		15
+#define BCM2835_DMA_DREQ_SLIM_MC_TX	16
+#define BCM2835_DMA_DREQ_HDMI		17
+#define BCM2835_DMA_DREQ_SLIM_MC_RX	18
+#define BCM2835_DMA_DREQ_SLIM_DC0	19
+#define BCM2835_DMA_DREQ_SLIM_DC1	20
+#define BCM2835_DMA_DREQ_SLIM_DC2	21
+#define BCM2835_DMA_DREQ_SLIM_DC3	22
+#define BCM2835_DMA_DREQ_SLIM_DC4	23
+#define BCM2835_DMA_DREQ_SCALER_FIFO0	24
+#define BCM2835_DMA_DREQ_SCALER_FIFO1	25
+#define BCM2835_DMA_DREQ_SCALER_FIFO2	26
+#define BCM2835_DMA_DREQ_SLIM_DC5	27
+#define BCM2835_DMA_DREQ_SLIM_DC6	28
+#define BCM2835_DMA_DREQ_SLIM_DC7	29
+#define BCM2835_DMA_DREQ_SLIM_DC8	30
+#define BCM2835_DMA_DREQ_SLIM_DC9	31
-- 
2.1.4

--
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

[PATCH 5/5] ARM: bcm2835: use defined DMA_DREQ names instead of magic numbers

[kernel-TqfNSX0MhmxHKSADF0wUEw]

From: Martin Sperl <kernel-TqfNSX0MhmxHKSADF0wUEw@public.gmane.org>

Change the device tree source so that instead of magic numbers
the corresponding BCM2835_DMA_DREQ_* names are used to ease readability.

Signed-off-by: Martin Sperl <kernel-TqfNSX0MhmxHKSADF0wUEw@public.gmane.org>
---
 arch/arm/boot/dts/bcm283x.dtsi | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi
index 084eda7..aec67a9 100644
--- a/arch/arm/boot/dts/bcm283x.dtsi
+++ b/arch/arm/boot/dts/bcm283x.dtsi
@@ -1,6 +1,7 @@
 #include <dt-bindings/pinctrl/bcm2835.h>
 #include <dt-bindings/clock/bcm2835.h>
 #include <dt-bindings/clock/bcm2835-aux.h>
+#include <dt-bindings/dma/bcm2835.h>
 #include <dt-bindings/interrupt-controller/bcm2835.h>
 #include "skeleton.dtsi"
 
@@ -134,8 +135,8 @@
 			reg = <0x7e203000 0x20>,
 			      <0x7e101098 0x02>;
 
-			dmas = <&dma 2>,
-			       <&dma 3>;
+			dmas = <&dma BCM2835_DMA_DREQ_PCM_TX>,
+			       <&dma BCM2835_DMA_DREQ_PCM_RX>;
 			dma-names = "tx", "rx";
 			status = "disabled";
 		};
-- 
2.1.4

--
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

Re: [PATCH 1/5] dt/bindings: bcm2835: correct description for DMA-int

[Rob Herring]

On Sat, Mar 05, 2016 at 06:02:49PM +0000, kernel-TqfNSX0MhmxHKSADF0wUEw@public.gmane.org wrote:
> From: Martin Sperl <kernel-TqfNSX0MhmxHKSADF0wUEw@public.gmane.org>
> 
> The description for interrupt DMA11 and DMA12 are wrong.
> 
> Interrupt DMA11 is the shared interrupt for DMA channels 11 to 14
> Interrupt DMA12 is the shared interrupt triggering for any DMA channel
> (this also includes DMA channel 15)
> 
> Signed-off-by: Martin Sperl <kernel-TqfNSX0MhmxHKSADF0wUEw@public.gmane.org>

Acked-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
--
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