diff options
| author | Andrew Victor <andrew@sanpeople.com> | 2007-02-22 07:34:56 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-02-22 14:53:30 +0000 |
| commit | 7f6e2d992d4cb2f537ece62d221e466df1fead1c (patch) | |
| tree | b07be5403c574e6ea9298a37c55b07cedbe7baec /arch/arm/mach-at91 | |
| parent | f8dbf45fabaec0371c3bdd1bc94abc569af4badf (diff) | |
[ARM] 4231/1: AT91: Merge and typo fixes.
The duplicate file "include/asm-arm/arch-at91rm9200/entry-macro.S" can
be removed - it was already moved to include/asm-arm/arch-at91/.
Fix 3 small typo's - two in comments, and the incorrect clock was
specified for the LCD device.
Signed-off-by: Andrew Victor <andrew@sanpeople.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
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 = { }; static struct clk lcdc_clk = { .name = "lcdc_clk", - .pmc_mask = 1 << AT91SAM9263_ID_ISI, + .pmc_mask = 1 << AT91SAM9263_ID_LCDC, .type = CLK_TYPE_PERIPHERAL, }; 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) if (enable_spi0) { at91_set_B_periph(AT91_PIN_PA0, 0); /* SPI0_MISO */ at91_set_B_periph(AT91_PIN_PA1, 0); /* SPI0_MOSI */ - at91_set_B_periph(AT91_PIN_PA2, 0); /* SPI1_SPCK */ + at91_set_B_periph(AT91_PIN_PA2, 0); /* SPI0_SPCK */ at91_clock_associate("spi0_clk", &at91sam9263_spi0_device.dev, "spi_clk"); platform_device_register(&at91sam9263_spi0_device); |