Skip to content

L
linux
Commit 80a5cfd6 authored by yt.shen@mediatek.com's avatar yt.shen@mediatek.com Committed by CK Hu
Browse files
Options

drm/mediatek: cleaning up and refine 

cleaning up unused define and refine function name and variable
Signed-off-by: default avatarshaoming chen <shaoming.chen@mediatek.com>
Signed-off-by: default avatarYT Shen <yt.shen@mediatek.com>
Acked-by: default avatarCK Hu <ck.hu@mediatek.com>
parent fb2557de
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 42 deletions
drivers/gpu/drm/mediatek/mtk_dsi.c
View file @ 80a5cfd6
...@@ -27,9 +27,6 @@ ...@@ -27,9 +27,6 @@
#include "mtk_drm_ddp_comp.h" #include "mtk_drm_ddp_comp.h"
#define DSI_VIDEO_FIFO_DEPTH (1920 / 4)
#define DSI_HOST_FIFO_DEPTH 64
#define DSI_START 0x00 #define DSI_START 0x00
#define DSI_CON_CTRL 0x10 #define DSI_CON_CTRL 0x10
...@@ -46,7 +43,7 @@ ...@@ -46,7 +43,7 @@
#define MIX_MODE BIT(17) #define MIX_MODE BIT(17)
#define DSI_TXRX_CTRL 0x18 #define DSI_TXRX_CTRL 0x18
#define VC_NUM (2 << 0) #define VC_NUM BIT(1)
#define LANE_NUM (0xf << 2) #define LANE_NUM (0xf << 2)
#define DIS_EOT BIT(6) #define DIS_EOT BIT(6)
#define NULL_EN BIT(7) #define NULL_EN BIT(7)
...@@ -164,7 +161,7 @@ static void mtk_dsi_mask(struct mtk_dsi *dsi, u32 offset, u32 mask, u32 data) ...@@ -164,7 +161,7 @@ static void mtk_dsi_mask(struct mtk_dsi *dsi, u32 offset, u32 mask, u32 data)
writel((temp & ~mask) | (data & mask), dsi->regs + offset); writel((temp & ~mask) | (data & mask), dsi->regs + offset);
} }
static void dsi_phy_timconfig(struct mtk_dsi *dsi) static void mtk_dsi_phy_timconfig(struct mtk_dsi *dsi)
{ {
u32 timcon0, timcon1, timcon2, timcon3; u32 timcon0, timcon1, timcon2, timcon3;
u32 ui, cycle_time; u32 ui, cycle_time;
...@@ -196,7 +193,7 @@ static void mtk_dsi_disable(struct mtk_dsi *dsi) ...@@ -196,7 +193,7 @@ static void mtk_dsi_disable(struct mtk_dsi *dsi)
mtk_dsi_mask(dsi, DSI_CON_CTRL, DSI_EN, 0); mtk_dsi_mask(dsi, DSI_CON_CTRL, DSI_EN, 0);
} }
static void mtk_dsi_reset(struct mtk_dsi *dsi) static void mtk_dsi_reset_engine(struct mtk_dsi *dsi)
{ {
mtk_dsi_mask(dsi, DSI_CON_CTRL, DSI_RESET, DSI_RESET); mtk_dsi_mask(dsi, DSI_CON_CTRL, DSI_RESET, DSI_RESET);
mtk_dsi_mask(dsi, DSI_CON_CTRL, DSI_RESET, 0); mtk_dsi_mask(dsi, DSI_CON_CTRL, DSI_RESET, 0);
...@@ -267,8 +264,8 @@ static int mtk_dsi_poweron(struct mtk_dsi *dsi) ...@@ -267,8 +264,8 @@ static int mtk_dsi_poweron(struct mtk_dsi *dsi)
} }
mtk_dsi_enable(dsi); mtk_dsi_enable(dsi);
mtk_dsi_reset(dsi); mtk_dsi_reset_engine(dsi);
dsi_phy_timconfig(dsi); mtk_dsi_phy_timconfig(dsi);
return 0; return 0;
...@@ -281,33 +278,33 @@ static int mtk_dsi_poweron(struct mtk_dsi *dsi) ...@@ -281,33 +278,33 @@ static int mtk_dsi_poweron(struct mtk_dsi *dsi)
return ret; return ret;
} }
static void dsi_clk_ulp_mode_enter(struct mtk_dsi *dsi) static void mtk_dsi_clk_ulp_mode_enter(struct mtk_dsi *dsi)
{ {
mtk_dsi_mask(dsi, DSI_PHY_LCCON, LC_HS_TX_EN, 0); mtk_dsi_mask(dsi, DSI_PHY_LCCON, LC_HS_TX_EN, 0);
mtk_dsi_mask(dsi, DSI_PHY_LCCON, LC_ULPM_EN, 0); mtk_dsi_mask(dsi, DSI_PHY_LCCON, LC_ULPM_EN, 0);
} }
static void dsi_clk_ulp_mode_leave(struct mtk_dsi *dsi) static void mtk_dsi_clk_ulp_mode_leave(struct mtk_dsi *dsi)
{ {
mtk_dsi_mask(dsi, DSI_PHY_LCCON, LC_ULPM_EN, 0); mtk_dsi_mask(dsi, DSI_PHY_LCCON, LC_ULPM_EN, 0);
mtk_dsi_mask(dsi, DSI_PHY_LCCON, LC_WAKEUP_EN, LC_WAKEUP_EN); mtk_dsi_mask(dsi, DSI_PHY_LCCON, LC_WAKEUP_EN, LC_WAKEUP_EN);
mtk_dsi_mask(dsi, DSI_PHY_LCCON, LC_WAKEUP_EN, 0); mtk_dsi_mask(dsi, DSI_PHY_LCCON, LC_WAKEUP_EN, 0);
} }
static void dsi_lane0_ulp_mode_enter(struct mtk_dsi *dsi) static void mtk_dsi_lane0_ulp_mode_enter(struct mtk_dsi *dsi)
{ {
mtk_dsi_mask(dsi, DSI_PHY_LD0CON, LD0_HS_TX_EN, 0); mtk_dsi_mask(dsi, DSI_PHY_LD0CON, LD0_HS_TX_EN, 0);
mtk_dsi_mask(dsi, DSI_PHY_LD0CON, LD0_ULPM_EN, 0); mtk_dsi_mask(dsi, DSI_PHY_LD0CON, LD0_ULPM_EN, 0);
} }
static void dsi_lane0_ulp_mode_leave(struct mtk_dsi *dsi) static void mtk_dsi_lane0_ulp_mode_leave(struct mtk_dsi *dsi)
{ {
mtk_dsi_mask(dsi, DSI_PHY_LD0CON, LD0_ULPM_EN, 0); mtk_dsi_mask(dsi, DSI_PHY_LD0CON, LD0_ULPM_EN, 0);
mtk_dsi_mask(dsi, DSI_PHY_LD0CON, LD0_WAKEUP_EN, LD0_WAKEUP_EN); mtk_dsi_mask(dsi, DSI_PHY_LD0CON, LD0_WAKEUP_EN, LD0_WAKEUP_EN);
mtk_dsi_mask(dsi, DSI_PHY_LD0CON, LD0_WAKEUP_EN, 0); mtk_dsi_mask(dsi, DSI_PHY_LD0CON, LD0_WAKEUP_EN, 0);
} }
static bool dsi_clk_hs_state(struct mtk_dsi *dsi) static bool mtk_dsi_clk_hs_state(struct mtk_dsi *dsi)
{ {
u32 tmp_reg1; u32 tmp_reg1;
...@@ -315,15 +312,15 @@ static bool dsi_clk_hs_state(struct mtk_dsi *dsi) ...@@ -315,15 +312,15 @@ static bool dsi_clk_hs_state(struct mtk_dsi *dsi)
return ((tmp_reg1 & LC_HS_TX_EN) == 1) ? true : false; return ((tmp_reg1 & LC_HS_TX_EN) == 1) ? true : false;
} }
static void dsi_clk_hs_mode(struct mtk_dsi *dsi, bool enter) static void mtk_dsi_clk_hs_mode(struct mtk_dsi *dsi, bool enter)
{ {
if (enter && !dsi_clk_hs_state(dsi)) if (enter && !mtk_dsi_clk_hs_state(dsi))
mtk_dsi_mask(dsi, DSI_PHY_LCCON, LC_HS_TX_EN, LC_HS_TX_EN); mtk_dsi_mask(dsi, DSI_PHY_LCCON, LC_HS_TX_EN, LC_HS_TX_EN);
else if (!enter && dsi_clk_hs_state(dsi)) else if (!enter && mtk_dsi_clk_hs_state(dsi))
mtk_dsi_mask(dsi, DSI_PHY_LCCON, LC_HS_TX_EN, 0); mtk_dsi_mask(dsi, DSI_PHY_LCCON, LC_HS_TX_EN, 0);
} }
static void dsi_set_mode(struct mtk_dsi *dsi) static void mtk_dsi_set_mode(struct mtk_dsi *dsi)
{ {
u32 vid_mode = CMD_MODE; u32 vid_mode = CMD_MODE;
...@@ -338,7 +335,7 @@ static void dsi_set_mode(struct mtk_dsi *dsi) ...@@ -338,7 +335,7 @@ static void dsi_set_mode(struct mtk_dsi *dsi)
writel(vid_mode, dsi->regs + DSI_MODE_CTRL); writel(vid_mode, dsi->regs + DSI_MODE_CTRL);
} }
static void dsi_ps_control_vact(struct mtk_dsi *dsi) static void mtk_dsi_ps_control_vact(struct mtk_dsi *dsi)
{ {
struct videomode *vm = &dsi->vm; struct videomode *vm = &dsi->vm;
u32 dsi_buf_bpp, ps_wc; u32 dsi_buf_bpp, ps_wc;
...@@ -372,7 +369,7 @@ static void dsi_ps_control_vact(struct mtk_dsi *dsi) ...@@ -372,7 +369,7 @@ static void dsi_ps_control_vact(struct mtk_dsi *dsi)
writel(ps_wc, dsi->regs + DSI_HSTX_CKL_WC); writel(ps_wc, dsi->regs + DSI_HSTX_CKL_WC);
} }
static void dsi_rxtx_control(struct mtk_dsi *dsi) static void mtk_dsi_rxtx_control(struct mtk_dsi *dsi)
{ {
u32 tmp_reg; u32 tmp_reg;
...@@ -397,9 +394,9 @@ static void dsi_rxtx_control(struct mtk_dsi *dsi) ...@@ -397,9 +394,9 @@ static void dsi_rxtx_control(struct mtk_dsi *dsi)
writel(tmp_reg, dsi->regs + DSI_TXRX_CTRL); writel(tmp_reg, dsi->regs + DSI_TXRX_CTRL);
} }
static void dsi_ps_control(struct mtk_dsi *dsi) static void mtk_dsi_ps_control(struct mtk_dsi *dsi)
{ {
unsigned int dsi_tmp_buf_bpp; u32 dsi_tmp_buf_bpp;
u32 tmp_reg; u32 tmp_reg;
switch (dsi->format) { switch (dsi->format) {
...@@ -429,12 +426,12 @@ static void dsi_ps_control(struct mtk_dsi *dsi) ...@@ -429,12 +426,12 @@ static void dsi_ps_control(struct mtk_dsi *dsi)
writel(tmp_reg, dsi->regs + DSI_PSCTRL); writel(tmp_reg, dsi->regs + DSI_PSCTRL);
} }
static void dsi_config_vdo_timing(struct mtk_dsi *dsi) static void mtk_dsi_config_vdo_timing(struct mtk_dsi *dsi)
{ {
unsigned int horizontal_sync_active_byte; u32 horizontal_sync_active_byte;
unsigned int horizontal_backporch_byte; u32 horizontal_backporch_byte;
unsigned int horizontal_frontporch_byte; u32 horizontal_frontporch_byte;
unsigned int dsi_tmp_buf_bpp; u32 dsi_tmp_buf_bpp;
struct videomode *vm = &dsi->vm; struct videomode *vm = &dsi->vm;
...@@ -463,7 +460,7 @@ static void dsi_config_vdo_timing(struct mtk_dsi *dsi) ...@@ -463,7 +460,7 @@ static void dsi_config_vdo_timing(struct mtk_dsi *dsi)
writel(horizontal_backporch_byte, dsi->regs + DSI_HBP_WC); writel(horizontal_backporch_byte, dsi->regs + DSI_HBP_WC);
writel(horizontal_frontporch_byte, dsi->regs + DSI_HFP_WC); writel(horizontal_frontporch_byte, dsi->regs + DSI_HFP_WC);
dsi_ps_control(dsi); mtk_dsi_ps_control(dsi);
} }
static void mtk_dsi_start(struct mtk_dsi *dsi) static void mtk_dsi_start(struct mtk_dsi *dsi)
...@@ -480,8 +477,8 @@ static void mtk_dsi_poweroff(struct mtk_dsi *dsi) ...@@ -480,8 +477,8 @@ static void mtk_dsi_poweroff(struct mtk_dsi *dsi)
if (--dsi->refcount != 0) if (--dsi->refcount != 0)
return; return;
dsi_lane0_ulp_mode_enter(dsi); mtk_dsi_lane0_ulp_mode_enter(dsi);
dsi_clk_ulp_mode_enter(dsi); mtk_dsi_clk_ulp_mode_enter(dsi);
mtk_dsi_disable(dsi); mtk_dsi_disable(dsi);
...@@ -511,18 +508,18 @@ static void mtk_output_dsi_enable(struct mtk_dsi *dsi) ...@@ -511,18 +508,18 @@ static void mtk_output_dsi_enable(struct mtk_dsi *dsi)
return; return;
} }
dsi_rxtx_control(dsi); mtk_dsi_rxtx_control(dsi);
dsi_clk_ulp_mode_leave(dsi); mtk_dsi_clk_ulp_mode_leave(dsi);
dsi_lane0_ulp_mode_leave(dsi); mtk_dsi_lane0_ulp_mode_leave(dsi);
dsi_clk_hs_mode(dsi, 0); mtk_dsi_clk_hs_mode(dsi, 0);
dsi_set_mode(dsi); mtk_dsi_set_mode(dsi);
dsi_ps_control_vact(dsi); mtk_dsi_ps_control_vact(dsi);
dsi_config_vdo_timing(dsi); mtk_dsi_config_vdo_timing(dsi);
dsi_set_mode(dsi); mtk_dsi_set_mode(dsi);
dsi_clk_hs_mode(dsi, 1); mtk_dsi_clk_hs_mode(dsi, 1);
mtk_dsi_start(dsi); mtk_dsi_start(dsi);
......
drivers/gpu/drm/mediatek/mtk_mipi_tx.c
View file @ 80a5cfd6
...@@ -134,7 +134,7 @@ struct mtk_mipitx_data { ...@@ -134,7 +134,7 @@ struct mtk_mipitx_data {
struct mtk_mipi_tx { struct mtk_mipi_tx {
struct device *dev; struct device *dev;
void __iomem *regs; void __iomem *regs;
unsigned int data_rate; u32 data_rate;
const struct mtk_mipitx_data *driver_data; const struct mtk_mipitx_data *driver_data;
struct clk_hw pll_hw; struct clk_hw pll_hw;
struct clk *pll; struct clk *pll;
...@@ -172,7 +172,7 @@ static void mtk_mipi_tx_update_bits(struct mtk_mipi_tx *mipi_tx, u32 offset, ...@@ -172,7 +172,7 @@ static void mtk_mipi_tx_update_bits(struct mtk_mipi_tx *mipi_tx, u32 offset,
static int mtk_mipi_tx_pll_prepare(struct clk_hw *hw) static int mtk_mipi_tx_pll_prepare(struct clk_hw *hw)
{ {
struct mtk_mipi_tx *mipi_tx = mtk_mipi_tx_from_clk_hw(hw); struct mtk_mipi_tx *mipi_tx = mtk_mipi_tx_from_clk_hw(hw);
unsigned int txdiv, txdiv0, txdiv1; u8 txdiv, txdiv0, txdiv1;
u64 pcw; u64 pcw;
dev_dbg(mipi_tx->dev, "prepare: %u Hz\n", mipi_tx->data_rate); dev_dbg(mipi_tx->dev, "prepare: %u Hz\n", mipi_tx->data_rate);
...@@ -326,7 +326,7 @@ static const struct clk_ops mtk_mipi_tx_pll_ops = { ...@@ -326,7 +326,7 @@ static const struct clk_ops mtk_mipi_tx_pll_ops = {
static int mtk_mipi_tx_power_on_signal(struct phy *phy) static int mtk_mipi_tx_power_on_signal(struct phy *phy)
{ {
struct mtk_mipi_tx *mipi_tx = phy_get_drvdata(phy); struct mtk_mipi_tx *mipi_tx = phy_get_drvdata(phy);
unsigned int reg; u32 reg;
for (reg = MIPITX_DSI_CLOCK_LANE; for (reg = MIPITX_DSI_CLOCK_LANE;
reg <= MIPITX_DSI_DATA_LANE3; reg += 4) reg <= MIPITX_DSI_DATA_LANE3; reg += 4)
...@@ -357,7 +357,7 @@ static int mtk_mipi_tx_power_on(struct phy *phy) ...@@ -357,7 +357,7 @@ static int mtk_mipi_tx_power_on(struct phy *phy)
static void mtk_mipi_tx_power_off_signal(struct phy *phy) static void mtk_mipi_tx_power_off_signal(struct phy *phy)
{ {
struct mtk_mipi_tx *mipi_tx = phy_get_drvdata(phy); struct mtk_mipi_tx *mipi_tx = phy_get_drvdata(phy);
unsigned int reg; u32 reg;
mtk_mipi_tx_set_bits(mipi_tx, MIPITX_DSI_TOP_CON, mtk_mipi_tx_set_bits(mipi_tx, MIPITX_DSI_TOP_CON,
RG_DSI_PAD_TIE_LOW_EN); RG_DSI_PAD_TIE_LOW_EN);
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7