Commit 0ace4b99 authored by chunhui dai's avatar chunhui dai Committed by CK Hu

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.
Signed-off-by: default avatarchunhui dai <chunhui.dai@mediatek.com>
Signed-off-by: default avatarCK Hu <ck.hu@mediatek.com>
parent 4e90a6eb
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
#include <linux/component.h> #include <linux/component.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/of_device.h>
#include <linux/of_graph.h> #include <linux/of_graph.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/types.h> #include <linux/types.h>
...@@ -72,6 +73,7 @@ struct mtk_dpi { ...@@ -72,6 +73,7 @@ struct mtk_dpi {
struct clk *tvd_clk; struct clk *tvd_clk;
int irq; int irq;
struct drm_display_mode mode; struct drm_display_mode mode;
const struct mtk_dpi_conf *conf;
enum mtk_dpi_out_color_format color_format; enum mtk_dpi_out_color_format color_format;
enum mtk_dpi_out_yc_map yc_map; enum mtk_dpi_out_yc_map yc_map;
enum mtk_dpi_out_bit_num bit_num; enum mtk_dpi_out_bit_num bit_num;
...@@ -110,6 +112,10 @@ struct mtk_dpi_yc_limit { ...@@ -110,6 +112,10 @@ struct mtk_dpi_yc_limit {
u16 c_bottom; 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) static void mtk_dpi_mask(struct mtk_dpi *dpi, u32 offset, u32 val, u32 mask)
{ {
u32 tmp = readl(dpi->regs + offset) & ~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) ...@@ -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) 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, static void mtk_dpi_config_color_format(struct mtk_dpi *dpi,
...@@ -639,6 +645,10 @@ static const struct component_ops mtk_dpi_component_ops = { ...@@ -639,6 +645,10 @@ static const struct component_ops mtk_dpi_component_ops = {
.unbind = mtk_dpi_unbind, .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) static int mtk_dpi_probe(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
...@@ -653,6 +663,7 @@ static int mtk_dpi_probe(struct platform_device *pdev) ...@@ -653,6 +663,7 @@ static int mtk_dpi_probe(struct platform_device *pdev)
return -ENOMEM; return -ENOMEM;
dpi->dev = dev; dpi->dev = dev;
dpi->conf = (struct mtk_dpi_conf *)of_device_get_match_data(dev);
mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
dpi->regs = devm_ioremap_resource(dev, mem); dpi->regs = devm_ioremap_resource(dev, mem);
...@@ -732,8 +743,10 @@ static int mtk_dpi_remove(struct platform_device *pdev) ...@@ -732,8 +743,10 @@ static int mtk_dpi_remove(struct platform_device *pdev)
} }
static const struct of_device_id mtk_dpi_of_ids[] = { 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 = { struct platform_driver mtk_dpi_driver = {
......
...@@ -223,6 +223,5 @@ ...@@ -223,6 +223,5 @@
#define ESAV_CODE2 (0xFFF << 0) #define ESAV_CODE2 (0xFFF << 0)
#define ESAV_CODE3_MSB BIT(16) #define ESAV_CODE3_MSB BIT(16)
#define DPI_H_FRE_CON 0xE0
#define H_FRE_2N BIT(25) #define H_FRE_2N BIT(25)
#endif /* __MTK_DPI_REGS_H */ #endif /* __MTK_DPI_REGS_H */
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