Commit 553e7f75 authored by Arnd Bergmann's avatar Arnd Bergmann

ARM: spear: rename duplicate pl080_plat_data

Both spear3xx and spear6xx have a global symbol named
pl080_plat_data. Eventually, both should be removed, but
for now, we can rename one to pl080_plat_data and declare
it static, since that one does not actually need to be
visible outside of spear6xx.c.
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
parent d9909ebe
...@@ -322,7 +322,7 @@ static struct pl08x_channel_data spear600_dma_info[] = { ...@@ -322,7 +322,7 @@ static struct pl08x_channel_data spear600_dma_info[] = {
}, },
}; };
struct pl08x_platform_data pl080_plat_data = { static struct pl08x_platform_data spear6xx_pl080_plat_data = {
.memcpy_channel = { .memcpy_channel = {
.bus_id = "memcpy", .bus_id = "memcpy",
.cctl_memcpy = .cctl_memcpy =
...@@ -406,7 +406,7 @@ void __init spear6xx_timer_init(void) ...@@ -406,7 +406,7 @@ void __init spear6xx_timer_init(void)
/* Add auxdata to pass platform data */ /* Add auxdata to pass platform data */
struct of_dev_auxdata spear6xx_auxdata_lookup[] __initdata = { struct of_dev_auxdata spear6xx_auxdata_lookup[] __initdata = {
OF_DEV_AUXDATA("arm,pl080", SPEAR_ICM3_DMA_BASE, NULL, OF_DEV_AUXDATA("arm,pl080", SPEAR_ICM3_DMA_BASE, NULL,
&pl080_plat_data), &spear6xx_pl080_plat_data),
{} {}
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment