mirror of
https://github.com/Ysurac/openmptcprouter.git
synced 2025-03-09 15:40:20 +00:00
22f2648b87
回推到d292938262 (diff-d29d8326a73da875bb76462833c6db678a92c6b658fcd67e20e2fc338b51967d)
有问题。
101 lines
3.1 KiB
Diff
Executable file
101 lines
3.1 KiB
Diff
Executable file
From c2b3363773bfc93b3e4082ccfa99cda18ea980be Mon Sep 17 00:00:00 2001
|
|
From: chunhui dai <chunhui.dai@mediatek.com>
|
|
Date: Wed, 3 Oct 2018 11:41:42 +0800
|
|
Subject: [PATCH 28/77] drm/mediatek: move hardware register to node data
|
|
|
|
The address of register DPI_H_FRE_CON is different in different IC.
|
|
Using of_node data to find this address.
|
|
|
|
Reviewed-by: CK Hu <ck.hu@mediatek.com>
|
|
Signed-off-by: chunhui dai <chunhui.dai@mediatek.com>
|
|
---
|
|
drivers/gpu/drm/mediatek/mtk_dpi.c | 19 ++++++++++++++++---
|
|
drivers/gpu/drm/mediatek/mtk_dpi_regs.h | 1 -
|
|
2 files changed, 16 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c b/drivers/gpu/drm/mediatek/mtk_dpi.c
|
|
index 5ede1ddbaa1a..72aa43187731 100644
|
|
--- a/drivers/gpu/drm/mediatek/mtk_dpi.c
|
|
+++ b/drivers/gpu/drm/mediatek/mtk_dpi.c
|
|
@@ -18,6 +18,7 @@
|
|
#include <linux/component.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/of.h>
|
|
+#include <linux/of_device.h>
|
|
#include <linux/of_graph.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/types.h>
|
|
@@ -72,6 +73,7 @@ struct mtk_dpi {
|
|
struct clk *tvd_clk;
|
|
int irq;
|
|
struct drm_display_mode mode;
|
|
+ const struct mtk_dpi_conf *conf;
|
|
enum mtk_dpi_out_color_format color_format;
|
|
enum mtk_dpi_out_yc_map yc_map;
|
|
enum mtk_dpi_out_bit_num bit_num;
|
|
@@ -110,6 +112,10 @@ struct mtk_dpi_yc_limit {
|
|
u16 c_bottom;
|
|
};
|
|
|
|
+struct mtk_dpi_conf {
|
|
+ u32 reg_h_fre_con;
|
|
+};
|
|
+
|
|
static void mtk_dpi_mask(struct mtk_dpi *dpi, u32 offset, u32 val, u32 mask)
|
|
{
|
|
u32 tmp = readl(dpi->regs + offset) & ~mask;
|
|
@@ -335,7 +341,7 @@ static void mtk_dpi_config_swap_input(struct mtk_dpi *dpi, bool enable)
|
|
|
|
static void mtk_dpi_config_2n_h_fre(struct mtk_dpi *dpi)
|
|
{
|
|
- mtk_dpi_mask(dpi, DPI_H_FRE_CON, H_FRE_2N, H_FRE_2N);
|
|
+ mtk_dpi_mask(dpi, dpi->conf->reg_h_fre_con, H_FRE_2N, H_FRE_2N);
|
|
}
|
|
|
|
static void mtk_dpi_config_color_format(struct mtk_dpi *dpi,
|
|
@@ -639,6 +645,10 @@ static const struct component_ops mtk_dpi_component_ops = {
|
|
.unbind = mtk_dpi_unbind,
|
|
};
|
|
|
|
+static const struct mtk_dpi_conf mt8173_conf = {
|
|
+ .reg_h_fre_con = 0xe0,
|
|
+};
|
|
+
|
|
static int mtk_dpi_probe(struct platform_device *pdev)
|
|
{
|
|
struct device *dev = &pdev->dev;
|
|
@@ -653,6 +663,7 @@ static int mtk_dpi_probe(struct platform_device *pdev)
|
|
return -ENOMEM;
|
|
|
|
dpi->dev = dev;
|
|
+ dpi->conf = (struct mtk_dpi_conf *)of_device_get_match_data(dev);
|
|
|
|
mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
dpi->regs = devm_ioremap_resource(dev, mem);
|
|
@@ -732,8 +743,10 @@ static int mtk_dpi_remove(struct platform_device *pdev)
|
|
}
|
|
|
|
static const struct of_device_id mtk_dpi_of_ids[] = {
|
|
- { .compatible = "mediatek,mt8173-dpi", },
|
|
- {}
|
|
+ { .compatible = "mediatek,mt8173-dpi",
|
|
+ .data = &mt8173_conf,
|
|
+ },
|
|
+ { },
|
|
};
|
|
|
|
struct platform_driver mtk_dpi_driver = {
|
|
diff --git a/drivers/gpu/drm/mediatek/mtk_dpi_regs.h b/drivers/gpu/drm/mediatek/mtk_dpi_regs.h
|
|
index 4b6ad4751a31..040444d7718d 100644
|
|
--- a/drivers/gpu/drm/mediatek/mtk_dpi_regs.h
|
|
+++ b/drivers/gpu/drm/mediatek/mtk_dpi_regs.h
|
|
@@ -223,6 +223,5 @@
|
|
#define ESAV_CODE2 (0xFFF << 0)
|
|
#define ESAV_CODE3_MSB BIT(16)
|
|
|
|
-#define DPI_H_FRE_CON 0xE0
|
|
#define H_FRE_2N BIT(25)
|
|
#endif /* __MTK_DPI_REGS_H */
|
|
--
|
|
2.19.1
|
|
|