diff options
Diffstat (limited to 'arch/arm/mach-at91')
-rw-r--r-- | arch/arm/mach-at91/at91sam9263.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-at91/at91sam9263_devices.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-at91/at91sam9263.c b/arch/arm/mach-at91/at91sam9263.c index 6aa342e8f1b1..0e89a7fca3fa 100644 --- a/arch/arm/mach-at91/at91sam9263.c +++ b/arch/arm/mach-at91/at91sam9263.c | |||
@@ -124,7 +124,7 @@ static struct clk isi_clk = { | |||
124 | }; | 124 | }; |
125 | static struct clk lcdc_clk = { | 125 | static struct clk lcdc_clk = { |
126 | .name = "lcdc_clk", | 126 | .name = "lcdc_clk", |
127 | .pmc_mask = 1 << AT91SAM9263_ID_ISI, | 127 | .pmc_mask = 1 << AT91SAM9263_ID_LCDC, |
128 | .type = CLK_TYPE_PERIPHERAL, | 128 | .type = CLK_TYPE_PERIPHERAL, |
129 | }; | 129 | }; |
130 | static struct clk ohci_clk = { | 130 | static struct clk ohci_clk = { |
diff --git a/arch/arm/mach-at91/at91sam9263_devices.c b/arch/arm/mach-at91/at91sam9263_devices.c index d9af7ca58bce..b77121f27f34 100644 --- a/arch/arm/mach-at91/at91sam9263_devices.c +++ b/arch/arm/mach-at91/at91sam9263_devices.c | |||
@@ -553,7 +553,7 @@ void __init at91_add_device_spi(struct spi_board_info *devices, int nr_devices) | |||
553 | if (enable_spi0) { | 553 | if (enable_spi0) { |
554 | at91_set_B_periph(AT91_PIN_PA0, 0); /* SPI0_MISO */ | 554 | at91_set_B_periph(AT91_PIN_PA0, 0); /* SPI0_MISO */ |
555 | at91_set_B_periph(AT91_PIN_PA1, 0); /* SPI0_MOSI */ | 555 | at91_set_B_periph(AT91_PIN_PA1, 0); /* SPI0_MOSI */ |
556 | at91_set_B_periph(AT91_PIN_PA2, 0); /* SPI1_SPCK */ | 556 | at91_set_B_periph(AT91_PIN_PA2, 0); /* SPI0_SPCK */ |
557 | 557 | ||
558 | at91_clock_associate("spi0_clk", &at91sam9263_spi0_device.dev, "spi_clk"); | 558 | at91_clock_associate("spi0_clk", &at91sam9263_spi0_device.dev, "spi_clk"); |
559 | platform_device_register(&at91sam9263_spi0_device); | 559 | platform_device_register(&at91sam9263_spi0_device); |