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

This project is archived. Its data is read-only.

Commit 51ddec76 authored Apr 24, 2011 by Jean-Christophe PLAGNIOL-VILLARD Committed by Arnd Bergmann Jul 28, 2011

at91: move register clocks to soc generic init



Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Patrice Vilchez <patrice.vilchez@atmel.com>

parent 46539374

arch/arm/mach-at91/at91cap9.c

+1 −3

Original line number	Original line	Diff line number	Diff line
	@@ -346,9 +346,6 @@ static void __init at91cap9_initialize(void)
	pm_power_off = at91cap9_poweroff;		pm_power_off = at91cap9_poweroff;
	at91_extern_irq = (1 << AT91CAP9_ID_IRQ0) \| (1 << AT91CAP9_ID_IRQ1);		at91_extern_irq = (1 << AT91CAP9_ID_IRQ0) \| (1 << AT91CAP9_ID_IRQ1);

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

	/* Register GPIO subsystem */		/* Register GPIO subsystem */
	at91_gpio_init(at91cap9_gpio, 4);		at91_gpio_init(at91cap9_gpio, 4);

	@@ -404,5 +401,6 @@ static unsigned int at91cap9_default_irq_priority[NR_AIC_IRQS] __initdata = {
	struct at91_init_soc __initdata at91cap9_soc = {		struct at91_init_soc __initdata at91cap9_soc = {
	.map_io = at91cap9_map_io,		.map_io = at91cap9_map_io,
	.default_irq_priority = at91cap9_default_irq_priority,		.default_irq_priority = at91cap9_default_irq_priority,
			.register_clocks = at91cap9_register_clocks,
	.init = at91cap9_initialize,		.init = at91cap9_initialize,
	};		};

arch/arm/mach-at91/at91rm9200.c

+1 −3

Original line number	Original line	Diff line number	Diff line
	@@ -317,9 +317,6 @@ static void __init at91rm9200_initialize(void)
	\| (1 << AT91RM9200_ID_IRQ4) \| (1 << AT91RM9200_ID_IRQ5)		\| (1 << AT91RM9200_ID_IRQ4) \| (1 << AT91RM9200_ID_IRQ5)
	\| (1 << AT91RM9200_ID_IRQ6);		\| (1 << AT91RM9200_ID_IRQ6);

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

	/* Initialize GPIO subsystem */		/* Initialize GPIO subsystem */
	at91_gpio_init(at91rm9200_gpio,		at91_gpio_init(at91rm9200_gpio,
	cpu_is_at91rm9200_bga() ? AT91RM9200_BGA : AT91RM9200_PQFP);		cpu_is_at91rm9200_bga() ? AT91RM9200_BGA : AT91RM9200_PQFP);
	@@ -371,5 +368,6 @@ static unsigned int at91rm9200_default_irq_priority[NR_AIC_IRQS] __initdata = {
	struct at91_init_soc __initdata at91rm9200_soc = {		struct at91_init_soc __initdata at91rm9200_soc = {
	.map_io = at91rm9200_map_io,		.map_io = at91rm9200_map_io,
	.default_irq_priority = at91rm9200_default_irq_priority,		.default_irq_priority = at91rm9200_default_irq_priority,
			.register_clocks = at91rm9200_register_clocks,
	.init = at91rm9200_initialize,		.init = at91rm9200_initialize,
	};		};

arch/arm/mach-at91/at91sam9260.c

+1 −3

Original line number	Original line	Diff line number	Diff line
	@@ -357,9 +357,6 @@ static void __init at91sam9260_initialize(void)
	at91_extern_irq = (1 << AT91SAM9260_ID_IRQ0) \| (1 << AT91SAM9260_ID_IRQ1)		at91_extern_irq = (1 << AT91SAM9260_ID_IRQ0) \| (1 << AT91SAM9260_ID_IRQ1)
	\| (1 << AT91SAM9260_ID_IRQ2);		\| (1 << AT91SAM9260_ID_IRQ2);

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

	/* Register GPIO subsystem */		/* Register GPIO subsystem */
	at91_gpio_init(at91sam9260_gpio, 3);		at91_gpio_init(at91sam9260_gpio, 3);
	}		}
	@@ -409,5 +406,6 @@ static unsigned int at91sam9260_default_irq_priority[NR_AIC_IRQS] __initdata = {
	struct at91_init_soc __initdata at91sam9260_soc = {		struct at91_init_soc __initdata at91sam9260_soc = {
	.map_io = at91sam9260_map_io,		.map_io = at91sam9260_map_io,
	.default_irq_priority = at91sam9260_default_irq_priority,		.default_irq_priority = at91sam9260_default_irq_priority,
			.register_clocks = at91sam9260_register_clocks,
	.init = at91sam9260_initialize,		.init = at91sam9260_initialize,
	};		};

arch/arm/mach-at91/at91sam9261.c

+1 −3

Original line number	Original line	Diff line number	Diff line
	@@ -309,9 +309,6 @@ static void __init at91sam9261_initialize(void)
	at91_extern_irq = (1 << AT91SAM9261_ID_IRQ0) \| (1 << AT91SAM9261_ID_IRQ1)		at91_extern_irq = (1 << AT91SAM9261_ID_IRQ0) \| (1 << AT91SAM9261_ID_IRQ1)
	\| (1 << AT91SAM9261_ID_IRQ2);		\| (1 << AT91SAM9261_ID_IRQ2);

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

	/* Register GPIO subsystem */		/* Register GPIO subsystem */
	at91_gpio_init(at91sam9261_gpio, 3);		at91_gpio_init(at91sam9261_gpio, 3);
	}		}
	@@ -361,5 +358,6 @@ static unsigned int at91sam9261_default_irq_priority[NR_AIC_IRQS] __initdata = {
	struct at91_init_soc __initdata at91sam9261_soc = {		struct at91_init_soc __initdata at91sam9261_soc = {
	.map_io = at91sam9261_map_io,		.map_io = at91sam9261_map_io,
	.default_irq_priority = at91sam9261_default_irq_priority,		.default_irq_priority = at91sam9261_default_irq_priority,
			.register_clocks = at91sam9261_register_clocks,
	.init = at91sam9261_initialize,		.init = at91sam9261_initialize,
	};		};

arch/arm/mach-at91/at91sam9263.c

+1 −3

Original line number	Original line	Diff line number	Diff line
	@@ -320,9 +320,6 @@ static void __init at91sam9263_initialize(void)
	pm_power_off = at91sam9263_poweroff;		pm_power_off = at91sam9263_poweroff;
	at91_extern_irq = (1 << AT91SAM9263_ID_IRQ0) \| (1 << AT91SAM9263_ID_IRQ1);		at91_extern_irq = (1 << AT91SAM9263_ID_IRQ0) \| (1 << AT91SAM9263_ID_IRQ1);

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

	/* Register GPIO subsystem */		/* Register GPIO subsystem */
	at91_gpio_init(at91sam9263_gpio, 5);		at91_gpio_init(at91sam9263_gpio, 5);
	}		}
	@@ -372,5 +369,6 @@ static unsigned int at91sam9263_default_irq_priority[NR_AIC_IRQS] __initdata = {
	struct at91_init_soc __initdata at91sam9263_soc = {		struct at91_init_soc __initdata at91sam9263_soc = {
	.map_io = at91sam9263_map_io,		.map_io = at91sam9263_map_io,
	.default_irq_priority = at91sam9263_default_irq_priority,		.default_irq_priority = at91sam9263_default_irq_priority,
			.register_clocks = at91sam9263_register_clocks,
	.init = at91sam9263_initialize,		.init = at91sam9263_initialize,
	};		};