ARM: DRA7: hwmod: remove DSS addresses from hwmod

The addresses for DSS are provided in the DT data, so they can be
removed from the hwmod.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
index fac0a2044da42b9bcdf45b59cfb9a0703916128d..1ab7096af8e23c239c247f4bca8a39d66b955a9f 100644 (file)
--- a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
@@ -2905,58 +2905,27 @@ static struct omap_hwmod_ocp_if dra7xx_l3_main_1__tptc1 = {
        .user           = OCP_USER_MPU,
 };
 
-static struct omap_hwmod_addr_space dra7xx_dss_addrs[] = {
-       {
-               .name           = "family",
-               .pa_start       = 0x58000000,
-               .pa_end         = 0x5800007f,
-               .flags          = ADDR_TYPE_RT
-       },
-};
-
 /* l3_main_1 -> dss */
 static struct omap_hwmod_ocp_if dra7xx_l3_main_1__dss = {
        .master         = &dra7xx_l3_main_1_hwmod,
        .slave          = &dra7xx_dss_hwmod,
        .clk            = "l3_iclk_div",
-       .addr           = dra7xx_dss_addrs,
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-static struct omap_hwmod_addr_space dra7xx_dss_dispc_addrs[] = {
-       {
-               .name           = "dispc",
-               .pa_start       = 0x58001000,
-               .pa_end         = 0x58001fff,
-               .flags          = ADDR_TYPE_RT
-       },
-};
-
 /* l3_main_1 -> dispc */
 static struct omap_hwmod_ocp_if dra7xx_l3_main_1__dispc = {
        .master         = &dra7xx_l3_main_1_hwmod,
        .slave          = &dra7xx_dss_dispc_hwmod,
        .clk            = "l3_iclk_div",
-       .addr           = dra7xx_dss_dispc_addrs,
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-static struct omap_hwmod_addr_space dra7xx_dss_hdmi_addrs[] = {
-       {
-               .name           = "hdmi_wp",
-               .pa_start       = 0x58040000,
-               .pa_end         = 0x580400ff,
-               .flags          = ADDR_TYPE_RT
-       },
-       { }
-};
-
 /* l3_main_1 -> dispc */
 static struct omap_hwmod_ocp_if dra7xx_l3_main_1__hdmi = {
        .master         = &dra7xx_l3_main_1_hwmod,
        .slave          = &dra7xx_dss_hdmi_hwmod,
        .clk            = "l3_iclk_div",
-       .addr           = dra7xx_dss_hdmi_addrs,
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };