[PATCH 1/4] ARM: imx27-dt: Fix build due to removal of irq_domain_add

linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed

* [PATCH 1/4] ARM: imx27-dt: Fix build due to removal of irq_domain_add_simple()
@ 2012-04-12  1:12 Fabio Estevam
  2012-04-12  1:12 ` [PATCH 2/4] ARM: imx27: Use 'AITC' for the interrupt controller name Fabio Estevam
                   ` (3 more replies)
  0 siblings, 4 replies; 6+ messages in thread
From: Fabio Estevam @ 2012-04-12  1:12 UTC (permalink / raw)
  To: linux-arm-kernel

commit 6b783f7c (irq_domain: Remove irq_domain_add_simple() 
replaced irq_domain_add_simple with irq_domain_add_legacy()

Implement this conversion so that imx27-dt can be built again.

Reported-by: Chris Ball <cjb@laptop.org>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 arch/arm/mach-imx/imx27-dt.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-imx/imx27-dt.c b/arch/arm/mach-imx/imx27-dt.c
index 861ceb8..ffff10c 100644
--- a/arch/arm/mach-imx/imx27-dt.c
+++ b/arch/arm/mach-imx/imx27-dt.c
@@ -35,7 +35,7 @@ static const struct of_dev_auxdata imx27_auxdata_lookup[] __initconst = {
 static int __init imx27_avic_add_irq_domain(struct device_node *np,
 				struct device_node *interrupt_parent)
 {
-	irq_domain_add_simple(np, 0);
+	irq_domain_add_legacy(np, 64, 0, 0, &irq_domain_simple_ops, NULL);
 	return 0;
 }
 
@@ -43,8 +43,10 @@ static int __init imx27_gpio_add_irq_domain(struct device_node *np,
 				struct device_node *interrupt_parent)
 {
 	static int gpio_irq_base = MXC_GPIO_IRQ_START + ARCH_NR_GPIOS;
-
-	irq_domain_add_simple(np, gpio_irq_base);
+
+	gpio_irq_base -= 32;
+	irq_domain_add_legacy(np, 32, gpio_irq_base, 0, &irq_domain_simple_ops,
+				NULL);
 
 	return 0;
 }
-- 
1.7.1

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

* [PATCH 2/4] ARM: imx27: Use 'AITC' for the interrupt controller name
  2012-04-12  1:12 [PATCH 1/4] ARM: imx27-dt: Fix build due to removal of irq_domain_add_simple() Fabio Estevam
@ 2012-04-12  1:12 ` Fabio Estevam
  2012-04-12  1:12 ` [PATCH 3/4] ARM: dts: Add basic support for mx27_3ds board Fabio Estevam
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 6+ messages in thread
From: Fabio Estevam @ 2012-04-12  1:12 UTC (permalink / raw)
  To: linux-arm-kernel

On the MX27 Reference Manual the interrupt controller is named AITC:
ARM926EJ-S Interrupt Controller

So use the AITC term instead of AVIC.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 arch/arm/boot/dts/imx27.dtsi |    6 +++---
 arch/arm/mach-imx/imx27-dt.c |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/arm/boot/dts/imx27.dtsi b/arch/arm/boot/dts/imx27.dtsi
index bc5e7d5..b907277 100644
--- a/arch/arm/boot/dts/imx27.dtsi
+++ b/arch/arm/boot/dts/imx27.dtsi
@@ -21,8 +21,8 @@
 		serial5 = &uart6;
 	};
 
-	avic: avic-interrupt-controller at e0000000 {
-		compatible = "fsl,imx27-avic", "fsl,avic";
+	aitc: aitc-interrupt-controller at e0000000 {
+		compatible = "fsl,imx27-aitc", "fsl,aitc";
 		interrupt-controller;
 		#interrupt-cells = <1>;
 		reg = <0x10040000 0x1000>;
@@ -42,7 +42,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "simple-bus";
-		interrupt-parent = <&avic>;
+		interrupt-parent = <&aitc>;
 		ranges;
 
 		aipi at 10000000 { /* AIPI1 */
diff --git a/arch/arm/mach-imx/imx27-dt.c b/arch/arm/mach-imx/imx27-dt.c
index ffff10c..51ad447 100644
--- a/arch/arm/mach-imx/imx27-dt.c
+++ b/arch/arm/mach-imx/imx27-dt.c
@@ -32,7 +32,7 @@ static const struct of_dev_auxdata imx27_auxdata_lookup[] __initconst = {
 	{ /* sentinel */ }
 };
 
-static int __init imx27_avic_add_irq_domain(struct device_node *np,
+static int __init imx27_aitc_add_irq_domain(struct device_node *np,
 				struct device_node *interrupt_parent)
 {
 	irq_domain_add_legacy(np, 64, 0, 0, &irq_domain_simple_ops, NULL);
@@ -52,7 +52,7 @@ static int __init imx27_gpio_add_irq_domain(struct device_node *np,
 }
 
 static const struct of_device_id imx27_irq_match[] __initconst = {
-	{ .compatible = "fsl,imx27-avic", .data = imx27_avic_add_irq_domain, },
+	{ .compatible = "fsl,imx27-aitc", .data = imx27_aitc_add_irq_domain, },
 	{ .compatible = "fsl,imx27-gpio", .data = imx27_gpio_add_irq_domain, },
 	{ /* sentinel */ }
 };
-- 
1.7.1

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

* [PATCH 3/4] ARM: dts: Add basic support for mx27_3ds board
  2012-04-12  1:12 [PATCH 1/4] ARM: imx27-dt: Fix build due to removal of irq_domain_add_simple() Fabio Estevam
  2012-04-12  1:12 ` [PATCH 2/4] ARM: imx27: Use 'AITC' for the interrupt controller name Fabio Estevam
@ 2012-04-12  1:12 ` Fabio Estevam
  2012-04-12  1:12 ` [PATCH 4/4] ARM: imx_v4_v5_defconfig: Let CONFIG_MACH_IMX27_DT be built by default Fabio Estevam
  2012-04-13 14:44 ` [PATCH 1/4] ARM: imx27-dt: Fix build due to removal of irq_domain_add_simple() Sascha Hauer
  3 siblings, 0 replies; 6+ messages in thread
From: Fabio Estevam @ 2012-04-12  1:12 UTC (permalink / raw)
  To: linux-arm-kernel

Add a very basic dt support for mx27_3ds (also known as mx27pdk).

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 arch/arm/boot/dts/imx27-3ds.dts |   41 +++++++++++++++++++++++++++++++++++++++
 1 files changed, 41 insertions(+), 0 deletions(-)
 create mode 100644 arch/arm/boot/dts/imx27-3ds.dts

diff --git a/arch/arm/boot/dts/imx27-3ds.dts b/arch/arm/boot/dts/imx27-3ds.dts
new file mode 100644
index 0000000..d3f8296
--- /dev/null
+++ b/arch/arm/boot/dts/imx27-3ds.dts
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2012 Sascha Hauer, Pengutronix
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+/dts-v1/;
+/include/ "imx27.dtsi"
+
+/ {
+	model = "mx27_3ds";
+	compatible = "freescale,imx27-3ds", "fsl,imx27";
+
+	memory {
+		reg = <0x0 0x0>;
+	};
+
+	soc {
+		aipi at 10000000 { /* aipi */
+
+			wdog at 10002000 {
+				status = "okay";
+			};
+
+			uart at 1000a000 {
+				fsl,uart-has-rtscts;
+				status = "okay";
+			};
+
+			fec at 1002b000 {
+				status = "okay";
+			};
+		};
+	};
+
+};
-- 
1.7.1

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

* [PATCH 4/4] ARM: imx_v4_v5_defconfig: Let CONFIG_MACH_IMX27_DT be built by default
  2012-04-12  1:12 [PATCH 1/4] ARM: imx27-dt: Fix build due to removal of irq_domain_add_simple() Fabio Estevam
  2012-04-12  1:12 ` [PATCH 2/4] ARM: imx27: Use 'AITC' for the interrupt controller name Fabio Estevam
  2012-04-12  1:12 ` [PATCH 3/4] ARM: dts: Add basic support for mx27_3ds board Fabio Estevam
@ 2012-04-12  1:12 ` Fabio Estevam
  2012-04-13 14:44 ` [PATCH 1/4] ARM: imx27-dt: Fix build due to removal of irq_domain_add_simple() Sascha Hauer
  3 siblings, 0 replies; 6+ messages in thread
From: Fabio Estevam @ 2012-04-12  1:12 UTC (permalink / raw)
  To: linux-arm-kernel

Let CONFIG_MACH_IMX27_DT be built by default.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 arch/arm/configs/imx_v4_v5_defconfig |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/arch/arm/configs/imx_v4_v5_defconfig b/arch/arm/configs/imx_v4_v5_defconfig
index b5ac644..b654f1d 100644
--- a/arch/arm/configs/imx_v4_v5_defconfig
+++ b/arch/arm/configs/imx_v4_v5_defconfig
@@ -33,6 +33,7 @@ CONFIG_MACH_IMX27LITE=y
 CONFIG_MACH_PCA100=y
 CONFIG_MACH_MXT_TD60=y
 CONFIG_MACH_IMX27IPCAM=y
+CONFIG_MACH_IMX27_DT=y
 CONFIG_MXC_IRQ_PRIOR=y
 CONFIG_MXC_PWM=y
 CONFIG_NO_HZ=y
-- 
1.7.1

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

* [PATCH 1/4] ARM: imx27-dt: Fix build due to removal of irq_domain_add_simple()
  2012-04-12  1:12 [PATCH 1/4] ARM: imx27-dt: Fix build due to removal of irq_domain_add_simple() Fabio Estevam
                   ` (2 preceding siblings ...)
  2012-04-12  1:12 ` [PATCH 4/4] ARM: imx_v4_v5_defconfig: Let CONFIG_MACH_IMX27_DT be built by default Fabio Estevam
@ 2012-04-13 14:44 ` Sascha Hauer
  2012-04-25 18:15   ` Fabio Estevam
  3 siblings, 1 reply; 6+ messages in thread
From: Sascha Hauer @ 2012-04-13 14:44 UTC (permalink / raw)
  To: linux-arm-kernel

On Wed, Apr 11, 2012 at 10:12:09PM -0300, Fabio Estevam wrote:
> commit 6b783f7c (irq_domain: Remove irq_domain_add_simple() 
> replaced irq_domain_add_simple with irq_domain_add_legacy()
> 
> Implement this conversion so that imx27-dt can be built again.

Applied this one as a fix (-rc) and the other ones for -next.

Sascha

> 
> Reported-by: Chris Ball <cjb@laptop.org>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---
>  arch/arm/mach-imx/imx27-dt.c |    8 +++++---
>  1 files changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/arm/mach-imx/imx27-dt.c b/arch/arm/mach-imx/imx27-dt.c
> index 861ceb8..ffff10c 100644
> --- a/arch/arm/mach-imx/imx27-dt.c
> +++ b/arch/arm/mach-imx/imx27-dt.c
> @@ -35,7 +35,7 @@ static const struct of_dev_auxdata imx27_auxdata_lookup[] __initconst = {
>  static int __init imx27_avic_add_irq_domain(struct device_node *np,
>  				struct device_node *interrupt_parent)
>  {
> -	irq_domain_add_simple(np, 0);
> +	irq_domain_add_legacy(np, 64, 0, 0, &irq_domain_simple_ops, NULL);
>  	return 0;
>  }
>  
> @@ -43,8 +43,10 @@ static int __init imx27_gpio_add_irq_domain(struct device_node *np,
>  				struct device_node *interrupt_parent)
>  {
>  	static int gpio_irq_base = MXC_GPIO_IRQ_START + ARCH_NR_GPIOS;
> -
> -	irq_domain_add_simple(np, gpio_irq_base);
> +
> +	gpio_irq_base -= 32;
> +	irq_domain_add_legacy(np, 32, gpio_irq_base, 0, &irq_domain_simple_ops,
> +				NULL);
>  
>  	return 0;
>  }
> -- 
> 1.7.1
> 
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

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

* [PATCH 1/4] ARM: imx27-dt: Fix build due to removal of irq_domain_add_simple()
  2012-04-13 14:44 ` [PATCH 1/4] ARM: imx27-dt: Fix build due to removal of irq_domain_add_simple() Sascha Hauer
@ 2012-04-25 18:15   ` Fabio Estevam
  0 siblings, 0 replies; 6+ messages in thread
From: Fabio Estevam @ 2012-04-25 18:15 UTC (permalink / raw)
  To: linux-arm-kernel

Sascha,

On Fri, Apr 13, 2012 at 11:44 AM, Sascha Hauer <s.hauer@pengutronix.de> wrote:

> Applied this one as a fix (-rc) and the other ones for -next.

I don't see the other patches applied in for-next.

Actually I haven?t found the for-next branch.

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

end of thread, other threads:[~2012-04-25 18:15 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-12  1:12 [PATCH 1/4] ARM: imx27-dt: Fix build due to removal of irq_domain_add_simple() Fabio Estevam
2012-04-12  1:12 ` [PATCH 2/4] ARM: imx27: Use 'AITC' for the interrupt controller name Fabio Estevam
2012-04-12  1:12 ` [PATCH 3/4] ARM: dts: Add basic support for mx27_3ds board Fabio Estevam
2012-04-12  1:12 ` [PATCH 4/4] ARM: imx_v4_v5_defconfig: Let CONFIG_MACH_IMX27_DT be built by default Fabio Estevam
2012-04-13 14:44 ` [PATCH 1/4] ARM: imx27-dt: Fix build due to removal of irq_domain_add_simple() Sascha Hauer
2012-04-25 18:15   ` Fabio Estevam

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