|
@@ -2034,23 +2034,6 @@ static int dsi_cio_power(struct platform_device *dsidev,
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-/* Number of lanes used by the dss device */
|
|
|
-static inline int dsi_get_num_lanes_used(struct omap_dss_device *dssdev)
|
|
|
-{
|
|
|
- int num_data_lanes = 0;
|
|
|
-
|
|
|
- if (dssdev->phy.dsi.data1_lane != 0)
|
|
|
- num_data_lanes++;
|
|
|
- if (dssdev->phy.dsi.data2_lane != 0)
|
|
|
- num_data_lanes++;
|
|
|
- if (dssdev->phy.dsi.data3_lane != 0)
|
|
|
- num_data_lanes++;
|
|
|
- if (dssdev->phy.dsi.data4_lane != 0)
|
|
|
- num_data_lanes++;
|
|
|
-
|
|
|
- return num_data_lanes + 1;
|
|
|
-}
|
|
|
-
|
|
|
static unsigned dsi_get_line_buf_size(struct platform_device *dsidev)
|
|
|
{
|
|
|
int val;
|
|
@@ -3863,6 +3846,7 @@ static int dsi_proto_config(struct omap_dss_device *dssdev)
|
|
|
static void dsi_proto_timings(struct omap_dss_device *dssdev)
|
|
|
{
|
|
|
struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);
|
|
|
+ struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);
|
|
|
unsigned tlpx, tclk_zero, tclk_prepare, tclk_trail;
|
|
|
unsigned tclk_pre, tclk_post;
|
|
|
unsigned ths_prepare, ths_prepare_ths_zero, ths_zero;
|
|
@@ -3870,7 +3854,7 @@ static void dsi_proto_timings(struct omap_dss_device *dssdev)
|
|
|
unsigned ddr_clk_pre, ddr_clk_post;
|
|
|
unsigned enter_hs_mode_lat, exit_hs_mode_lat;
|
|
|
unsigned ths_eot;
|
|
|
- int ndl = dsi_get_num_lanes_used(dssdev) - 1;
|
|
|
+ int ndl = dsi->num_lanes_used - 1;
|
|
|
u32 r;
|
|
|
|
|
|
r = dsi_read_reg(dsidev, DSI_DSIPHY_CFG0);
|
|
@@ -4554,7 +4538,6 @@ int dsi_init_display(struct omap_dss_device *dssdev)
|
|
|
{
|
|
|
struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);
|
|
|
struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);
|
|
|
- int dsi_module = dsi_get_dsidev_id(dsidev);
|
|
|
|
|
|
DSSDBG("DSI init\n");
|
|
|
|
|
@@ -4576,12 +4559,6 @@ int dsi_init_display(struct omap_dss_device *dssdev)
|
|
|
dsi->vdds_dsi_reg = vdds_dsi;
|
|
|
}
|
|
|
|
|
|
- if (dsi_get_num_lanes_used(dssdev) > dsi->num_lanes_supported) {
|
|
|
- DSSERR("DSI%d can't support more than %d lanes\n",
|
|
|
- dsi_module + 1, dsi->num_lanes_supported);
|
|
|
- return -EINVAL;
|
|
|
- }
|
|
|
-
|
|
|
return 0;
|
|
|
}
|
|
|
|