diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2012-11-11 19:12:33 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2012-11-11 19:12:33 +0100 |
| commit | e59d969f441fb8e25b30125bdf201153adc5a7e3 (patch) | |
| tree | e18250fbc1bc9e2ca864292d2390325f8ac84c80 /arch/arm/mach-at91/at91sam9263.c | |
| parent | 4ddb1c295752252f61670e35c791bf16e58bbce6 (diff) | |
| parent | f6f94f6660dbe34039e5c86a46c7845589e7ee0c (diff) | |
| download | linux-e59d969f441fb8e25b30125bdf201153adc5a7e3.tar.gz linux-e59d969f441fb8e25b30125bdf201153adc5a7e3.tar.bz2 linux-e59d969f441fb8e25b30125bdf201153adc5a7e3.zip | |
Merge branch 'at91' into devel
Diffstat (limited to 'arch/arm/mach-at91/at91sam9263.c')
| -rw-r--r-- | arch/arm/mach-at91/at91sam9263.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/arm/mach-at91/at91sam9263.c b/arch/arm/mach-at91/at91sam9263.c index d6f9c23927c4..448fce1ada15 100644 --- a/arch/arm/mach-at91/at91sam9263.c +++ b/arch/arm/mach-at91/at91sam9263.c @@ -212,6 +212,11 @@ static struct clk_lookup periph_clocks_lookups[] = { CLKDEV_CON_DEV_ID("spi_clk", "fffa4000.spi", &spi0_clk), CLKDEV_CON_DEV_ID("spi_clk", "fffa8000.spi", &spi1_clk), CLKDEV_CON_DEV_ID(NULL, "fff88000.i2c", &twi_clk), + CLKDEV_CON_DEV_ID(NULL, "fffff200.gpio", &pioA_clk), + CLKDEV_CON_DEV_ID(NULL, "fffff400.gpio", &pioB_clk), + CLKDEV_CON_DEV_ID(NULL, "fffff600.gpio", &pioCDE_clk), + CLKDEV_CON_DEV_ID(NULL, "fffff800.gpio", &pioCDE_clk), + CLKDEV_CON_DEV_ID(NULL, "fffffa00.gpio", &pioCDE_clk), }; static struct clk_lookup usart_clocks_lookups[] = { @@ -365,10 +370,10 @@ static unsigned int at91sam9263_default_irq_priority[NR_AIC_IRQS] __initdata = { 0, /* Advanced Interrupt Controller (IRQ1) */ }; -struct at91_init_soc __initdata at91sam9263_soc = { +AT91_SOC_START(sam9263) .map_io = at91sam9263_map_io, .default_irq_priority = at91sam9263_default_irq_priority, .ioremap_registers = at91sam9263_ioremap_registers, .register_clocks = at91sam9263_register_clocks, .init = at91sam9263_initialize, -}; +AT91_SOC_END |