From mboxrd@z Thu Jan 1 00:00:00 1970 From: Viresh Kumar Subject: Re: [PATCH 30/31] ARM: amba: spear: use common amba device initializers Date: Fri, 20 Jan 2012 15:08:32 +0530 Message-ID: <4F193618.7070407@st.com> References: <20120120092207.GD1068@n2100.arm.linux.org.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: Sender: linux-samsung-soc-owner@vger.kernel.org To: Russell King - ARM Linux Cc: "linux-arm-kernel@lists.infradead.org" , "devicetree-discuss@lists.ozlabs.org" , "linux-mmc@vger.kernel.org" , "linux-omap@vger.kernel.org" , "linux-samsung-soc@vger.kernel.org" , STEricsson_nomadik_linux List-Id: devicetree@vger.kernel.org On 1/20/2012 3:02 PM, Russell King - ARM Linux wrote: > Signed-off-by: Russell King > --- > arch/arm/mach-spear3xx/spear300.c | 14 ++------------ > arch/arm/mach-spear3xx/spear3xx.c | 27 ++++----------------------- > 2 files changed, 6 insertions(+), 35 deletions(-) > > diff --git a/arch/arm/mach-spear3xx/spear300.c b/arch/arm/mach-spear3xx/spear300.c > index 6fdeec9..9da50e281 100644 > --- a/arch/arm/mach-spear3xx/spear300.c > +++ b/arch/arm/mach-spear3xx/spear300.c > @@ -430,18 +430,8 @@ static struct pl061_platform_data gpio1_plat_data = { > .irq_base = SPEAR300_GPIO1_INT_BASE, > }; > > -struct amba_device spear300_gpio1_device = { > - .dev = { > - .init_name = "gpio1", > - .platform_data = &gpio1_plat_data, > - }, > - .res = { > - .start = SPEAR300_GPIO_BASE, > - .end = SPEAR300_GPIO_BASE + SZ_4K - 1, > - .flags = IORESOURCE_MEM, > - }, > - .irq = {SPEAR300_VIRQ_GPIO1}, > -}; > +AMBA_APB_DEVICE(spear300_gpio1, "gpio1", 0, SPEAR300_GPIO_BASE, > + {SPEAR300_VIRQ_GPIO1}, &gpio1_plat_data); > > /* spear300 routines */ > void __init spear300_init(struct pmx_mode *pmx_mode, struct pmx_dev **pmx_devs, > diff --git a/arch/arm/mach-spear3xx/spear3xx.c b/arch/arm/mach-spear3xx/spear3xx.c > index bc4f1c6..b1733c3 100644 > --- a/arch/arm/mach-spear3xx/spear3xx.c > +++ b/arch/arm/mach-spear3xx/spear3xx.c > @@ -28,31 +28,12 @@ static struct pl061_platform_data gpio_plat_data = { > .irq_base = SPEAR3XX_GPIO_INT_BASE, > }; > > -struct amba_device spear3xx_gpio_device = { > - .dev = { > - .init_name = "gpio", > - .platform_data = &gpio_plat_data, > - }, > - .res = { > - .start = SPEAR3XX_ICM3_GPIO_BASE, > - .end = SPEAR3XX_ICM3_GPIO_BASE + SZ_4K - 1, > - .flags = IORESOURCE_MEM, > - }, > - .irq = {SPEAR3XX_IRQ_BASIC_GPIO}, > -}; > +AMBA_APB_DEVICE(spear3xx_gpio, "gpio", 0, SPEAR3XX_ICM3_GPIO_BASE, > + {SPEAR3XX_IRQ_BASIC_GPIO}, &gpio_plat_data); > > /* uart device registration */ > -struct amba_device spear3xx_uart_device = { > - .dev = { > - .init_name = "uart", > - }, > - .res = { > - .start = SPEAR3XX_ICM1_UART_BASE, > - .end = SPEAR3XX_ICM1_UART_BASE + SZ_4K - 1, > - .flags = IORESOURCE_MEM, > - }, > - .irq = {SPEAR3XX_IRQ_UART}, > -}; > +AMBA_APB_DEVICE(spear3xx_uart, "uart", 0, SPEAR3XX_ICM1_UART_BASE, > + {SPEAR3XX_IRQ_UART}, NULL); > > /* Do spear3xx familiy common initialization part here */ > void __init spear3xx_init(void) Acked-by: Viresh Kumar -- viresh