[glsdk/meta-ti-glsdk.git] / recipes-kernel / linux / linux-3.0 / pm-wip / voltdm / 0044-OMAP4-hwmod-data-Fix-L3-interconnect-data-order-and-.patch
1 From 96fade0623664f946eceba792415d3dc78e3ec52 Mon Sep 17 00:00:00 2001
2 From: Benoit Cousson <b-cousson@ti.com>
3 Date: Sat, 9 Jul 2011 19:14:27 -0600
4 Subject: [PATCH 044/149] OMAP4: hwmod data: Fix L3 interconnect data order and alignement
6 Change the position of the ocp_if structure to match the template.
8 Remove unneeded comma at the end of address space flag field.
10 Remove USER_SDMA since this ocp link is only from the l3_main_1
11 path that is accessible only from the MPU in that case and not
12 the SDMA.
14 Signed-off-by: Benoit Cousson <b-cousson@ti.com>
15 Cc: Paul Walmsley <paul@pwsan.com>
16 Signed-off-by: Paul Walmsley <paul@pwsan.com>
17 ---
18 arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 27 +++++++++++++--------------
19 1 files changed, 13 insertions(+), 14 deletions(-)
21 diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
22 index 316e922..94c0b60 100644
23 --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
24 +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
25 @@ -216,6 +216,12 @@ static struct omap_hwmod omap44xx_l3_instr_hwmod = {
26 };
28 /* l3_main_1 interface data */
29 +static struct omap_hwmod_irq_info omap44xx_l3_main_1_irqs[] = {
30 + { .name = "dbg_err", .irq = 9 + OMAP44XX_IRQ_GIC_START },
31 + { .name = "app_err", .irq = 10 + OMAP44XX_IRQ_GIC_START },
32 + { .irq = -1 }
33 +};
34 +
35 /* dsp -> l3_main_1 */
36 static struct omap_hwmod_ocp_if omap44xx_dsp__l3_main_1 = {
37 .master = &omap44xx_dsp_hwmod,
38 @@ -264,18 +270,11 @@ static struct omap_hwmod_ocp_if omap44xx_mmc2__l3_main_1 = {
39 .user = OCP_USER_MPU | OCP_USER_SDMA,
40 };
42 -/* L3 target configuration and error log registers */
43 -static struct omap_hwmod_irq_info omap44xx_l3_targ_irqs[] = {
44 - { .irq = 9 + OMAP44XX_IRQ_GIC_START },
45 - { .irq = 10 + OMAP44XX_IRQ_GIC_START },
46 - { .irq = -1 }
47 -};
48 -
49 static struct omap_hwmod_addr_space omap44xx_l3_main_1_addrs[] = {
50 {
51 .pa_start = 0x44000000,
52 .pa_end = 0x44000fff,
53 - .flags = ADDR_TYPE_RT,
54 + .flags = ADDR_TYPE_RT
55 },
56 { }
57 };
58 @@ -286,7 +285,7 @@ static struct omap_hwmod_ocp_if omap44xx_mpu__l3_main_1 = {
59 .slave = &omap44xx_l3_main_1_hwmod,
60 .clk = "l3_div_ck",
61 .addr = omap44xx_l3_main_1_addrs,
62 - .user = OCP_USER_MPU | OCP_USER_SDMA,
63 + .user = OCP_USER_MPU,
64 };
66 /* l3_main_1 slave ports */
67 @@ -303,9 +302,9 @@ static struct omap_hwmod_ocp_if *omap44xx_l3_main_1_slaves[] = {
68 static struct omap_hwmod omap44xx_l3_main_1_hwmod = {
69 .name = "l3_main_1",
70 .class = &omap44xx_l3_hwmod_class,
71 - .mpu_irqs = omap44xx_l3_targ_irqs,
72 .slaves = omap44xx_l3_main_1_slaves,
73 .slaves_cnt = ARRAY_SIZE(omap44xx_l3_main_1_slaves),
74 + .mpu_irqs = omap44xx_l3_main_1_irqs,
75 .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430),
76 };
78 @@ -354,7 +353,7 @@ static struct omap_hwmod_addr_space omap44xx_l3_main_2_addrs[] = {
79 {
80 .pa_start = 0x44800000,
81 .pa_end = 0x44801fff,
82 - .flags = ADDR_TYPE_RT,
83 + .flags = ADDR_TYPE_RT
84 },
85 { }
86 };
87 @@ -365,7 +364,7 @@ static struct omap_hwmod_ocp_if omap44xx_l3_main_1__l3_main_2 = {
88 .slave = &omap44xx_l3_main_2_hwmod,
89 .clk = "l3_div_ck",
90 .addr = omap44xx_l3_main_2_addrs,
91 - .user = OCP_USER_MPU | OCP_USER_SDMA,
92 + .user = OCP_USER_MPU,
93 };
95 /* l4_cfg -> l3_main_2 */
96 @@ -409,7 +408,7 @@ static struct omap_hwmod_addr_space omap44xx_l3_main_3_addrs[] = {
97 {
98 .pa_start = 0x45000000,
99 .pa_end = 0x45000fff,
100 - .flags = ADDR_TYPE_RT,
101 + .flags = ADDR_TYPE_RT
102 },
103 { }
104 };
105 @@ -420,7 +419,7 @@ static struct omap_hwmod_ocp_if omap44xx_l3_main_1__l3_main_3 = {
106 .slave = &omap44xx_l3_main_3_hwmod,
107 .clk = "l3_div_ck",
108 .addr = omap44xx_l3_main_3_addrs,
109 - .user = OCP_USER_MPU | OCP_USER_SDMA,
110 + .user = OCP_USER_MPU,
111 };
113 /* l3_main_2 -> l3_main_3 */
114 --
115 1.6.6.1