@@ -111,7 +111,7 @@ struct dp_display_private {
111111 struct dp_event event_list [DP_EVENT_Q_MAX ];
112112 spinlock_t event_lock ;
113113
114- bool wide_bus_en ;
114+ bool wide_bus_supported ;
115115
116116 struct dp_audio * audio ;
117117};
@@ -120,7 +120,7 @@ struct msm_dp_desc {
120120 phys_addr_t io_start ;
121121 unsigned int id ;
122122 unsigned int connector_type ;
123- bool wide_bus_en ;
123+ bool wide_bus_supported ;
124124};
125125
126126static const struct msm_dp_desc sc7180_dp_descs [] = {
@@ -129,8 +129,8 @@ static const struct msm_dp_desc sc7180_dp_descs[] = {
129129};
130130
131131static const struct msm_dp_desc sc7280_dp_descs [] = {
132- { .io_start = 0x0ae90000 , .id = MSM_DP_CONTROLLER_0 , .connector_type = DRM_MODE_CONNECTOR_DisplayPort , .wide_bus_en = true },
133- { .io_start = 0x0aea0000 , .id = MSM_DP_CONTROLLER_1 , .connector_type = DRM_MODE_CONNECTOR_eDP , .wide_bus_en = true },
132+ { .io_start = 0x0ae90000 , .id = MSM_DP_CONTROLLER_0 , .connector_type = DRM_MODE_CONNECTOR_DisplayPort , .wide_bus_supported = true },
133+ { .io_start = 0x0aea0000 , .id = MSM_DP_CONTROLLER_1 , .connector_type = DRM_MODE_CONNECTOR_eDP , .wide_bus_supported = true },
134134 {}
135135};
136136
@@ -142,22 +142,22 @@ static const struct msm_dp_desc sc8180x_dp_descs[] = {
142142};
143143
144144static const struct msm_dp_desc sc8280xp_dp_descs [] = {
145- { .io_start = 0x0ae90000 , .id = MSM_DP_CONTROLLER_0 , .connector_type = DRM_MODE_CONNECTOR_DisplayPort , .wide_bus_en = true },
146- { .io_start = 0x0ae98000 , .id = MSM_DP_CONTROLLER_1 , .connector_type = DRM_MODE_CONNECTOR_DisplayPort , .wide_bus_en = true },
147- { .io_start = 0x0ae9a000 , .id = MSM_DP_CONTROLLER_2 , .connector_type = DRM_MODE_CONNECTOR_DisplayPort , .wide_bus_en = true },
148- { .io_start = 0x0aea0000 , .id = MSM_DP_CONTROLLER_3 , .connector_type = DRM_MODE_CONNECTOR_DisplayPort , .wide_bus_en = true },
149- { .io_start = 0x22090000 , .id = MSM_DP_CONTROLLER_0 , .connector_type = DRM_MODE_CONNECTOR_DisplayPort , .wide_bus_en = true },
150- { .io_start = 0x22098000 , .id = MSM_DP_CONTROLLER_1 , .connector_type = DRM_MODE_CONNECTOR_DisplayPort , .wide_bus_en = true },
151- { .io_start = 0x2209a000 , .id = MSM_DP_CONTROLLER_2 , .connector_type = DRM_MODE_CONNECTOR_DisplayPort , .wide_bus_en = true },
152- { .io_start = 0x220a0000 , .id = MSM_DP_CONTROLLER_3 , .connector_type = DRM_MODE_CONNECTOR_DisplayPort , .wide_bus_en = true },
145+ { .io_start = 0x0ae90000 , .id = MSM_DP_CONTROLLER_0 , .connector_type = DRM_MODE_CONNECTOR_DisplayPort , .wide_bus_supported = true },
146+ { .io_start = 0x0ae98000 , .id = MSM_DP_CONTROLLER_1 , .connector_type = DRM_MODE_CONNECTOR_DisplayPort , .wide_bus_supported = true },
147+ { .io_start = 0x0ae9a000 , .id = MSM_DP_CONTROLLER_2 , .connector_type = DRM_MODE_CONNECTOR_DisplayPort , .wide_bus_supported = true },
148+ { .io_start = 0x0aea0000 , .id = MSM_DP_CONTROLLER_3 , .connector_type = DRM_MODE_CONNECTOR_DisplayPort , .wide_bus_supported = true },
149+ { .io_start = 0x22090000 , .id = MSM_DP_CONTROLLER_0 , .connector_type = DRM_MODE_CONNECTOR_DisplayPort , .wide_bus_supported = true },
150+ { .io_start = 0x22098000 , .id = MSM_DP_CONTROLLER_1 , .connector_type = DRM_MODE_CONNECTOR_DisplayPort , .wide_bus_supported = true },
151+ { .io_start = 0x2209a000 , .id = MSM_DP_CONTROLLER_2 , .connector_type = DRM_MODE_CONNECTOR_DisplayPort , .wide_bus_supported = true },
152+ { .io_start = 0x220a0000 , .id = MSM_DP_CONTROLLER_3 , .connector_type = DRM_MODE_CONNECTOR_DisplayPort , .wide_bus_supported = true },
153153 {}
154154};
155155
156156static const struct msm_dp_desc sc8280xp_edp_descs [] = {
157- { .io_start = 0x0ae9a000 , .id = MSM_DP_CONTROLLER_2 , .connector_type = DRM_MODE_CONNECTOR_eDP , .wide_bus_en = true },
158- { .io_start = 0x0aea0000 , .id = MSM_DP_CONTROLLER_3 , .connector_type = DRM_MODE_CONNECTOR_eDP , .wide_bus_en = true },
159- { .io_start = 0x2209a000 , .id = MSM_DP_CONTROLLER_2 , .connector_type = DRM_MODE_CONNECTOR_eDP , .wide_bus_en = true },
160- { .io_start = 0x220a0000 , .id = MSM_DP_CONTROLLER_3 , .connector_type = DRM_MODE_CONNECTOR_eDP , .wide_bus_en = true },
157+ { .io_start = 0x0ae9a000 , .id = MSM_DP_CONTROLLER_2 , .connector_type = DRM_MODE_CONNECTOR_eDP , .wide_bus_supported = true },
158+ { .io_start = 0x0aea0000 , .id = MSM_DP_CONTROLLER_3 , .connector_type = DRM_MODE_CONNECTOR_eDP , .wide_bus_supported = true },
159+ { .io_start = 0x2209a000 , .id = MSM_DP_CONTROLLER_2 , .connector_type = DRM_MODE_CONNECTOR_eDP , .wide_bus_supported = true },
160+ { .io_start = 0x220a0000 , .id = MSM_DP_CONTROLLER_3 , .connector_type = DRM_MODE_CONNECTOR_eDP , .wide_bus_supported = true },
161161 {}
162162};
163163
@@ -766,9 +766,9 @@ static int dp_init_sub_modules(struct dp_display_private *dp)
766766 goto error_ctrl ;
767767 }
768768
769- /* populate wide_bus_en to differernt layers */
770- dp -> ctrl -> wide_bus_en = dp -> wide_bus_en ;
771- dp -> catalog -> wide_bus_en = dp -> wide_bus_en ;
769+ /* populate wide_bus_supported to different layers */
770+ dp -> ctrl -> wide_bus_en = dp -> wide_bus_supported ;
771+ dp -> catalog -> wide_bus_en = dp -> wide_bus_supported ;
772772
773773 return rc ;
774774
@@ -1247,7 +1247,7 @@ static int dp_display_probe(struct platform_device *pdev)
12471247 dp -> name = "drm_dp" ;
12481248 dp -> id = desc -> id ;
12491249 dp -> dp_display .connector_type = desc -> connector_type ;
1250- dp -> wide_bus_en = desc -> wide_bus_en ;
1250+ dp -> wide_bus_supported = desc -> wide_bus_supported ;
12511251 dp -> dp_display .is_edp =
12521252 (dp -> dp_display .connector_type == DRM_MODE_CONNECTOR_eDP );
12531253
@@ -1381,7 +1381,7 @@ bool msm_dp_wide_bus_available(const struct msm_dp *dp_display)
13811381
13821382 dp = container_of (dp_display , struct dp_display_private , dp_display );
13831383
1384- return dp -> wide_bus_en ;
1384+ return dp -> wide_bus_supported ;
13851385}
13861386
13871387void dp_display_debugfs_init (struct msm_dp * dp_display , struct dentry * root , bool is_edp )
0 commit comments