提交 b0db69b4 编写于 作者: D Dario Binacchi 提交者: Tom Rini

dm: fix build errors generated by last merges

Something was wrong in the merge process into the mainline.
Some added patches access driver structure fields and functions that
have been modified by previous patches.
The patch renames:
 - dev_get_platdata to dev_get_plat
 - dev_get_uclass_platdata to dev_get_uclass_plat
 - ofdata_to_platdata to of_to_plat
 - plat_data_alloc_size to plat_auto
 - priv_auto_alloc_size to priv_auto
 - video_uc_platdata to video_uc_plat
Signed-off-by: NDario Binacchi <dariobin@libero.it>
上级 83e13c34
......@@ -260,7 +260,7 @@ U_BOOT_DRIVER(clk_ti_am3_dpll) = {
.name = "ti_am3_dpll_clock",
.id = UCLASS_CLK,
.of_match = clk_ti_am3_dpll_of_match,
.ofdata_to_platdata = clk_ti_am3_dpll_of_to_plat,
.of_to_plat = clk_ti_am3_dpll_of_to_plat,
.probe = clk_ti_am3_dpll_probe,
.remove = clk_ti_am3_dpll_remove,
.priv_auto = sizeof(struct clk_ti_am3_dpll_priv),
......
......@@ -148,7 +148,7 @@ U_BOOT_DRIVER(clk_ti_ctrl) = {
.name = "ti_ctrl_clk",
.id = UCLASS_CLK,
.of_match = clk_ti_ctrl_ids,
.ofdata_to_platdata = clk_ti_ctrl_of_to_plat,
.of_to_plat = clk_ti_ctrl_of_to_plat,
.ops = &clk_ti_ctrl_ops,
.priv_auto = sizeof(struct clk_ti_ctrl_priv),
};
......@@ -373,7 +373,7 @@ U_BOOT_DRIVER(clk_ti_divider) = {
.name = "ti_divider_clock",
.id = UCLASS_CLK,
.of_match = clk_ti_divider_of_match,
.ofdata_to_platdata = clk_ti_divider_of_to_plat,
.of_to_plat = clk_ti_divider_of_to_plat,
.probe = clk_ti_divider_probe,
.remove = clk_ti_divider_remove,
.priv_auto = sizeof(struct clk_ti_divider_priv),
......
......@@ -87,7 +87,7 @@ U_BOOT_DRIVER(clk_ti_gate) = {
.name = "ti_gate_clock",
.id = UCLASS_CLK,
.of_match = clk_ti_gate_of_match,
.ofdata_to_platdata = clk_ti_gate_of_to_plat,
.of_to_plat = clk_ti_gate_of_to_plat,
.priv_auto = sizeof(struct clk_ti_gate_priv),
.ops = &clk_ti_gate_ops,
};
......@@ -245,7 +245,7 @@ U_BOOT_DRIVER(clk_ti_mux) = {
.name = "ti_mux_clock",
.id = UCLASS_CLK,
.of_match = clk_ti_mux_of_match,
.ofdata_to_platdata = clk_ti_mux_of_to_plat,
.of_to_plat = clk_ti_mux_of_to_plat,
.probe = clk_ti_mux_probe,
.remove = clk_ti_mux_remove,
.priv_auto = sizeof(struct clk_ti_mux_priv),
......
......@@ -461,7 +461,7 @@ U_BOOT_DRIVER(ti_ehrpwm) = {
.id = UCLASS_PWM,
.of_match = ti_ehrpwm_ids,
.ops = &ti_ehrpwm_ops,
.ofdata_to_platdata = ti_ehrpwm_of_to_plat,
.of_to_plat = ti_ehrpwm_of_to_plat,
.probe = ti_ehrpwm_probe,
.remove = ti_ehrpwm_remove,
.priv_auto = sizeof(struct ti_ehrpwm_priv),
......
......@@ -571,6 +571,6 @@ U_BOOT_DRIVER(ca_sflash) = {
.id = UCLASS_SPI,
.of_match = ca_sflash_ids,
.ops = &ca_sflash_ops,
.priv_auto_alloc_size = sizeof(struct ca_sflash_priv),
.priv_auto = sizeof(struct ca_sflash_priv),
.probe = ca_sflash_probe,
};
......@@ -299,7 +299,7 @@ static int seps525_probe(struct udevice *dev)
static int seps525_bind(struct udevice *dev)
{
struct video_uc_platdata *plat = dev_get_uclass_platdata(dev);
struct video_uc_plat *plat = dev_get_uclass_plat(dev);
plat->size = WIDTH * HEIGHT * 16;
......@@ -320,8 +320,8 @@ U_BOOT_DRIVER(seps525_video) = {
.id = UCLASS_VIDEO,
.of_match = seps525_ids,
.ops = &seps525_ops,
.platdata_auto_alloc_size = sizeof(struct video_uc_platdata),
.plat_auto = sizeof(struct video_uc_plat),
.bind = seps525_bind,
.probe = seps525_probe,
.priv_auto_alloc_size = sizeof(struct seps525_priv),
.priv_auto = sizeof(struct seps525_priv),
};
......@@ -34,7 +34,7 @@ static const struct display_timing default_timing = {
static int tl070wsh30_panel_enable_backlight(struct udevice *dev)
{
struct mipi_dsi_panel_plat *plat = dev_get_platdata(dev);
struct mipi_dsi_panel_plat *plat = dev_get_plat(dev);
struct mipi_dsi_device *device = plat->device;
struct tl070wsh30_panel_priv *priv = dev_get_priv(dev);
int ret;
......@@ -70,7 +70,7 @@ static int tl070wsh30_panel_get_display_timing(struct udevice *dev,
return 0;
}
static int tl070wsh30_panel_ofdata_to_platdata(struct udevice *dev)
static int tl070wsh30_panel_of_to_plat(struct udevice *dev)
{
struct tl070wsh30_panel_priv *priv = dev_get_priv(dev);
int ret;
......@@ -105,7 +105,7 @@ static int tl070wsh30_panel_ofdata_to_platdata(struct udevice *dev)
static int tl070wsh30_panel_probe(struct udevice *dev)
{
struct tl070wsh30_panel_priv *priv = dev_get_priv(dev);
struct mipi_dsi_panel_plat *plat = dev_get_platdata(dev);
struct mipi_dsi_panel_plat *plat = dev_get_plat(dev);
int ret;
if (IS_ENABLED(CONFIG_DM_REGULATOR) && priv->reg) {
......@@ -148,8 +148,8 @@ U_BOOT_DRIVER(tl070wsh30_panel) = {
.id = UCLASS_PANEL,
.of_match = tl070wsh30_panel_ids,
.ops = &tl070wsh30_panel_ops,
.ofdata_to_platdata = tl070wsh30_panel_ofdata_to_platdata,
.of_to_plat = tl070wsh30_panel_of_to_plat,
.probe = tl070wsh30_panel_probe,
.platdata_auto_alloc_size = sizeof(struct mipi_dsi_panel_plat),
.priv_auto_alloc_size = sizeof(struct tl070wsh30_panel_priv),
.plat_auto = sizeof(struct mipi_dsi_panel_plat),
.priv_auto = sizeof(struct tl070wsh30_panel_priv),
};
......@@ -165,7 +165,7 @@ U_BOOT_DRIVER(tilcdc_panel) = {
.id = UCLASS_PANEL,
.of_match = tilcdc_panel_ids,
.ops = &tilcdc_panel_ops,
.ofdata_to_platdata = tilcdc_panel_of_to_plat,
.of_to_plat = tilcdc_panel_of_to_plat,
.probe = tilcdc_panel_probe,
.remove = tilcdc_panel_remove,
.priv_auto = sizeof(struct tilcdc_panel_priv),
......
......@@ -155,7 +155,7 @@ static ulong tilcdc_set_pixel_clk_rate(struct udevice *dev, ulong rate)
static int tilcdc_remove(struct udevice *dev)
{
struct video_uc_platdata *uc_plat = dev_get_uclass_platdata(dev);
struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev);
struct tilcdc_priv *priv = dev_get_priv(dev);
uc_plat->base -= 0x20;
......@@ -167,7 +167,7 @@ static int tilcdc_remove(struct udevice *dev)
static int tilcdc_probe(struct udevice *dev)
{
struct video_uc_platdata *uc_plat = dev_get_uclass_platdata(dev);
struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev);
struct video_priv *uc_priv = dev_get_uclass_priv(dev);
struct tilcdc_priv *priv = dev_get_priv(dev);
struct tilcdc_regs *regs = priv->regs;
......@@ -399,7 +399,7 @@ static int tilcdc_of_to_plat(struct udevice *dev)
static int tilcdc_bind(struct udevice *dev)
{
struct video_uc_platdata *uc_plat = dev_get_uclass_platdata(dev);
struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev);
uc_plat->size = ((LCDC_MAX_WIDTH * LCDC_MAX_HEIGHT *
(1 << LCDC_MAX_LOG2_BPP)) >> 3) + 0x20;
......@@ -418,7 +418,7 @@ U_BOOT_DRIVER(tilcdc) = {
.id = UCLASS_VIDEO,
.of_match = tilcdc_ids,
.bind = tilcdc_bind,
.ofdata_to_platdata = tilcdc_of_to_plat,
.of_to_plat = tilcdc_of_to_plat,
.probe = tilcdc_probe,
.remove = tilcdc_remove,
.priv_auto = sizeof(struct tilcdc_priv)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册