Merge tag 'mediatek-drm-next-5.7' of https://github.com/ckhu-mediatek/linux.git-tags into drm-next (cb7adfd6) · Commits · 戴 / test

Documentation/devicetree/bindings/display/mediatek/mediatek,dpi.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -7,6 +7,7 @@ output bus.

		Required properties:
		- compatible: "mediatek,<chip>-dpi"
		the supported chips are mt2701 , mt8173 and mt8183.
		- reg: Physical base address and length of the controller's registers
		- interrupts: The interrupt signal from the function block.
		- clocks: device clocks

+1 −1

Original line number	Diff line number	Diff line
		@@ -5629,7 +5629,7 @@ F: include/uapi/drm/lima_drm.h
		T: git git://anongit.freedesktop.org/drm/drm-misc

		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>
		L: dri-devel@lists.freedesktop.org
		S: Supported

+18 −0

Original line number	Diff line number	Diff line
		@@ -664,6 +664,16 @@ static unsigned int mt2701_calculate_factor(int clock)
		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 = {
		.cal_factor = mt8173_calculate_factor,
		.reg_h_fre_con = 0xe0,
		@@ -675,6 +685,11 @@ static const struct mtk_dpi_conf mt2701_conf = {
		.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)
		{
		struct device *dev = &pdev->dev;
		@@ -770,6 +785,9 @@ static const struct of_device_id mtk_dpi_of_ids[] = {
		{ .compatible = "mediatek,mt8173-dpi",
		.data = &mt8173_conf,
		},
		{ .compatible = "mediatek,mt8183-dpi",
		.data = &mt8183_conf,
		},
		{ },
		};