Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752415Ab0DUIzc (ORCPT ); Wed, 21 Apr 2010 04:55:32 -0400 Received: from adelie.canonical.com ([91.189.90.139]:43529 "EHLO adelie.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751173Ab0DUIzb (ORCPT ); Wed, 21 Apr 2010 04:55:31 -0400 Date: Wed, 21 Apr 2010 11:55:25 +0300 From: Amit Kucheria To: Dinh.Nguyen@freescale.com Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux@arm.linux.org.uk, s.hauer@pengutronix.de, valentin.longchamp@epfl.ch, daniel@caiaq.de, grant.likely@secretlab.ca, bryan.wu@canonical.com, r.herring@freescale.com Subject: Re: [PATCH 2.6.34-rc5] mx5: Add registration of GPIOs for MX51 Babbage board. Message-ID: <20100421085524.GA2951@matterhorn.lan> Mail-Followup-To: Dinh.Nguyen@freescale.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux@arm.linux.org.uk, s.hauer@pengutronix.de, valentin.longchamp@epfl.ch, daniel@caiaq.de, grant.likely@secretlab.ca, bryan.wu@canonical.com, r.herring@freescale.com References: <1271780048-8172-1-git-send-email-Dinh.Nguyen@freescale.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <1271780048-8172-1-git-send-email-Dinh.Nguyen@freescale.com> X-URL: http://www.verdurent.com/ User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 5244 Lines: 148 On 10 Apr 20, Dinh.Nguyen@freescale.com wrote: > From: Dinh Nguyen > > Update /plat-mxc/gpio.c to support Freescale's MX51 Babbage HW. > This patch applies to 2.6.34-rc5. > > Signed-off-by: Dinh Nguyen Acked-by: Amit Kucheria I'll include this in the mx5 tree to push to Sascha. > > > --- > arch/arm/mach-mx5/devices.c | 33 +++++++++++++++++++++++++++++++-- > arch/arm/plat-mxc/gpio.c | 5 ++--- > arch/arm/plat-mxc/tzic.c | 4 +++- > 3 files changed, 36 insertions(+), 6 deletions(-) > > diff --git a/arch/arm/mach-mx5/devices.c b/arch/arm/mach-mx5/devices.c > index d6fd396..5070ae1 100644 > --- a/arch/arm/mach-mx5/devices.c > +++ b/arch/arm/mach-mx5/devices.c > @@ -1,5 +1,6 @@ > /* > * Copyright 2009 Amit Kucheria > + * Copyright (C) 2010 Freescale Semiconductor, Inc. > * > * The code contained herein is licensed under the GNU General Public > * License. You may obtain a copy of the GNU General Public License > @@ -10,8 +11,10 @@ > */ > > #include > +#include > #include > #include > +#include > > static struct resource uart0[] = { > { > @@ -89,8 +92,34 @@ struct platform_device mxc_fec_device = { > .resource = mxc_fec_resources, > }; > > -/* Dummy definition to allow compiling in AVIC and TZIC simultaneously */ > +static struct mxc_gpio_port mxc_gpio_ports[] = { > + { > + .chip.label = "gpio-0", > + .base = MX51_IO_ADDRESS(MX51_GPIO1_BASE_ADDR), > + .irq = MX51_MXC_INT_GPIO1_LOW, > + .virtual_irq_start = MXC_GPIO_IRQ_START > + }, > + { > + .chip.label = "gpio-1", > + .base = MX51_IO_ADDRESS(MX51_GPIO2_BASE_ADDR), > + .irq = MX51_MXC_INT_GPIO2_LOW, > + .virtual_irq_start = MXC_GPIO_IRQ_START + 32 * 1 > + }, > + { > + .chip.label = "gpio-2", > + .base = MX51_IO_ADDRESS(MX51_GPIO3_BASE_ADDR), > + .irq = MX51_MXC_INT_GPIO3_LOW, > + .virtual_irq_start = MXC_GPIO_IRQ_START + 32 * 2 > + }, > + { > + .chip.label = "gpio-3", > + .base = MX51_IO_ADDRESS(MX51_GPIO4_BASE_ADDR), > + .irq = MX51_MXC_INT_GPIO4_LOW, > + .virtual_irq_start = MXC_GPIO_IRQ_START + 32 * 3 > + }, > +}; > + > int __init mxc_register_gpios(void) > { > - return 0; > + return mxc_gpio_init(mxc_gpio_ports, ARRAY_SIZE(mxc_gpio_ports)); > } > diff --git a/arch/arm/plat-mxc/gpio.c b/arch/arm/plat-mxc/gpio.c > index 70b2389..71437c6 100644 > --- a/arch/arm/plat-mxc/gpio.c > +++ b/arch/arm/plat-mxc/gpio.c > @@ -3,7 +3,7 @@ > * Copyright 2008 Juergen Beisert, kernel@pengutronix.de > * > * Based on code from Freescale, > - * Copyright 2004-2006 Freescale Semiconductor, Inc. All Rights Reserved. > + * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved. > * > * This program is free software; you can redistribute it and/or > * modify it under the terms of the GNU General Public License > @@ -38,7 +38,6 @@ static int gpio_table_size; > #define GPIO_ICR2 (cpu_is_mx1_mx2() ? 0x2C : 0x10) > #define GPIO_IMR (cpu_is_mx1_mx2() ? 0x30 : 0x14) > #define GPIO_ISR (cpu_is_mx1_mx2() ? 0x34 : 0x18) > -#define GPIO_ISR (cpu_is_mx1_mx2() ? 0x34 : 0x18) > > #define GPIO_INT_LOW_LEV (cpu_is_mx1_mx2() ? 0x3 : 0x0) > #define GPIO_INT_HIGH_LEV (cpu_is_mx1_mx2() ? 0x2 : 0x1) > @@ -289,7 +288,7 @@ int __init mxc_gpio_init(struct mxc_gpio_port *port, int cnt) > /* its a serious configuration bug when it fails */ > BUG_ON( gpiochip_add(&port[i].chip) < 0 ); > > - if (cpu_is_mx1() || cpu_is_mx3() || cpu_is_mx25()) { > + if (cpu_is_mx1() || cpu_is_mx3() || cpu_is_mx25() || cpu_is_mx51()) { > /* setup one handler for each entry */ > set_irq_chained_handler(port[i].irq, mx3_gpio_irq_handler); > set_irq_data(port[i].irq, &port[i]); > diff --git a/arch/arm/plat-mxc/tzic.c b/arch/arm/plat-mxc/tzic.c > index afa6709..9b86d2a 100644 > --- a/arch/arm/plat-mxc/tzic.c > +++ b/arch/arm/plat-mxc/tzic.c > @@ -1,5 +1,5 @@ > /* > - * Copyright 2004-2009 Freescale Semiconductor, Inc. All Rights Reserved. > + * Copyright (C)2004-2010 Freescale Semiconductor, Inc. All Rights Reserved. > * > * The code contained herein is licensed under the GNU General Public > * License. You may obtain a copy of the GNU General Public License > @@ -19,6 +19,7 @@ > #include > > #include > +#include > > /* > ***************************************** > @@ -144,6 +145,7 @@ void __init tzic_init_irq(void __iomem *irqbase) > set_irq_handler(i, handle_level_irq); > set_irq_flags(i, IRQF_VALID); > } > + mxc_register_gpios(); > > pr_info("TrustZone Interrupt Controller (TZIC) initialized\n"); > } > -- > 1.6.0.4 > -- ---------------------------------------------------------------------- Amit Kucheria, Kernel Engineer || amit.kucheria@canonical.com ---------------------------------------------------------------------- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/