Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 303373
b: refs/heads/master
c: e17f18c
h: refs/heads/master
i:
  303371: ae36178
v: v3
  • Loading branch information
Paul Walmsley committed Apr 19, 2012
1 parent 3b5c1e7 commit d43f55c
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0c6688753f9912c6a7013549ec31c8844020bbc1
refs/heads/master: e17f18c007040053babe785f5ba61aa3536bd77d
32 changes: 31 additions & 1 deletion trunk/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,6 @@ static struct omap_hwmod omap44xx_mpu_private_hwmod = {
* efuse_ctrl_std
* mpu_c0
* mpu_c1
* ocmc_ram
* ocp_wp_noc
* prcm_mpu
* prm
Expand Down Expand Up @@ -2384,6 +2383,28 @@ static struct omap_hwmod omap44xx_mpu_hwmod = {
},
};

/*
* 'ocmc_ram' class
* top-level core on-chip ram
*/

static struct omap_hwmod_class omap44xx_ocmc_ram_hwmod_class = {
.name = "ocmc_ram",
};

/* ocmc_ram */
static struct omap_hwmod omap44xx_ocmc_ram_hwmod = {
.name = "ocmc_ram",
.class = &omap44xx_ocmc_ram_hwmod_class,
.clkdm_name = "l3_2_clkdm",
.prcm = {
.omap4 = {
.clkctrl_offs = OMAP4_CM_L3_2_OCMC_RAM_CLKCTRL_OFFSET,
.context_offs = OMAP4_RM_L3_2_OCMC_RAM_CONTEXT_OFFSET,
},
},
};

/*
* 'ocp2scp' class
* bridge to transform ocp interface protocol to scp (serial control port)
Expand Down Expand Up @@ -4964,6 +4985,14 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__mmc5 = {
.user = OCP_USER_MPU | OCP_USER_SDMA,
};

/* l3_main_2 -> ocmc_ram */
static struct omap_hwmod_ocp_if omap44xx_l3_main_2__ocmc_ram = {
.master = &omap44xx_l3_main_2_hwmod,
.slave = &omap44xx_ocmc_ram_hwmod,
.clk = "l3_div_ck",
.user = OCP_USER_MPU | OCP_USER_SDMA,
};

/* l4_cfg -> ocp2scp_usb_phy */
static struct omap_hwmod_ocp_if omap44xx_l4_cfg__ocp2scp_usb_phy = {
.master = &omap44xx_l4_cfg_hwmod,
Expand Down Expand Up @@ -5695,6 +5724,7 @@ static struct omap_hwmod_ocp_if *omap44xx_hwmod_ocp_ifs[] __initdata = {
&omap44xx_l4_per__mmc3,
&omap44xx_l4_per__mmc4,
&omap44xx_l4_per__mmc5,
&omap44xx_l3_main_2__ocmc_ram,
&omap44xx_l4_cfg__ocp2scp_usb_phy,
&omap44xx_l3_main_2__sl2if,
&omap44xx_l4_abe__slimbus1,
Expand Down

0 comments on commit d43f55c

Please sign in to comment.