[PATCH 0/2] Add support for dm81xx to omap intc, remove unused legacy support

[PATCH 0/2] Add support for dm81xx to omap intc, remove unused legacy support

[Tony Lindgren]

Hi,

Here's a patch to get the ti81xx interrupt support working properly,
and to remove some unused legacy code.

Regards,

Tony

clone of "xxx-81xx-mainline"

Tony Lindgren (2):
  irqchip: omap-intc: Fix support for dm814 and dm816
  irqchip: omap-intc: Remove unused legacy interface for omap2

 .../interrupt-controller/ti,omap-intc-irq.txt      | 28 ++++++++++++++++++++++
 drivers/irqchip/irq-omap-intc.c                    | 22 ++++-------------
 include/linux/irqchip/irq-omap-intc.h              |  2 --
 3 files changed, 33 insertions(+), 19 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/interrupt-controller/ti,omap-intc-irq.txt

-- 
2.1.4

[PATCH 1/2] irqchip: omap-intc: Fix support for dm814 and dm816

[Tony Lindgren]

On dm81xx we have 128 interrupts like am33xx has. Let's add
compatible flags for dm814x and dm816x, and document the
existing binding.

As the dm81xx are booting in device tree only mode, we can now
also remove ti81xx_init_irq() legacy function.

Cc: Brian Hutchinson <b.hutchman@gmail.com>
Cc: Felipe Balbi <balbi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
 .../interrupt-controller/ti,omap-intc-irq.txt      | 28 ++++++++++++++++++++++
 drivers/irqchip/irq-omap-intc.c                    | 14 ++++-------
 include/linux/irqchip/irq-omap-intc.h              |  1 -
 3 files changed, 33 insertions(+), 10 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/interrupt-controller/ti,omap-intc-irq.txt

diff --git a/Documentation/devicetree/bindings/interrupt-controller/ti,omap-intc-irq.txt b/Documentation/devicetree/bindings/interrupt-controller/ti,omap-intc-irq.txt
new file mode 100644
index 0000000..38ce5d03
--- /dev/null
+++ b/Documentation/devicetree/bindings/interrupt-controller/ti,omap-intc-irq.txt
@@ -0,0 +1,28 @@
+Omap2/3 intc controller
+
+On TI omap2 and 3 the intc interrupt controller can provide
+96 or 128 IRQ signals to the ARM host depending on the SoC.
+
+Required Properties:
+- compatible: should be one of
+			"ti,omap2-intc"
+			"ti,omap3-intc"
+			"ti,dm814-intc"
+			"ti,dm816-intc"
+			"ti,am33xx-intc"
+
+- interrupt-controller : Identifies the node as an interrupt controller
+- #interrupt-cells : Specifies the number of cells needed to encode interrupt
+		     source, should be 1 for intc
+- interrupts: interrupt reference to primary interrupt controller
+
+Please refer to interrupts.txt in this directory for details of the common
+Interrupt Controllers bindings used by client devices.
+
+Example:
+	intc: interrupt-controller@48200000 {
+		compatible = "ti,omap3-intc";
+		interrupt-controller;
+		#interrupt-cells = <1>;
+		reg = <0x48200000 0x1000>;
+	};
diff --git a/drivers/irqchip/irq-omap-intc.c b/drivers/irqchip/irq-omap-intc.c
index 28718d3..b75a44a 100644
--- a/drivers/irqchip/irq-omap-intc.c
+++ b/drivers/irqchip/irq-omap-intc.c
@@ -364,14 +364,6 @@ void __init omap3_init_irq(void)
 	set_handle_irq(omap_intc_handle_irq);
 }
 
-void __init ti81xx_init_irq(void)
-{
-	omap_nr_irqs = 96;
-	omap_nr_pending = 4;
-	omap_init_irq(OMAP34XX_IC_BASE, NULL);
-	set_handle_irq(omap_intc_handle_irq);
-}
-
 static int __init intc_of_init(struct device_node *node,
 			     struct device_node *parent)
 {
@@ -383,7 +375,9 @@ static int __init intc_of_init(struct device_node *node,
 	if (WARN_ON(!node))
 		return -ENODEV;
 
-	if (of_device_is_compatible(node, "ti,am33xx-intc")) {
+	if (of_device_is_compatible(node, "ti,dm814-intc") ||
+	    of_device_is_compatible(node, "ti,dm816-intc") ||
+	    of_device_is_compatible(node, "ti,am33xx-intc")) {
 		omap_nr_irqs = 128;
 		omap_nr_pending = 4;
 	}
@@ -399,4 +393,6 @@ static int __init intc_of_init(struct device_node *node,
 
 IRQCHIP_DECLARE(omap2_intc, "ti,omap2-intc", intc_of_init);
 IRQCHIP_DECLARE(omap3_intc, "ti,omap3-intc", intc_of_init);
+IRQCHIP_DECLARE(dm814x_intc, "ti,dm814-intc", intc_of_init);
+IRQCHIP_DECLARE(dm816x_intc, "ti,dm816-intc", intc_of_init);
 IRQCHIP_DECLARE(am33xx_intc, "ti,am33xx-intc", intc_of_init);
diff --git a/include/linux/irqchip/irq-omap-intc.h b/include/linux/irqchip/irq-omap-intc.h
index e06b370..bda426a 100644
--- a/include/linux/irqchip/irq-omap-intc.h
+++ b/include/linux/irqchip/irq-omap-intc.h
@@ -20,7 +20,6 @@
 
 void omap2_init_irq(void);
 void omap3_init_irq(void);
-void ti81xx_init_irq(void);
 
 int omap_irq_pending(void);
 void omap_intc_save_context(void);
-- 
2.1.4

[PATCH 2/2] irqchip: omap-intc: Remove unused legacy interface for omap2

[Tony Lindgren]

Nowadays omap2 is booting in device tree only mode so there is no
need to keep the legacy interface around for omap2_init_irq().

Cc: Felipe Balbi <balbi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
 drivers/irqchip/irq-omap-intc.c       | 8 --------
 include/linux/irqchip/irq-omap-intc.h | 1 -
 2 files changed, 9 deletions(-)

diff --git a/drivers/irqchip/irq-omap-intc.c b/drivers/irqchip/irq-omap-intc.c
index b75a44a..ece8624 100644
--- a/drivers/irqchip/irq-omap-intc.c
+++ b/drivers/irqchip/irq-omap-intc.c
@@ -348,14 +348,6 @@ out:
 		omap_ack_irq(NULL);
 }
 
-void __init omap2_init_irq(void)
-{
-	omap_nr_irqs = 96;
-	omap_nr_pending = 3;
-	omap_init_irq(OMAP24XX_IC_BASE, NULL);
-	set_handle_irq(omap_intc_handle_irq);
-}
-
 void __init omap3_init_irq(void)
 {
 	omap_nr_irqs = 96;
diff --git a/include/linux/irqchip/irq-omap-intc.h b/include/linux/irqchip/irq-omap-intc.h
index bda426a..2e3d1af 100644
--- a/include/linux/irqchip/irq-omap-intc.h
+++ b/include/linux/irqchip/irq-omap-intc.h
@@ -18,7 +18,6 @@
 #ifndef __INCLUDE_LINUX_IRQCHIP_IRQ_OMAP_INTC_H
 #define __INCLUDE_LINUX_IRQCHIP_IRQ_OMAP_INTC_H
 
-void omap2_init_irq(void);
 void omap3_init_irq(void);
 
 int omap_irq_pending(void);
-- 
2.1.4

Re: [PATCH 1/2] irqchip: omap-intc: Fix support for dm814 and dm816

[Felipe Balbi]

[-- Attachment #1: Type: text/plain, Size: 4168 bytes --]

On Tue, Jan 13, 2015 at 02:23:25PM -0800, Tony Lindgren wrote:
> On dm81xx we have 128 interrupts like am33xx has. Let's add
> compatible flags for dm814x and dm816x, and document the
> existing binding.
> 
> As the dm81xx are booting in device tree only mode, we can now
> also remove ti81xx_init_irq() legacy function.
> 
> Cc: Brian Hutchinson <b.hutchman@gmail.com>
> Cc: Felipe Balbi <balbi@ti.com>
> Signed-off-by: Tony Lindgren <tony@atomide.com>

Thanks for documenting the binding :-s

Reviewed-by: Felipe Balbi <balbi@ti.com>
Acked-by: Felipe Balbi <balbi@ti.com>

> ---
>  .../interrupt-controller/ti,omap-intc-irq.txt      | 28 ++++++++++++++++++++++
>  drivers/irqchip/irq-omap-intc.c                    | 14 ++++-------
>  include/linux/irqchip/irq-omap-intc.h              |  1 -
>  3 files changed, 33 insertions(+), 10 deletions(-)
>  create mode 100644 Documentation/devicetree/bindings/interrupt-controller/ti,omap-intc-irq.txt
> 
> diff --git a/Documentation/devicetree/bindings/interrupt-controller/ti,omap-intc-irq.txt b/Documentation/devicetree/bindings/interrupt-controller/ti,omap-intc-irq.txt
> new file mode 100644
> index 0000000..38ce5d03
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/interrupt-controller/ti,omap-intc-irq.txt
> @@ -0,0 +1,28 @@
> +Omap2/3 intc controller
> +
> +On TI omap2 and 3 the intc interrupt controller can provide
> +96 or 128 IRQ signals to the ARM host depending on the SoC.
> +
> +Required Properties:
> +- compatible: should be one of
> +			"ti,omap2-intc"
> +			"ti,omap3-intc"
> +			"ti,dm814-intc"
> +			"ti,dm816-intc"
> +			"ti,am33xx-intc"
> +
> +- interrupt-controller : Identifies the node as an interrupt controller
> +- #interrupt-cells : Specifies the number of cells needed to encode interrupt
> +		     source, should be 1 for intc
> +- interrupts: interrupt reference to primary interrupt controller
> +
> +Please refer to interrupts.txt in this directory for details of the common
> +Interrupt Controllers bindings used by client devices.
> +
> +Example:
> +	intc: interrupt-controller@48200000 {
> +		compatible = "ti,omap3-intc";
> +		interrupt-controller;
> +		#interrupt-cells = <1>;
> +		reg = <0x48200000 0x1000>;
> +	};
> diff --git a/drivers/irqchip/irq-omap-intc.c b/drivers/irqchip/irq-omap-intc.c
> index 28718d3..b75a44a 100644
> --- a/drivers/irqchip/irq-omap-intc.c
> +++ b/drivers/irqchip/irq-omap-intc.c
> @@ -364,14 +364,6 @@ void __init omap3_init_irq(void)
>  	set_handle_irq(omap_intc_handle_irq);
>  }
>  
> -void __init ti81xx_init_irq(void)
> -{
> -	omap_nr_irqs = 96;
> -	omap_nr_pending = 4;
> -	omap_init_irq(OMAP34XX_IC_BASE, NULL);
> -	set_handle_irq(omap_intc_handle_irq);
> -}
> -
>  static int __init intc_of_init(struct device_node *node,
>  			     struct device_node *parent)
>  {
> @@ -383,7 +375,9 @@ static int __init intc_of_init(struct device_node *node,
>  	if (WARN_ON(!node))
>  		return -ENODEV;
>  
> -	if (of_device_is_compatible(node, "ti,am33xx-intc")) {
> +	if (of_device_is_compatible(node, "ti,dm814-intc") ||
> +	    of_device_is_compatible(node, "ti,dm816-intc") ||
> +	    of_device_is_compatible(node, "ti,am33xx-intc")) {
>  		omap_nr_irqs = 128;
>  		omap_nr_pending = 4;
>  	}
> @@ -399,4 +393,6 @@ static int __init intc_of_init(struct device_node *node,
>  
>  IRQCHIP_DECLARE(omap2_intc, "ti,omap2-intc", intc_of_init);
>  IRQCHIP_DECLARE(omap3_intc, "ti,omap3-intc", intc_of_init);
> +IRQCHIP_DECLARE(dm814x_intc, "ti,dm814-intc", intc_of_init);
> +IRQCHIP_DECLARE(dm816x_intc, "ti,dm816-intc", intc_of_init);
>  IRQCHIP_DECLARE(am33xx_intc, "ti,am33xx-intc", intc_of_init);
> diff --git a/include/linux/irqchip/irq-omap-intc.h b/include/linux/irqchip/irq-omap-intc.h
> index e06b370..bda426a 100644
> --- a/include/linux/irqchip/irq-omap-intc.h
> +++ b/include/linux/irqchip/irq-omap-intc.h
> @@ -20,7 +20,6 @@
>  
>  void omap2_init_irq(void);
>  void omap3_init_irq(void);
> -void ti81xx_init_irq(void);
>  
>  int omap_irq_pending(void);
>  void omap_intc_save_context(void);
> -- 
> 2.1.4
> 

-- 
balbi

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH 2/2] irqchip: omap-intc: Remove unused legacy interface for omap2

[Felipe Balbi]

[-- Attachment #1: Type: text/plain, Size: 1561 bytes --]

On Tue, Jan 13, 2015 at 02:23:26PM -0800, Tony Lindgren wrote:
> Nowadays omap2 is booting in device tree only mode so there is no
> need to keep the legacy interface around for omap2_init_irq().
> 
> Cc: Felipe Balbi <balbi@ti.com>
> Signed-off-by: Tony Lindgren <tony@atomide.com>

Awesome, only one to go now.

Reviewed-by: Felipe Balbi <balbi@ti.com>
Acked-by: Felipe Balbi <balbi@ti.com>

> ---
>  drivers/irqchip/irq-omap-intc.c       | 8 --------
>  include/linux/irqchip/irq-omap-intc.h | 1 -
>  2 files changed, 9 deletions(-)
> 
> diff --git a/drivers/irqchip/irq-omap-intc.c b/drivers/irqchip/irq-omap-intc.c
> index b75a44a..ece8624 100644
> --- a/drivers/irqchip/irq-omap-intc.c
> +++ b/drivers/irqchip/irq-omap-intc.c
> @@ -348,14 +348,6 @@ out:
>  		omap_ack_irq(NULL);
>  }
>  
> -void __init omap2_init_irq(void)
> -{
> -	omap_nr_irqs = 96;
> -	omap_nr_pending = 3;
> -	omap_init_irq(OMAP24XX_IC_BASE, NULL);
> -	set_handle_irq(omap_intc_handle_irq);
> -}
> -
>  void __init omap3_init_irq(void)
>  {
>  	omap_nr_irqs = 96;
> diff --git a/include/linux/irqchip/irq-omap-intc.h b/include/linux/irqchip/irq-omap-intc.h
> index bda426a..2e3d1af 100644
> --- a/include/linux/irqchip/irq-omap-intc.h
> +++ b/include/linux/irqchip/irq-omap-intc.h
> @@ -18,7 +18,6 @@
>  #ifndef __INCLUDE_LINUX_IRQCHIP_IRQ_OMAP_INTC_H
>  #define __INCLUDE_LINUX_IRQCHIP_IRQ_OMAP_INTC_H
>  
> -void omap2_init_irq(void);
>  void omap3_init_irq(void);
>  
>  int omap_irq_pending(void);
> -- 
> 2.1.4
> 

-- 
balbi

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

[tip:irq/core] irqchip: omap-intc: Fix support for dm814 and dm816

[tip-bot for Tony Lindgren]

Commit-ID:  19f92b237b1700d30b788f00b16a627ffbfdf0e5
Gitweb:     http://git.kernel.org/tip/19f92b237b1700d30b788f00b16a627ffbfdf0e5
Author:     Tony Lindgren <tony@atomide.com>
AuthorDate: Tue, 13 Jan 2015 14:23:25 -0800
Committer:  Thomas Gleixner <tglx@linutronix.de>
CommitDate: Mon, 26 Jan 2015 11:38:23 +0100

irqchip: omap-intc: Fix support for dm814 and dm816

On dm81xx we have 128 interrupts like am33xx has. Let's add
compatible flags for dm814x and dm816x, and document the
existing binding.

As the dm81xx are booting in device tree only mode, we can now
also remove ti81xx_init_irq() legacy function.

Signed-off-by: Tony Lindgren <tony@atomide.com>
Reviewed-by: Felipe Balbi <balbi@ti.com>
Cc: Brian Hutchinson <b.hutchman@gmail.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Link: http://lkml.kernel.org/r/1421187806-6804-2-git-send-email-tony@atomide.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
 .../interrupt-controller/ti,omap-intc-irq.txt      | 28 ++++++++++++++++++++++
 drivers/irqchip/irq-omap-intc.c                    | 14 ++++-------
 include/linux/irqchip/irq-omap-intc.h              |  1 -
 3 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/Documentation/devicetree/bindings/interrupt-controller/ti,omap-intc-irq.txt b/Documentation/devicetree/bindings/interrupt-controller/ti,omap-intc-irq.txt
new file mode 100644
index 0000000..38ce5d03
--- /dev/null
+++ b/Documentation/devicetree/bindings/interrupt-controller/ti,omap-intc-irq.txt
@@ -0,0 +1,28 @@
+Omap2/3 intc controller
+
+On TI omap2 and 3 the intc interrupt controller can provide
+96 or 128 IRQ signals to the ARM host depending on the SoC.
+
+Required Properties:
+- compatible: should be one of
+			"ti,omap2-intc"
+			"ti,omap3-intc"
+			"ti,dm814-intc"
+			"ti,dm816-intc"
+			"ti,am33xx-intc"
+
+- interrupt-controller : Identifies the node as an interrupt controller
+- #interrupt-cells : Specifies the number of cells needed to encode interrupt
+		     source, should be 1 for intc
+- interrupts: interrupt reference to primary interrupt controller
+
+Please refer to interrupts.txt in this directory for details of the common
+Interrupt Controllers bindings used by client devices.
+
+Example:
+	intc: interrupt-controller@48200000 {
+		compatible = "ti,omap3-intc";
+		interrupt-controller;
+		#interrupt-cells = <1>;
+		reg = <0x48200000 0x1000>;
+	};
diff --git a/drivers/irqchip/irq-omap-intc.c b/drivers/irqchip/irq-omap-intc.c
index c03f140..b444d0e 100644
--- a/drivers/irqchip/irq-omap-intc.c
+++ b/drivers/irqchip/irq-omap-intc.c
@@ -380,14 +380,6 @@ void __init omap3_init_irq(void)
 	set_handle_irq(omap_intc_handle_irq);
 }
 
-void __init ti81xx_init_irq(void)
-{
-	omap_nr_irqs = 96;
-	omap_nr_pending = 4;
-	omap_init_irq(OMAP34XX_IC_BASE, NULL);
-	set_handle_irq(omap_intc_handle_irq);
-}
-
 static int __init intc_of_init(struct device_node *node,
 			     struct device_node *parent)
 {
@@ -399,7 +391,9 @@ static int __init intc_of_init(struct device_node *node,
 	if (WARN_ON(!node))
 		return -ENODEV;
 
-	if (of_device_is_compatible(node, "ti,am33xx-intc")) {
+	if (of_device_is_compatible(node, "ti,dm814-intc") ||
+	    of_device_is_compatible(node, "ti,dm816-intc") ||
+	    of_device_is_compatible(node, "ti,am33xx-intc")) {
 		omap_nr_irqs = 128;
 		omap_nr_pending = 4;
 	}
@@ -415,4 +409,6 @@ static int __init intc_of_init(struct device_node *node,
 
 IRQCHIP_DECLARE(omap2_intc, "ti,omap2-intc", intc_of_init);
 IRQCHIP_DECLARE(omap3_intc, "ti,omap3-intc", intc_of_init);
+IRQCHIP_DECLARE(dm814x_intc, "ti,dm814-intc", intc_of_init);
+IRQCHIP_DECLARE(dm816x_intc, "ti,dm816-intc", intc_of_init);
 IRQCHIP_DECLARE(am33xx_intc, "ti,am33xx-intc", intc_of_init);
diff --git a/include/linux/irqchip/irq-omap-intc.h b/include/linux/irqchip/irq-omap-intc.h
index e06b370..bda426a 100644
--- a/include/linux/irqchip/irq-omap-intc.h
+++ b/include/linux/irqchip/irq-omap-intc.h
@@ -20,7 +20,6 @@
 
 void omap2_init_irq(void);
 void omap3_init_irq(void);
-void ti81xx_init_irq(void);
 
 int omap_irq_pending(void);
 void omap_intc_save_context(void);

[tip:irq/core] irqchip: omap-intc: Remove unused legacy interface for omap2

[tip-bot for Tony Lindgren]

Commit-ID:  c7f2a2ac377626897ad68e63d24d85ee21f47bb1
Gitweb:     http://git.kernel.org/tip/c7f2a2ac377626897ad68e63d24d85ee21f47bb1
Author:     Tony Lindgren <tony@atomide.com>
AuthorDate: Tue, 13 Jan 2015 14:23:26 -0800
Committer:  Thomas Gleixner <tglx@linutronix.de>
CommitDate: Mon, 26 Jan 2015 11:38:23 +0100

irqchip: omap-intc: Remove unused legacy interface for omap2

Nowadays omap2 is booting in device tree only mode so there is no
need to keep the legacy interface around for omap2_init_irq().

Signed-off-by: Tony Lindgren <tony@atomide.com>
Reviewed-by: Felipe Balbi <balbi@ti.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Link: http://lkml.kernel.org/r/1421187806-6804-3-git-send-email-tony@atomide.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
 drivers/irqchip/irq-omap-intc.c       | 8 --------
 include/linux/irqchip/irq-omap-intc.h | 1 -
 2 files changed, 9 deletions(-)

diff --git a/drivers/irqchip/irq-omap-intc.c b/drivers/irqchip/irq-omap-intc.c
index b444d0e..a569c6d 100644
--- a/drivers/irqchip/irq-omap-intc.c
+++ b/drivers/irqchip/irq-omap-intc.c
@@ -364,14 +364,6 @@ out:
 		omap_ack_irq(NULL);
 }
 
-void __init omap2_init_irq(void)
-{
-	omap_nr_irqs = 96;
-	omap_nr_pending = 3;
-	omap_init_irq(OMAP24XX_IC_BASE, NULL);
-	set_handle_irq(omap_intc_handle_irq);
-}
-
 void __init omap3_init_irq(void)
 {
 	omap_nr_irqs = 96;
diff --git a/include/linux/irqchip/irq-omap-intc.h b/include/linux/irqchip/irq-omap-intc.h
index bda426a..2e3d1af 100644
--- a/include/linux/irqchip/irq-omap-intc.h
+++ b/include/linux/irqchip/irq-omap-intc.h
@@ -18,7 +18,6 @@
 #ifndef __INCLUDE_LINUX_IRQCHIP_IRQ_OMAP_INTC_H
 #define __INCLUDE_LINUX_IRQCHIP_IRQ_OMAP_INTC_H
 
-void omap2_init_irq(void);
 void omap3_init_irq(void);
 
 int omap_irq_pending(void);