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

Commit f2173834 authored Sep 27, 2006 by Andrew Victor Committed by Russell King Sep 28, 2006

[ARM] 3867/1: AT91 GPIO update



This patch makes the AT91 gpio.c support processor-generic (AT91RM9200
and AT91SAM9xxx).  The GPIO controllers supported by a particular AT91
processor are defined in the processor-specific file and are registered
with gpio.c at startup.

Signed-off-by: Andrew Victor <andrew@sanpeople.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

parent 2eeaaa21

arch/arm/mach-at91rm9200/at91rm9200.c

+37 −2

Original line number	Diff line number	Diff line
		@@ -243,11 +243,34 @@ static void __init at91rm9200_register_clocks(void)
		clk_register(&pck3);
		}

		/* --------------------------------------------------------------------
		* GPIO
		* -------------------------------------------------------------------- */

		static struct at91_gpio_bank at91rm9200_gpio[] = {
		{
		.id = AT91RM9200_ID_PIOA,
		.offset = AT91_PIOA,
		.clock = &pioA_clk,
		}, {
		.id = AT91RM9200_ID_PIOB,
		.offset = AT91_PIOB,
		.clock = &pioB_clk,
		}, {
		.id = AT91RM9200_ID_PIOC,
		.offset = AT91_PIOC,
		.clock = &pioC_clk,
		}, {
		.id = AT91RM9200_ID_PIOD,
		.offset = AT91_PIOD,
		.clock = &pioD_clk,
		}
		};

		/* --------------------------------------------------------------------
		* AT91RM9200 processor initialization
		* -------------------------------------------------------------------- */
		void __init at91rm9200_initialize(unsigned long main_clock)
		void __init at91rm9200_initialize(unsigned long main_clock, unsigned short banks)
		{
		/* Map peripherals */
		iotable_init(at91rm9200_io_desc, ARRAY_SIZE(at91rm9200_io_desc));
		@@ -257,8 +280,16 @@ void __init at91rm9200_initialize(unsigned long main_clock)

		/* Register the processor-specific clocks */
		at91rm9200_register_clocks();

		/* Initialize GPIO subsystem */
		at91_gpio_init(at91rm9200_gpio, banks);
		}


		/* --------------------------------------------------------------------
		* Interrupt initialization
		* -------------------------------------------------------------------- */

		/*
		* The default interrupt priority levels (0 = lowest, 7 = highest).
		*/
		@@ -297,10 +328,14 @@ static unsigned int at91rm9200_default_irq_priority[NR_AIC_IRQS] __initdata = {
		0 /* Advanced Interrupt Controller (IRQ6) */
		};

		void __init at91rm9200_init_irq(unsigned int priority[NR_AIC_IRQS])
		void __init at91rm9200_init_interrupts(unsigned int priority[NR_AIC_IRQS])
		{
		if (!priority)
		priority = at91rm9200_default_irq_priority;

		/* Initialize the AIC interrupt controller */
		at91_aic_init(priority);

		/* Enable GPIO interrupts */
		at91_gpio_irq_setup();
		}

arch/arm/mach-at91rm9200/board-1arm.c

+6 −9

Original line number	Diff line number	Diff line
		@@ -39,14 +39,6 @@

		#include "generic.h"

		static void __init onearm_init_irq(void)
		{
		/* Initialize AIC controller */
		at91rm9200_init_irq(NULL);

		/* Set up the GPIO interrupts */
		at91_gpio_irq_setup(PQFP_GPIO_BANKS);
		}

		/*
		* Serial port configuration.
		@@ -62,12 +54,17 @@ static struct at91_uart_config __initdata onearm_uart_config = {
		static void __init onearm_map_io(void)
		{
		/* Initialize processor: 18.432 MHz crystal */
		at91rm9200_initialize(18432000);
		at91rm9200_initialize(18432000, AT91RM9200_PQFP);

		/* Setup the serial ports and console */
		at91_init_serial(&onearm_uart_config);
		}

		static void __init onearm_init_irq(void)
		{
		at91rm9200_init_interrupts(NULL);
		}

		static struct at91_eth_data __initdata onearm_eth_data = {
		.phy_irq_pin = AT91_PIN_PC4,
		.is_rmii = 1,

arch/arm/mach-at91rm9200/board-carmeva.c

+7 −9

Original line number	Diff line number	Diff line
		@@ -40,14 +40,6 @@

		#include "generic.h"

		static void __init carmeva_init_irq(void)
		{
		/* Initialize AIC controller */
		at91rm9200_init_irq(NULL);

		/* Set up the GPIO interrupts */
		at91_gpio_irq_setup(BGA_GPIO_BANKS);
		}

		/*
		* Serial port configuration.
		@@ -63,12 +55,18 @@ static struct at91_uart_config __initdata carmeva_uart_config = {
		static void __init carmeva_map_io(void)
		{
		/* Initialize processor: 20.000 MHz crystal */
		at91rm9200_initialize(20000000);
		at91rm9200_initialize(20000000, AT91RM9200_BGA);

		/* Setup the serial ports and console */
		at91_init_serial(&carmeva_uart_config);
		}

		static void __init carmeva_init_irq(void)
		{
		at91rm9200_init_interrupts(NULL);
		}


		static struct at91_eth_data __initdata carmeva_eth_data = {
		.phy_irq_pin = AT91_PIN_PC4,
		.is_rmii = 1,

arch/arm/mach-at91rm9200/board-csb337.c

+6 −9

Original line number	Diff line number	Diff line
		@@ -39,14 +39,6 @@

		#include "generic.h"

		static void __init csb337_init_irq(void)
		{
		/* Initialize AIC controller */
		at91rm9200_init_irq(NULL);

		/* Set up the GPIO interrupts */
		at91_gpio_irq_setup(BGA_GPIO_BANKS);
		}

		/*
		* Serial port configuration.
		@@ -62,7 +54,7 @@ static struct at91_uart_config __initdata csb337_uart_config = {
		static void __init csb337_map_io(void)
		{
		/* Initialize processor: 3.6864 MHz crystal */
		at91rm9200_initialize(3686400);
		at91rm9200_initialize(3686400, AT91RM9200_BGA);

		/* Setup the LEDs */
		at91_init_leds(AT91_PIN_PB0, AT91_PIN_PB1);
		@@ -71,6 +63,11 @@ static void __init csb337_map_io(void)
		at91_init_serial(&csb337_uart_config);
		}

		static void __init csb337_init_irq(void)
		{
		at91rm9200_init_interrupts(NULL);
		}

		static struct at91_eth_data __initdata csb337_eth_data = {
		.phy_irq_pin = AT91_PIN_PC2,
		.is_rmii = 0,

arch/arm/mach-at91rm9200/board-csb637.c

+6 −9

Original line number	Diff line number	Diff line
		@@ -38,14 +38,6 @@

		#include "generic.h"

		static void __init csb637_init_irq(void)
		{
		/* Initialize AIC controller */
		at91rm9200_init_irq(NULL);

		/* Set up the GPIO interrupts */
		at91_gpio_irq_setup(BGA_GPIO_BANKS);
		}

		/*
		* Serial port configuration.
		@@ -61,7 +53,7 @@ static struct at91_uart_config __initdata csb637_uart_config = {
		static void __init csb637_map_io(void)
		{
		/* Initialize processor: 3.6864 MHz crystal */
		at91rm9200_initialize(3686400);
		at91rm9200_initialize(3686400, AT91RM9200_BGA);

		/* Setup the LEDs */
		at91_init_leds(AT91_PIN_PB2, AT91_PIN_PB2);
		@@ -70,6 +62,11 @@ static void __init csb637_map_io(void)
		at91_init_serial(&csb637_uart_config);
		}

		static void __init csb637_init_irq(void)
		{
		at91rm9200_init_interrupts(NULL);
		}

		static struct at91_eth_data __initdata csb637_eth_data = {
		.phy_irq_pin = AT91_PIN_PC0,
		.is_rmii = 0,