LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

video: sunxi: dw-hdmi: Read address from DT node 

Currently HDMI controller MMIO address is hardcoded. Change that so
address is read from DT node. That will make adding support for new
variants a bit easier.

Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com>
Signed-off-by: Samuel Holland <samuel@sholland.org>
This commit is contained in:
Jernej Skrabec 2022-11-28 01:02:26 -06:00 committed by Andre Przywara
parent 2f52be8b8d
commit cd108f2795
1 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
drivers/video/sunxi/sunxi_dw_hdmi.c
View File

@ -56,10 +56,10 @@ static int sunxi_dw_hdmi_get_divider(uint clock)
return 1; return 1;
} }
static void sunxi_dw_hdmi_phy_init(void) static void sunxi_dw_hdmi_phy_init(struct dw_hdmi *hdmi)
{ {
struct sunxi_hdmi_phy * const phy = struct sunxi_hdmi_phy * const phy =
(struct sunxi_hdmi_phy *)(SUNXI_HDMI_BASE + HDMI_PHY_OFFS); (struct sunxi_hdmi_phy *)(hdmi->ioaddr + HDMI_PHY_OFFS);
unsigned long tmo; unsigned long tmo;
u32 tmp; u32 tmp;
@ -113,10 +113,10 @@ static void sunxi_dw_hdmi_phy_init(void)
writel(0x42494E47, &phy->unscramble); writel(0x42494E47, &phy->unscramble);
} }
static void sunxi_dw_hdmi_phy_set(uint clock, int phy_div) static void sunxi_dw_hdmi_phy_set(struct dw_hdmi *hdmi, uint clock, int phy_div)
{ {
struct sunxi_hdmi_phy * const phy = struct sunxi_hdmi_phy * const phy =
(struct sunxi_hdmi_phy *)(SUNXI_HDMI_BASE + HDMI_PHY_OFFS); (struct sunxi_hdmi_phy *)(hdmi->ioaddr + HDMI_PHY_OFFS);
int div = sunxi_dw_hdmi_get_divider(clock); int div = sunxi_dw_hdmi_get_divider(clock);
u32 tmp; u32 tmp;
@ -270,7 +270,7 @@ static int sunxi_dw_hdmi_phy_cfg(struct dw_hdmi *hdmi, uint mpixelclock)
int phy_div; int phy_div;
sunxi_dw_hdmi_pll_set(mpixelclock / 1000, &phy_div); sunxi_dw_hdmi_pll_set(mpixelclock / 1000, &phy_div);
sunxi_dw_hdmi_phy_set(mpixelclock, phy_div); sunxi_dw_hdmi_phy_set(hdmi, mpixelclock, phy_div);
return 0; return 0;
} }
@ -291,10 +291,10 @@ static bool sunxi_dw_hdmi_mode_valid(struct udevice *dev,
static int sunxi_dw_hdmi_enable(struct udevice *dev, int panel_bpp, static int sunxi_dw_hdmi_enable(struct udevice *dev, int panel_bpp,
const struct display_timing *edid) const struct display_timing *edid)
{ {
struct sunxi_hdmi_phy * const phy =
(struct sunxi_hdmi_phy *)(SUNXI_HDMI_BASE + HDMI_PHY_OFFS);
struct display_plat *uc_plat = dev_get_uclass_plat(dev);
struct sunxi_dw_hdmi_priv *priv = dev_get_priv(dev); struct sunxi_dw_hdmi_priv *priv = dev_get_priv(dev);
struct sunxi_hdmi_phy * const phy =
(struct sunxi_hdmi_phy *)(priv->hdmi.ioaddr + HDMI_PHY_OFFS);
struct display_plat *uc_plat = dev_get_uclass_plat(dev);
int ret; int ret;
ret = dw_hdmi_enable(&priv->hdmi, edid); ret = dw_hdmi_enable(&priv->hdmi, edid);
@ -316,7 +316,7 @@ static int sunxi_dw_hdmi_enable(struct udevice *dev, int panel_bpp,
* again or othwerwise BSP driver won't work. Dummy read is * again or othwerwise BSP driver won't work. Dummy read is
* needed or otherwise last write doesn't get written correctly. * needed or otherwise last write doesn't get written correctly.
*/ */
(void)readb(SUNXI_HDMI_BASE); (void)readb(priv->hdmi.ioaddr);
writel(0, &phy->unscramble); writel(0, &phy->unscramble);
return 0; return 0;
@ -345,13 +345,7 @@ static int sunxi_dw_hdmi_probe(struct udevice *dev)
/* Clock on */ /* Clock on */
setbits_le32(&ccm->hdmi_clk_cfg, CCM_HDMI_CTRL_GATE); setbits_le32(&ccm->hdmi_clk_cfg, CCM_HDMI_CTRL_GATE);
sunxi_dw_hdmi_phy_init(); sunxi_dw_hdmi_phy_init(&priv->hdmi);
priv->hdmi.ioaddr = SUNXI_HDMI_BASE;
priv->hdmi.i2c_clk_high = 0xd8;
priv->hdmi.i2c_clk_low = 0xfe;
priv->hdmi.reg_io_width = 1;
priv->hdmi.phy_set = sunxi_dw_hdmi_phy_cfg;
ret = dw_hdmi_phy_wait_for_hpd(&priv->hdmi); ret = dw_hdmi_phy_wait_for_hpd(&priv->hdmi);
if (ret < 0) { if (ret < 0) {
@ -364,6 +358,20 @@ static int sunxi_dw_hdmi_probe(struct udevice *dev)
return 0; return 0;
} }
static int sunxi_dw_hdmi_of_to_plat(struct udevice *dev)
{
struct sunxi_dw_hdmi_priv *priv = dev_get_priv(dev);
struct dw_hdmi *hdmi = &priv->hdmi;
hdmi->ioaddr = (ulong)dev_read_addr(dev);
hdmi->i2c_clk_high = 0xd8;
hdmi->i2c_clk_low = 0xfe;
hdmi->reg_io_width = 1;
hdmi->phy_set = sunxi_dw_hdmi_phy_cfg;
return 0;
}
static const struct dm_display_ops sunxi_dw_hdmi_ops = { static const struct dm_display_ops sunxi_dw_hdmi_ops = {
.read_edid = sunxi_dw_hdmi_read_edid, .read_edid = sunxi_dw_hdmi_read_edid,
.enable = sunxi_dw_hdmi_enable, .enable = sunxi_dw_hdmi_enable,
@ -380,6 +388,7 @@ U_BOOT_DRIVER(sunxi_dw_hdmi) = {
.id = UCLASS_DISPLAY, .id = UCLASS_DISPLAY,
.of_match = sunxi_dw_hdmi_ids, .of_match = sunxi_dw_hdmi_ids,
.probe = sunxi_dw_hdmi_probe, .probe = sunxi_dw_hdmi_probe,
.of_to_plat = sunxi_dw_hdmi_of_to_plat,
.priv_auto = sizeof(struct sunxi_dw_hdmi_priv), .priv_auto = sizeof(struct sunxi_dw_hdmi_priv),
.ops = &sunxi_dw_hdmi_ops, .ops = &sunxi_dw_hdmi_ops,
}; };