Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e24798e6 authored by Dinh Nguyen's avatar Dinh Nguyen Committed by Sascha Hauer
Browse files

mx5: Add registration of GPIOs for MX5 devices 



Register the gpio irqs on Freescale's MX51 Babbage HW.

Signed-off-by: default avatarDinh Nguyen <Dinh.Nguyen@freescale.com>
Signed-off-by: default avatarAmit Kucheria <amit.kucheria@canonical.com>
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent 38a66f51

arch/arm/mach-mx5/devices.c

+31 −2
Original line number Diff line number Diff line 
/*

 * Copyright 2009 Amit Kucheria <amit.kucheria@canonical.com>

 * 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 <linux/platform_device.h>

#include <linux/gpio.h>

#include <mach/hardware.h>

#include <mach/imx-uart.h>

#include <mach/irqs.h>



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

}

arch/arm/plat-mxc/gpio.c

+2 −3
Original line number Diff line number Diff line
@@ -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]);

arch/arm/plat-mxc/tzic.c

+3 −1
Original line number Diff line number Diff line 
/*

 * 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 <asm/mach/irq.h>



#include <mach/hardware.h>

#include <mach/common.h>



/*

 *****************************************
@@ -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");

}