Commit cb7adfd6 authored by Dave Airlie's avatar Dave Airlie

Merge tag 'mediatek-drm-next-5.7' of https://github.com/ckhu-mediatek/linux.git-tags into drm-next

Mediatek DRM Next for Linux 5.7

This include MT8183 DPI support.
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: CK Hu <ck.hu@mediatek.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1584580683.29614.5.camel@mtksdaap41
parents 04253939 93e97f71
...@@ -7,6 +7,7 @@ output bus. ...@@ -7,6 +7,7 @@ output bus.
Required properties: Required properties:
- compatible: "mediatek,<chip>-dpi" - compatible: "mediatek,<chip>-dpi"
the supported chips are mt2701 , mt8173 and mt8183.
- reg: Physical base address and length of the controller's registers - reg: Physical base address and length of the controller's registers
- interrupts: The interrupt signal from the function block. - interrupts: The interrupt signal from the function block.
- clocks: device clocks - clocks: device clocks
......
...@@ -5629,7 +5629,7 @@ F: include/uapi/drm/lima_drm.h ...@@ -5629,7 +5629,7 @@ F: include/uapi/drm/lima_drm.h
T: git git://anongit.freedesktop.org/drm/drm-misc T: git git://anongit.freedesktop.org/drm/drm-misc
DRM DRIVERS FOR MEDIATEK DRM DRIVERS FOR MEDIATEK
M: CK Hu <ck.hu@mediatek.com> M: Chun-Kuang Hu <chunkuang.hu@kernel.org>
M: Philipp Zabel <p.zabel@pengutronix.de> M: Philipp Zabel <p.zabel@pengutronix.de>
L: dri-devel@lists.freedesktop.org L: dri-devel@lists.freedesktop.org
S: Supported S: Supported
......
...@@ -664,6 +664,16 @@ static unsigned int mt2701_calculate_factor(int clock) ...@@ -664,6 +664,16 @@ static unsigned int mt2701_calculate_factor(int clock)
return 1; return 1;
} }
static unsigned int mt8183_calculate_factor(int clock)
{
if (clock <= 27000)
return 8;
else if (clock <= 167000)
return 4;
else
return 2;
}
static const struct mtk_dpi_conf mt8173_conf = { static const struct mtk_dpi_conf mt8173_conf = {
.cal_factor = mt8173_calculate_factor, .cal_factor = mt8173_calculate_factor,
.reg_h_fre_con = 0xe0, .reg_h_fre_con = 0xe0,
...@@ -675,6 +685,11 @@ static const struct mtk_dpi_conf mt2701_conf = { ...@@ -675,6 +685,11 @@ static const struct mtk_dpi_conf mt2701_conf = {
.edge_sel_en = true, .edge_sel_en = true,
}; };
static const struct mtk_dpi_conf mt8183_conf = {
.cal_factor = mt8183_calculate_factor,
.reg_h_fre_con = 0xe0,
};
static int mtk_dpi_probe(struct platform_device *pdev) static int mtk_dpi_probe(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
...@@ -770,6 +785,9 @@ static const struct of_device_id mtk_dpi_of_ids[] = { ...@@ -770,6 +785,9 @@ static const struct of_device_id mtk_dpi_of_ids[] = {
{ .compatible = "mediatek,mt8173-dpi", { .compatible = "mediatek,mt8173-dpi",
.data = &mt8173_conf, .data = &mt8173_conf,
}, },
{ .compatible = "mediatek,mt8183-dpi",
.data = &mt8183_conf,
},
{ }, { },
}; };
......
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