Skip to content

L
linux
Commit 4a7cf90a authored by Kevin Hilman's avatar Kevin Hilman Committed by Paul Walmsley
Browse files
Options

OMAP2&3: hwmod: Replace l3 -> l3_main 

Replace all the struct that contain l3 with l3_main in order
to be consistent with the OMAP4 naming convention.
Signed-off-by: default avatarBenoit Cousson <b-cousson@ti.com>
Signed-off-by: default avatarKevin Hilman <khilman@deeprootsystems.com>
Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
parent 90709ae9
Show whitespace changes
Inline Side-by-side
Showing with 55 additions and 55 deletions
arch/arm/mach-omap2/omap_hwmod_2420_data.c
View file @ 4a7cf90a
...@@ -30,41 +30,41 @@ ...@@ -30,41 +30,41 @@
*/ */
static struct omap_hwmod omap2420_mpu_hwmod; static struct omap_hwmod omap2420_mpu_hwmod;
static struct omap_hwmod omap2420_l3_hwmod; static struct omap_hwmod omap2420_l3_main_hwmod;
static struct omap_hwmod omap2420_l4_core_hwmod; static struct omap_hwmod omap2420_l4_core_hwmod;
/* L3 -> L4_CORE interface */ /* L3 -> L4_CORE interface */
static struct omap_hwmod_ocp_if omap2420_l3__l4_core = { static struct omap_hwmod_ocp_if omap2420_l3_main__l4_core = {
.master = &omap2420_l3_hwmod, .master = &omap2420_l3_main_hwmod,
.slave = &omap2420_l4_core_hwmod, .slave = &omap2420_l4_core_hwmod,
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
/* MPU -> L3 interface */ /* MPU -> L3 interface */
static struct omap_hwmod_ocp_if omap2420_mpu__l3 = { static struct omap_hwmod_ocp_if omap2420_mpu__l3_main = {
.master = &omap2420_mpu_hwmod, .master = &omap2420_mpu_hwmod,
.slave = &omap2420_l3_hwmod, .slave = &omap2420_l3_main_hwmod,
.user = OCP_USER_MPU, .user = OCP_USER_MPU,
}; };
/* Slave interfaces on the L3 interconnect */ /* Slave interfaces on the L3 interconnect */
static struct omap_hwmod_ocp_if *omap2420_l3_slaves[] = { static struct omap_hwmod_ocp_if *omap2420_l3_main_slaves[] = {
&omap2420_mpu__l3, &omap2420_mpu__l3_main,
}; };
/* Master interfaces on the L3 interconnect */ /* Master interfaces on the L3 interconnect */
static struct omap_hwmod_ocp_if *omap2420_l3_masters[] = { static struct omap_hwmod_ocp_if *omap2420_l3_main_masters[] = {
&omap2420_l3__l4_core, &omap2420_l3_main__l4_core,
}; };
/* L3 */ /* L3 */
static struct omap_hwmod omap2420_l3_hwmod = { static struct omap_hwmod omap2420_l3_main_hwmod = {
.name = "l3_main", .name = "l3_main",
.class = &l3_hwmod_class, .class = &l3_hwmod_class,
.masters = omap2420_l3_masters, .masters = omap2420_l3_main_masters,
.masters_cnt = ARRAY_SIZE(omap2420_l3_masters), .masters_cnt = ARRAY_SIZE(omap2420_l3_main_masters),
.slaves = omap2420_l3_slaves, .slaves = omap2420_l3_main_slaves,
.slaves_cnt = ARRAY_SIZE(omap2420_l3_slaves), .slaves_cnt = ARRAY_SIZE(omap2420_l3_main_slaves),
.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420), .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420),
.flags = HWMOD_NO_IDLEST, .flags = HWMOD_NO_IDLEST,
}; };
...@@ -80,7 +80,7 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__l4_wkup = { ...@@ -80,7 +80,7 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__l4_wkup = {
/* Slave interfaces on the L4_CORE interconnect */ /* Slave interfaces on the L4_CORE interconnect */
static struct omap_hwmod_ocp_if *omap2420_l4_core_slaves[] = { static struct omap_hwmod_ocp_if *omap2420_l4_core_slaves[] = {
&omap2420_l3__l4_core, &omap2420_l3_main__l4_core,
}; };
/* Master interfaces on the L4_CORE interconnect */ /* Master interfaces on the L4_CORE interconnect */
...@@ -123,7 +123,7 @@ static struct omap_hwmod omap2420_l4_wkup_hwmod = { ...@@ -123,7 +123,7 @@ static struct omap_hwmod omap2420_l4_wkup_hwmod = {
/* Master interfaces on the MPU device */ /* Master interfaces on the MPU device */
static struct omap_hwmod_ocp_if *omap2420_mpu_masters[] = { static struct omap_hwmod_ocp_if *omap2420_mpu_masters[] = {
&omap2420_mpu__l3, &omap2420_mpu__l3_main,
}; };
/* MPU */ /* MPU */
...@@ -137,7 +137,7 @@ static struct omap_hwmod omap2420_mpu_hwmod = { ...@@ -137,7 +137,7 @@ static struct omap_hwmod omap2420_mpu_hwmod = {
}; };
static __initdata struct omap_hwmod *omap2420_hwmods[] = { static __initdata struct omap_hwmod *omap2420_hwmods[] = {
&omap2420_l3_hwmod, &omap2420_l3_main_hwmod,
&omap2420_l4_core_hwmod, &omap2420_l4_core_hwmod,
&omap2420_l4_wkup_hwmod, &omap2420_l4_wkup_hwmod,
&omap2420_mpu_hwmod, &omap2420_mpu_hwmod,
......
arch/arm/mach-omap2/omap_hwmod_2430_data.c
View file @ 4a7cf90a
...@@ -30,41 +30,41 @@ ...@@ -30,41 +30,41 @@
*/ */
static struct omap_hwmod omap2430_mpu_hwmod; static struct omap_hwmod omap2430_mpu_hwmod;
static struct omap_hwmod omap2430_l3_hwmod; static struct omap_hwmod omap2430_l3_main_hwmod;
static struct omap_hwmod omap2430_l4_core_hwmod; static struct omap_hwmod omap2430_l4_core_hwmod;
/* L3 -> L4_CORE interface */ /* L3 -> L4_CORE interface */
static struct omap_hwmod_ocp_if omap2430_l3__l4_core = { static struct omap_hwmod_ocp_if omap2430_l3_main__l4_core = {
.master = &omap2430_l3_hwmod, .master = &omap2430_l3_main_hwmod,
.slave = &omap2430_l4_core_hwmod, .slave = &omap2430_l4_core_hwmod,
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
/* MPU -> L3 interface */ /* MPU -> L3 interface */
static struct omap_hwmod_ocp_if omap2430_mpu__l3 = { static struct omap_hwmod_ocp_if omap2430_mpu__l3_main = {
.master = &omap2430_mpu_hwmod, .master = &omap2430_mpu_hwmod,
.slave = &omap2430_l3_hwmod, .slave = &omap2430_l3_main_hwmod,
.user = OCP_USER_MPU, .user = OCP_USER_MPU,
}; };
/* Slave interfaces on the L3 interconnect */ /* Slave interfaces on the L3 interconnect */
static struct omap_hwmod_ocp_if *omap2430_l3_slaves[] = { static struct omap_hwmod_ocp_if *omap2430_l3_main_slaves[] = {
&omap2430_mpu__l3, &omap2430_mpu__l3_main,
}; };
/* Master interfaces on the L3 interconnect */ /* Master interfaces on the L3 interconnect */
static struct omap_hwmod_ocp_if *omap2430_l3_masters[] = { static struct omap_hwmod_ocp_if *omap2430_l3_main_masters[] = {
&omap2430_l3__l4_core, &omap2430_l3_main__l4_core,
}; };
/* L3 */ /* L3 */
static struct omap_hwmod omap2430_l3_hwmod = { static struct omap_hwmod omap2430_l3_main_hwmod = {
.name = "l3_main", .name = "l3_main",
.class = &l3_hwmod_class, .class = &l3_hwmod_class,
.masters = omap2430_l3_masters, .masters = omap2430_l3_main_masters,
.masters_cnt = ARRAY_SIZE(omap2430_l3_masters), .masters_cnt = ARRAY_SIZE(omap2430_l3_main_masters),
.slaves = omap2430_l3_slaves, .slaves = omap2430_l3_main_slaves,
.slaves_cnt = ARRAY_SIZE(omap2430_l3_slaves), .slaves_cnt = ARRAY_SIZE(omap2430_l3_main_slaves),
.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2430), .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2430),
.flags = HWMOD_NO_IDLEST, .flags = HWMOD_NO_IDLEST,
}; };
...@@ -82,7 +82,7 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__l4_wkup = { ...@@ -82,7 +82,7 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__l4_wkup = {
/* Slave interfaces on the L4_CORE interconnect */ /* Slave interfaces on the L4_CORE interconnect */
static struct omap_hwmod_ocp_if *omap2430_l4_core_slaves[] = { static struct omap_hwmod_ocp_if *omap2430_l4_core_slaves[] = {
&omap2430_l3__l4_core, &omap2430_l3_main__l4_core,
}; };
/* Master interfaces on the L4_CORE interconnect */ /* Master interfaces on the L4_CORE interconnect */
...@@ -125,7 +125,7 @@ static struct omap_hwmod omap2430_l4_wkup_hwmod = { ...@@ -125,7 +125,7 @@ static struct omap_hwmod omap2430_l4_wkup_hwmod = {
/* Master interfaces on the MPU device */ /* Master interfaces on the MPU device */
static struct omap_hwmod_ocp_if *omap2430_mpu_masters[] = { static struct omap_hwmod_ocp_if *omap2430_mpu_masters[] = {
&omap2430_mpu__l3, &omap2430_mpu__l3_main,
}; };
/* MPU */ /* MPU */
...@@ -139,7 +139,7 @@ static struct omap_hwmod omap2430_mpu_hwmod = { ...@@ -139,7 +139,7 @@ static struct omap_hwmod omap2430_mpu_hwmod = {
}; };
static __initdata struct omap_hwmod *omap2430_hwmods[] = { static __initdata struct omap_hwmod *omap2430_hwmods[] = {
&omap2430_l3_hwmod, &omap2430_l3_main_hwmod,
&omap2430_l4_core_hwmod, &omap2430_l4_core_hwmod,
&omap2430_l4_wkup_hwmod, &omap2430_l4_wkup_hwmod,
&omap2430_mpu_hwmod, &omap2430_mpu_hwmod,
......
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
View file @ 4a7cf90a
...@@ -32,50 +32,50 @@ ...@@ -32,50 +32,50 @@
*/ */
static struct omap_hwmod omap3xxx_mpu_hwmod; static struct omap_hwmod omap3xxx_mpu_hwmod;
static struct omap_hwmod omap3xxx_l3_hwmod; static struct omap_hwmod omap3xxx_l3_main_hwmod;
static struct omap_hwmod omap3xxx_l4_core_hwmod; static struct omap_hwmod omap3xxx_l4_core_hwmod;
static struct omap_hwmod omap3xxx_l4_per_hwmod; static struct omap_hwmod omap3xxx_l4_per_hwmod;
/* L3 -> L4_CORE interface */ /* L3 -> L4_CORE interface */
static struct omap_hwmod_ocp_if omap3xxx_l3__l4_core = { static struct omap_hwmod_ocp_if omap3xxx_l3_main__l4_core = {
.master = &omap3xxx_l3_hwmod, .master = &omap3xxx_l3_main_hwmod,
.slave = &omap3xxx_l4_core_hwmod, .slave = &omap3xxx_l4_core_hwmod,
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
/* L3 -> L4_PER interface */ /* L3 -> L4_PER interface */
static struct omap_hwmod_ocp_if omap3xxx_l3__l4_per = { static struct omap_hwmod_ocp_if omap3xxx_l3_main__l4_per = {
.master = &omap3xxx_l3_hwmod, .master = &omap3xxx_l3_main_hwmod,
.slave = &omap3xxx_l4_per_hwmod, .slave = &omap3xxx_l4_per_hwmod,
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
/* MPU -> L3 interface */ /* MPU -> L3 interface */
static struct omap_hwmod_ocp_if omap3xxx_mpu__l3 = { static struct omap_hwmod_ocp_if omap3xxx_mpu__l3_main = {
.master = &omap3xxx_mpu_hwmod, .master = &omap3xxx_mpu_hwmod,
.slave = &omap3xxx_l3_hwmod, .slave = &omap3xxx_l3_main_hwmod,
.user = OCP_USER_MPU, .user = OCP_USER_MPU,
}; };
/* Slave interfaces on the L3 interconnect */ /* Slave interfaces on the L3 interconnect */
static struct omap_hwmod_ocp_if *omap3xxx_l3_slaves[] = { static struct omap_hwmod_ocp_if *omap3xxx_l3_main_slaves[] = {
&omap3xxx_mpu__l3, &omap3xxx_mpu__l3_main,
}; };
/* Master interfaces on the L3 interconnect */ /* Master interfaces on the L3 interconnect */
static struct omap_hwmod_ocp_if *omap3xxx_l3_masters[] = { static struct omap_hwmod_ocp_if *omap3xxx_l3_main_masters[] = {
&omap3xxx_l3__l4_core, &omap3xxx_l3_main__l4_core,
&omap3xxx_l3__l4_per, &omap3xxx_l3_main__l4_per,
}; };
/* L3 */ /* L3 */
static struct omap_hwmod omap3xxx_l3_hwmod = { static struct omap_hwmod omap3xxx_l3_main_hwmod = {
.name = "l3_main", .name = "l3_main",
.class = &l3_hwmod_class, .class = &l3_hwmod_class,
.masters = omap3xxx_l3_masters, .masters = omap3xxx_l3_main_masters,
.masters_cnt = ARRAY_SIZE(omap3xxx_l3_masters), .masters_cnt = ARRAY_SIZE(omap3xxx_l3_main_masters),
.slaves = omap3xxx_l3_slaves, .slaves = omap3xxx_l3_main_slaves,
.slaves_cnt = ARRAY_SIZE(omap3xxx_l3_slaves), .slaves_cnt = ARRAY_SIZE(omap3xxx_l3_main_slaves),
.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430), .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
.flags = HWMOD_NO_IDLEST, .flags = HWMOD_NO_IDLEST,
}; };
...@@ -91,7 +91,7 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_core__l4_wkup = { ...@@ -91,7 +91,7 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_core__l4_wkup = {
/* Slave interfaces on the L4_CORE interconnect */ /* Slave interfaces on the L4_CORE interconnect */
static struct omap_hwmod_ocp_if *omap3xxx_l4_core_slaves[] = { static struct omap_hwmod_ocp_if *omap3xxx_l4_core_slaves[] = {
&omap3xxx_l3__l4_core, &omap3xxx_l3_main__l4_core,
}; };
/* Master interfaces on the L4_CORE interconnect */ /* Master interfaces on the L4_CORE interconnect */
...@@ -113,7 +113,7 @@ static struct omap_hwmod omap3xxx_l4_core_hwmod = { ...@@ -113,7 +113,7 @@ static struct omap_hwmod omap3xxx_l4_core_hwmod = {
/* Slave interfaces on the L4_PER interconnect */ /* Slave interfaces on the L4_PER interconnect */
static struct omap_hwmod_ocp_if *omap3xxx_l4_per_slaves[] = { static struct omap_hwmod_ocp_if *omap3xxx_l4_per_slaves[] = {
&omap3xxx_l3__l4_per, &omap3xxx_l3_main__l4_per,
}; };
/* Master interfaces on the L4_PER interconnect */ /* Master interfaces on the L4_PER interconnect */
...@@ -155,7 +155,7 @@ static struct omap_hwmod omap3xxx_l4_wkup_hwmod = { ...@@ -155,7 +155,7 @@ static struct omap_hwmod omap3xxx_l4_wkup_hwmod = {
/* Master interfaces on the MPU device */ /* Master interfaces on the MPU device */
static struct omap_hwmod_ocp_if *omap3xxx_mpu_masters[] = { static struct omap_hwmod_ocp_if *omap3xxx_mpu_masters[] = {
&omap3xxx_mpu__l3, &omap3xxx_mpu__l3_main,
}; };
/* MPU */ /* MPU */
...@@ -169,7 +169,7 @@ static struct omap_hwmod omap3xxx_mpu_hwmod = { ...@@ -169,7 +169,7 @@ static struct omap_hwmod omap3xxx_mpu_hwmod = {
}; };
static __initdata struct omap_hwmod *omap3xxx_hwmods[] = { static __initdata struct omap_hwmod *omap3xxx_hwmods[] = {
&omap3xxx_l3_hwmod, &omap3xxx_l3_main_hwmod,
&omap3xxx_l4_core_hwmod, &omap3xxx_l4_core_hwmod,
&omap3xxx_l4_per_hwmod, &omap3xxx_l4_per_hwmod,
&omap3xxx_l4_wkup_hwmod, &omap3xxx_l4_wkup_hwmod,
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7