diff options
| author | Hubert Feurstein <h.feurstein@gmail.com> | 2011-09-15 18:57:06 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-10-08 11:12:14 +0200 |
| commit | 0a716d42114da07bc80953f7edcdfcf494a01514 (patch) | |
| tree | 1f7196563ac1921aa78b9f34bc7863009668ee6f | |
| parent | 5edd6ef8e86cf5378d5f40e1f4d1aa9f96a58588 (diff) | |
| download | barebox-0a716d42114da07bc80953f7edcdfcf494a01514.tar.gz barebox-0a716d42114da07bc80953f7edcdfcf494a01514.tar.xz | |
at91: add missing clkdev changes
This fixes the following compile errors
arch/arm/mach-at91/at91sam9g45.c:185:3: error: 'ohci_clk' undeclared here (not in a function)
arch/arm/mach-at91/at91sam9g45.c:186:3: error: 'tcb1_clk' undeclared here (not in a function)
arch/arm/mach-at91/at91sam9g45_devices.c: In function 'at91_add_device_mci':
arch/arm/mach-at91/at91sam9g45_devices.c:258:2: warning: implicit declaration of function 'at91_clock_associate'
[...]
arch/arm/mach-at91/built-in.o: In function `at91_add_device_mci':
sam9_smc.c:(.text.at91_add_device_mci+0x1d0): undefined reference to `at91_clock_associate'
arch/arm/mach-at91/at91sam9260_devices.c: In function 'at91_add_device_mci':
arch/arm/mach-at91/at91sam9260_devices.c:251:2: warning: implicit declaration of function 'at91_clock_associate'
which were introduced in commit:
"at91: swtich to clkdev" (ae19fe26cc230bc38238c2d66b8f464761286316)
Signed-off-by: Hubert Feurstein <h.feurstein@gmail.com>
Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | arch/arm/mach-at91/at91sam9260_devices.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-at91/at91sam9g45.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-at91/at91sam9g45_devices.c | 7 |
3 files changed, 1 insertions, 10 deletions
diff --git a/arch/arm/mach-at91/at91sam9260_devices.c b/arch/arm/mach-at91/at91sam9260_devices.c index 4540f4bf5d..44d3f1e989 100644 --- a/arch/arm/mach-at91/at91sam9260_devices.c +++ b/arch/arm/mach-at91/at91sam9260_devices.c @@ -248,7 +248,6 @@ void at91_add_device_mci(short mmc_id, struct atmel_mci_platform_data *data) dev = add_generic_device("atmel_mci", 0, NULL, AT91SAM9260_BASE_MCI, SZ_16K, IORESOURCE_MEM, data); - at91_clock_associate("mci_clk", dev, "mci_clk"); } #else void at91_add_device_mci(short mmc_id, struct atmel_mci_platform_data *data) {} diff --git a/arch/arm/mach-at91/at91sam9g45.c b/arch/arm/mach-at91/at91sam9g45.c index 9c478cdfdd..6b9fbc5542 100644 --- a/arch/arm/mach-at91/at91sam9g45.c +++ b/arch/arm/mach-at91/at91sam9g45.c @@ -181,9 +181,6 @@ static struct clk *periph_clocks[] __initdata = { &isi_clk, &udphs_clk, &mmc1_clk, - // irq0 - &ohci_clk, - &tcb1_clk, }; static struct clk_lookup periph_clocks_lookups[] = { diff --git a/arch/arm/mach-at91/at91sam9g45_devices.c b/arch/arm/mach-at91/at91sam9g45_devices.c index f6e1eb419e..022f3e1875 100644 --- a/arch/arm/mach-at91/at91sam9g45_devices.c +++ b/arch/arm/mach-at91/at91sam9g45_devices.c @@ -188,8 +188,6 @@ void at91_register_uart(unsigned id, unsigned pins) void at91_add_device_mci(short mmc_id, struct atmel_mci_platform_data *data) { resource_size_t start; - struct device_d *dev; - char* clk_name; if (!data) return; @@ -209,7 +207,6 @@ void at91_add_device_mci(short mmc_id, struct atmel_mci_platform_data *data) if (mmc_id == 0) { /* MCI0 */ start = AT91SAM9G45_BASE_MCI0; - clk_name = "mci0_clk"; /* CLK */ at91_set_A_periph(AT91_PIN_PA0, 0); @@ -231,7 +228,6 @@ void at91_add_device_mci(short mmc_id, struct atmel_mci_platform_data *data) } } else { /* MCI1 */ start = AT91SAM9G45_BASE_MCI1; - clk_name = "mci1_clk"; /* CLK */ at91_set_A_periph(AT91_PIN_PA31, 0); @@ -253,9 +249,8 @@ void at91_add_device_mci(short mmc_id, struct atmel_mci_platform_data *data) } } - dev = add_generic_device("atmel_mci", mmc_id, NULL, start, 4096, + add_generic_device("atmel_mci", mmc_id, NULL, start, 4096, IORESOURCE_MEM, data); - at91_clock_associate(clk_name, dev, "mci_clk"); } #else void at91_add_device_mci(short mmc_id, struct atmel_mci_platform_data *data) {} |