From e9fdc59b7b9f57ac8f886779ded5a8a326f7e9e6 Mon Sep 17 00:00:00 2001 From: Zeng Zhaoming Date: Tue, 28 Jun 2011 09:15:47 +0800 Subject: ENGR00139229-1 MX6: Bring up i.MX6 sabreauto with Single core MSL code for bring up MX6 sabreauto board with Single core. Merged from testbuild:imx6_bringup branch. Signed-off-by: Anson Huang Signed-off-by: Jason Liu Signed-off-by: Ranjani Vaidyanathan Singed-off-by: Dinh Nguyen Signed-off-by: Richard Zhu Signed-off-by: Anish Trivedi Signed-off-by: Dong Aisheng Signed-off-by: Jason Chen Signed-off-by: Lily Zhang Signed-off-by: Sammy He Signed-off-by: Peter Chen Signed-off-by: Frank Li Signed-off-by: Terry Lv Signed-off-by: Richard Zhao Signed-off-by: Zeng Zhaoming Merged-by: Zeng Zhaoming Reviewed-by: Jason Liu Reviewed-by: Frank Li --- arch/arm/plat-mxc/gpio.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'arch/arm/plat-mxc/gpio.c') diff --git a/arch/arm/plat-mxc/gpio.c b/arch/arm/plat-mxc/gpio.c index cd09dc70905f..a287e50bebcb 100755 --- 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 (C) 2004-2011 Freescale Semiconductor, Inc. All Rights Reserved. + * Copyright (C) 2004-2011 Freescale Semiconductor, Inc. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -177,6 +177,8 @@ static void mx3_gpio_irq_handler(u32 irq, struct irq_desc *desc) u32 irq_stat; struct mxc_gpio_port *port = irq_get_handler_data(irq); + desc->irq_data.chip->irq_ack(&desc->irq_data); + irq_stat = __raw_readl(port->base + GPIO_ISR) & __raw_readl(port->base + GPIO_IMR); @@ -337,7 +339,7 @@ int __init mxc_gpio_init(struct mxc_gpio_port *port, int cnt) BUG_ON( gpiochip_add(&port[i].chip) < 0 ); if (cpu_is_mx1() || cpu_is_mx3() || cpu_is_mx25() || - cpu_is_mx51() || cpu_is_mx53()) { + cpu_is_mx51() || cpu_is_mx53() || cpu_is_mx6q()) { /* setup one handler for each entry */ irq_set_chained_handler(port[i].irq, mx3_gpio_irq_handler); -- cgit v1.2.3