Commit 7c68dd96 authored by Tomi Valkeinen's avatar Tomi Valkeinen

OMAP: DSS2: Change DSI device naming

Currently, there are 2 differently named platform devices generated for
the 2 DSS DSI modules. In order to use the same driver, the dsi devices
should be 2 instances of the same platform device.

Change the platform device names from "omapdss_dsi1" and "omapdss_dsi2"
to omapdss_dsi", and set the device indices to 0 and 1.
Signed-off-by: default avatarArchit Taneja <archit@ti.com>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent f3646582
...@@ -267,7 +267,7 @@ static struct twl4030_gpio_platform_data devkit8000_gpio_data = { ...@@ -267,7 +267,7 @@ static struct twl4030_gpio_platform_data devkit8000_gpio_data = {
static struct regulator_consumer_supply devkit8000_vpll1_supplies[] = { static struct regulator_consumer_supply devkit8000_vpll1_supplies[] = {
REGULATOR_SUPPLY("vdds_dsi", "omapdss"), REGULATOR_SUPPLY("vdds_dsi", "omapdss"),
REGULATOR_SUPPLY("vdds_dsi", "omapdss_dsi1"), REGULATOR_SUPPLY("vdds_dsi", "omapdss_dsi.0"),
}; };
/* VMMC1 for MMC1 pins CMD, CLK, DAT0..DAT3 (20 mA, plus card == max 220 mA) */ /* VMMC1 for MMC1 pins CMD, CLK, DAT0..DAT3 (20 mA, plus card == max 220 mA) */
......
...@@ -335,7 +335,7 @@ static struct regulator_consumer_supply pandora_vmmc3_supply[] = { ...@@ -335,7 +335,7 @@ static struct regulator_consumer_supply pandora_vmmc3_supply[] = {
static struct regulator_consumer_supply pandora_vdds_supplies[] = { static struct regulator_consumer_supply pandora_vdds_supplies[] = {
REGULATOR_SUPPLY("vdds_sdi", "omapdss"), REGULATOR_SUPPLY("vdds_sdi", "omapdss"),
REGULATOR_SUPPLY("vdds_dsi", "omapdss"), REGULATOR_SUPPLY("vdds_dsi", "omapdss"),
REGULATOR_SUPPLY("vdds_dsi", "omapdss_dsi1"), REGULATOR_SUPPLY("vdds_dsi", "omapdss_dsi.0"),
}; };
static struct regulator_consumer_supply pandora_vcc_lcd_supply[] = { static struct regulator_consumer_supply pandora_vcc_lcd_supply[] = {
......
...@@ -61,7 +61,7 @@ static const struct omap_dss_hwmod_data omap3_dss_hwmod_data[] __initdata = { ...@@ -61,7 +61,7 @@ static const struct omap_dss_hwmod_data omap3_dss_hwmod_data[] __initdata = {
{ "dss_dispc", "omapdss_dispc", -1 }, { "dss_dispc", "omapdss_dispc", -1 },
{ "dss_rfbi", "omapdss_rfbi", -1 }, { "dss_rfbi", "omapdss_rfbi", -1 },
{ "dss_venc", "omapdss_venc", -1 }, { "dss_venc", "omapdss_venc", -1 },
{ "dss_dsi1", "omapdss_dsi1", -1 }, { "dss_dsi1", "omapdss_dsi", 0 },
}; };
static const struct omap_dss_hwmod_data omap4_dss_hwmod_data[] __initdata = { static const struct omap_dss_hwmod_data omap4_dss_hwmod_data[] __initdata = {
...@@ -69,8 +69,8 @@ static const struct omap_dss_hwmod_data omap4_dss_hwmod_data[] __initdata = { ...@@ -69,8 +69,8 @@ static const struct omap_dss_hwmod_data omap4_dss_hwmod_data[] __initdata = {
{ "dss_dispc", "omapdss_dispc", -1 }, { "dss_dispc", "omapdss_dispc", -1 },
{ "dss_rfbi", "omapdss_rfbi", -1 }, { "dss_rfbi", "omapdss_rfbi", -1 },
{ "dss_venc", "omapdss_venc", -1 }, { "dss_venc", "omapdss_venc", -1 },
{ "dss_dsi1", "omapdss_dsi1", -1 }, { "dss_dsi1", "omapdss_dsi", 0 },
{ "dss_dsi2", "omapdss_dsi2", -1 }, { "dss_dsi2", "omapdss_dsi", 1 },
{ "dss_hdmi", "omapdss_hdmi", -1 }, { "dss_hdmi", "omapdss_hdmi", -1 },
}; };
......
...@@ -99,7 +99,7 @@ static struct regulator_init_data omap3_vdac_idata = { ...@@ -99,7 +99,7 @@ static struct regulator_init_data omap3_vdac_idata = {
static struct regulator_consumer_supply omap3_vpll2_supplies[] = { static struct regulator_consumer_supply omap3_vpll2_supplies[] = {
REGULATOR_SUPPLY("vdds_dsi", "omapdss"), REGULATOR_SUPPLY("vdds_dsi", "omapdss"),
REGULATOR_SUPPLY("vdds_dsi", "omapdss_dsi1"), REGULATOR_SUPPLY("vdds_dsi", "omapdss_dsi.0"),
}; };
static struct regulator_init_data omap3_vpll2_idata = { static struct regulator_init_data omap3_vpll2_idata = {
......
...@@ -368,14 +368,9 @@ struct platform_device *dsi_get_dsidev_from_id(int module) ...@@ -368,14 +368,9 @@ struct platform_device *dsi_get_dsidev_from_id(int module)
return dsi_pdev_map[module]; return dsi_pdev_map[module];
} }
static int dsi_get_dsidev_id(struct platform_device *dsidev) static inline int dsi_get_dsidev_id(struct platform_device *dsidev)
{ {
/* TEMP: Pass 0 as the dsi module index till the time the dsi platform return dsidev->id;
* device names aren't changed to the form "omapdss_dsi.0",
* "omapdss_dsi.1" and so on */
BUG_ON(dsidev->id != -1);
return 0;
} }
static inline void dsi_write_reg(struct platform_device *dsidev, static inline void dsi_write_reg(struct platform_device *dsidev,
...@@ -4465,7 +4460,7 @@ static void dsi_put_clocks(struct platform_device *dsidev) ...@@ -4465,7 +4460,7 @@ static void dsi_put_clocks(struct platform_device *dsidev)
} }
/* DSI1 HW IP initialisation */ /* DSI1 HW IP initialisation */
static int omap_dsi1hw_probe(struct platform_device *dsidev) static int omap_dsihw_probe(struct platform_device *dsidev)
{ {
struct omap_display_platform_data *dss_plat_data; struct omap_display_platform_data *dss_plat_data;
struct omap_dss_board_info *board_info; struct omap_dss_board_info *board_info;
...@@ -4575,7 +4570,7 @@ static int omap_dsi1hw_probe(struct platform_device *dsidev) ...@@ -4575,7 +4570,7 @@ static int omap_dsi1hw_probe(struct platform_device *dsidev)
return r; return r;
} }
static int omap_dsi1hw_remove(struct platform_device *dsidev) static int omap_dsihw_remove(struct platform_device *dsidev)
{ {
struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev); struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);
...@@ -4636,11 +4631,11 @@ static const struct dev_pm_ops dsi_pm_ops = { ...@@ -4636,11 +4631,11 @@ static const struct dev_pm_ops dsi_pm_ops = {
.runtime_resume = dsi_runtime_resume, .runtime_resume = dsi_runtime_resume,
}; };
static struct platform_driver omap_dsi1hw_driver = { static struct platform_driver omap_dsihw_driver = {
.probe = omap_dsi1hw_probe, .probe = omap_dsihw_probe,
.remove = omap_dsi1hw_remove, .remove = omap_dsihw_remove,
.driver = { .driver = {
.name = "omapdss_dsi1", .name = "omapdss_dsi",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.pm = &dsi_pm_ops, .pm = &dsi_pm_ops,
}, },
...@@ -4648,10 +4643,10 @@ static struct platform_driver omap_dsi1hw_driver = { ...@@ -4648,10 +4643,10 @@ static struct platform_driver omap_dsi1hw_driver = {
int dsi_init_platform_driver(void) int dsi_init_platform_driver(void)
{ {
return platform_driver_register(&omap_dsi1hw_driver); return platform_driver_register(&omap_dsihw_driver);
} }
void dsi_uninit_platform_driver(void) void dsi_uninit_platform_driver(void)
{ {
return platform_driver_unregister(&omap_dsi1hw_driver); return platform_driver_unregister(&omap_dsihw_driver);
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment