Skip to content

Commit

Permalink
ARM: OMAP4: hwmod data: Update AESS data with memory bank area
Browse files Browse the repository at this point in the history
Add AESS memory bank data in hwmod in order to provide memory address
information to the driver.

This version also changes the AESS main clock to use a
non-CLKCTRL-based functional clock.  These are being removed from the
clock data, since they should be handled by the IP block integration
code.  Without this change, the kernel crashes during boot.  Thanks to
Tony Lindgren for reporting this during a test merge.

Signed-off-by: Sebastien Guiriec <s-guiriec@ti.com>
[paul@pwsan.com: updated to change the AESS main_clk]
Cc: Tony Lindgren <tony@atomide.com>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
  • Loading branch information
Sebastien Guiriec authored and Paul Walmsley committed Feb 10, 2013
1 parent c02060d commit 9f0c599
Showing 1 changed file with 43 additions and 1 deletion.
44 changes: 43 additions & 1 deletion arch/arm/mach-omap2/omap_hwmod_44xx_data.c
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ static struct omap_hwmod omap44xx_aess_hwmod = {
.clkdm_name = "abe_clkdm",
.mpu_irqs = omap44xx_aess_irqs,
.sdma_reqs = omap44xx_aess_sdma_reqs,
.main_clk = "aess_fck",
.main_clk = "aess_fclk",
.prcm = {
.omap4 = {
.clkctrl_offs = OMAP4_CM1_ABE_AESS_CLKCTRL_OFFSET,
Expand Down Expand Up @@ -4250,6 +4250,27 @@ static struct omap_hwmod_ocp_if omap44xx_l4_cfg__ocp_wp_noc = {

static struct omap_hwmod_addr_space omap44xx_aess_addrs[] = {
{
.name = "dmem",
.pa_start = 0x40180000,
.pa_end = 0x4018ffff
},
{
.name = "cmem",
.pa_start = 0x401a0000,
.pa_end = 0x401a1fff
},
{
.name = "smem",
.pa_start = 0x401c0000,
.pa_end = 0x401c5fff
},
{
.name = "pmem",
.pa_start = 0x401e0000,
.pa_end = 0x401e1fff
},
{
.name = "mpu",
.pa_start = 0x401f1000,
.pa_end = 0x401f13ff,
.flags = ADDR_TYPE_RT
Expand All @@ -4268,6 +4289,27 @@ static struct omap_hwmod_ocp_if __maybe_unused omap44xx_l4_abe__aess = {

static struct omap_hwmod_addr_space omap44xx_aess_dma_addrs[] = {
{
.name = "dmem_dma",
.pa_start = 0x49080000,
.pa_end = 0x4908ffff
},
{
.name = "cmem_dma",
.pa_start = 0x490a0000,
.pa_end = 0x490a1fff
},
{
.name = "smem_dma",
.pa_start = 0x490c0000,
.pa_end = 0x490c5fff
},
{
.name = "pmem_dma",
.pa_start = 0x490e0000,
.pa_end = 0x490e1fff
},
{
.name = "dma",
.pa_start = 0x490f1000,
.pa_end = 0x490f13ff,
.flags = ADDR_TYPE_RT
Expand Down

0 comments on commit 9f0c599

Please sign in to comment.