* [PATCH v5 0/4] Config mipi tx current and impedance
@ 2020-04-10 4:32 Jitao Shi
2020-04-10 4:32 ` [PATCH v5 1/4] dt-bindings: display: mediatek: add property to control mipi tx drive current Jitao Shi
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Jitao Shi @ 2020-04-10 4:32 UTC (permalink / raw)
To: Rob Herring, Mark Rutland, Matthias Brugger, Daniel Vetter,
David Airlie, dri-devel, linux-kernel
Cc: linux-mediatek, devicetree, linux-arm-kernel, srv_heupstream,
yingjoe.chen, eddie.huang, cawa.cheng, bibby.hsieh, ck.hu,
stonea168, huijuan.xie, Jitao Shi
Changes since v4:
- add Reviewed-by:
- move the get the calibration data code to probe.
Changes since v3:
- refine drive-strength-microamp as from 3000 to 6000.
Changes since v2:
- fix the title of commit message.
- rename mipitx-current-drive to drive-strength-microamp
Changes since v1:
- fix coding style.
- change mtk_mipi_tx_config_calibration_data() to void
Jitao Shi (4):
dt-bindings: display: mediatek: add property to control mipi tx drive
current
dt-bindings: display: mediatek: get mipitx calibration data from nvmem
drm/mediatek: add the mipitx driving control
drm/mediatek: config mipitx impedance with calibration data
.../display/mediatek/mediatek,dsi.txt | 10 ++++
drivers/gpu/drm/mediatek/mtk_mipi_tx.c | 54 +++++++++++++++++++
drivers/gpu/drm/mediatek/mtk_mipi_tx.h | 4 ++
drivers/gpu/drm/mediatek/mtk_mt8183_mipi_tx.c | 28 ++++++++++
4 files changed, 96 insertions(+)
--
2.21.0
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v5 1/4] dt-bindings: display: mediatek: add property to control mipi tx drive current
2020-04-10 4:32 [PATCH v5 0/4] Config mipi tx current and impedance Jitao Shi
@ 2020-04-10 4:32 ` Jitao Shi
2020-04-10 4:32 ` [PATCH v5 2/4] dt-bindings: display: mediatek: get mipitx calibration data from nvmem Jitao Shi
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Jitao Shi @ 2020-04-10 4:32 UTC (permalink / raw)
To: Rob Herring, Mark Rutland, Matthias Brugger, Daniel Vetter,
David Airlie, dri-devel, linux-kernel
Cc: linux-mediatek, devicetree, linux-arm-kernel, srv_heupstream,
yingjoe.chen, eddie.huang, cawa.cheng, bibby.hsieh, ck.hu,
stonea168, huijuan.xie, Jitao Shi, Chun-Kuang Hu
Add a property to control mipi tx drive current:
"drive-strength-microamp"
Reviewed-by: Chun-Kuang Hu <chunkuang.hu@kernel.org>
Signed-off-by: Jitao Shi <jitao.shi@mediatek.com>
---
.../devicetree/bindings/display/mediatek/mediatek,dsi.txt | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,dsi.txt b/Documentation/devicetree/bindings/display/mediatek/mediatek,dsi.txt
index a19a6cc375ed..d78b6d6d8fab 100644
--- a/Documentation/devicetree/bindings/display/mediatek/mediatek,dsi.txt
+++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,dsi.txt
@@ -33,6 +33,10 @@ Required properties:
- #clock-cells: must be <0>;
- #phy-cells: must be <0>.
+Optional properties:
+- drive-strength-microamp: adjust driving current, should be 3000 ~ 6000. And
+ the step is 200.
+
Example:
mipi_tx0: mipi-dphy@10215000 {
@@ -42,6 +46,7 @@ mipi_tx0: mipi-dphy@10215000 {
clock-output-names = "mipi_tx0_pll";
#clock-cells = <0>;
#phy-cells = <0>;
+ drive-strength-microamp = <4600>;
};
dsi0: dsi@1401b000 {
--
2.21.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v5 2/4] dt-bindings: display: mediatek: get mipitx calibration data from nvmem
2020-04-10 4:32 [PATCH v5 0/4] Config mipi tx current and impedance Jitao Shi
2020-04-10 4:32 ` [PATCH v5 1/4] dt-bindings: display: mediatek: add property to control mipi tx drive current Jitao Shi
@ 2020-04-10 4:32 ` Jitao Shi
2020-04-10 4:32 ` [PATCH v5 3/4] drm/mediatek: add the mipitx driving control Jitao Shi
2020-04-10 4:32 ` [PATCH v5 4/4] drm/mediatek: config mipitx impedance with calibration data Jitao Shi
3 siblings, 0 replies; 6+ messages in thread
From: Jitao Shi @ 2020-04-10 4:32 UTC (permalink / raw)
To: Rob Herring, Mark Rutland, Matthias Brugger, Daniel Vetter,
David Airlie, dri-devel, linux-kernel
Cc: linux-mediatek, devicetree, linux-arm-kernel, srv_heupstream,
yingjoe.chen, eddie.huang, cawa.cheng, bibby.hsieh, ck.hu,
stonea168, huijuan.xie, Jitao Shi, Chun-Kuang Hu, Rob Herring
Add properties to get get mipitx calibration data.
Reviewed-by: Chun-Kuang Hu <chunkuang.hu@kernel.org>
Reviewed-by: Rob Herring <robh@kernel.org>
Signed-off-by: Jitao Shi <jitao.shi@mediatek.com>
---
.../devicetree/bindings/display/mediatek/mediatek,dsi.txt | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,dsi.txt b/Documentation/devicetree/bindings/display/mediatek/mediatek,dsi.txt
index d78b6d6d8fab..8e4729de8c85 100644
--- a/Documentation/devicetree/bindings/display/mediatek/mediatek,dsi.txt
+++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,dsi.txt
@@ -36,6 +36,9 @@ Required properties:
Optional properties:
- drive-strength-microamp: adjust driving current, should be 3000 ~ 6000. And
the step is 200.
+- nvmem-cells: A phandle to the calibration data provided by a nvmem device. If
+ unspecified default values shall be used.
+- nvmem-cell-names: Should be "calibration-data"
Example:
@@ -47,6 +50,8 @@ mipi_tx0: mipi-dphy@10215000 {
#clock-cells = <0>;
#phy-cells = <0>;
drive-strength-microamp = <4600>;
+ nvmem-cells= <&mipi_tx_calibration>;
+ nvmem-cell-names = "calibration-data";
};
dsi0: dsi@1401b000 {
--
2.21.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v5 3/4] drm/mediatek: add the mipitx driving control
2020-04-10 4:32 [PATCH v5 0/4] Config mipi tx current and impedance Jitao Shi
2020-04-10 4:32 ` [PATCH v5 1/4] dt-bindings: display: mediatek: add property to control mipi tx drive current Jitao Shi
2020-04-10 4:32 ` [PATCH v5 2/4] dt-bindings: display: mediatek: get mipitx calibration data from nvmem Jitao Shi
@ 2020-04-10 4:32 ` Jitao Shi
2020-04-10 4:32 ` [PATCH v5 4/4] drm/mediatek: config mipitx impedance with calibration data Jitao Shi
3 siblings, 0 replies; 6+ messages in thread
From: Jitao Shi @ 2020-04-10 4:32 UTC (permalink / raw)
To: Rob Herring, Mark Rutland, Matthias Brugger, Daniel Vetter,
David Airlie, dri-devel, linux-kernel
Cc: linux-mediatek, devicetree, linux-arm-kernel, srv_heupstream,
yingjoe.chen, eddie.huang, cawa.cheng, bibby.hsieh, ck.hu,
stonea168, huijuan.xie, Jitao Shi, Chun-Kuang Hu
Add a property in device tree to control the driving by different
board.
Reviewed-by: Chun-Kuang Hu <chunkuang.hu@kernel.org>
Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com>
Signed-off-by: Jitao Shi <jitao.shi@mediatek.com>
---
drivers/gpu/drm/mediatek/mtk_mipi_tx.c | 14 ++++++++++++++
drivers/gpu/drm/mediatek/mtk_mipi_tx.h | 1 +
drivers/gpu/drm/mediatek/mtk_mt8183_mipi_tx.c | 7 +++++++
3 files changed, 22 insertions(+)
diff --git a/drivers/gpu/drm/mediatek/mtk_mipi_tx.c b/drivers/gpu/drm/mediatek/mtk_mipi_tx.c
index e4d34484ecc8..e301af64809e 100644
--- a/drivers/gpu/drm/mediatek/mtk_mipi_tx.c
+++ b/drivers/gpu/drm/mediatek/mtk_mipi_tx.c
@@ -125,6 +125,20 @@ static int mtk_mipi_tx_probe(struct platform_device *pdev)
return ret;
}
+ ret = of_property_read_u32(dev->of_node, "drive-strength-microamp",
+ &mipi_tx->mipitx_drive);
+ /* If can't get the "mipi_tx->mipitx_drive", set it default 0x8 */
+ if (ret < 0)
+ mipi_tx->mipitx_drive = 4600;
+
+ /* check the mipitx_drive valid */
+ if (mipi_tx->mipitx_drive > 6000 || mipi_tx->mipitx_drive < 3000) {
+ dev_warn(dev, "drive-strength-microamp is invalid %d, not in 3000 ~ 6000\n",
+ mipi_tx->mipitx_drive);
+ mipi_tx->mipitx_drive = clamp_val(mipi_tx->mipitx_drive, 3000,
+ 6000);
+ }
+
ref_clk_name = __clk_get_name(ref_clk);
ret = of_property_read_string(dev->of_node, "clock-output-names",
diff --git a/drivers/gpu/drm/mediatek/mtk_mipi_tx.h b/drivers/gpu/drm/mediatek/mtk_mipi_tx.h
index 413f35d86219..eea44327fe9f 100644
--- a/drivers/gpu/drm/mediatek/mtk_mipi_tx.h
+++ b/drivers/gpu/drm/mediatek/mtk_mipi_tx.h
@@ -27,6 +27,7 @@ struct mtk_mipi_tx {
struct device *dev;
void __iomem *regs;
u32 data_rate;
+ u32 mipitx_drive;
const struct mtk_mipitx_data *driver_data;
struct clk_hw pll_hw;
struct clk *pll;
diff --git a/drivers/gpu/drm/mediatek/mtk_mt8183_mipi_tx.c b/drivers/gpu/drm/mediatek/mtk_mt8183_mipi_tx.c
index 91f08a351fd0..e4cc967750cb 100644
--- a/drivers/gpu/drm/mediatek/mtk_mt8183_mipi_tx.c
+++ b/drivers/gpu/drm/mediatek/mtk_mt8183_mipi_tx.c
@@ -17,6 +17,9 @@
#define RG_DSI_BG_CORE_EN BIT(7)
#define RG_DSI_PAD_TIEL_SEL BIT(8)
+#define MIPITX_VOLTAGE_SEL 0x0010
+#define RG_DSI_HSTX_LDO_REF_SEL (0xf << 6)
+
#define MIPITX_PLL_PWR 0x0028
#define MIPITX_PLL_CON0 0x002c
#define MIPITX_PLL_CON1 0x0030
@@ -123,6 +126,10 @@ static void mtk_mipi_tx_power_on_signal(struct phy *phy)
mtk_mipi_tx_clear_bits(mipi_tx, MIPITX_D3_SW_CTL_EN, DSI_SW_CTL_EN);
mtk_mipi_tx_clear_bits(mipi_tx, MIPITX_CK_SW_CTL_EN, DSI_SW_CTL_EN);
+ mtk_mipi_tx_update_bits(mipi_tx, MIPITX_VOLTAGE_SEL,
+ RG_DSI_HSTX_LDO_REF_SEL,
+ (mipi_tx->mipitx_drive - 3000) / 200 << 6);
+
mtk_mipi_tx_set_bits(mipi_tx, MIPITX_CK_CKMODE_EN, DSI_CK_CKMODE_EN);
}
--
2.21.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v5 4/4] drm/mediatek: config mipitx impedance with calibration data
2020-04-10 4:32 [PATCH v5 0/4] Config mipi tx current and impedance Jitao Shi
` (2 preceding siblings ...)
2020-04-10 4:32 ` [PATCH v5 3/4] drm/mediatek: add the mipitx driving control Jitao Shi
@ 2020-04-10 4:32 ` Jitao Shi
2020-04-10 16:12 ` Chun-Kuang Hu
3 siblings, 1 reply; 6+ messages in thread
From: Jitao Shi @ 2020-04-10 4:32 UTC (permalink / raw)
To: Rob Herring, Mark Rutland, Matthias Brugger, Daniel Vetter,
David Airlie, dri-devel, linux-kernel
Cc: linux-mediatek, devicetree, linux-arm-kernel, srv_heupstream,
yingjoe.chen, eddie.huang, cawa.cheng, bibby.hsieh, ck.hu,
stonea168, huijuan.xie, Jitao Shi
Read calibration data from nvmem, and config mipitx impedance with
calibration data to make sure their impedance are 100ohm.
Signed-off-by: Jitao Shi <jitao.shi@mediatek.com>
---
drivers/gpu/drm/mediatek/mtk_mipi_tx.c | 40 +++++++++++++++++++
drivers/gpu/drm/mediatek/mtk_mipi_tx.h | 3 ++
drivers/gpu/drm/mediatek/mtk_mt8183_mipi_tx.c | 21 ++++++++++
3 files changed, 64 insertions(+)
diff --git a/drivers/gpu/drm/mediatek/mtk_mipi_tx.c b/drivers/gpu/drm/mediatek/mtk_mipi_tx.c
index e301af64809e..5e91fc2c1318 100644
--- a/drivers/gpu/drm/mediatek/mtk_mipi_tx.c
+++ b/drivers/gpu/drm/mediatek/mtk_mipi_tx.c
@@ -88,6 +88,44 @@ static const struct phy_ops mtk_mipi_tx_ops = {
.owner = THIS_MODULE,
};
+static void mtk_mipi_tx_get_calibration_datal(struct mtk_mipi_tx *mipi_tx)
+{
+ struct nvmem_cell *cell;
+ size_t len;
+ u32 *buf;
+
+ memset(mipi_tx->rt_code, 0, sizeof(mipi_tx->rt_code));
+ cell = nvmem_cell_get(mipi_tx->dev, "calibration-data");
+ if (IS_ERR(cell)) {
+ dev_info(mipi_tx->dev, "can't get nvmem_cell_get, ignore it\n");
+ } else {
+ buf = (u32 *)nvmem_cell_read(cell, &len);
+ nvmem_cell_put(cell);
+
+ if (IS_ERR(buf)) {
+ dev_info(mipi_tx->dev, "can't get data, ignore it\n");
+ } else {
+ if (len < 3 * sizeof(u32)) {
+ dev_info(mipi_tx->dev, "invalid calibration data\n");
+ kfree(buf);
+ return;
+ }
+
+ mipi_tx->rt_code[0] = ((buf[0] >> 6 & 0x1f) << 5) |
+ (buf[0] >> 11 & 0x1f);
+ mipi_tx->rt_code[1] = ((buf[1] >> 27 & 0x1f) << 5) |
+ (buf[0] >> 1 & 0x1f);
+ mipi_tx->rt_code[2] = ((buf[1] >> 17 & 0x1f) << 5) |
+ (buf[1] >> 22 & 0x1f);
+ mipi_tx->rt_code[3] = ((buf[1] >> 7 & 0x1f) << 5) |
+ (buf[1] >> 12 & 0x1f);
+ mipi_tx->rt_code[4] = ((buf[2] >> 27 & 0x1f) << 5) |
+ (buf[1] >> 2 & 0x1f);
+ kfree(buf);
+ }
+ }
+}
+
static int mtk_mipi_tx_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
@@ -174,6 +212,8 @@ static int mtk_mipi_tx_probe(struct platform_device *pdev)
mipi_tx->dev = dev;
+ mtk_mipi_tx_get_calibration_datal(mipi_tx);
+
return of_clk_add_provider(dev->of_node, of_clk_src_simple_get,
mipi_tx->pll);
}
diff --git a/drivers/gpu/drm/mediatek/mtk_mipi_tx.h b/drivers/gpu/drm/mediatek/mtk_mipi_tx.h
index eea44327fe9f..c76f07c3fdeb 100644
--- a/drivers/gpu/drm/mediatek/mtk_mipi_tx.h
+++ b/drivers/gpu/drm/mediatek/mtk_mipi_tx.h
@@ -12,9 +12,11 @@
#include <linux/delay.h>
#include <linux/io.h>
#include <linux/module.h>
+#include <linux/nvmem-consumer.h>
#include <linux/of_device.h>
#include <linux/platform_device.h>
#include <linux/phy/phy.h>
+#include <linux/slab.h>
struct mtk_mipitx_data {
const u32 mppll_preserve;
@@ -28,6 +30,7 @@ struct mtk_mipi_tx {
void __iomem *regs;
u32 data_rate;
u32 mipitx_drive;
+ u32 rt_code[5];
const struct mtk_mipitx_data *driver_data;
struct clk_hw pll_hw;
struct clk *pll;
diff --git a/drivers/gpu/drm/mediatek/mtk_mt8183_mipi_tx.c b/drivers/gpu/drm/mediatek/mtk_mt8183_mipi_tx.c
index e4cc967750cb..9f3e55aeebb2 100644
--- a/drivers/gpu/drm/mediatek/mtk_mt8183_mipi_tx.c
+++ b/drivers/gpu/drm/mediatek/mtk_mt8183_mipi_tx.c
@@ -28,6 +28,7 @@
#define MIPITX_PLL_CON4 0x003c
#define RG_DSI_PLL_IBIAS (3 << 10)
+#define MIPITX_D2P_RTCODE 0x0100
#define MIPITX_D2_SW_CTL_EN 0x0144
#define MIPITX_D0_SW_CTL_EN 0x0244
#define MIPITX_CK_CKMODE_EN 0x0328
@@ -108,6 +109,24 @@ static const struct clk_ops mtk_mipi_tx_pll_ops = {
.recalc_rate = mtk_mipi_tx_pll_recalc_rate,
};
+static void mtk_mipi_tx_config_calibration_data(struct mtk_mipi_tx *mipi_tx)
+{
+ int i, j;
+
+ for (i = 0; i < 5; i++) {
+ if ((mipi_tx->rt_code[i] & 0x1f) == 0)
+ mipi_tx->rt_code[i] |= 0x10;
+
+ if ((mipi_tx->rt_code[i] >> 5 & 0x1f) == 0)
+ mipi_tx->rt_code[i] |= 0x10 << 5;
+
+ for (j = 0; j < 10; j++)
+ mtk_mipi_tx_update_bits(mipi_tx,
+ MIPITX_D2P_RTCODE * (i + 1) + j * 4,
+ 1, mipi_tx->rt_code[i] >> j & 1);
+ }
+}
+
static void mtk_mipi_tx_power_on_signal(struct phy *phy)
{
struct mtk_mipi_tx *mipi_tx = phy_get_drvdata(phy);
@@ -130,6 +149,8 @@ static void mtk_mipi_tx_power_on_signal(struct phy *phy)
RG_DSI_HSTX_LDO_REF_SEL,
(mipi_tx->mipitx_drive - 3000) / 200 << 6);
+ mtk_mipi_tx_config_calibration_data(mipi_tx);
+
mtk_mipi_tx_set_bits(mipi_tx, MIPITX_CK_CKMODE_EN, DSI_CK_CKMODE_EN);
}
--
2.21.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v5 4/4] drm/mediatek: config mipitx impedance with calibration data
2020-04-10 4:32 ` [PATCH v5 4/4] drm/mediatek: config mipitx impedance with calibration data Jitao Shi
@ 2020-04-10 16:12 ` Chun-Kuang Hu
0 siblings, 0 replies; 6+ messages in thread
From: Chun-Kuang Hu @ 2020-04-10 16:12 UTC (permalink / raw)
To: Jitao Shi
Cc: Rob Herring, Mark Rutland, Matthias Brugger, Daniel Vetter,
David Airlie, DRI Development, linux-kernel, devicetree,
srv_heupstream, huijuan.xie, stonea168, cawa.cheng,
moderated list:ARM/Mediatek SoC support, yingjoe.chen,
eddie.huang, Linux ARM
Hi, Jitao:
Jitao Shi <jitao.shi@mediatek.com> 於 2020年4月10日 週五 下午12:33寫道:
>
> Read calibration data from nvmem, and config mipitx impedance with
> calibration data to make sure their impedance are 100ohm.
>
> Signed-off-by: Jitao Shi <jitao.shi@mediatek.com>
> ---
> drivers/gpu/drm/mediatek/mtk_mipi_tx.c | 40 +++++++++++++++++++
> drivers/gpu/drm/mediatek/mtk_mipi_tx.h | 3 ++
> drivers/gpu/drm/mediatek/mtk_mt8183_mipi_tx.c | 21 ++++++++++
> 3 files changed, 64 insertions(+)
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_mipi_tx.c b/drivers/gpu/drm/mediatek/mtk_mipi_tx.c
> index e301af64809e..5e91fc2c1318 100644
> --- a/drivers/gpu/drm/mediatek/mtk_mipi_tx.c
> +++ b/drivers/gpu/drm/mediatek/mtk_mipi_tx.c
> @@ -88,6 +88,44 @@ static const struct phy_ops mtk_mipi_tx_ops = {
> .owner = THIS_MODULE,
> };
>
> +static void mtk_mipi_tx_get_calibration_datal(struct mtk_mipi_tx *mipi_tx)
> +{
> + struct nvmem_cell *cell;
> + size_t len;
> + u32 *buf;
> +
> + memset(mipi_tx->rt_code, 0, sizeof(mipi_tx->rt_code));
You use kzalloc() to allocate mipi_tx, so this is already zero-initialized.
> + cell = nvmem_cell_get(mipi_tx->dev, "calibration-data");
> + if (IS_ERR(cell)) {
> + dev_info(mipi_tx->dev, "can't get nvmem_cell_get, ignore it\n");
> + } else {
If you return when error, you could get rid of the 'else', so you
could reduce many 'tab' and reduce the probability of one line over 80
character.
> + buf = (u32 *)nvmem_cell_read(cell, &len);
> + nvmem_cell_put(cell);
> +
> + if (IS_ERR(buf)) {
> + dev_info(mipi_tx->dev, "can't get data, ignore it\n");
> + } else {
Ditto.
Regards,
Chun-Kuang.
> + if (len < 3 * sizeof(u32)) {
> + dev_info(mipi_tx->dev, "invalid calibration data\n");
> + kfree(buf);
> + return;
> + }
> +
> + mipi_tx->rt_code[0] = ((buf[0] >> 6 & 0x1f) << 5) |
> + (buf[0] >> 11 & 0x1f);
> + mipi_tx->rt_code[1] = ((buf[1] >> 27 & 0x1f) << 5) |
> + (buf[0] >> 1 & 0x1f);
> + mipi_tx->rt_code[2] = ((buf[1] >> 17 & 0x1f) << 5) |
> + (buf[1] >> 22 & 0x1f);
> + mipi_tx->rt_code[3] = ((buf[1] >> 7 & 0x1f) << 5) |
> + (buf[1] >> 12 & 0x1f);
> + mipi_tx->rt_code[4] = ((buf[2] >> 27 & 0x1f) << 5) |
> + (buf[1] >> 2 & 0x1f);
> + kfree(buf);
> + }
> + }
> +}
> +
> static int mtk_mipi_tx_probe(struct platform_device *pdev)
> {
> struct device *dev = &pdev->dev;
> @@ -174,6 +212,8 @@ static int mtk_mipi_tx_probe(struct platform_device *pdev)
>
> mipi_tx->dev = dev;
>
> + mtk_mipi_tx_get_calibration_datal(mipi_tx);
> +
> return of_clk_add_provider(dev->of_node, of_clk_src_simple_get,
> mipi_tx->pll);
> }
> diff --git a/drivers/gpu/drm/mediatek/mtk_mipi_tx.h b/drivers/gpu/drm/mediatek/mtk_mipi_tx.h
> index eea44327fe9f..c76f07c3fdeb 100644
> --- a/drivers/gpu/drm/mediatek/mtk_mipi_tx.h
> +++ b/drivers/gpu/drm/mediatek/mtk_mipi_tx.h
> @@ -12,9 +12,11 @@
> #include <linux/delay.h>
> #include <linux/io.h>
> #include <linux/module.h>
> +#include <linux/nvmem-consumer.h>
> #include <linux/of_device.h>
> #include <linux/platform_device.h>
> #include <linux/phy/phy.h>
> +#include <linux/slab.h>
>
> struct mtk_mipitx_data {
> const u32 mppll_preserve;
> @@ -28,6 +30,7 @@ struct mtk_mipi_tx {
> void __iomem *regs;
> u32 data_rate;
> u32 mipitx_drive;
> + u32 rt_code[5];
> const struct mtk_mipitx_data *driver_data;
> struct clk_hw pll_hw;
> struct clk *pll;
> diff --git a/drivers/gpu/drm/mediatek/mtk_mt8183_mipi_tx.c b/drivers/gpu/drm/mediatek/mtk_mt8183_mipi_tx.c
> index e4cc967750cb..9f3e55aeebb2 100644
> --- a/drivers/gpu/drm/mediatek/mtk_mt8183_mipi_tx.c
> +++ b/drivers/gpu/drm/mediatek/mtk_mt8183_mipi_tx.c
> @@ -28,6 +28,7 @@
> #define MIPITX_PLL_CON4 0x003c
> #define RG_DSI_PLL_IBIAS (3 << 10)
>
> +#define MIPITX_D2P_RTCODE 0x0100
> #define MIPITX_D2_SW_CTL_EN 0x0144
> #define MIPITX_D0_SW_CTL_EN 0x0244
> #define MIPITX_CK_CKMODE_EN 0x0328
> @@ -108,6 +109,24 @@ static const struct clk_ops mtk_mipi_tx_pll_ops = {
> .recalc_rate = mtk_mipi_tx_pll_recalc_rate,
> };
>
> +static void mtk_mipi_tx_config_calibration_data(struct mtk_mipi_tx *mipi_tx)
> +{
> + int i, j;
> +
> + for (i = 0; i < 5; i++) {
> + if ((mipi_tx->rt_code[i] & 0x1f) == 0)
> + mipi_tx->rt_code[i] |= 0x10;
> +
> + if ((mipi_tx->rt_code[i] >> 5 & 0x1f) == 0)
> + mipi_tx->rt_code[i] |= 0x10 << 5;
> +
> + for (j = 0; j < 10; j++)
> + mtk_mipi_tx_update_bits(mipi_tx,
> + MIPITX_D2P_RTCODE * (i + 1) + j * 4,
> + 1, mipi_tx->rt_code[i] >> j & 1);
> + }
> +}
> +
> static void mtk_mipi_tx_power_on_signal(struct phy *phy)
> {
> struct mtk_mipi_tx *mipi_tx = phy_get_drvdata(phy);
> @@ -130,6 +149,8 @@ static void mtk_mipi_tx_power_on_signal(struct phy *phy)
> RG_DSI_HSTX_LDO_REF_SEL,
> (mipi_tx->mipitx_drive - 3000) / 200 << 6);
>
> + mtk_mipi_tx_config_calibration_data(mipi_tx);
> +
> mtk_mipi_tx_set_bits(mipi_tx, MIPITX_CK_CKMODE_EN, DSI_CK_CKMODE_EN);
> }
>
> --
> 2.21.0
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-04-10 16:12 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-10 4:32 [PATCH v5 0/4] Config mipi tx current and impedance Jitao Shi
2020-04-10 4:32 ` [PATCH v5 1/4] dt-bindings: display: mediatek: add property to control mipi tx drive current Jitao Shi
2020-04-10 4:32 ` [PATCH v5 2/4] dt-bindings: display: mediatek: get mipitx calibration data from nvmem Jitao Shi
2020-04-10 4:32 ` [PATCH v5 3/4] drm/mediatek: add the mipitx driving control Jitao Shi
2020-04-10 4:32 ` [PATCH v5 4/4] drm/mediatek: config mipitx impedance with calibration data Jitao Shi
2020-04-10 16:12 ` Chun-Kuang Hu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).