Skip to content

K
Kernel

openeuler / Kernel
接近 2 年 前同步成功

通知 8
Star 0
Fork 0
K
Kernel
提交 78183f3f 编写于 作者: P Paul Walmsley
浏览文件
操作

omap_hwmod: use a null structure record to terminate omap_hwmod_addr_space arrays 

Previously, struct omap_hwmod_addr_space arrays were unterminated; and
users of these arrays used the ARRAY_SIZE() macro to determine the
length of the array.  However, ARRAY_SIZE() only works when the array
is in the same scope as the macro user.

So far this hasn't been a problem.  However, to reduce duplicated
data, a subsequent patch will move common data to a separate, shared
file.  When this is done, ARRAY_SIZE() will no longer be usable.

This patch removes ARRAY_SIZE() usage for struct omap_hwmod_addr_space
arrays and uses a null structure member as the array terminator
instead.
Signed-off-by: NPaul Walmsley <paul@pwsan.com>
上级 ecba3287
展开全部 隐藏空白更改
内联 并排
Showing with 249 addition and 225 deletion
arch/arm/mach-omap2/omap_hwmod.c
浏览文件 @ 78183f3f
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
* omap_hwmod implementation for OMAP2/3/4 * omap_hwmod implementation for OMAP2/3/4
* *
* Copyright (C) 2009-2011 Nokia Corporation * Copyright (C) 2009-2011 Nokia Corporation
* Copyright (C) 2011 Texas Instruments, Inc.
* *
* Paul Walmsley, Benoît Cousson, Kevin Hilman * Paul Walmsley, Benoît Cousson, Kevin Hilman
* *
...@@ -677,6 +678,29 @@ static void _disable_optional_clocks(struct omap_hwmod *oh) ...@@ -677,6 +678,29 @@ static void _disable_optional_clocks(struct omap_hwmod *oh)
} }
} }
/**
* _count_ocp_if_addr_spaces - count the number of address space entries for @oh
* @oh: struct omap_hwmod *oh
*
* Count and return the number of address space ranges associated with
* the hwmod @oh. Used to allocate struct resource data. Returns 0
* if @oh is NULL.
*/
static int _count_ocp_if_addr_spaces(struct omap_hwmod_ocp_if *os)
{
struct omap_hwmod_addr_space *mem;
int i = 0;
if (!os || !os->addr)
return 0;
do {
mem = &os->addr[i++];
} while (mem->pa_start != mem->pa_end);
return i;
}
/** /**
* _find_mpu_port_index - find hwmod OCP slave port ID intended for MPU use * _find_mpu_port_index - find hwmod OCP slave port ID intended for MPU use
* @oh: struct omap_hwmod * * @oh: struct omap_hwmod *
...@@ -722,8 +746,7 @@ static void __iomem * __init _find_mpu_rt_base(struct omap_hwmod *oh, u8 index) ...@@ -722,8 +746,7 @@ static void __iomem * __init _find_mpu_rt_base(struct omap_hwmod *oh, u8 index)
{ {
struct omap_hwmod_ocp_if *os; struct omap_hwmod_ocp_if *os;
struct omap_hwmod_addr_space *mem; struct omap_hwmod_addr_space *mem;
int i; int i = 0, found = 0;
int found = 0;
void __iomem *va_start; void __iomem *va_start;
if (!oh || oh->slaves_cnt == 0) if (!oh || oh->slaves_cnt == 0)
...@@ -731,12 +754,14 @@ static void __iomem * __init _find_mpu_rt_base(struct omap_hwmod *oh, u8 index) ...@@ -731,12 +754,14 @@ static void __iomem * __init _find_mpu_rt_base(struct omap_hwmod *oh, u8 index)
os = oh->slaves[index]; os = oh->slaves[index];
for (i = 0, mem = os->addr; i < os->addr_cnt; i++, mem++) { if (!os->addr)
if (mem->flags & ADDR_TYPE_RT) { return NULL;
do {
mem = &os->addr[i++];
if (mem->flags & ADDR_TYPE_RT)
found = 1; found = 1;
break; } while (!found && mem->pa_start != mem->pa_end);
}
}
if (found) { if (found) {
va_start = ioremap(mem->pa_start, mem->pa_end - mem->pa_start); va_start = ioremap(mem->pa_start, mem->pa_end - mem->pa_start);
...@@ -1942,7 +1967,7 @@ int omap_hwmod_count_resources(struct omap_hwmod *oh) ...@@ -1942,7 +1967,7 @@ int omap_hwmod_count_resources(struct omap_hwmod *oh)
ret = oh->mpu_irqs_cnt + oh->sdma_reqs_cnt; ret = oh->mpu_irqs_cnt + oh->sdma_reqs_cnt;
for (i = 0; i < oh->slaves_cnt; i++) for (i = 0; i < oh->slaves_cnt; i++)
ret += oh->slaves[i]->addr_cnt; ret += _count_ocp_if_addr_spaces(oh->slaves[i]);
return ret; return ret;
} }
...@@ -1982,10 +2007,12 @@ int omap_hwmod_fill_resources(struct omap_hwmod *oh, struct resource *res) ...@@ -1982,10 +2007,12 @@ int omap_hwmod_fill_resources(struct omap_hwmod *oh, struct resource *res)
for (i = 0; i < oh->slaves_cnt; i++) { for (i = 0; i < oh->slaves_cnt; i++) {
struct omap_hwmod_ocp_if *os; struct omap_hwmod_ocp_if *os;
int addr_cnt;
os = oh->slaves[i]; os = oh->slaves[i];
addr_cnt = _count_ocp_if_addr_spaces(os);
for (j = 0; j < os->addr_cnt; j++) { for (j = 0; j < addr_cnt; j++) {
(res + r)->name = (os->addr + j)->name; (res + r)->name = (os->addr + j)->name;
(res + r)->start = (os->addr + j)->pa_start; (res + r)->start = (os->addr + j)->pa_start;
(res + r)->end = (os->addr + j)->pa_end; (res + r)->end = (os->addr + j)->pa_end;
......
arch/arm/mach-omap2/omap_hwmod_2420_data.c
浏览文件 @ 78183f3f
/* /*
* omap_hwmod_2420_data.c - hardware modules present on the OMAP2420 chips * omap_hwmod_2420_data.c - hardware modules present on the OMAP2420 chips
* *
* Copyright (C) 2009-2010 Nokia Corporation * Copyright (C) 2009-2011 Nokia Corporation
* Paul Walmsley * Paul Walmsley
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
...@@ -120,6 +120,7 @@ static struct omap_hwmod_addr_space omap2420_mcspi1_addr_space[] = { ...@@ -120,6 +120,7 @@ static struct omap_hwmod_addr_space omap2420_mcspi1_addr_space[] = {
.pa_end = 0x480980ff, .pa_end = 0x480980ff,
.flags = ADDR_TYPE_RT, .flags = ADDR_TYPE_RT,
}, },
{ }
}; };
static struct omap_hwmod_ocp_if omap2420_l4_core__mcspi1 = { static struct omap_hwmod_ocp_if omap2420_l4_core__mcspi1 = {
...@@ -127,7 +128,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__mcspi1 = { ...@@ -127,7 +128,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__mcspi1 = {
.slave = &omap2420_mcspi1_hwmod, .slave = &omap2420_mcspi1_hwmod,
.clk = "mcspi1_ick", .clk = "mcspi1_ick",
.addr = omap2420_mcspi1_addr_space, .addr = omap2420_mcspi1_addr_space,
.addr_cnt = ARRAY_SIZE(omap2420_mcspi1_addr_space),
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
...@@ -138,6 +138,7 @@ static struct omap_hwmod_addr_space omap2420_mcspi2_addr_space[] = { ...@@ -138,6 +138,7 @@ static struct omap_hwmod_addr_space omap2420_mcspi2_addr_space[] = {
.pa_end = 0x4809a0ff, .pa_end = 0x4809a0ff,
.flags = ADDR_TYPE_RT, .flags = ADDR_TYPE_RT,
}, },
{ }
}; };
static struct omap_hwmod_ocp_if omap2420_l4_core__mcspi2 = { static struct omap_hwmod_ocp_if omap2420_l4_core__mcspi2 = {
...@@ -145,7 +146,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__mcspi2 = { ...@@ -145,7 +146,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__mcspi2 = {
.slave = &omap2420_mcspi2_hwmod, .slave = &omap2420_mcspi2_hwmod,
.clk = "mcspi2_ick", .clk = "mcspi2_ick",
.addr = omap2420_mcspi2_addr_space, .addr = omap2420_mcspi2_addr_space,
.addr_cnt = ARRAY_SIZE(omap2420_mcspi2_addr_space),
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
...@@ -163,6 +163,7 @@ static struct omap_hwmod_addr_space omap2420_uart1_addr_space[] = { ...@@ -163,6 +163,7 @@ static struct omap_hwmod_addr_space omap2420_uart1_addr_space[] = {
.pa_end = OMAP2_UART1_BASE + SZ_8K - 1, .pa_end = OMAP2_UART1_BASE + SZ_8K - 1,
.flags = ADDR_MAP_ON_INIT | ADDR_TYPE_RT, .flags = ADDR_MAP_ON_INIT | ADDR_TYPE_RT,
}, },
{ }
}; };
static struct omap_hwmod_ocp_if omap2_l4_core__uart1 = { static struct omap_hwmod_ocp_if omap2_l4_core__uart1 = {
...@@ -170,7 +171,6 @@ static struct omap_hwmod_ocp_if omap2_l4_core__uart1 = { ...@@ -170,7 +171,6 @@ static struct omap_hwmod_ocp_if omap2_l4_core__uart1 = {
.slave = &omap2420_uart1_hwmod, .slave = &omap2420_uart1_hwmod,
.clk = "uart1_ick", .clk = "uart1_ick",
.addr = omap2420_uart1_addr_space, .addr = omap2420_uart1_addr_space,
.addr_cnt = ARRAY_SIZE(omap2420_uart1_addr_space),
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
...@@ -181,6 +181,7 @@ static struct omap_hwmod_addr_space omap2420_uart2_addr_space[] = { ...@@ -181,6 +181,7 @@ static struct omap_hwmod_addr_space omap2420_uart2_addr_space[] = {
.pa_end = OMAP2_UART2_BASE + SZ_1K - 1, .pa_end = OMAP2_UART2_BASE + SZ_1K - 1,
.flags = ADDR_MAP_ON_INIT | ADDR_TYPE_RT, .flags = ADDR_MAP_ON_INIT | ADDR_TYPE_RT,
}, },
{ }
}; };
static struct omap_hwmod_ocp_if omap2_l4_core__uart2 = { static struct omap_hwmod_ocp_if omap2_l4_core__uart2 = {
...@@ -188,7 +189,6 @@ static struct omap_hwmod_ocp_if omap2_l4_core__uart2 = { ...@@ -188,7 +189,6 @@ static struct omap_hwmod_ocp_if omap2_l4_core__uart2 = {
.slave = &omap2420_uart2_hwmod, .slave = &omap2420_uart2_hwmod,
.clk = "uart2_ick", .clk = "uart2_ick",
.addr = omap2420_uart2_addr_space, .addr = omap2420_uart2_addr_space,
.addr_cnt = ARRAY_SIZE(omap2420_uart2_addr_space),
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
...@@ -199,6 +199,7 @@ static struct omap_hwmod_addr_space omap2420_uart3_addr_space[] = { ...@@ -199,6 +199,7 @@ static struct omap_hwmod_addr_space omap2420_uart3_addr_space[] = {
.pa_end = OMAP2_UART3_BASE + SZ_1K - 1, .pa_end = OMAP2_UART3_BASE + SZ_1K - 1,
.flags = ADDR_MAP_ON_INIT | ADDR_TYPE_RT, .flags = ADDR_MAP_ON_INIT | ADDR_TYPE_RT,
}, },
{ }
}; };
static struct omap_hwmod_ocp_if omap2_l4_core__uart3 = { static struct omap_hwmod_ocp_if omap2_l4_core__uart3 = {
...@@ -206,7 +207,6 @@ static struct omap_hwmod_ocp_if omap2_l4_core__uart3 = { ...@@ -206,7 +207,6 @@ static struct omap_hwmod_ocp_if omap2_l4_core__uart3 = {
.slave = &omap2420_uart3_hwmod, .slave = &omap2420_uart3_hwmod,
.clk = "uart3_ick", .clk = "uart3_ick",
.addr = omap2420_uart3_addr_space, .addr = omap2420_uart3_addr_space,
.addr_cnt = ARRAY_SIZE(omap2420_uart3_addr_space),
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
...@@ -220,6 +220,7 @@ static struct omap_hwmod_addr_space omap2420_i2c1_addr_space[] = { ...@@ -220,6 +220,7 @@ static struct omap_hwmod_addr_space omap2420_i2c1_addr_space[] = {
.pa_end = 0x48070000 + OMAP2_I2C_AS_LEN - 1, .pa_end = 0x48070000 + OMAP2_I2C_AS_LEN - 1,
.flags = ADDR_TYPE_RT, .flags = ADDR_TYPE_RT,
}, },
{ }
}; };
static struct omap_hwmod_ocp_if omap2420_l4_core__i2c1 = { static struct omap_hwmod_ocp_if omap2420_l4_core__i2c1 = {
...@@ -227,7 +228,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__i2c1 = { ...@@ -227,7 +228,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__i2c1 = {
.slave = &omap2420_i2c1_hwmod, .slave = &omap2420_i2c1_hwmod,
.clk = "i2c1_ick", .clk = "i2c1_ick",
.addr = omap2420_i2c1_addr_space, .addr = omap2420_i2c1_addr_space,
.addr_cnt = ARRAY_SIZE(omap2420_i2c1_addr_space),
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
...@@ -238,6 +238,7 @@ static struct omap_hwmod_addr_space omap2420_i2c2_addr_space[] = { ...@@ -238,6 +238,7 @@ static struct omap_hwmod_addr_space omap2420_i2c2_addr_space[] = {
.pa_end = 0x48072000 + OMAP2_I2C_AS_LEN - 1, .pa_end = 0x48072000 + OMAP2_I2C_AS_LEN - 1,
.flags = ADDR_TYPE_RT, .flags = ADDR_TYPE_RT,
}, },
{ }
}; };
static struct omap_hwmod_ocp_if omap2420_l4_core__i2c2 = { static struct omap_hwmod_ocp_if omap2420_l4_core__i2c2 = {
...@@ -245,7 +246,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__i2c2 = { ...@@ -245,7 +246,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__i2c2 = {
.slave = &omap2420_i2c2_hwmod, .slave = &omap2420_i2c2_hwmod,
.clk = "i2c2_ick", .clk = "i2c2_ick",
.addr = omap2420_i2c2_addr_space, .addr = omap2420_i2c2_addr_space,
.addr_cnt = ARRAY_SIZE(omap2420_i2c2_addr_space),
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
...@@ -370,6 +370,7 @@ static struct omap_hwmod_addr_space omap2420_timer1_addrs[] = { ...@@ -370,6 +370,7 @@ static struct omap_hwmod_addr_space omap2420_timer1_addrs[] = {
.pa_end = 0x48028000 + SZ_1K - 1, .pa_end = 0x48028000 + SZ_1K - 1,
.flags = ADDR_TYPE_RT .flags = ADDR_TYPE_RT
}, },
{ }
}; };
/* l4_wkup -> timer1 */ /* l4_wkup -> timer1 */
...@@ -378,7 +379,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_wkup__timer1 = { ...@@ -378,7 +379,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_wkup__timer1 = {
.slave = &omap2420_timer1_hwmod, .slave = &omap2420_timer1_hwmod,
.clk = "gpt1_ick", .clk = "gpt1_ick",
.addr = omap2420_timer1_addrs, .addr = omap2420_timer1_addrs,
.addr_cnt = ARRAY_SIZE(omap2420_timer1_addrs),
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
...@@ -420,6 +420,7 @@ static struct omap_hwmod_addr_space omap2420_timer2_addrs[] = { ...@@ -420,6 +420,7 @@ static struct omap_hwmod_addr_space omap2420_timer2_addrs[] = {
.pa_end = 0x4802a000 + SZ_1K - 1, .pa_end = 0x4802a000 + SZ_1K - 1,
.flags = ADDR_TYPE_RT .flags = ADDR_TYPE_RT
}, },
{ }
}; };
/* l4_core -> timer2 */ /* l4_core -> timer2 */
...@@ -428,7 +429,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__timer2 = { ...@@ -428,7 +429,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__timer2 = {
.slave = &omap2420_timer2_hwmod, .slave = &omap2420_timer2_hwmod,
.clk = "gpt2_ick", .clk = "gpt2_ick",
.addr = omap2420_timer2_addrs, .addr = omap2420_timer2_addrs,
.addr_cnt = ARRAY_SIZE(omap2420_timer2_addrs),
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
...@@ -470,6 +470,7 @@ static struct omap_hwmod_addr_space omap2420_timer3_addrs[] = { ...@@ -470,6 +470,7 @@ static struct omap_hwmod_addr_space omap2420_timer3_addrs[] = {
.pa_end = 0x48078000 + SZ_1K - 1, .pa_end = 0x48078000 + SZ_1K - 1,
.flags = ADDR_TYPE_RT .flags = ADDR_TYPE_RT
}, },
{ }
}; };
/* l4_core -> timer3 */ /* l4_core -> timer3 */
...@@ -478,7 +479,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__timer3 = { ...@@ -478,7 +479,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__timer3 = {
.slave = &omap2420_timer3_hwmod, .slave = &omap2420_timer3_hwmod,
.clk = "gpt3_ick", .clk = "gpt3_ick",
.addr = omap2420_timer3_addrs, .addr = omap2420_timer3_addrs,
.addr_cnt = ARRAY_SIZE(omap2420_timer3_addrs),
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
...@@ -520,6 +520,7 @@ static struct omap_hwmod_addr_space omap2420_timer4_addrs[] = { ...@@ -520,6 +520,7 @@ static struct omap_hwmod_addr_space omap2420_timer4_addrs[] = {
.pa_end = 0x4807a000 + SZ_1K - 1, .pa_end = 0x4807a000 + SZ_1K - 1,
.flags = ADDR_TYPE_RT .flags = ADDR_TYPE_RT
}, },
{ }
}; };
/* l4_core -> timer4 */ /* l4_core -> timer4 */
...@@ -528,7 +529,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__timer4 = { ...@@ -528,7 +529,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__timer4 = {
.slave = &omap2420_timer4_hwmod, .slave = &omap2420_timer4_hwmod,
.clk = "gpt4_ick", .clk = "gpt4_ick",
.addr = omap2420_timer4_addrs, .addr = omap2420_timer4_addrs,
.addr_cnt = ARRAY_SIZE(omap2420_timer4_addrs),
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
...@@ -570,6 +570,7 @@ static struct omap_hwmod_addr_space omap2420_timer5_addrs[] = { ...@@ -570,6 +570,7 @@ static struct omap_hwmod_addr_space omap2420_timer5_addrs[] = {
.pa_end = 0x4807c000 + SZ_1K - 1, .pa_end = 0x4807c000 + SZ_1K - 1,
.flags = ADDR_TYPE_RT .flags = ADDR_TYPE_RT
}, },
{ }
}; };
/* l4_core -> timer5 */ /* l4_core -> timer5 */
...@@ -578,7 +579,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__timer5 = { ...@@ -578,7 +579,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__timer5 = {
.slave = &omap2420_timer5_hwmod, .slave = &omap2420_timer5_hwmod,
.clk = "gpt5_ick", .clk = "gpt5_ick",
.addr = omap2420_timer5_addrs, .addr = omap2420_timer5_addrs,
.addr_cnt = ARRAY_SIZE(omap2420_timer5_addrs),
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
...@@ -621,6 +621,7 @@ static struct omap_hwmod_addr_space omap2420_timer6_addrs[] = { ...@@ -621,6 +621,7 @@ static struct omap_hwmod_addr_space omap2420_timer6_addrs[] = {
.pa_end = 0x4807e000 + SZ_1K - 1, .pa_end = 0x4807e000 + SZ_1K - 1,
.flags = ADDR_TYPE_RT .flags = ADDR_TYPE_RT
}, },
{ }
}; };
/* l4_core -> timer6 */ /* l4_core -> timer6 */
...@@ -629,7 +630,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__timer6 = { ...@@ -629,7 +630,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__timer6 = {
.slave = &omap2420_timer6_hwmod, .slave = &omap2420_timer6_hwmod,
.clk = "gpt6_ick", .clk = "gpt6_ick",
.addr = omap2420_timer6_addrs, .addr = omap2420_timer6_addrs,
.addr_cnt = ARRAY_SIZE(omap2420_timer6_addrs),
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
...@@ -671,6 +671,7 @@ static struct omap_hwmod_addr_space omap2420_timer7_addrs[] = { ...@@ -671,6 +671,7 @@ static struct omap_hwmod_addr_space omap2420_timer7_addrs[] = {
.pa_end = 0x48080000 + SZ_1K - 1, .pa_end = 0x48080000 + SZ_1K - 1,
.flags = ADDR_TYPE_RT .flags = ADDR_TYPE_RT
}, },
{ }
}; };
/* l4_core -> timer7 */ /* l4_core -> timer7 */
...@@ -679,7 +680,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__timer7 = { ...@@ -679,7 +680,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__timer7 = {
.slave = &omap2420_timer7_hwmod, .slave = &omap2420_timer7_hwmod,
.clk = "gpt7_ick", .clk = "gpt7_ick",
.addr = omap2420_timer7_addrs, .addr = omap2420_timer7_addrs,
.addr_cnt = ARRAY_SIZE(omap2420_timer7_addrs),
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
...@@ -721,6 +721,7 @@ static struct omap_hwmod_addr_space omap2420_timer8_addrs[] = { ...@@ -721,6 +721,7 @@ static struct omap_hwmod_addr_space omap2420_timer8_addrs[] = {
.pa_end = 0x48082000 + SZ_1K - 1, .pa_end = 0x48082000 + SZ_1K - 1,
.flags = ADDR_TYPE_RT .flags = ADDR_TYPE_RT
}, },
{ }
}; };
/* l4_core -> timer8 */ /* l4_core -> timer8 */
...@@ -729,7 +730,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__timer8 = { ...@@ -729,7 +730,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__timer8 = {
.slave = &omap2420_timer8_hwmod, .slave = &omap2420_timer8_hwmod,
.clk = "gpt8_ick", .clk = "gpt8_ick",
.addr = omap2420_timer8_addrs, .addr = omap2420_timer8_addrs,
.addr_cnt = ARRAY_SIZE(omap2420_timer8_addrs),
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
...@@ -771,6 +771,7 @@ static struct omap_hwmod_addr_space omap2420_timer9_addrs[] = { ...@@ -771,6 +771,7 @@ static struct omap_hwmod_addr_space omap2420_timer9_addrs[] = {
.pa_end = 0x48084000 + SZ_1K - 1, .pa_end = 0x48084000 + SZ_1K - 1,
.flags = ADDR_TYPE_RT .flags = ADDR_TYPE_RT
}, },
{ }
}; };
/* l4_core -> timer9 */ /* l4_core -> timer9 */
...@@ -779,7 +780,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__timer9 = { ...@@ -779,7 +780,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__timer9 = {
.slave = &omap2420_timer9_hwmod, .slave = &omap2420_timer9_hwmod,
.clk = "gpt9_ick", .clk = "gpt9_ick",
.addr = omap2420_timer9_addrs, .addr = omap2420_timer9_addrs,
.addr_cnt = ARRAY_SIZE(omap2420_timer9_addrs),
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
...@@ -821,6 +821,7 @@ static struct omap_hwmod_addr_space omap2420_timer10_addrs[] = { ...@@ -821,6 +821,7 @@ static struct omap_hwmod_addr_space omap2420_timer10_addrs[] = {
.pa_end = 0x48086000 + SZ_1K - 1, .pa_end = 0x48086000 + SZ_1K - 1,
.flags = ADDR_TYPE_RT .flags = ADDR_TYPE_RT
}, },
{ }
}; };
/* l4_core -> timer10 */ /* l4_core -> timer10 */
...@@ -829,7 +830,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__timer10 = { ...@@ -829,7 +830,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__timer10 = {
.slave = &omap2420_timer10_hwmod, .slave = &omap2420_timer10_hwmod,
.clk = "gpt10_ick", .clk = "gpt10_ick",
.addr = omap2420_timer10_addrs, .addr = omap2420_timer10_addrs,
.addr_cnt = ARRAY_SIZE(omap2420_timer10_addrs),
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
...@@ -871,6 +871,7 @@ static struct omap_hwmod_addr_space omap2420_timer11_addrs[] = { ...@@ -871,6 +871,7 @@ static struct omap_hwmod_addr_space omap2420_timer11_addrs[] = {
.pa_end = 0x48088000 + SZ_1K - 1, .pa_end = 0x48088000 + SZ_1K - 1,
.flags = ADDR_TYPE_RT .flags = ADDR_TYPE_RT
}, },
{ }
}; };
/* l4_core -> timer11 */ /* l4_core -> timer11 */
...@@ -879,7 +880,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__timer11 = { ...@@ -879,7 +880,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__timer11 = {
.slave = &omap2420_timer11_hwmod, .slave = &omap2420_timer11_hwmod,
.clk = "gpt11_ick", .clk = "gpt11_ick",
.addr = omap2420_timer11_addrs, .addr = omap2420_timer11_addrs,
.addr_cnt = ARRAY_SIZE(omap2420_timer11_addrs),
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
...@@ -921,6 +921,7 @@ static struct omap_hwmod_addr_space omap2420_timer12_addrs[] = { ...@@ -921,6 +921,7 @@ static struct omap_hwmod_addr_space omap2420_timer12_addrs[] = {
.pa_end = 0x4808a000 + SZ_1K - 1, .pa_end = 0x4808a000 + SZ_1K - 1,
.flags = ADDR_TYPE_RT .flags = ADDR_TYPE_RT
}, },
{ }
}; };
/* l4_core -> timer12 */ /* l4_core -> timer12 */
...@@ -929,7 +930,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__timer12 = { ...@@ -929,7 +930,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__timer12 = {
.slave = &omap2420_timer12_hwmod, .slave = &omap2420_timer12_hwmod,
.clk = "gpt12_ick", .clk = "gpt12_ick",
.addr = omap2420_timer12_addrs, .addr = omap2420_timer12_addrs,
.addr_cnt = ARRAY_SIZE(omap2420_timer12_addrs),
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
...@@ -966,6 +966,7 @@ static struct omap_hwmod_addr_space omap2420_wd_timer2_addrs[] = { ...@@ -966,6 +966,7 @@ static struct omap_hwmod_addr_space omap2420_wd_timer2_addrs[] = {
.pa_end = 0x4802207f, .pa_end = 0x4802207f,
.flags = ADDR_TYPE_RT .flags = ADDR_TYPE_RT
}, },
{ }
}; };
static struct omap_hwmod_ocp_if omap2420_l4_wkup__wd_timer2 = { static struct omap_hwmod_ocp_if omap2420_l4_wkup__wd_timer2 = {
...@@ -973,7 +974,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_wkup__wd_timer2 = { ...@@ -973,7 +974,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_wkup__wd_timer2 = {
.slave = &omap2420_wd_timer2_hwmod, .slave = &omap2420_wd_timer2_hwmod,
.clk = "mpu_wdt_ick", .clk = "mpu_wdt_ick",
.addr = omap2420_wd_timer2_addrs, .addr = omap2420_wd_timer2_addrs,
.addr_cnt = ARRAY_SIZE(omap2420_wd_timer2_addrs),
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
...@@ -1184,6 +1184,7 @@ static struct omap_hwmod_addr_space omap2420_dss_addrs[] = { ...@@ -1184,6 +1184,7 @@ static struct omap_hwmod_addr_space omap2420_dss_addrs[] = {
.pa_end = 0x480503FF, .pa_end = 0x480503FF,
.flags = ADDR_TYPE_RT .flags = ADDR_TYPE_RT
}, },
{ }
}; };
/* l4_core -> dss */ /* l4_core -> dss */
...@@ -1192,7 +1193,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__dss = { ...@@ -1192,7 +1193,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__dss = {
.slave = &omap2420_dss_core_hwmod, .slave = &omap2420_dss_core_hwmod,
.clk = "dss_ick", .clk = "dss_ick",
.addr = omap2420_dss_addrs, .addr = omap2420_dss_addrs,
.addr_cnt = ARRAY_SIZE(omap2420_dss_addrs),
.fw = { .fw = {
.omap2 = { .omap2 = {
.l4_fw_region = OMAP2420_L4_CORE_FW_DSS_CORE_REGION, .l4_fw_region = OMAP2420_L4_CORE_FW_DSS_CORE_REGION,
...@@ -1268,6 +1268,7 @@ static struct omap_hwmod_addr_space omap2420_dss_dispc_addrs[] = { ...@@ -1268,6 +1268,7 @@ static struct omap_hwmod_addr_space omap2420_dss_dispc_addrs[] = {
.pa_end = 0x480507FF, .pa_end = 0x480507FF,
.flags = ADDR_TYPE_RT .flags = ADDR_TYPE_RT
}, },
{ }
}; };
/* l4_core -> dss_dispc */ /* l4_core -> dss_dispc */
...@@ -1276,7 +1277,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__dss_dispc = { ...@@ -1276,7 +1277,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__dss_dispc = {
.slave = &omap2420_dss_dispc_hwmod, .slave = &omap2420_dss_dispc_hwmod,
.clk = "dss_ick", .clk = "dss_ick",
.addr = omap2420_dss_dispc_addrs, .addr = omap2420_dss_dispc_addrs,
.addr_cnt = ARRAY_SIZE(omap2420_dss_dispc_addrs),
.fw = { .fw = {
.omap2 = { .omap2 = {
.l4_fw_region = OMAP2420_L4_CORE_FW_DSS_DISPC_REGION, .l4_fw_region = OMAP2420_L4_CORE_FW_DSS_DISPC_REGION,
...@@ -1338,6 +1338,7 @@ static struct omap_hwmod_addr_space omap2420_dss_rfbi_addrs[] = { ...@@ -1338,6 +1338,7 @@ static struct omap_hwmod_addr_space omap2420_dss_rfbi_addrs[] = {
.pa_end = 0x48050BFF, .pa_end = 0x48050BFF,
.flags = ADDR_TYPE_RT .flags = ADDR_TYPE_RT
}, },
{ }
}; };
/* l4_core -> dss_rfbi */ /* l4_core -> dss_rfbi */
...@@ -1346,7 +1347,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__dss_rfbi = { ...@@ -1346,7 +1347,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__dss_rfbi = {
.slave = &omap2420_dss_rfbi_hwmod, .slave = &omap2420_dss_rfbi_hwmod,
.clk = "dss_ick", .clk = "dss_ick",
.addr = omap2420_dss_rfbi_addrs, .addr = omap2420_dss_rfbi_addrs,
.addr_cnt = ARRAY_SIZE(omap2420_dss_rfbi_addrs),
.fw = { .fw = {
.omap2 = { .omap2 = {
.l4_fw_region = OMAP2420_L4_CORE_FW_DSS_CORE_REGION, .l4_fw_region = OMAP2420_L4_CORE_FW_DSS_CORE_REGION,
...@@ -1394,6 +1394,7 @@ static struct omap_hwmod_addr_space omap2420_dss_venc_addrs[] = { ...@@ -1394,6 +1394,7 @@ static struct omap_hwmod_addr_space omap2420_dss_venc_addrs[] = {
.pa_end = 0x48050FFF, .pa_end = 0x48050FFF,
.flags = ADDR_TYPE_RT .flags = ADDR_TYPE_RT
}, },
{ }
}; };
/* l4_core -> dss_venc */ /* l4_core -> dss_venc */
...@@ -1402,7 +1403,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__dss_venc = { ...@@ -1402,7 +1403,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__dss_venc = {
.slave = &omap2420_dss_venc_hwmod, .slave = &omap2420_dss_venc_hwmod,
.clk = "dss_54m_fck", .clk = "dss_54m_fck",
.addr = omap2420_dss_venc_addrs, .addr = omap2420_dss_venc_addrs,
.addr_cnt = ARRAY_SIZE(omap2420_dss_venc_addrs),
.fw = { .fw = {
.omap2 = { .omap2 = {
.l4_fw_region = OMAP2420_L4_CORE_FW_DSS_VENC_REGION, .l4_fw_region = OMAP2420_L4_CORE_FW_DSS_VENC_REGION,
...@@ -1536,6 +1536,7 @@ static struct omap_hwmod_addr_space omap2420_gpio1_addr_space[] = { ...@@ -1536,6 +1536,7 @@ static struct omap_hwmod_addr_space omap2420_gpio1_addr_space[] = {
.pa_end = 0x480181ff, .pa_end = 0x480181ff,
.flags = ADDR_TYPE_RT .flags = ADDR_TYPE_RT
}, },
{ }
}; };
static struct omap_hwmod_ocp_if omap2420_l4_wkup__gpio1 = { static struct omap_hwmod_ocp_if omap2420_l4_wkup__gpio1 = {
...@@ -1543,7 +1544,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_wkup__gpio1 = { ...@@ -1543,7 +1544,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_wkup__gpio1 = {
.slave = &omap2420_gpio1_hwmod, .slave = &omap2420_gpio1_hwmod,
.clk = "gpios_ick", .clk = "gpios_ick",
.addr = omap2420_gpio1_addr_space, .addr = omap2420_gpio1_addr_space,
.addr_cnt = ARRAY_SIZE(omap2420_gpio1_addr_space),
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
...@@ -1554,6 +1554,7 @@ static struct omap_hwmod_addr_space omap2420_gpio2_addr_space[] = { ...@@ -1554,6 +1554,7 @@ static struct omap_hwmod_addr_space omap2420_gpio2_addr_space[] = {
.pa_end = 0x4801a1ff, .pa_end = 0x4801a1ff,
.flags = ADDR_TYPE_RT .flags = ADDR_TYPE_RT
}, },
{ }
}; };
static struct omap_hwmod_ocp_if omap2420_l4_wkup__gpio2 = { static struct omap_hwmod_ocp_if omap2420_l4_wkup__gpio2 = {
...@@ -1561,7 +1562,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_wkup__gpio2 = { ...@@ -1561,7 +1562,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_wkup__gpio2 = {
.slave = &omap2420_gpio2_hwmod, .slave = &omap2420_gpio2_hwmod,
.clk = "gpios_ick", .clk = "gpios_ick",
.addr = omap2420_gpio2_addr_space, .addr = omap2420_gpio2_addr_space,
.addr_cnt = ARRAY_SIZE(omap2420_gpio2_addr_space),
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
...@@ -1572,6 +1572,7 @@ static struct omap_hwmod_addr_space omap2420_gpio3_addr_space[] = { ...@@ -1572,6 +1572,7 @@ static struct omap_hwmod_addr_space omap2420_gpio3_addr_space[] = {
.pa_end = 0x4801c1ff, .pa_end = 0x4801c1ff,
.flags = ADDR_TYPE_RT .flags = ADDR_TYPE_RT
}, },
{ }
}; };
static struct omap_hwmod_ocp_if omap2420_l4_wkup__gpio3 = { static struct omap_hwmod_ocp_if omap2420_l4_wkup__gpio3 = {
...@@ -1579,7 +1580,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_wkup__gpio3 = { ...@@ -1579,7 +1580,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_wkup__gpio3 = {
.slave = &omap2420_gpio3_hwmod, .slave = &omap2420_gpio3_hwmod,
.clk = "gpios_ick", .clk = "gpios_ick",
.addr = omap2420_gpio3_addr_space, .addr = omap2420_gpio3_addr_space,
.addr_cnt = ARRAY_SIZE(omap2420_gpio3_addr_space),
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
...@@ -1590,6 +1590,7 @@ static struct omap_hwmod_addr_space omap2420_gpio4_addr_space[] = { ...@@ -1590,6 +1590,7 @@ static struct omap_hwmod_addr_space omap2420_gpio4_addr_space[] = {
.pa_end = 0x4801e1ff, .pa_end = 0x4801e1ff,
.flags = ADDR_TYPE_RT .flags = ADDR_TYPE_RT
}, },
{ }
}; };
static struct omap_hwmod_ocp_if omap2420_l4_wkup__gpio4 = { static struct omap_hwmod_ocp_if omap2420_l4_wkup__gpio4 = {
...@@ -1597,7 +1598,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_wkup__gpio4 = { ...@@ -1597,7 +1598,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_wkup__gpio4 = {
.slave = &omap2420_gpio4_hwmod, .slave = &omap2420_gpio4_hwmod,
.clk = "gpios_ick", .clk = "gpios_ick",
.addr = omap2420_gpio4_addr_space, .addr = omap2420_gpio4_addr_space,
.addr_cnt = ARRAY_SIZE(omap2420_gpio4_addr_space),
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
...@@ -1789,6 +1789,7 @@ static struct omap_hwmod_addr_space omap2420_dma_system_addrs[] = { ...@@ -1789,6 +1789,7 @@ static struct omap_hwmod_addr_space omap2420_dma_system_addrs[] = {
.pa_end = 0x48056fff, .pa_end = 0x48056fff,
.flags = ADDR_TYPE_RT .flags = ADDR_TYPE_RT
}, },
{ }
}; };
/* dma_system -> L3 */ /* dma_system -> L3 */
...@@ -1810,7 +1811,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__dma_system = { ...@@ -1810,7 +1811,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__dma_system = {
.slave = &omap2420_dma_system_hwmod, .slave = &omap2420_dma_system_hwmod,
.clk = "sdma_ick", .clk = "sdma_ick",
.addr = omap2420_dma_system_addrs, .addr = omap2420_dma_system_addrs,
.addr_cnt = ARRAY_SIZE(omap2420_dma_system_addrs),
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
...@@ -1868,6 +1868,7 @@ static struct omap_hwmod_addr_space omap2420_mailbox_addrs[] = { ...@@ -1868,6 +1868,7 @@ static struct omap_hwmod_addr_space omap2420_mailbox_addrs[] = {
.pa_end = 0x480941ff, .pa_end = 0x480941ff,
.flags = ADDR_TYPE_RT, .flags = ADDR_TYPE_RT,
}, },
{ }
}; };
/* l4_core -> mailbox */ /* l4_core -> mailbox */
...@@ -1875,7 +1876,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__mailbox = { ...@@ -1875,7 +1876,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__mailbox = {
.master = &omap2420_l4_core_hwmod, .master = &omap2420_l4_core_hwmod,
.slave = &omap2420_mailbox_hwmod, .slave = &omap2420_mailbox_hwmod,
.addr = omap2420_mailbox_addrs, .addr = omap2420_mailbox_addrs,
.addr_cnt = ARRAY_SIZE(omap2420_mailbox_addrs),
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
...@@ -2044,6 +2044,7 @@ static struct omap_hwmod_addr_space omap2420_mcbsp1_addrs[] = { ...@@ -2044,6 +2044,7 @@ static struct omap_hwmod_addr_space omap2420_mcbsp1_addrs[] = {
.pa_end = 0x480740ff, .pa_end = 0x480740ff,
.flags = ADDR_TYPE_RT .flags = ADDR_TYPE_RT
}, },
{ }
}; };
/* l4_core -> mcbsp1 */ /* l4_core -> mcbsp1 */
...@@ -2052,7 +2053,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__mcbsp1 = { ...@@ -2052,7 +2053,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__mcbsp1 = {
.slave = &omap2420_mcbsp1_hwmod, .slave = &omap2420_mcbsp1_hwmod,
.clk = "mcbsp1_ick", .clk = "mcbsp1_ick",
.addr = omap2420_mcbsp1_addrs, .addr = omap2420_mcbsp1_addrs,
.addr_cnt = ARRAY_SIZE(omap2420_mcbsp1_addrs),
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
...@@ -2101,6 +2101,7 @@ static struct omap_hwmod_addr_space omap2420_mcbsp2_addrs[] = { ...@@ -2101,6 +2101,7 @@ static struct omap_hwmod_addr_space omap2420_mcbsp2_addrs[] = {
.pa_end = 0x480760ff, .pa_end = 0x480760ff,
.flags = ADDR_TYPE_RT .flags = ADDR_TYPE_RT
}, },
{ }
}; };
/* l4_core -> mcbsp2 */ /* l4_core -> mcbsp2 */
...@@ -2109,7 +2110,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__mcbsp2 = { ...@@ -2109,7 +2110,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__mcbsp2 = {
.slave = &omap2420_mcbsp2_hwmod, .slave = &omap2420_mcbsp2_hwmod,
.clk = "mcbsp2_ick", .clk = "mcbsp2_ick",
.addr = omap2420_mcbsp2_addrs, .addr = omap2420_mcbsp2_addrs,
.addr_cnt = ARRAY_SIZE(omap2420_mcbsp2_addrs),
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
......
arch/arm/mach-omap2/omap_hwmod_2430_data.c
浏览文件 @ 78183f3f
/* /*
* omap_hwmod_2430_data.c - hardware modules present on the OMAP2430 chips * omap_hwmod_2430_data.c - hardware modules present on the OMAP2430 chips
* *
* Copyright (C) 2009-2010 Nokia Corporation * Copyright (C) 2009-2011 Nokia Corporation
* Paul Walmsley * Paul Walmsley
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
...@@ -141,6 +141,7 @@ static struct omap_hwmod_addr_space omap2430_i2c1_addr_space[] = { ...@@ -141,6 +141,7 @@ static struct omap_hwmod_addr_space omap2430_i2c1_addr_space[] = {
.pa_end = 0x48070000 + OMAP2_I2C_AS_LEN - 1, .pa_end = 0x48070000 + OMAP2_I2C_AS_LEN - 1,
.flags = ADDR_TYPE_RT, .flags = ADDR_TYPE_RT,
}, },
{ }
}; };
static struct omap_hwmod_ocp_if omap2430_l4_core__i2c1 = { static struct omap_hwmod_ocp_if omap2430_l4_core__i2c1 = {
...@@ -148,7 +149,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__i2c1 = { ...@@ -148,7 +149,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__i2c1 = {
.slave = &omap2430_i2c1_hwmod, .slave = &omap2430_i2c1_hwmod,
.clk = "i2c1_ick", .clk = "i2c1_ick",
.addr = omap2430_i2c1_addr_space, .addr = omap2430_i2c1_addr_space,
.addr_cnt = ARRAY_SIZE(omap2430_i2c1_addr_space),
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
...@@ -159,6 +159,7 @@ static struct omap_hwmod_addr_space omap2430_i2c2_addr_space[] = { ...@@ -159,6 +159,7 @@ static struct omap_hwmod_addr_space omap2430_i2c2_addr_space[] = {
.pa_end = 0x48072000 + OMAP2_I2C_AS_LEN - 1, .pa_end = 0x48072000 + OMAP2_I2C_AS_LEN - 1,
.flags = ADDR_TYPE_RT, .flags = ADDR_TYPE_RT,
}, },
{ }
}; };
static struct omap_hwmod_ocp_if omap2430_l4_core__i2c2 = { static struct omap_hwmod_ocp_if omap2430_l4_core__i2c2 = {
...@@ -166,7 +167,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__i2c2 = { ...@@ -166,7 +167,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__i2c2 = {
.slave = &omap2430_i2c2_hwmod, .slave = &omap2430_i2c2_hwmod,
.clk = "i2c2_ick", .clk = "i2c2_ick",
.addr = omap2430_i2c2_addr_space, .addr = omap2430_i2c2_addr_space,
.addr_cnt = ARRAY_SIZE(omap2430_i2c2_addr_space),
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
...@@ -184,6 +184,7 @@ static struct omap_hwmod_addr_space omap2430_uart1_addr_space[] = { ...@@ -184,6 +184,7 @@ static struct omap_hwmod_addr_space omap2430_uart1_addr_space[] = {
.pa_end = OMAP2_UART1_BASE + SZ_8K - 1, .pa_end = OMAP2_UART1_BASE + SZ_8K - 1,
.flags = ADDR_MAP_ON_INIT | ADDR_TYPE_RT, .flags = ADDR_MAP_ON_INIT | ADDR_TYPE_RT,
}, },
{ }
}; };
static struct omap_hwmod_ocp_if omap2_l4_core__uart1 = { static struct omap_hwmod_ocp_if omap2_l4_core__uart1 = {
...@@ -191,7 +192,6 @@ static struct omap_hwmod_ocp_if omap2_l4_core__uart1 = { ...@@ -191,7 +192,6 @@ static struct omap_hwmod_ocp_if omap2_l4_core__uart1 = {
.slave = &omap2430_uart1_hwmod, .slave = &omap2430_uart1_hwmod,
.clk = "uart1_ick", .clk = "uart1_ick",
.addr = omap2430_uart1_addr_space, .addr = omap2430_uart1_addr_space,
.addr_cnt = ARRAY_SIZE(omap2430_uart1_addr_space),
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
...@@ -202,6 +202,7 @@ static struct omap_hwmod_addr_space omap2430_uart2_addr_space[] = { ...@@ -202,6 +202,7 @@ static struct omap_hwmod_addr_space omap2430_uart2_addr_space[] = {
.pa_end = OMAP2_UART2_BASE + SZ_1K - 1, .pa_end = OMAP2_UART2_BASE + SZ_1K - 1,
.flags = ADDR_MAP_ON_INIT | ADDR_TYPE_RT, .flags = ADDR_MAP_ON_INIT | ADDR_TYPE_RT,
}, },
{ }
}; };
static struct omap_hwmod_ocp_if omap2_l4_core__uart2 = { static struct omap_hwmod_ocp_if omap2_l4_core__uart2 = {
...@@ -209,7 +210,6 @@ static struct omap_hwmod_ocp_if omap2_l4_core__uart2 = { ...@@ -209,7 +210,6 @@ static struct omap_hwmod_ocp_if omap2_l4_core__uart2 = {
.slave = &omap2430_uart2_hwmod, .slave = &omap2430_uart2_hwmod,
.clk = "uart2_ick", .clk = "uart2_ick",
.addr = omap2430_uart2_addr_space, .addr = omap2430_uart2_addr_space,
.addr_cnt = ARRAY_SIZE(omap2430_uart2_addr_space),
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
...@@ -220,6 +220,7 @@ static struct omap_hwmod_addr_space omap2430_uart3_addr_space[] = { ...@@ -220,6 +220,7 @@ static struct omap_hwmod_addr_space omap2430_uart3_addr_space[] = {
.pa_end = OMAP2_UART3_BASE + SZ_1K - 1, .pa_end = OMAP2_UART3_BASE + SZ_1K - 1,
.flags = ADDR_MAP_ON_INIT | ADDR_TYPE_RT, .flags = ADDR_MAP_ON_INIT | ADDR_TYPE_RT,
}, },
{ }
}; };
static struct omap_hwmod_ocp_if omap2_l4_core__uart3 = { static struct omap_hwmod_ocp_if omap2_l4_core__uart3 = {
...@@ -227,7 +228,6 @@ static struct omap_hwmod_ocp_if omap2_l4_core__uart3 = { ...@@ -227,7 +228,6 @@ static struct omap_hwmod_ocp_if omap2_l4_core__uart3 = {
.slave = &omap2430_uart3_hwmod, .slave = &omap2430_uart3_hwmod,
.clk = "uart3_ick", .clk = "uart3_ick",
.addr = omap2430_uart3_addr_space, .addr = omap2430_uart3_addr_space,
.addr_cnt = ARRAY_SIZE(omap2430_uart3_addr_space),
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
...@@ -248,7 +248,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__usbhsotg = { ...@@ -248,7 +248,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__usbhsotg = {
.slave = &omap2430_usbhsotg_hwmod, .slave = &omap2430_usbhsotg_hwmod,
.clk = "usb_l4_ick", .clk = "usb_l4_ick",
.addr = omap2430_usbhsotg_addrs, .addr = omap2430_usbhsotg_addrs,
.addr_cnt = ARRAY_SIZE(omap2430_usbhsotg_addrs),
.user = OCP_USER_MPU, .user = OCP_USER_MPU,
}; };
...@@ -267,6 +266,7 @@ static struct omap_hwmod_addr_space omap2430_mmc1_addr_space[] = { ...@@ -267,6 +266,7 @@ static struct omap_hwmod_addr_space omap2430_mmc1_addr_space[] = {
.pa_end = 0x4809c1ff, .pa_end = 0x4809c1ff,
.flags = ADDR_TYPE_RT, .flags = ADDR_TYPE_RT,
}, },
{ }
}; };
static struct omap_hwmod_ocp_if omap2430_l4_core__mmc1 = { static struct omap_hwmod_ocp_if omap2430_l4_core__mmc1 = {
...@@ -274,7 +274,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__mmc1 = { ...@@ -274,7 +274,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__mmc1 = {
.slave = &omap2430_mmc1_hwmod, .slave = &omap2430_mmc1_hwmod,
.clk = "mmchs1_ick", .clk = "mmchs1_ick",
.addr = omap2430_mmc1_addr_space, .addr = omap2430_mmc1_addr_space,
.addr_cnt = ARRAY_SIZE(omap2430_mmc1_addr_space),
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
...@@ -285,14 +284,14 @@ static struct omap_hwmod_addr_space omap2430_mmc2_addr_space[] = { ...@@ -285,14 +284,14 @@ static struct omap_hwmod_addr_space omap2430_mmc2_addr_space[] = {
.pa_end = 0x480b41ff, .pa_end = 0x480b41ff,
.flags = ADDR_TYPE_RT, .flags = ADDR_TYPE_RT,
}, },
{ }
}; };
static struct omap_hwmod_ocp_if omap2430_l4_core__mmc2 = { static struct omap_hwmod_ocp_if omap2430_l4_core__mmc2 = {
.master = &omap2430_l4_core_hwmod, .master = &omap2430_l4_core_hwmod,
.slave = &omap2430_mmc2_hwmod, .slave = &omap2430_mmc2_hwmod,
.addr = omap2430_mmc2_addr_space,
.clk = "mmchs2_ick", .clk = "mmchs2_ick",
.addr_cnt = ARRAY_SIZE(omap2430_mmc2_addr_space), .addr = omap2430_mmc2_addr_space,
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
...@@ -339,6 +338,7 @@ static struct omap_hwmod_addr_space omap2430_mcspi1_addr_space[] = { ...@@ -339,6 +338,7 @@ static struct omap_hwmod_addr_space omap2430_mcspi1_addr_space[] = {
.pa_end = 0x480980ff, .pa_end = 0x480980ff,
.flags = ADDR_TYPE_RT, .flags = ADDR_TYPE_RT,
}, },
{ }
}; };
static struct omap_hwmod_ocp_if omap2430_l4_core__mcspi1 = { static struct omap_hwmod_ocp_if omap2430_l4_core__mcspi1 = {
...@@ -346,7 +346,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__mcspi1 = { ...@@ -346,7 +346,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__mcspi1 = {
.slave = &omap2430_mcspi1_hwmod, .slave = &omap2430_mcspi1_hwmod,
.clk = "mcspi1_ick", .clk = "mcspi1_ick",
.addr = omap2430_mcspi1_addr_space, .addr = omap2430_mcspi1_addr_space,
.addr_cnt = ARRAY_SIZE(omap2430_mcspi1_addr_space),
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
...@@ -357,6 +356,7 @@ static struct omap_hwmod_addr_space omap2430_mcspi2_addr_space[] = { ...@@ -357,6 +356,7 @@ static struct omap_hwmod_addr_space omap2430_mcspi2_addr_space[] = {
.pa_end = 0x4809a0ff, .pa_end = 0x4809a0ff,
.flags = ADDR_TYPE_RT, .flags = ADDR_TYPE_RT,
}, },
{ }
}; };
static struct omap_hwmod_ocp_if omap2430_l4_core__mcspi2 = { static struct omap_hwmod_ocp_if omap2430_l4_core__mcspi2 = {
...@@ -364,7 +364,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__mcspi2 = { ...@@ -364,7 +364,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__mcspi2 = {
.slave = &omap2430_mcspi2_hwmod, .slave = &omap2430_mcspi2_hwmod,
.clk = "mcspi2_ick", .clk = "mcspi2_ick",
.addr = omap2430_mcspi2_addr_space, .addr = omap2430_mcspi2_addr_space,
.addr_cnt = ARRAY_SIZE(omap2430_mcspi2_addr_space),
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
...@@ -375,6 +374,7 @@ static struct omap_hwmod_addr_space omap2430_mcspi3_addr_space[] = { ...@@ -375,6 +374,7 @@ static struct omap_hwmod_addr_space omap2430_mcspi3_addr_space[] = {
.pa_end = 0x480b80ff, .pa_end = 0x480b80ff,
.flags = ADDR_TYPE_RT, .flags = ADDR_TYPE_RT,
}, },
{ }
}; };
static struct omap_hwmod_ocp_if omap2430_l4_core__mcspi3 = { static struct omap_hwmod_ocp_if omap2430_l4_core__mcspi3 = {
...@@ -382,7 +382,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__mcspi3 = { ...@@ -382,7 +382,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__mcspi3 = {
.slave = &omap2430_mcspi3_hwmod, .slave = &omap2430_mcspi3_hwmod,
.clk = "mcspi3_ick", .clk = "mcspi3_ick",
.addr = omap2430_mcspi3_addr_space, .addr = omap2430_mcspi3_addr_space,
.addr_cnt = ARRAY_SIZE(omap2430_mcspi3_addr_space),
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
...@@ -471,6 +470,7 @@ static struct omap_hwmod_addr_space omap2430_timer1_addrs[] = { ...@@ -471,6 +470,7 @@ static struct omap_hwmod_addr_space omap2430_timer1_addrs[] = {
.pa_end = 0x49018000 + SZ_1K - 1, .pa_end = 0x49018000 + SZ_1K - 1,
.flags = ADDR_TYPE_RT .flags = ADDR_TYPE_RT
}, },
{ }
}; };
/* l4_wkup -> timer1 */ /* l4_wkup -> timer1 */
...@@ -479,7 +479,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_wkup__timer1 = { ...@@ -479,7 +479,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_wkup__timer1 = {
.slave = &omap2430_timer1_hwmod, .slave = &omap2430_timer1_hwmod,
.clk = "gpt1_ick", .clk = "gpt1_ick",
.addr = omap2430_timer1_addrs, .addr = omap2430_timer1_addrs,
.addr_cnt = ARRAY_SIZE(omap2430_timer1_addrs),
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
...@@ -521,6 +520,7 @@ static struct omap_hwmod_addr_space omap2430_timer2_addrs[] = { ...@@ -521,6 +520,7 @@ static struct omap_hwmod_addr_space omap2430_timer2_addrs[] = {
.pa_end = 0x4802a000 + SZ_1K - 1, .pa_end = 0x4802a000 + SZ_1K - 1,
.flags = ADDR_TYPE_RT .flags = ADDR_TYPE_RT
}, },
{ }
}; };
/* l4_core -> timer2 */ /* l4_core -> timer2 */
...@@ -529,7 +529,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__timer2 = { ...@@ -529,7 +529,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__timer2 = {
.slave = &omap2430_timer2_hwmod, .slave = &omap2430_timer2_hwmod,
.clk = "gpt2_ick", .clk = "gpt2_ick",
.addr = omap2430_timer2_addrs, .addr = omap2430_timer2_addrs,
.addr_cnt = ARRAY_SIZE(omap2430_timer2_addrs),
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
...@@ -571,6 +570,7 @@ static struct omap_hwmod_addr_space omap2430_timer3_addrs[] = { ...@@ -571,6 +570,7 @@ static struct omap_hwmod_addr_space omap2430_timer3_addrs[] = {
.pa_end = 0x48078000 + SZ_1K - 1, .pa_end = 0x48078000 + SZ_1K - 1,
.flags = ADDR_TYPE_RT .flags = ADDR_TYPE_RT
}, },
{ }
}; };
/* l4_core -> timer3 */ /* l4_core -> timer3 */
...@@ -579,7 +579,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__timer3 = { ...@@ -579,7 +579,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__timer3 = {
.slave = &omap2430_timer3_hwmod, .slave = &omap2430_timer3_hwmod,
.clk = "gpt3_ick", .clk = "gpt3_ick",
.addr = omap2430_timer3_addrs, .addr = omap2430_timer3_addrs,
.addr_cnt = ARRAY_SIZE(omap2430_timer3_addrs),
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
...@@ -621,6 +620,7 @@ static struct omap_hwmod_addr_space omap2430_timer4_addrs[] = { ...@@ -621,6 +620,7 @@ static struct omap_hwmod_addr_space omap2430_timer4_addrs[] = {
.pa_end = 0x4807a000 + SZ_1K - 1, .pa_end = 0x4807a000 + SZ_1K - 1,
.flags = ADDR_TYPE_RT .flags = ADDR_TYPE_RT
}, },
{ }
}; };
/* l4_core -> timer4 */ /* l4_core -> timer4 */
...@@ -629,7 +629,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__timer4 = { ...@@ -629,7 +629,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__timer4 = {
.slave = &omap2430_timer4_hwmod, .slave = &omap2430_timer4_hwmod,
.clk = "gpt4_ick", .clk = "gpt4_ick",
.addr = omap2430_timer4_addrs, .addr = omap2430_timer4_addrs,
.addr_cnt = ARRAY_SIZE(omap2430_timer4_addrs),
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
...@@ -671,6 +670,7 @@ static struct omap_hwmod_addr_space omap2430_timer5_addrs[] = { ...@@ -671,6 +670,7 @@ static struct omap_hwmod_addr_space omap2430_timer5_addrs[] = {
.pa_end = 0x4807c000 + SZ_1K - 1, .pa_end = 0x4807c000 + SZ_1K - 1,
.flags = ADDR_TYPE_RT .flags = ADDR_TYPE_RT
}, },
{ }
}; };
/* l4_core -> timer5 */ /* l4_core -> timer5 */
...@@ -679,7 +679,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__timer5 = { ...@@ -679,7 +679,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__timer5 = {
.slave = &omap2430_timer5_hwmod, .slave = &omap2430_timer5_hwmod,
.clk = "gpt5_ick", .clk = "gpt5_ick",
.addr = omap2430_timer5_addrs, .addr = omap2430_timer5_addrs,
.addr_cnt = ARRAY_SIZE(omap2430_timer5_addrs),
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
...@@ -721,6 +720,7 @@ static struct omap_hwmod_addr_space omap2430_timer6_addrs[] = { ...@@ -721,6 +720,7 @@ static struct omap_hwmod_addr_space omap2430_timer6_addrs[] = {
.pa_end = 0x4807e000 + SZ_1K - 1, .pa_end = 0x4807e000 + SZ_1K - 1,
.flags = ADDR_TYPE_RT .flags = ADDR_TYPE_RT
}, },
{ }
}; };
/* l4_core -> timer6 */ /* l4_core -> timer6 */
...@@ -729,7 +729,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__timer6 = { ...@@ -729,7 +729,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__timer6 = {
.slave = &omap2430_timer6_hwmod, .slave = &omap2430_timer6_hwmod,
.clk = "gpt6_ick", .clk = "gpt6_ick",
.addr = omap2430_timer6_addrs, .addr = omap2430_timer6_addrs,
.addr_cnt = ARRAY_SIZE(omap2430_timer6_addrs),
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
...@@ -771,6 +770,7 @@ static struct omap_hwmod_addr_space omap2430_timer7_addrs[] = { ...@@ -771,6 +770,7 @@ static struct omap_hwmod_addr_space omap2430_timer7_addrs[] = {
.pa_end = 0x48080000 + SZ_1K - 1, .pa_end = 0x48080000 + SZ_1K - 1,
.flags = ADDR_TYPE_RT .flags = ADDR_TYPE_RT
}, },
{ }
}; };
/* l4_core -> timer7 */ /* l4_core -> timer7 */
...@@ -779,7 +779,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__timer7 = { ...@@ -779,7 +779,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__timer7 = {
.slave = &omap2430_timer7_hwmod, .slave = &omap2430_timer7_hwmod,
.clk = "gpt7_ick", .clk = "gpt7_ick",
.addr = omap2430_timer7_addrs, .addr = omap2430_timer7_addrs,
.addr_cnt = ARRAY_SIZE(omap2430_timer7_addrs),
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
...@@ -821,6 +820,7 @@ static struct omap_hwmod_addr_space omap2430_timer8_addrs[] = { ...@@ -821,6 +820,7 @@ static struct omap_hwmod_addr_space omap2430_timer8_addrs[] = {
.pa_end = 0x48082000 + SZ_1K - 1, .pa_end = 0x48082000 + SZ_1K - 1,
.flags = ADDR_TYPE_RT .flags = ADDR_TYPE_RT
}, },
{ }
}; };
/* l4_core -> timer8 */ /* l4_core -> timer8 */
...@@ -829,7 +829,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__timer8 = { ...@@ -829,7 +829,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__timer8 = {
.slave = &omap2430_timer8_hwmod, .slave = &omap2430_timer8_hwmod,
.clk = "gpt8_ick", .clk = "gpt8_ick",
.addr = omap2430_timer8_addrs, .addr = omap2430_timer8_addrs,
.addr_cnt = ARRAY_SIZE(omap2430_timer8_addrs),
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
...@@ -871,6 +870,7 @@ static struct omap_hwmod_addr_space omap2430_timer9_addrs[] = { ...@@ -871,6 +870,7 @@ static struct omap_hwmod_addr_space omap2430_timer9_addrs[] = {
.pa_end = 0x48084000 + SZ_1K - 1, .pa_end = 0x48084000 + SZ_1K - 1,
.flags = ADDR_TYPE_RT .flags = ADDR_TYPE_RT
}, },
{ }
}; };
/* l4_core -> timer9 */ /* l4_core -> timer9 */
...@@ -879,7 +879,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__timer9 = { ...@@ -879,7 +879,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__timer9 = {
.slave = &omap2430_timer9_hwmod, .slave = &omap2430_timer9_hwmod,
.clk = "gpt9_ick", .clk = "gpt9_ick",
.addr = omap2430_timer9_addrs, .addr = omap2430_timer9_addrs,
.addr_cnt = ARRAY_SIZE(omap2430_timer9_addrs),
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
...@@ -921,6 +920,7 @@ static struct omap_hwmod_addr_space omap2430_timer10_addrs[] = { ...@@ -921,6 +920,7 @@ static struct omap_hwmod_addr_space omap2430_timer10_addrs[] = {
.pa_end = 0x48086000 + SZ_1K - 1, .pa_end = 0x48086000 + SZ_1K - 1,
.flags = ADDR_TYPE_RT .flags = ADDR_TYPE_RT
}, },
{ }
}; };
/* l4_core -> timer10 */ /* l4_core -> timer10 */
...@@ -929,7 +929,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__timer10 = { ...@@ -929,7 +929,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__timer10 = {
.slave = &omap2430_timer10_hwmod, .slave = &omap2430_timer10_hwmod,
.clk = "gpt10_ick", .clk = "gpt10_ick",
.addr = omap2430_timer10_addrs, .addr = omap2430_timer10_addrs,
.addr_cnt = ARRAY_SIZE(omap2430_timer10_addrs),
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
...@@ -971,6 +970,7 @@ static struct omap_hwmod_addr_space omap2430_timer11_addrs[] = { ...@@ -971,6 +970,7 @@ static struct omap_hwmod_addr_space omap2430_timer11_addrs[] = {
.pa_end = 0x48088000 + SZ_1K - 1, .pa_end = 0x48088000 + SZ_1K - 1,
.flags = ADDR_TYPE_RT .flags = ADDR_TYPE_RT
}, },
{ }
}; };
/* l4_core -> timer11 */ /* l4_core -> timer11 */
...@@ -979,7 +979,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__timer11 = { ...@@ -979,7 +979,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__timer11 = {
.slave = &omap2430_timer11_hwmod, .slave = &omap2430_timer11_hwmod,
.clk = "gpt11_ick", .clk = "gpt11_ick",
.addr = omap2430_timer11_addrs, .addr = omap2430_timer11_addrs,
.addr_cnt = ARRAY_SIZE(omap2430_timer11_addrs),
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
...@@ -1021,6 +1020,7 @@ static struct omap_hwmod_addr_space omap2430_timer12_addrs[] = { ...@@ -1021,6 +1020,7 @@ static struct omap_hwmod_addr_space omap2430_timer12_addrs[] = {
.pa_end = 0x4808a000 + SZ_1K - 1, .pa_end = 0x4808a000 + SZ_1K - 1,
.flags = ADDR_TYPE_RT .flags = ADDR_TYPE_RT
}, },
{ }
}; };
/* l4_core -> timer12 */ /* l4_core -> timer12 */
...@@ -1029,7 +1029,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__timer12 = { ...@@ -1029,7 +1029,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__timer12 = {
.slave = &omap2430_timer12_hwmod, .slave = &omap2430_timer12_hwmod,
.clk = "gpt12_ick", .clk = "gpt12_ick",
.addr = omap2430_timer12_addrs, .addr = omap2430_timer12_addrs,
.addr_cnt = ARRAY_SIZE(omap2430_timer12_addrs),
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
...@@ -1066,6 +1065,7 @@ static struct omap_hwmod_addr_space omap2430_wd_timer2_addrs[] = { ...@@ -1066,6 +1065,7 @@ static struct omap_hwmod_addr_space omap2430_wd_timer2_addrs[] = {
.pa_end = 0x4901607f, .pa_end = 0x4901607f,
.flags = ADDR_TYPE_RT .flags = ADDR_TYPE_RT
}, },
{ }
}; };
static struct omap_hwmod_ocp_if omap2430_l4_wkup__wd_timer2 = { static struct omap_hwmod_ocp_if omap2430_l4_wkup__wd_timer2 = {
...@@ -1073,7 +1073,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_wkup__wd_timer2 = { ...@@ -1073,7 +1073,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_wkup__wd_timer2 = {
.slave = &omap2430_wd_timer2_hwmod, .slave = &omap2430_wd_timer2_hwmod,
.clk = "mpu_wdt_ick", .clk = "mpu_wdt_ick",
.addr = omap2430_wd_timer2_addrs, .addr = omap2430_wd_timer2_addrs,
.addr_cnt = ARRAY_SIZE(omap2430_wd_timer2_addrs),
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
...@@ -1284,6 +1283,7 @@ static struct omap_hwmod_addr_space omap2430_dss_addrs[] = { ...@@ -1284,6 +1283,7 @@ static struct omap_hwmod_addr_space omap2430_dss_addrs[] = {
.pa_end = 0x480503FF, .pa_end = 0x480503FF,
.flags = ADDR_TYPE_RT .flags = ADDR_TYPE_RT
}, },
{ }
}; };
/* l4_core -> dss */ /* l4_core -> dss */
...@@ -1292,7 +1292,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__dss = { ...@@ -1292,7 +1292,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__dss = {
.slave = &omap2430_dss_core_hwmod, .slave = &omap2430_dss_core_hwmod,
.clk = "dss_ick", .clk = "dss_ick",
.addr = omap2430_dss_addrs, .addr = omap2430_dss_addrs,
.addr_cnt = ARRAY_SIZE(omap2430_dss_addrs),
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
...@@ -1362,6 +1361,7 @@ static struct omap_hwmod_addr_space omap2430_dss_dispc_addrs[] = { ...@@ -1362,6 +1361,7 @@ static struct omap_hwmod_addr_space omap2430_dss_dispc_addrs[] = {
.pa_end = 0x480507FF, .pa_end = 0x480507FF,
.flags = ADDR_TYPE_RT .flags = ADDR_TYPE_RT
}, },
{ }
}; };
/* l4_core -> dss_dispc */ /* l4_core -> dss_dispc */
...@@ -1370,7 +1370,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__dss_dispc = { ...@@ -1370,7 +1370,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__dss_dispc = {
.slave = &omap2430_dss_dispc_hwmod, .slave = &omap2430_dss_dispc_hwmod,
.clk = "dss_ick", .clk = "dss_ick",
.addr = omap2430_dss_dispc_addrs, .addr = omap2430_dss_dispc_addrs,
.addr_cnt = ARRAY_SIZE(omap2430_dss_dispc_addrs),
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
...@@ -1426,6 +1425,7 @@ static struct omap_hwmod_addr_space omap2430_dss_rfbi_addrs[] = { ...@@ -1426,6 +1425,7 @@ static struct omap_hwmod_addr_space omap2430_dss_rfbi_addrs[] = {
.pa_end = 0x48050BFF, .pa_end = 0x48050BFF,
.flags = ADDR_TYPE_RT .flags = ADDR_TYPE_RT
}, },
{ }
}; };
/* l4_core -> dss_rfbi */ /* l4_core -> dss_rfbi */
...@@ -1434,7 +1434,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__dss_rfbi = { ...@@ -1434,7 +1434,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__dss_rfbi = {
.slave = &omap2430_dss_rfbi_hwmod, .slave = &omap2430_dss_rfbi_hwmod,
.clk = "dss_ick", .clk = "dss_ick",
.addr = omap2430_dss_rfbi_addrs, .addr = omap2430_dss_rfbi_addrs,
.addr_cnt = ARRAY_SIZE(omap2430_dss_rfbi_addrs),
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
...@@ -1476,6 +1475,7 @@ static struct omap_hwmod_addr_space omap2430_dss_venc_addrs[] = { ...@@ -1476,6 +1475,7 @@ static struct omap_hwmod_addr_space omap2430_dss_venc_addrs[] = {
.pa_end = 0x48050FFF, .pa_end = 0x48050FFF,
.flags = ADDR_TYPE_RT .flags = ADDR_TYPE_RT
}, },
{ }
}; };
/* l4_core -> dss_venc */ /* l4_core -> dss_venc */
...@@ -1484,7 +1484,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__dss_venc = { ...@@ -1484,7 +1484,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__dss_venc = {
.slave = &omap2430_dss_venc_hwmod, .slave = &omap2430_dss_venc_hwmod,
.clk = "dss_54m_fck", .clk = "dss_54m_fck",
.addr = omap2430_dss_venc_addrs, .addr = omap2430_dss_venc_addrs,
.addr_cnt = ARRAY_SIZE(omap2430_dss_venc_addrs),
.flags = OCPIF_SWSUP_IDLE, .flags = OCPIF_SWSUP_IDLE,
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
...@@ -1621,6 +1620,7 @@ static struct omap_hwmod_addr_space omap2430_gpio1_addr_space[] = { ...@@ -1621,6 +1620,7 @@ static struct omap_hwmod_addr_space omap2430_gpio1_addr_space[] = {
.pa_end = 0x4900C1ff, .pa_end = 0x4900C1ff,
.flags = ADDR_TYPE_RT .flags = ADDR_TYPE_RT
}, },
{ }
}; };
static struct omap_hwmod_ocp_if omap2430_l4_wkup__gpio1 = { static struct omap_hwmod_ocp_if omap2430_l4_wkup__gpio1 = {
...@@ -1628,7 +1628,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_wkup__gpio1 = { ...@@ -1628,7 +1628,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_wkup__gpio1 = {
.slave = &omap2430_gpio1_hwmod, .slave = &omap2430_gpio1_hwmod,
.clk = "gpios_ick", .clk = "gpios_ick",
.addr = omap2430_gpio1_addr_space, .addr = omap2430_gpio1_addr_space,
.addr_cnt = ARRAY_SIZE(omap2430_gpio1_addr_space),
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
...@@ -1639,6 +1638,7 @@ static struct omap_hwmod_addr_space omap2430_gpio2_addr_space[] = { ...@@ -1639,6 +1638,7 @@ static struct omap_hwmod_addr_space omap2430_gpio2_addr_space[] = {
.pa_end = 0x4900E1ff, .pa_end = 0x4900E1ff,
.flags = ADDR_TYPE_RT .flags = ADDR_TYPE_RT
}, },
{ }
}; };
static struct omap_hwmod_ocp_if omap2430_l4_wkup__gpio2 = { static struct omap_hwmod_ocp_if omap2430_l4_wkup__gpio2 = {
...@@ -1646,7 +1646,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_wkup__gpio2 = { ...@@ -1646,7 +1646,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_wkup__gpio2 = {
.slave = &omap2430_gpio2_hwmod, .slave = &omap2430_gpio2_hwmod,
.clk = "gpios_ick", .clk = "gpios_ick",
.addr = omap2430_gpio2_addr_space, .addr = omap2430_gpio2_addr_space,
.addr_cnt = ARRAY_SIZE(omap2430_gpio2_addr_space),
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
...@@ -1657,6 +1656,7 @@ static struct omap_hwmod_addr_space omap2430_gpio3_addr_space[] = { ...@@ -1657,6 +1656,7 @@ static struct omap_hwmod_addr_space omap2430_gpio3_addr_space[] = {
.pa_end = 0x490101ff, .pa_end = 0x490101ff,
.flags = ADDR_TYPE_RT .flags = ADDR_TYPE_RT
}, },
{ }
}; };
static struct omap_hwmod_ocp_if omap2430_l4_wkup__gpio3 = { static struct omap_hwmod_ocp_if omap2430_l4_wkup__gpio3 = {
...@@ -1664,7 +1664,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_wkup__gpio3 = { ...@@ -1664,7 +1664,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_wkup__gpio3 = {
.slave = &omap2430_gpio3_hwmod, .slave = &omap2430_gpio3_hwmod,
.clk = "gpios_ick", .clk = "gpios_ick",
.addr = omap2430_gpio3_addr_space, .addr = omap2430_gpio3_addr_space,
.addr_cnt = ARRAY_SIZE(omap2430_gpio3_addr_space),
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
...@@ -1675,6 +1674,7 @@ static struct omap_hwmod_addr_space omap2430_gpio4_addr_space[] = { ...@@ -1675,6 +1674,7 @@ static struct omap_hwmod_addr_space omap2430_gpio4_addr_space[] = {
.pa_end = 0x490121ff, .pa_end = 0x490121ff,
.flags = ADDR_TYPE_RT .flags = ADDR_TYPE_RT
}, },
{ }
}; };
static struct omap_hwmod_ocp_if omap2430_l4_wkup__gpio4 = { static struct omap_hwmod_ocp_if omap2430_l4_wkup__gpio4 = {
...@@ -1682,7 +1682,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_wkup__gpio4 = { ...@@ -1682,7 +1682,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_wkup__gpio4 = {
.slave = &omap2430_gpio4_hwmod, .slave = &omap2430_gpio4_hwmod,
.clk = "gpios_ick", .clk = "gpios_ick",
.addr = omap2430_gpio4_addr_space, .addr = omap2430_gpio4_addr_space,
.addr_cnt = ARRAY_SIZE(omap2430_gpio4_addr_space),
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
...@@ -1693,6 +1692,7 @@ static struct omap_hwmod_addr_space omap2430_gpio5_addr_space[] = { ...@@ -1693,6 +1692,7 @@ static struct omap_hwmod_addr_space omap2430_gpio5_addr_space[] = {
.pa_end = 0x480B61ff, .pa_end = 0x480B61ff,
.flags = ADDR_TYPE_RT .flags = ADDR_TYPE_RT
}, },
{ }
}; };
static struct omap_hwmod_ocp_if omap2430_l4_core__gpio5 = { static struct omap_hwmod_ocp_if omap2430_l4_core__gpio5 = {
...@@ -1700,7 +1700,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__gpio5 = { ...@@ -1700,7 +1700,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__gpio5 = {
.slave = &omap2430_gpio5_hwmod, .slave = &omap2430_gpio5_hwmod,
.clk = "gpio5_ick", .clk = "gpio5_ick",
.addr = omap2430_gpio5_addr_space, .addr = omap2430_gpio5_addr_space,
.addr_cnt = ARRAY_SIZE(omap2430_gpio5_addr_space),
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
...@@ -1923,6 +1922,7 @@ static struct omap_hwmod_addr_space omap2430_dma_system_addrs[] = { ...@@ -1923,6 +1922,7 @@ static struct omap_hwmod_addr_space omap2430_dma_system_addrs[] = {
.pa_end = 0x48056fff, .pa_end = 0x48056fff,
.flags = ADDR_TYPE_RT .flags = ADDR_TYPE_RT
}, },
{ }
}; };
/* dma_system -> L3 */ /* dma_system -> L3 */
...@@ -1944,7 +1944,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__dma_system = { ...@@ -1944,7 +1944,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__dma_system = {
.slave = &omap2430_dma_system_hwmod, .slave = &omap2430_dma_system_hwmod,
.clk = "sdma_ick", .clk = "sdma_ick",
.addr = omap2430_dma_system_addrs, .addr = omap2430_dma_system_addrs,
.addr_cnt = ARRAY_SIZE(omap2430_dma_system_addrs),
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
...@@ -2001,6 +2000,7 @@ static struct omap_hwmod_addr_space omap2430_mailbox_addrs[] = { ...@@ -2001,6 +2000,7 @@ static struct omap_hwmod_addr_space omap2430_mailbox_addrs[] = {
.pa_end = 0x480941ff, .pa_end = 0x480941ff,
.flags = ADDR_TYPE_RT, .flags = ADDR_TYPE_RT,
}, },
{ }
}; };
/* l4_core -> mailbox */ /* l4_core -> mailbox */
...@@ -2008,7 +2008,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__mailbox = { ...@@ -2008,7 +2008,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__mailbox = {
.master = &omap2430_l4_core_hwmod, .master = &omap2430_l4_core_hwmod,
.slave = &omap2430_mailbox_hwmod, .slave = &omap2430_mailbox_hwmod,
.addr = omap2430_mailbox_addrs, .addr = omap2430_mailbox_addrs,
.addr_cnt = ARRAY_SIZE(omap2430_mailbox_addrs),
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
...@@ -2287,6 +2286,7 @@ static struct omap_hwmod_addr_space omap2430_mcbsp1_addrs[] = { ...@@ -2287,6 +2286,7 @@ static struct omap_hwmod_addr_space omap2430_mcbsp1_addrs[] = {
.pa_end = 0x480740ff, .pa_end = 0x480740ff,
.flags = ADDR_TYPE_RT .flags = ADDR_TYPE_RT
}, },
{ }
}; };
/* l4_core -> mcbsp1 */ /* l4_core -> mcbsp1 */
...@@ -2295,7 +2295,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__mcbsp1 = { ...@@ -2295,7 +2295,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__mcbsp1 = {
.slave = &omap2430_mcbsp1_hwmod, .slave = &omap2430_mcbsp1_hwmod,
.clk = "mcbsp1_ick", .clk = "mcbsp1_ick",
.addr = omap2430_mcbsp1_addrs, .addr = omap2430_mcbsp1_addrs,
.addr_cnt = ARRAY_SIZE(omap2430_mcbsp1_addrs),
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
...@@ -2345,6 +2344,7 @@ static struct omap_hwmod_addr_space omap2430_mcbsp2_addrs[] = { ...@@ -2345,6 +2344,7 @@ static struct omap_hwmod_addr_space omap2430_mcbsp2_addrs[] = {
.pa_end = 0x480760ff, .pa_end = 0x480760ff,
.flags = ADDR_TYPE_RT .flags = ADDR_TYPE_RT
}, },
{ }
}; };
/* l4_core -> mcbsp2 */ /* l4_core -> mcbsp2 */
...@@ -2353,7 +2353,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__mcbsp2 = { ...@@ -2353,7 +2353,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__mcbsp2 = {
.slave = &omap2430_mcbsp2_hwmod, .slave = &omap2430_mcbsp2_hwmod,
.clk = "mcbsp2_ick", .clk = "mcbsp2_ick",
.addr = omap2430_mcbsp2_addrs, .addr = omap2430_mcbsp2_addrs,
.addr_cnt = ARRAY_SIZE(omap2430_mcbsp2_addrs),
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
...@@ -2403,6 +2402,7 @@ static struct omap_hwmod_addr_space omap2430_mcbsp3_addrs[] = { ...@@ -2403,6 +2402,7 @@ static struct omap_hwmod_addr_space omap2430_mcbsp3_addrs[] = {
.pa_end = 0x4808C0ff, .pa_end = 0x4808C0ff,
.flags = ADDR_TYPE_RT .flags = ADDR_TYPE_RT
}, },
{ }
}; };
/* l4_core -> mcbsp3 */ /* l4_core -> mcbsp3 */
...@@ -2411,7 +2411,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__mcbsp3 = { ...@@ -2411,7 +2411,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__mcbsp3 = {
.slave = &omap2430_mcbsp3_hwmod, .slave = &omap2430_mcbsp3_hwmod,
.clk = "mcbsp3_ick", .clk = "mcbsp3_ick",
.addr = omap2430_mcbsp3_addrs, .addr = omap2430_mcbsp3_addrs,
.addr_cnt = ARRAY_SIZE(omap2430_mcbsp3_addrs),
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
...@@ -2461,6 +2460,7 @@ static struct omap_hwmod_addr_space omap2430_mcbsp4_addrs[] = { ...@@ -2461,6 +2460,7 @@ static struct omap_hwmod_addr_space omap2430_mcbsp4_addrs[] = {
.pa_end = 0x4808E0ff, .pa_end = 0x4808E0ff,
.flags = ADDR_TYPE_RT .flags = ADDR_TYPE_RT
}, },
{ }
}; };
/* l4_core -> mcbsp4 */ /* l4_core -> mcbsp4 */
...@@ -2469,7 +2469,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__mcbsp4 = { ...@@ -2469,7 +2469,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__mcbsp4 = {
.slave = &omap2430_mcbsp4_hwmod, .slave = &omap2430_mcbsp4_hwmod,
.clk = "mcbsp4_ick", .clk = "mcbsp4_ick",
.addr = omap2430_mcbsp4_addrs, .addr = omap2430_mcbsp4_addrs,
.addr_cnt = ARRAY_SIZE(omap2430_mcbsp4_addrs),
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
...@@ -2519,6 +2518,7 @@ static struct omap_hwmod_addr_space omap2430_mcbsp5_addrs[] = { ...@@ -2519,6 +2518,7 @@ static struct omap_hwmod_addr_space omap2430_mcbsp5_addrs[] = {
.pa_end = 0x480960ff, .pa_end = 0x480960ff,
.flags = ADDR_TYPE_RT .flags = ADDR_TYPE_RT
}, },
{ }
}; };
/* l4_core -> mcbsp5 */ /* l4_core -> mcbsp5 */
...@@ -2527,7 +2527,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__mcbsp5 = { ...@@ -2527,7 +2527,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__mcbsp5 = {
.slave = &omap2430_mcbsp5_hwmod, .slave = &omap2430_mcbsp5_hwmod,
.clk = "mcbsp5_ick", .clk = "mcbsp5_ick",
.addr = omap2430_mcbsp5_addrs, .addr = omap2430_mcbsp5_addrs,
.addr_cnt = ARRAY_SIZE(omap2430_mcbsp5_addrs),
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
......
arch/arm/plat-omap/include/plat/omap_hwmod.h
浏览文件 @ 78183f3f
...@@ -220,7 +220,6 @@ struct omap_hwmod_addr_space { ...@@ -220,7 +220,6 @@ struct omap_hwmod_addr_space {
* @clk: interface clock: OMAP clock name * @clk: interface clock: OMAP clock name
* @_clk: pointer to the interface struct clk (filled in at runtime) * @_clk: pointer to the interface struct clk (filled in at runtime)
* @fw: interface firewall data * @fw: interface firewall data
* @addr_cnt: ARRAY_SIZE(@addr)
* @width: OCP data width * @width: OCP data width
* @user: initiators using this interface (see OCP_USER_* macros above) * @user: initiators using this interface (see OCP_USER_* macros above)
* @flags: OCP interface flags (see OCPIF_* macros above) * @flags: OCP interface flags (see OCPIF_* macros above)
...@@ -239,7 +238,6 @@ struct omap_hwmod_ocp_if { ...@@ -239,7 +238,6 @@ struct omap_hwmod_ocp_if {
union { union {
struct omap_hwmod_omap2_firewall omap2; struct omap_hwmod_omap2_firewall omap2;
} fw; } fw;
u8 addr_cnt;
u8 width; u8 width;
u8 user; u8 user;
u8 flags; u8 flags;
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或