diff options
author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2016-06-07 04:32:02 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2016-06-10 08:10:52 -0400 |
commit | 05a7ac7266978bdafb0b9c1348c75ef6574b0bdc (patch) | |
tree | fa38fd3194299425ebc46b4f5f8e4e05fa05b7db /arch/arm/mach-omap2/omap_hwmod_7xx_data.c | |
parent | cab33b0e93a7601de39891ebf4abbc77a8bbe8f9 (diff) |
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>
Diffstat (limited to 'arch/arm/mach-omap2/omap_hwmod_7xx_data.c')
-rw-r--r-- | arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c index fac0a2044da4..1ab7096af8e2 100644 --- 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 = { | |||
2905 | .user = OCP_USER_MPU, | 2905 | .user = OCP_USER_MPU, |
2906 | }; | 2906 | }; |
2907 | 2907 | ||
2908 | static struct omap_hwmod_addr_space dra7xx_dss_addrs[] = { | ||
2909 | { | ||
2910 | .name = "family", | ||
2911 | .pa_start = 0x58000000, | ||
2912 | .pa_end = 0x5800007f, | ||
2913 | .flags = ADDR_TYPE_RT | ||
2914 | }, | ||
2915 | }; | ||
2916 | |||
2917 | /* l3_main_1 -> dss */ | 2908 | /* l3_main_1 -> dss */ |
2918 | static struct omap_hwmod_ocp_if dra7xx_l3_main_1__dss = { | 2909 | static struct omap_hwmod_ocp_if dra7xx_l3_main_1__dss = { |
2919 | .master = &dra7xx_l3_main_1_hwmod, | 2910 | .master = &dra7xx_l3_main_1_hwmod, |
2920 | .slave = &dra7xx_dss_hwmod, | 2911 | .slave = &dra7xx_dss_hwmod, |
2921 | .clk = "l3_iclk_div", | 2912 | .clk = "l3_iclk_div", |
2922 | .addr = dra7xx_dss_addrs, | ||
2923 | .user = OCP_USER_MPU | OCP_USER_SDMA, | 2913 | .user = OCP_USER_MPU | OCP_USER_SDMA, |
2924 | }; | 2914 | }; |
2925 | 2915 | ||
2926 | static struct omap_hwmod_addr_space dra7xx_dss_dispc_addrs[] = { | ||
2927 | { | ||
2928 | .name = "dispc", | ||
2929 | .pa_start = 0x58001000, | ||
2930 | .pa_end = 0x58001fff, | ||
2931 | .flags = ADDR_TYPE_RT | ||
2932 | }, | ||
2933 | }; | ||
2934 | |||
2935 | /* l3_main_1 -> dispc */ | 2916 | /* l3_main_1 -> dispc */ |
2936 | static struct omap_hwmod_ocp_if dra7xx_l3_main_1__dispc = { | 2917 | static struct omap_hwmod_ocp_if dra7xx_l3_main_1__dispc = { |
2937 | .master = &dra7xx_l3_main_1_hwmod, | 2918 | .master = &dra7xx_l3_main_1_hwmod, |
2938 | .slave = &dra7xx_dss_dispc_hwmod, | 2919 | .slave = &dra7xx_dss_dispc_hwmod, |
2939 | .clk = "l3_iclk_div", | 2920 | .clk = "l3_iclk_div", |
2940 | .addr = dra7xx_dss_dispc_addrs, | ||
2941 | .user = OCP_USER_MPU | OCP_USER_SDMA, | 2921 | .user = OCP_USER_MPU | OCP_USER_SDMA, |
2942 | }; | 2922 | }; |
2943 | 2923 | ||
2944 | static struct omap_hwmod_addr_space dra7xx_dss_hdmi_addrs[] = { | ||
2945 | { | ||
2946 | .name = "hdmi_wp", | ||
2947 | .pa_start = 0x58040000, | ||
2948 | .pa_end = 0x580400ff, | ||
2949 | .flags = ADDR_TYPE_RT | ||
2950 | }, | ||
2951 | { } | ||
2952 | }; | ||
2953 | |||
2954 | /* l3_main_1 -> dispc */ | 2924 | /* l3_main_1 -> dispc */ |
2955 | static struct omap_hwmod_ocp_if dra7xx_l3_main_1__hdmi = { | 2925 | static struct omap_hwmod_ocp_if dra7xx_l3_main_1__hdmi = { |
2956 | .master = &dra7xx_l3_main_1_hwmod, | 2926 | .master = &dra7xx_l3_main_1_hwmod, |
2957 | .slave = &dra7xx_dss_hdmi_hwmod, | 2927 | .slave = &dra7xx_dss_hdmi_hwmod, |
2958 | .clk = "l3_iclk_div", | 2928 | .clk = "l3_iclk_div", |
2959 | .addr = dra7xx_dss_hdmi_addrs, | ||
2960 | .user = OCP_USER_MPU | OCP_USER_SDMA, | 2929 | .user = OCP_USER_MPU | OCP_USER_SDMA, |
2961 | }; | 2930 | }; |
2962 | 2931 | ||