From mboxrd@z Thu Jan 1 00:00:00 1970 From: tony@atomide.com (Tony Lindgren) Date: Tue, 6 May 2014 07:41:29 -0700 Subject: [PATCH V5 2/3] arm: dts: dra7: Replace peripheral interrupt numbers with crossbar inputs In-Reply-To: <1399384579-25620-3-git-send-email-r.sricharan@ti.com> References: <1399384579-25620-1-git-send-email-r.sricharan@ti.com> <1399384579-25620-3-git-send-email-r.sricharan@ti.com> Message-ID: <20140506144128.GB18474@atomide.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org * Sricharan R [140506 06:58]: > Now with the crossbar IP in picture, the peripherals do not have the > fixed interrupt lines. Instead they rely on the crossbar irqchip to > allocate and map a free interrupt line to its crossbar input. So replacing > all the peripheral interrupt numbers with its fixed crossbar input lines. Presumably this depends on the crossbar fixes? Are you guys sure this is OK to apply now? Has it really been tested for the devices to work with the mainline kernel? I do not want to see constant patching of things over and over again with this stuff, so I'd like to see at least two Tested-by's for this series before applying. Regards, Tony > Cc: Benoit Cousson > Cc: Santosh Shilimkar > Cc: Rajendra Nayak > Cc: Tony Lindgren > Signed-off-by: Sricharan R > Signed-off-by: Nishanth Menon > --- > [V5] Rebased on 3.15-rc4 and replaced irqs numbers with crossbar > numbers for new peripherals. > > arch/arm/boot/dts/dra7.dtsi | 100 +++++++++++++++++++++++-------------------- > 1 file changed, 54 insertions(+), 46 deletions(-) > > diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi > index 0274a86..52e4bd0 100644 > --- a/arch/arm/boot/dts/dra7.dtsi > +++ b/arch/arm/boot/dts/dra7.dtsi > @@ -106,8 +106,8 @@ > ti,hwmods = "l3_main_1", "l3_main_2"; > reg = <0x44000000 0x2000>, > <0x44800000 0x3000>; > - interrupts = , > - ; > + interrupts = , > + ; > > prm: prm at 4ae06000 { > compatible = "ti,dra7-prm"; > @@ -182,10 +182,10 @@ > sdma: dma-controller at 4a056000 { > compatible = "ti,omap4430-sdma"; > reg = <0x4a056000 0x1000>; > - interrupts = , > - , > - , > - ; > + interrupts = , > + , > + , > + ; > #dma-cells = <1>; > #dma-channels = <32>; > #dma-requests = <127>; > @@ -194,7 +194,7 @@ > gpio1: gpio at 4ae10000 { > compatible = "ti,omap4-gpio"; > reg = <0x4ae10000 0x200>; > - interrupts = ; > + interrupts = ; > ti,hwmods = "gpio1"; > gpio-controller; > #gpio-cells = <2>; > @@ -205,7 +205,7 @@ > gpio2: gpio at 48055000 { > compatible = "ti,omap4-gpio"; > reg = <0x48055000 0x200>; > - interrupts = ; > + interrupts = ; > ti,hwmods = "gpio2"; > gpio-controller; > #gpio-cells = <2>; > @@ -216,7 +216,7 @@ > gpio3: gpio at 48057000 { > compatible = "ti,omap4-gpio"; > reg = <0x48057000 0x200>; > - interrupts = ; > + interrupts = ; > ti,hwmods = "gpio3"; > gpio-controller; > #gpio-cells = <2>; > @@ -227,7 +227,7 @@ > gpio4: gpio at 48059000 { > compatible = "ti,omap4-gpio"; > reg = <0x48059000 0x200>; > - interrupts = ; > + interrupts = ; > ti,hwmods = "gpio4"; > gpio-controller; > #gpio-cells = <2>; > @@ -238,7 +238,7 @@ > gpio5: gpio at 4805b000 { > compatible = "ti,omap4-gpio"; > reg = <0x4805b000 0x200>; > - interrupts = ; > + interrupts = ; > ti,hwmods = "gpio5"; > gpio-controller; > #gpio-cells = <2>; > @@ -249,7 +249,7 @@ > gpio6: gpio at 4805d000 { > compatible = "ti,omap4-gpio"; > reg = <0x4805d000 0x200>; > - interrupts = ; > + interrupts = ; > ti,hwmods = "gpio6"; > gpio-controller; > #gpio-cells = <2>; > @@ -260,7 +260,7 @@ > gpio7: gpio at 48051000 { > compatible = "ti,omap4-gpio"; > reg = <0x48051000 0x200>; > - interrupts = ; > + interrupts = ; > ti,hwmods = "gpio7"; > gpio-controller; > #gpio-cells = <2>; > @@ -271,7 +271,7 @@ > gpio8: gpio at 48053000 { > compatible = "ti,omap4-gpio"; > reg = <0x48053000 0x200>; > - interrupts = ; > + interrupts = ; > ti,hwmods = "gpio8"; > gpio-controller; > #gpio-cells = <2>; > @@ -282,7 +282,7 @@ > uart1: serial at 4806a000 { > compatible = "ti,omap4-uart"; > reg = <0x4806a000 0x100>; > - interrupts = ; > + interrupts = ; > ti,hwmods = "uart1"; > clock-frequency = <48000000>; > status = "disabled"; > @@ -291,7 +291,7 @@ > uart2: serial at 4806c000 { > compatible = "ti,omap4-uart"; > reg = <0x4806c000 0x100>; > - interrupts = ; > + interrupts = ; > ti,hwmods = "uart2"; > clock-frequency = <48000000>; > status = "disabled"; > @@ -300,7 +300,7 @@ > uart3: serial at 48020000 { > compatible = "ti,omap4-uart"; > reg = <0x48020000 0x100>; > - interrupts = ; > + interrupts = ; > ti,hwmods = "uart3"; > clock-frequency = <48000000>; > status = "disabled"; > @@ -309,7 +309,7 @@ > uart4: serial at 4806e000 { > compatible = "ti,omap4-uart"; > reg = <0x4806e000 0x100>; > - interrupts = ; > + interrupts = ; > ti,hwmods = "uart4"; > clock-frequency = <48000000>; > status = "disabled"; > @@ -318,7 +318,7 @@ > uart5: serial at 48066000 { > compatible = "ti,omap4-uart"; > reg = <0x48066000 0x100>; > - interrupts = ; > + interrupts = ; > ti,hwmods = "uart5"; > clock-frequency = <48000000>; > status = "disabled"; > @@ -327,7 +327,7 @@ > uart6: serial at 48068000 { > compatible = "ti,omap4-uart"; > reg = <0x48068000 0x100>; > - interrupts = ; > + interrupts = ; > ti,hwmods = "uart6"; > clock-frequency = <48000000>; > status = "disabled"; > @@ -336,6 +336,7 @@ > uart7: serial at 48420000 { > compatible = "ti,omap4-uart"; > reg = <0x48420000 0x100>; > + interrupts = ; > ti,hwmods = "uart7"; > clock-frequency = <48000000>; > status = "disabled"; > @@ -344,6 +345,7 @@ > uart8: serial at 48422000 { > compatible = "ti,omap4-uart"; > reg = <0x48422000 0x100>; > + interrupts = ; > ti,hwmods = "uart8"; > clock-frequency = <48000000>; > status = "disabled"; > @@ -352,6 +354,7 @@ > uart9: serial at 48424000 { > compatible = "ti,omap4-uart"; > reg = <0x48424000 0x100>; > + interrupts = ; > ti,hwmods = "uart9"; > clock-frequency = <48000000>; > status = "disabled"; > @@ -360,6 +363,7 @@ > uart10: serial at 4ae2b000 { > compatible = "ti,omap4-uart"; > reg = <0x4ae2b000 0x100>; > + interrupts = ; > ti,hwmods = "uart10"; > clock-frequency = <48000000>; > status = "disabled"; > @@ -368,7 +372,7 @@ > timer1: timer at 4ae18000 { > compatible = "ti,omap5430-timer"; > reg = <0x4ae18000 0x80>; > - interrupts = ; > + interrupts = ; > ti,hwmods = "timer1"; > ti,timer-alwon; > }; > @@ -376,28 +380,28 @@ > timer2: timer at 48032000 { > compatible = "ti,omap5430-timer"; > reg = <0x48032000 0x80>; > - interrupts = ; > + interrupts = ; > ti,hwmods = "timer2"; > }; > > timer3: timer at 48034000 { > compatible = "ti,omap5430-timer"; > reg = <0x48034000 0x80>; > - interrupts = ; > + interrupts = ; > ti,hwmods = "timer3"; > }; > > timer4: timer at 48036000 { > compatible = "ti,omap5430-timer"; > reg = <0x48036000 0x80>; > - interrupts = ; > + interrupts = ; > ti,hwmods = "timer4"; > }; > > timer5: timer at 48820000 { > compatible = "ti,omap5430-timer"; > reg = <0x48820000 0x80>; > - interrupts = ; > + interrupts = ; > ti,hwmods = "timer5"; > ti,timer-dsp; > }; > @@ -405,7 +409,7 @@ > timer6: timer at 48822000 { > compatible = "ti,omap5430-timer"; > reg = <0x48822000 0x80>; > - interrupts = ; > + interrupts = ; > ti,hwmods = "timer6"; > ti,timer-dsp; > ti,timer-pwm; > @@ -414,7 +418,7 @@ > timer7: timer at 48824000 { > compatible = "ti,omap5430-timer"; > reg = <0x48824000 0x80>; > - interrupts = ; > + interrupts = ; > ti,hwmods = "timer7"; > ti,timer-dsp; > }; > @@ -422,7 +426,7 @@ > timer8: timer at 48826000 { > compatible = "ti,omap5430-timer"; > reg = <0x48826000 0x80>; > - interrupts = ; > + interrupts = ; > ti,hwmods = "timer8"; > ti,timer-dsp; > ti,timer-pwm; > @@ -431,21 +435,21 @@ > timer9: timer at 4803e000 { > compatible = "ti,omap5430-timer"; > reg = <0x4803e000 0x80>; > - interrupts = ; > + interrupts = ; > ti,hwmods = "timer9"; > }; > > timer10: timer at 48086000 { > compatible = "ti,omap5430-timer"; > reg = <0x48086000 0x80>; > - interrupts = ; > + interrupts = ; > ti,hwmods = "timer10"; > }; > > timer11: timer at 48088000 { > compatible = "ti,omap5430-timer"; > reg = <0x48088000 0x80>; > - interrupts = ; > + interrupts = ; > ti,hwmods = "timer11"; > ti,timer-pwm; > }; > @@ -453,6 +457,7 @@ > timer13: timer at 48828000 { > compatible = "ti,omap5430-timer"; > reg = <0x48828000 0x80>; > + interrupts = ; > ti,hwmods = "timer13"; > status = "disabled"; > }; > @@ -460,6 +465,7 @@ > timer14: timer at 4882a000 { > compatible = "ti,omap5430-timer"; > reg = <0x4882a000 0x80>; > + interrupts = ; > ti,hwmods = "timer14"; > status = "disabled"; > }; > @@ -467,6 +473,7 @@ > timer15: timer at 4882c000 { > compatible = "ti,omap5430-timer"; > reg = <0x4882c000 0x80>; > + interrupts = ; > ti,hwmods = "timer15"; > status = "disabled"; > }; > @@ -474,6 +481,7 @@ > timer16: timer at 4882e000 { > compatible = "ti,omap5430-timer"; > reg = <0x4882e000 0x80>; > + interrupts = ; > ti,hwmods = "timer16"; > status = "disabled"; > }; > @@ -481,7 +489,7 @@ > wdt2: wdt at 4ae14000 { > compatible = "ti,omap4-wdt"; > reg = <0x4ae14000 0x80>; > - interrupts = ; > + interrupts = ; > ti,hwmods = "wd_timer2"; > }; > > @@ -495,14 +503,14 @@ > dmm at 4e000000 { > compatible = "ti,omap5-dmm"; > reg = <0x4e000000 0x800>; > - interrupts = <0 113 0x4>; > + interrupts = ; > ti,hwmods = "dmm"; > }; > > i2c1: i2c at 48070000 { > compatible = "ti,omap4-i2c"; > reg = <0x48070000 0x100>; > - interrupts = ; > + interrupts = ; > #address-cells = <1>; > #size-cells = <0>; > ti,hwmods = "i2c1"; > @@ -512,7 +520,7 @@ > i2c2: i2c at 48072000 { > compatible = "ti,omap4-i2c"; > reg = <0x48072000 0x100>; > - interrupts = ; > + interrupts = ; > #address-cells = <1>; > #size-cells = <0>; > ti,hwmods = "i2c2"; > @@ -522,7 +530,7 @@ > i2c3: i2c at 48060000 { > compatible = "ti,omap4-i2c"; > reg = <0x48060000 0x100>; > - interrupts = ; > + interrupts = ; > #address-cells = <1>; > #size-cells = <0>; > ti,hwmods = "i2c3"; > @@ -532,7 +540,7 @@ > i2c4: i2c at 4807a000 { > compatible = "ti,omap4-i2c"; > reg = <0x4807a000 0x100>; > - interrupts = ; > + interrupts = ; > #address-cells = <1>; > #size-cells = <0>; > ti,hwmods = "i2c4"; > @@ -542,7 +550,7 @@ > i2c5: i2c at 4807c000 { > compatible = "ti,omap4-i2c"; > reg = <0x4807c000 0x100>; > - interrupts = ; > + interrupts = ; > #address-cells = <1>; > #size-cells = <0>; > ti,hwmods = "i2c5"; > @@ -552,7 +560,7 @@ > mmc1: mmc at 4809c000 { > compatible = "ti,omap4-hsmmc"; > reg = <0x4809c000 0x400>; > - interrupts = ; > + interrupts = ; > ti,hwmods = "mmc1"; > ti,dual-volt; > ti,needs-special-reset; > @@ -565,7 +573,7 @@ > mmc2: mmc at 480b4000 { > compatible = "ti,omap4-hsmmc"; > reg = <0x480b4000 0x400>; > - interrupts = ; > + interrupts = ; > ti,hwmods = "mmc2"; > ti,needs-special-reset; > dmas = <&sdma 47>, <&sdma 48>; > @@ -576,7 +584,7 @@ > mmc3: mmc at 480ad000 { > compatible = "ti,omap4-hsmmc"; > reg = <0x480ad000 0x400>; > - interrupts = ; > + interrupts = ; > ti,hwmods = "mmc3"; > ti,needs-special-reset; > dmas = <&sdma 77>, <&sdma 78>; > @@ -587,7 +595,7 @@ > mmc4: mmc at 480d1000 { > compatible = "ti,omap4-hsmmc"; > reg = <0x480d1000 0x400>; > - interrupts = ; > + interrupts = ; > ti,hwmods = "mmc4"; > ti,needs-special-reset; > dmas = <&sdma 57>, <&sdma 58>; > @@ -730,7 +738,7 @@ > mcspi1: spi at 48098000 { > compatible = "ti,omap4-mcspi"; > reg = <0x48098000 0x200>; > - interrupts = ; > + interrupts = ; > #address-cells = <1>; > #size-cells = <0>; > ti,hwmods = "mcspi1"; > @@ -751,7 +759,7 @@ > mcspi2: spi at 4809a000 { > compatible = "ti,omap4-mcspi"; > reg = <0x4809a000 0x200>; > - interrupts = ; > + interrupts = ; > #address-cells = <1>; > #size-cells = <0>; > ti,hwmods = "mcspi2"; > @@ -767,7 +775,7 @@ > mcspi3: spi at 480b8000 { > compatible = "ti,omap4-mcspi"; > reg = <0x480b8000 0x200>; > - interrupts = ; > + interrupts = ; > #address-cells = <1>; > #size-cells = <0>; > ti,hwmods = "mcspi3"; > @@ -780,7 +788,7 @@ > mcspi4: spi at 480ba000 { > compatible = "ti,omap4-mcspi"; > reg = <0x480ba000 0x200>; > - interrupts = ; > + interrupts = ; > #address-cells = <1>; > #size-cells = <0>; > ti,hwmods = "mcspi4"; > -- > 1.7.9.5 >