* [PATCH v1 0/5] phy: phy-rockchip-dphy-rx0: add support for tx1rx1 rx mode
@ 2021-08-30 18:07 ` Mikhail Rudenko
0 siblings, 0 replies; 56+ messages in thread
From: Mikhail Rudenko @ 2021-08-30 18:07 UTC (permalink / raw)
To: linux-phy
Cc: linux-media, Mikhail Rudenko, devicetree, linux-arm-kernel,
linux-rockchip, linux-kernel
Implement support for RX mode of TX1RX1 D-PHY on RK3399. Code is based
on Rockchip BSP kernel branch 4.4. These patches have been tested on
FriendlyElec NanoPi M4 with OmniVision 4689-based sensor.
Mikhail Rudenko (5):
phy: phy-rockchip-dphy-rx0: refactor for tx1rx1 addition
phy: phy-rockchip-dphy-rx0: add support for tx1rx1 in receive mode
phy: rename phy-rockchip-dphy-rx0 to phy-rockchip-dphy-rx
dt-bindings: phy: phy-rockchip-dphy-rx0: add support for tx1rx1 phy
arm64: dts: rockchip: add mipi-dphy-tx1rx1 for rk3399
...hy-rx0.yaml => rockchip-mipi-dphy-rx.yaml} | 39 ++-
arch/arm64/boot/dts/rockchip/rk3399.dtsi | 15 ++
drivers/phy/rockchip/Kconfig | 8 +-
drivers/phy/rockchip/Makefile | 2 +-
...chip-dphy-rx0.c => phy-rockchip-dphy-rx.c} | 231 +++++++++++++++---
5 files changed, 252 insertions(+), 43 deletions(-)
rename Documentation/devicetree/bindings/phy/{rockchip-mipi-dphy-rx0.yaml => rockchip-mipi-dphy-rx.yaml} (65%)
rename drivers/phy/rockchip/{phy-rockchip-dphy-rx0.c => phy-rockchip-dphy-rx.c} (63%)
--
2.33.0
--
linux-phy mailing list
linux-phy@lists.infradead.org
https://lists.infradead.org/mailman/listinfo/linux-phy
^ permalink raw reply [flat|nested] 56+ messages in thread* [PATCH v1 0/5] phy: phy-rockchip-dphy-rx0: add support for tx1rx1 rx mode @ 2021-08-30 18:07 ` Mikhail Rudenko 0 siblings, 0 replies; 56+ messages in thread From: Mikhail Rudenko @ 2021-08-30 18:07 UTC (permalink / raw) To: linux-phy Cc: linux-media, Mikhail Rudenko, devicetree, linux-arm-kernel, linux-rockchip, linux-kernel Implement support for RX mode of TX1RX1 D-PHY on RK3399. Code is based on Rockchip BSP kernel branch 4.4. These patches have been tested on FriendlyElec NanoPi M4 with OmniVision 4689-based sensor. Mikhail Rudenko (5): phy: phy-rockchip-dphy-rx0: refactor for tx1rx1 addition phy: phy-rockchip-dphy-rx0: add support for tx1rx1 in receive mode phy: rename phy-rockchip-dphy-rx0 to phy-rockchip-dphy-rx dt-bindings: phy: phy-rockchip-dphy-rx0: add support for tx1rx1 phy arm64: dts: rockchip: add mipi-dphy-tx1rx1 for rk3399 ...hy-rx0.yaml => rockchip-mipi-dphy-rx.yaml} | 39 ++- arch/arm64/boot/dts/rockchip/rk3399.dtsi | 15 ++ drivers/phy/rockchip/Kconfig | 8 +- drivers/phy/rockchip/Makefile | 2 +- ...chip-dphy-rx0.c => phy-rockchip-dphy-rx.c} | 231 +++++++++++++++--- 5 files changed, 252 insertions(+), 43 deletions(-) rename Documentation/devicetree/bindings/phy/{rockchip-mipi-dphy-rx0.yaml => rockchip-mipi-dphy-rx.yaml} (65%) rename drivers/phy/rockchip/{phy-rockchip-dphy-rx0.c => phy-rockchip-dphy-rx.c} (63%) -- 2.33.0 ^ permalink raw reply [flat|nested] 56+ messages in thread
* [PATCH v1 0/5] phy: phy-rockchip-dphy-rx0: add support for tx1rx1 rx mode @ 2021-08-30 18:07 ` Mikhail Rudenko 0 siblings, 0 replies; 56+ messages in thread From: Mikhail Rudenko @ 2021-08-30 18:07 UTC (permalink / raw) To: linux-phy Cc: linux-media, Mikhail Rudenko, devicetree, linux-arm-kernel, linux-rockchip, linux-kernel Implement support for RX mode of TX1RX1 D-PHY on RK3399. Code is based on Rockchip BSP kernel branch 4.4. These patches have been tested on FriendlyElec NanoPi M4 with OmniVision 4689-based sensor. Mikhail Rudenko (5): phy: phy-rockchip-dphy-rx0: refactor for tx1rx1 addition phy: phy-rockchip-dphy-rx0: add support for tx1rx1 in receive mode phy: rename phy-rockchip-dphy-rx0 to phy-rockchip-dphy-rx dt-bindings: phy: phy-rockchip-dphy-rx0: add support for tx1rx1 phy arm64: dts: rockchip: add mipi-dphy-tx1rx1 for rk3399 ...hy-rx0.yaml => rockchip-mipi-dphy-rx.yaml} | 39 ++- arch/arm64/boot/dts/rockchip/rk3399.dtsi | 15 ++ drivers/phy/rockchip/Kconfig | 8 +- drivers/phy/rockchip/Makefile | 2 +- ...chip-dphy-rx0.c => phy-rockchip-dphy-rx.c} | 231 +++++++++++++++--- 5 files changed, 252 insertions(+), 43 deletions(-) rename Documentation/devicetree/bindings/phy/{rockchip-mipi-dphy-rx0.yaml => rockchip-mipi-dphy-rx.yaml} (65%) rename drivers/phy/rockchip/{phy-rockchip-dphy-rx0.c => phy-rockchip-dphy-rx.c} (63%) -- 2.33.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 56+ messages in thread
* [PATCH v1 0/5] phy: phy-rockchip-dphy-rx0: add support for tx1rx1 rx mode @ 2021-08-30 18:07 ` Mikhail Rudenko 0 siblings, 0 replies; 56+ messages in thread From: Mikhail Rudenko @ 2021-08-30 18:07 UTC (permalink / raw) To: linux-phy Cc: linux-media, Mikhail Rudenko, devicetree, linux-arm-kernel, linux-rockchip, linux-kernel Implement support for RX mode of TX1RX1 D-PHY on RK3399. Code is based on Rockchip BSP kernel branch 4.4. These patches have been tested on FriendlyElec NanoPi M4 with OmniVision 4689-based sensor. Mikhail Rudenko (5): phy: phy-rockchip-dphy-rx0: refactor for tx1rx1 addition phy: phy-rockchip-dphy-rx0: add support for tx1rx1 in receive mode phy: rename phy-rockchip-dphy-rx0 to phy-rockchip-dphy-rx dt-bindings: phy: phy-rockchip-dphy-rx0: add support for tx1rx1 phy arm64: dts: rockchip: add mipi-dphy-tx1rx1 for rk3399 ...hy-rx0.yaml => rockchip-mipi-dphy-rx.yaml} | 39 ++- arch/arm64/boot/dts/rockchip/rk3399.dtsi | 15 ++ drivers/phy/rockchip/Kconfig | 8 +- drivers/phy/rockchip/Makefile | 2 +- ...chip-dphy-rx0.c => phy-rockchip-dphy-rx.c} | 231 +++++++++++++++--- 5 files changed, 252 insertions(+), 43 deletions(-) rename Documentation/devicetree/bindings/phy/{rockchip-mipi-dphy-rx0.yaml => rockchip-mipi-dphy-rx.yaml} (65%) rename drivers/phy/rockchip/{phy-rockchip-dphy-rx0.c => phy-rockchip-dphy-rx.c} (63%) -- 2.33.0 _______________________________________________ Linux-rockchip mailing list Linux-rockchip@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip ^ permalink raw reply [flat|nested] 56+ messages in thread
* [PATCH v1 1/5] phy: phy-rockchip-dphy-rx0: refactor for tx1rx1 addition 2021-08-30 18:07 ` Mikhail Rudenko (?) (?) @ 2021-08-30 18:07 ` Mikhail Rudenko -1 siblings, 0 replies; 56+ messages in thread From: Mikhail Rudenko @ 2021-08-30 18:07 UTC (permalink / raw) To: linux-phy Cc: linux-media, Mikhail Rudenko, Kishon Vijay Abraham I, Vinod Koul, Heiko Stuebner, linux-arm-kernel, linux-rockchip, linux-kernel In order to accommodate for rk3399 tx1rx1 addition, make enable/disable function calls indirect via function pointers in rk_dphy_drv_data. Also rename rk_dphy_write and rk_dphy_enable to avoid naming clashes. Signed-off-by: Mikhail Rudenko <mike.rudenko@gmail.com> --- drivers/phy/rockchip/phy-rockchip-dphy-rx0.c | 38 +++++++++++++------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/drivers/phy/rockchip/phy-rockchip-dphy-rx0.c b/drivers/phy/rockchip/phy-rockchip-dphy-rx0.c index 4df9476ef2a9..72145cdfb036 100644 --- a/drivers/phy/rockchip/phy-rockchip-dphy-rx0.c +++ b/drivers/phy/rockchip/phy-rockchip-dphy-rx0.c @@ -138,12 +138,17 @@ static const struct dphy_reg rk3399_grf_dphy_regs[] = { [GRF_DPHY_RX0_TESTDOUT] = PHY_REG(RK3399_GRF_SOC_STATUS1, 8, 0), }; +struct rk_dphy; + struct rk_dphy_drv_data { const char * const *clks; unsigned int num_clks; const struct hsfreq_range *hsfreq_ranges; unsigned int num_hsfreq_ranges; const struct dphy_reg *regs; + + void (*enable)(struct rk_dphy *priv); + void (*disable)(struct rk_dphy *priv); }; struct rk_dphy { @@ -170,7 +175,7 @@ static inline void rk_dphy_write_grf(struct rk_dphy *priv, regmap_write(priv->grf, reg->offset, val); } -static void rk_dphy_write(struct rk_dphy *priv, u8 test_code, u8 test_data) +static void rk_dphy_write_mipi_rx(struct rk_dphy *priv, u8 test_code, u8 test_data) { rk_dphy_write_grf(priv, GRF_DPHY_RX0_TESTDIN, test_code); rk_dphy_write_grf(priv, GRF_DPHY_RX0_TESTEN, 1); @@ -186,7 +191,7 @@ static void rk_dphy_write(struct rk_dphy *priv, u8 test_code, u8 test_data) rk_dphy_write_grf(priv, GRF_DPHY_RX0_TESTCLK, 1); } -static void rk_dphy_enable(struct rk_dphy *priv) +static void rk_dphy_enable_rx(struct rk_dphy *priv) { rk_dphy_write_grf(priv, GRF_DPHY_RX0_FORCERXMODE, 0); rk_dphy_write_grf(priv, GRF_DPHY_RX0_FORCETXSTOPMODE, 0); @@ -206,22 +211,27 @@ static void rk_dphy_enable(struct rk_dphy *priv) usleep_range(100, 150); /* set clock lane */ - /* HS hsfreq_range & lane 0 settle bypass */ - rk_dphy_write(priv, CLOCK_LANE_HS_RX_CONTROL, 0); + /* HS hsfreq_range & lane 0 settle bypass */ + rk_dphy_write_mipi_rx(priv, CLOCK_LANE_HS_RX_CONTROL, 0); /* HS RX Control of lane0 */ - rk_dphy_write(priv, LANE0_HS_RX_CONTROL, priv->hsfreq << 1); + rk_dphy_write_mipi_rx(priv, LANE0_HS_RX_CONTROL, priv->hsfreq << 1); /* HS RX Control of lane1 */ - rk_dphy_write(priv, LANE1_HS_RX_CONTROL, priv->hsfreq << 1); + rk_dphy_write_mipi_rx(priv, LANE1_HS_RX_CONTROL, priv->hsfreq << 1); /* HS RX Control of lane2 */ - rk_dphy_write(priv, LANE2_HS_RX_CONTROL, priv->hsfreq << 1); + rk_dphy_write_mipi_rx(priv, LANE2_HS_RX_CONTROL, priv->hsfreq << 1); /* HS RX Control of lane3 */ - rk_dphy_write(priv, LANE3_HS_RX_CONTROL, priv->hsfreq << 1); + rk_dphy_write_mipi_rx(priv, LANE3_HS_RX_CONTROL, priv->hsfreq << 1); /* HS RX Data Lanes Settle State Time Control */ - rk_dphy_write(priv, LANES_THS_SETTLE_CONTROL, - THS_SETTLE_COUNTER_THRESHOLD); + rk_dphy_write_mipi_rx(priv, LANES_THS_SETTLE_CONTROL, + THS_SETTLE_COUNTER_THRESHOLD); /* Normal operation */ - rk_dphy_write(priv, 0x0, 0); + rk_dphy_write_mipi_rx(priv, 0x0, 0); +} + +static void rk_dphy_disable_rx(struct rk_dphy *priv) +{ + rk_dphy_write_grf(priv, GRF_DPHY_RX0_ENABLE, 0); } static int rk_dphy_configure(struct phy *phy, union phy_configure_opts *opts) @@ -266,7 +276,7 @@ static int rk_dphy_power_on(struct phy *phy) if (ret) return ret; - rk_dphy_enable(priv); + priv->drv_data->enable(priv); return 0; } @@ -275,7 +285,7 @@ static int rk_dphy_power_off(struct phy *phy) { struct rk_dphy *priv = phy_get_drvdata(phy); - rk_dphy_write_grf(priv, GRF_DPHY_RX0_ENABLE, 0); + priv->drv_data->disable(priv); clk_bulk_disable(priv->drv_data->num_clks, priv->clks); return 0; } @@ -310,6 +320,8 @@ static const struct rk_dphy_drv_data rk3399_mipidphy_drv_data = { .hsfreq_ranges = rk3399_mipidphy_hsfreq_ranges, .num_hsfreq_ranges = ARRAY_SIZE(rk3399_mipidphy_hsfreq_ranges), .regs = rk3399_grf_dphy_regs, + .enable = rk_dphy_enable_rx, + .disable = rk_dphy_disable_rx, }; static const struct of_device_id rk_dphy_dt_ids[] = { -- 2.33.0 -- linux-phy mailing list linux-phy@lists.infradead.org https://lists.infradead.org/mailman/listinfo/linux-phy ^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH v1 1/5] phy: phy-rockchip-dphy-rx0: refactor for tx1rx1 addition @ 2021-08-30 18:07 ` Mikhail Rudenko 0 siblings, 0 replies; 56+ messages in thread From: Mikhail Rudenko @ 2021-08-30 18:07 UTC (permalink / raw) To: linux-phy Cc: linux-media, Mikhail Rudenko, Kishon Vijay Abraham I, Vinod Koul, Heiko Stuebner, linux-arm-kernel, linux-rockchip, linux-kernel In order to accommodate for rk3399 tx1rx1 addition, make enable/disable function calls indirect via function pointers in rk_dphy_drv_data. Also rename rk_dphy_write and rk_dphy_enable to avoid naming clashes. Signed-off-by: Mikhail Rudenko <mike.rudenko@gmail.com> --- drivers/phy/rockchip/phy-rockchip-dphy-rx0.c | 38 +++++++++++++------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/drivers/phy/rockchip/phy-rockchip-dphy-rx0.c b/drivers/phy/rockchip/phy-rockchip-dphy-rx0.c index 4df9476ef2a9..72145cdfb036 100644 --- a/drivers/phy/rockchip/phy-rockchip-dphy-rx0.c +++ b/drivers/phy/rockchip/phy-rockchip-dphy-rx0.c @@ -138,12 +138,17 @@ static const struct dphy_reg rk3399_grf_dphy_regs[] = { [GRF_DPHY_RX0_TESTDOUT] = PHY_REG(RK3399_GRF_SOC_STATUS1, 8, 0), }; +struct rk_dphy; + struct rk_dphy_drv_data { const char * const *clks; unsigned int num_clks; const struct hsfreq_range *hsfreq_ranges; unsigned int num_hsfreq_ranges; const struct dphy_reg *regs; + + void (*enable)(struct rk_dphy *priv); + void (*disable)(struct rk_dphy *priv); }; struct rk_dphy { @@ -170,7 +175,7 @@ static inline void rk_dphy_write_grf(struct rk_dphy *priv, regmap_write(priv->grf, reg->offset, val); } -static void rk_dphy_write(struct rk_dphy *priv, u8 test_code, u8 test_data) +static void rk_dphy_write_mipi_rx(struct rk_dphy *priv, u8 test_code, u8 test_data) { rk_dphy_write_grf(priv, GRF_DPHY_RX0_TESTDIN, test_code); rk_dphy_write_grf(priv, GRF_DPHY_RX0_TESTEN, 1); @@ -186,7 +191,7 @@ static void rk_dphy_write(struct rk_dphy *priv, u8 test_code, u8 test_data) rk_dphy_write_grf(priv, GRF_DPHY_RX0_TESTCLK, 1); } -static void rk_dphy_enable(struct rk_dphy *priv) +static void rk_dphy_enable_rx(struct rk_dphy *priv) { rk_dphy_write_grf(priv, GRF_DPHY_RX0_FORCERXMODE, 0); rk_dphy_write_grf(priv, GRF_DPHY_RX0_FORCETXSTOPMODE, 0); @@ -206,22 +211,27 @@ static void rk_dphy_enable(struct rk_dphy *priv) usleep_range(100, 150); /* set clock lane */ - /* HS hsfreq_range & lane 0 settle bypass */ - rk_dphy_write(priv, CLOCK_LANE_HS_RX_CONTROL, 0); + /* HS hsfreq_range & lane 0 settle bypass */ + rk_dphy_write_mipi_rx(priv, CLOCK_LANE_HS_RX_CONTROL, 0); /* HS RX Control of lane0 */ - rk_dphy_write(priv, LANE0_HS_RX_CONTROL, priv->hsfreq << 1); + rk_dphy_write_mipi_rx(priv, LANE0_HS_RX_CONTROL, priv->hsfreq << 1); /* HS RX Control of lane1 */ - rk_dphy_write(priv, LANE1_HS_RX_CONTROL, priv->hsfreq << 1); + rk_dphy_write_mipi_rx(priv, LANE1_HS_RX_CONTROL, priv->hsfreq << 1); /* HS RX Control of lane2 */ - rk_dphy_write(priv, LANE2_HS_RX_CONTROL, priv->hsfreq << 1); + rk_dphy_write_mipi_rx(priv, LANE2_HS_RX_CONTROL, priv->hsfreq << 1); /* HS RX Control of lane3 */ - rk_dphy_write(priv, LANE3_HS_RX_CONTROL, priv->hsfreq << 1); + rk_dphy_write_mipi_rx(priv, LANE3_HS_RX_CONTROL, priv->hsfreq << 1); /* HS RX Data Lanes Settle State Time Control */ - rk_dphy_write(priv, LANES_THS_SETTLE_CONTROL, - THS_SETTLE_COUNTER_THRESHOLD); + rk_dphy_write_mipi_rx(priv, LANES_THS_SETTLE_CONTROL, + THS_SETTLE_COUNTER_THRESHOLD); /* Normal operation */ - rk_dphy_write(priv, 0x0, 0); + rk_dphy_write_mipi_rx(priv, 0x0, 0); +} + +static void rk_dphy_disable_rx(struct rk_dphy *priv) +{ + rk_dphy_write_grf(priv, GRF_DPHY_RX0_ENABLE, 0); } static int rk_dphy_configure(struct phy *phy, union phy_configure_opts *opts) @@ -266,7 +276,7 @@ static int rk_dphy_power_on(struct phy *phy) if (ret) return ret; - rk_dphy_enable(priv); + priv->drv_data->enable(priv); return 0; } @@ -275,7 +285,7 @@ static int rk_dphy_power_off(struct phy *phy) { struct rk_dphy *priv = phy_get_drvdata(phy); - rk_dphy_write_grf(priv, GRF_DPHY_RX0_ENABLE, 0); + priv->drv_data->disable(priv); clk_bulk_disable(priv->drv_data->num_clks, priv->clks); return 0; } @@ -310,6 +320,8 @@ static const struct rk_dphy_drv_data rk3399_mipidphy_drv_data = { .hsfreq_ranges = rk3399_mipidphy_hsfreq_ranges, .num_hsfreq_ranges = ARRAY_SIZE(rk3399_mipidphy_hsfreq_ranges), .regs = rk3399_grf_dphy_regs, + .enable = rk_dphy_enable_rx, + .disable = rk_dphy_disable_rx, }; static const struct of_device_id rk_dphy_dt_ids[] = { -- 2.33.0 ^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH v1 1/5] phy: phy-rockchip-dphy-rx0: refactor for tx1rx1 addition @ 2021-08-30 18:07 ` Mikhail Rudenko 0 siblings, 0 replies; 56+ messages in thread From: Mikhail Rudenko @ 2021-08-30 18:07 UTC (permalink / raw) To: linux-phy Cc: linux-media, Mikhail Rudenko, Kishon Vijay Abraham I, Vinod Koul, Heiko Stuebner, linux-arm-kernel, linux-rockchip, linux-kernel In order to accommodate for rk3399 tx1rx1 addition, make enable/disable function calls indirect via function pointers in rk_dphy_drv_data. Also rename rk_dphy_write and rk_dphy_enable to avoid naming clashes. Signed-off-by: Mikhail Rudenko <mike.rudenko@gmail.com> --- drivers/phy/rockchip/phy-rockchip-dphy-rx0.c | 38 +++++++++++++------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/drivers/phy/rockchip/phy-rockchip-dphy-rx0.c b/drivers/phy/rockchip/phy-rockchip-dphy-rx0.c index 4df9476ef2a9..72145cdfb036 100644 --- a/drivers/phy/rockchip/phy-rockchip-dphy-rx0.c +++ b/drivers/phy/rockchip/phy-rockchip-dphy-rx0.c @@ -138,12 +138,17 @@ static const struct dphy_reg rk3399_grf_dphy_regs[] = { [GRF_DPHY_RX0_TESTDOUT] = PHY_REG(RK3399_GRF_SOC_STATUS1, 8, 0), }; +struct rk_dphy; + struct rk_dphy_drv_data { const char * const *clks; unsigned int num_clks; const struct hsfreq_range *hsfreq_ranges; unsigned int num_hsfreq_ranges; const struct dphy_reg *regs; + + void (*enable)(struct rk_dphy *priv); + void (*disable)(struct rk_dphy *priv); }; struct rk_dphy { @@ -170,7 +175,7 @@ static inline void rk_dphy_write_grf(struct rk_dphy *priv, regmap_write(priv->grf, reg->offset, val); } -static void rk_dphy_write(struct rk_dphy *priv, u8 test_code, u8 test_data) +static void rk_dphy_write_mipi_rx(struct rk_dphy *priv, u8 test_code, u8 test_data) { rk_dphy_write_grf(priv, GRF_DPHY_RX0_TESTDIN, test_code); rk_dphy_write_grf(priv, GRF_DPHY_RX0_TESTEN, 1); @@ -186,7 +191,7 @@ static void rk_dphy_write(struct rk_dphy *priv, u8 test_code, u8 test_data) rk_dphy_write_grf(priv, GRF_DPHY_RX0_TESTCLK, 1); } -static void rk_dphy_enable(struct rk_dphy *priv) +static void rk_dphy_enable_rx(struct rk_dphy *priv) { rk_dphy_write_grf(priv, GRF_DPHY_RX0_FORCERXMODE, 0); rk_dphy_write_grf(priv, GRF_DPHY_RX0_FORCETXSTOPMODE, 0); @@ -206,22 +211,27 @@ static void rk_dphy_enable(struct rk_dphy *priv) usleep_range(100, 150); /* set clock lane */ - /* HS hsfreq_range & lane 0 settle bypass */ - rk_dphy_write(priv, CLOCK_LANE_HS_RX_CONTROL, 0); + /* HS hsfreq_range & lane 0 settle bypass */ + rk_dphy_write_mipi_rx(priv, CLOCK_LANE_HS_RX_CONTROL, 0); /* HS RX Control of lane0 */ - rk_dphy_write(priv, LANE0_HS_RX_CONTROL, priv->hsfreq << 1); + rk_dphy_write_mipi_rx(priv, LANE0_HS_RX_CONTROL, priv->hsfreq << 1); /* HS RX Control of lane1 */ - rk_dphy_write(priv, LANE1_HS_RX_CONTROL, priv->hsfreq << 1); + rk_dphy_write_mipi_rx(priv, LANE1_HS_RX_CONTROL, priv->hsfreq << 1); /* HS RX Control of lane2 */ - rk_dphy_write(priv, LANE2_HS_RX_CONTROL, priv->hsfreq << 1); + rk_dphy_write_mipi_rx(priv, LANE2_HS_RX_CONTROL, priv->hsfreq << 1); /* HS RX Control of lane3 */ - rk_dphy_write(priv, LANE3_HS_RX_CONTROL, priv->hsfreq << 1); + rk_dphy_write_mipi_rx(priv, LANE3_HS_RX_CONTROL, priv->hsfreq << 1); /* HS RX Data Lanes Settle State Time Control */ - rk_dphy_write(priv, LANES_THS_SETTLE_CONTROL, - THS_SETTLE_COUNTER_THRESHOLD); + rk_dphy_write_mipi_rx(priv, LANES_THS_SETTLE_CONTROL, + THS_SETTLE_COUNTER_THRESHOLD); /* Normal operation */ - rk_dphy_write(priv, 0x0, 0); + rk_dphy_write_mipi_rx(priv, 0x0, 0); +} + +static void rk_dphy_disable_rx(struct rk_dphy *priv) +{ + rk_dphy_write_grf(priv, GRF_DPHY_RX0_ENABLE, 0); } static int rk_dphy_configure(struct phy *phy, union phy_configure_opts *opts) @@ -266,7 +276,7 @@ static int rk_dphy_power_on(struct phy *phy) if (ret) return ret; - rk_dphy_enable(priv); + priv->drv_data->enable(priv); return 0; } @@ -275,7 +285,7 @@ static int rk_dphy_power_off(struct phy *phy) { struct rk_dphy *priv = phy_get_drvdata(phy); - rk_dphy_write_grf(priv, GRF_DPHY_RX0_ENABLE, 0); + priv->drv_data->disable(priv); clk_bulk_disable(priv->drv_data->num_clks, priv->clks); return 0; } @@ -310,6 +320,8 @@ static const struct rk_dphy_drv_data rk3399_mipidphy_drv_data = { .hsfreq_ranges = rk3399_mipidphy_hsfreq_ranges, .num_hsfreq_ranges = ARRAY_SIZE(rk3399_mipidphy_hsfreq_ranges), .regs = rk3399_grf_dphy_regs, + .enable = rk_dphy_enable_rx, + .disable = rk_dphy_disable_rx, }; static const struct of_device_id rk_dphy_dt_ids[] = { -- 2.33.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH v1 1/5] phy: phy-rockchip-dphy-rx0: refactor for tx1rx1 addition @ 2021-08-30 18:07 ` Mikhail Rudenko 0 siblings, 0 replies; 56+ messages in thread From: Mikhail Rudenko @ 2021-08-30 18:07 UTC (permalink / raw) To: linux-phy Cc: linux-media, Mikhail Rudenko, Kishon Vijay Abraham I, Vinod Koul, Heiko Stuebner, linux-arm-kernel, linux-rockchip, linux-kernel In order to accommodate for rk3399 tx1rx1 addition, make enable/disable function calls indirect via function pointers in rk_dphy_drv_data. Also rename rk_dphy_write and rk_dphy_enable to avoid naming clashes. Signed-off-by: Mikhail Rudenko <mike.rudenko@gmail.com> --- drivers/phy/rockchip/phy-rockchip-dphy-rx0.c | 38 +++++++++++++------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/drivers/phy/rockchip/phy-rockchip-dphy-rx0.c b/drivers/phy/rockchip/phy-rockchip-dphy-rx0.c index 4df9476ef2a9..72145cdfb036 100644 --- a/drivers/phy/rockchip/phy-rockchip-dphy-rx0.c +++ b/drivers/phy/rockchip/phy-rockchip-dphy-rx0.c @@ -138,12 +138,17 @@ static const struct dphy_reg rk3399_grf_dphy_regs[] = { [GRF_DPHY_RX0_TESTDOUT] = PHY_REG(RK3399_GRF_SOC_STATUS1, 8, 0), }; +struct rk_dphy; + struct rk_dphy_drv_data { const char * const *clks; unsigned int num_clks; const struct hsfreq_range *hsfreq_ranges; unsigned int num_hsfreq_ranges; const struct dphy_reg *regs; + + void (*enable)(struct rk_dphy *priv); + void (*disable)(struct rk_dphy *priv); }; struct rk_dphy { @@ -170,7 +175,7 @@ static inline void rk_dphy_write_grf(struct rk_dphy *priv, regmap_write(priv->grf, reg->offset, val); } -static void rk_dphy_write(struct rk_dphy *priv, u8 test_code, u8 test_data) +static void rk_dphy_write_mipi_rx(struct rk_dphy *priv, u8 test_code, u8 test_data) { rk_dphy_write_grf(priv, GRF_DPHY_RX0_TESTDIN, test_code); rk_dphy_write_grf(priv, GRF_DPHY_RX0_TESTEN, 1); @@ -186,7 +191,7 @@ static void rk_dphy_write(struct rk_dphy *priv, u8 test_code, u8 test_data) rk_dphy_write_grf(priv, GRF_DPHY_RX0_TESTCLK, 1); } -static void rk_dphy_enable(struct rk_dphy *priv) +static void rk_dphy_enable_rx(struct rk_dphy *priv) { rk_dphy_write_grf(priv, GRF_DPHY_RX0_FORCERXMODE, 0); rk_dphy_write_grf(priv, GRF_DPHY_RX0_FORCETXSTOPMODE, 0); @@ -206,22 +211,27 @@ static void rk_dphy_enable(struct rk_dphy *priv) usleep_range(100, 150); /* set clock lane */ - /* HS hsfreq_range & lane 0 settle bypass */ - rk_dphy_write(priv, CLOCK_LANE_HS_RX_CONTROL, 0); + /* HS hsfreq_range & lane 0 settle bypass */ + rk_dphy_write_mipi_rx(priv, CLOCK_LANE_HS_RX_CONTROL, 0); /* HS RX Control of lane0 */ - rk_dphy_write(priv, LANE0_HS_RX_CONTROL, priv->hsfreq << 1); + rk_dphy_write_mipi_rx(priv, LANE0_HS_RX_CONTROL, priv->hsfreq << 1); /* HS RX Control of lane1 */ - rk_dphy_write(priv, LANE1_HS_RX_CONTROL, priv->hsfreq << 1); + rk_dphy_write_mipi_rx(priv, LANE1_HS_RX_CONTROL, priv->hsfreq << 1); /* HS RX Control of lane2 */ - rk_dphy_write(priv, LANE2_HS_RX_CONTROL, priv->hsfreq << 1); + rk_dphy_write_mipi_rx(priv, LANE2_HS_RX_CONTROL, priv->hsfreq << 1); /* HS RX Control of lane3 */ - rk_dphy_write(priv, LANE3_HS_RX_CONTROL, priv->hsfreq << 1); + rk_dphy_write_mipi_rx(priv, LANE3_HS_RX_CONTROL, priv->hsfreq << 1); /* HS RX Data Lanes Settle State Time Control */ - rk_dphy_write(priv, LANES_THS_SETTLE_CONTROL, - THS_SETTLE_COUNTER_THRESHOLD); + rk_dphy_write_mipi_rx(priv, LANES_THS_SETTLE_CONTROL, + THS_SETTLE_COUNTER_THRESHOLD); /* Normal operation */ - rk_dphy_write(priv, 0x0, 0); + rk_dphy_write_mipi_rx(priv, 0x0, 0); +} + +static void rk_dphy_disable_rx(struct rk_dphy *priv) +{ + rk_dphy_write_grf(priv, GRF_DPHY_RX0_ENABLE, 0); } static int rk_dphy_configure(struct phy *phy, union phy_configure_opts *opts) @@ -266,7 +276,7 @@ static int rk_dphy_power_on(struct phy *phy) if (ret) return ret; - rk_dphy_enable(priv); + priv->drv_data->enable(priv); return 0; } @@ -275,7 +285,7 @@ static int rk_dphy_power_off(struct phy *phy) { struct rk_dphy *priv = phy_get_drvdata(phy); - rk_dphy_write_grf(priv, GRF_DPHY_RX0_ENABLE, 0); + priv->drv_data->disable(priv); clk_bulk_disable(priv->drv_data->num_clks, priv->clks); return 0; } @@ -310,6 +320,8 @@ static const struct rk_dphy_drv_data rk3399_mipidphy_drv_data = { .hsfreq_ranges = rk3399_mipidphy_hsfreq_ranges, .num_hsfreq_ranges = ARRAY_SIZE(rk3399_mipidphy_hsfreq_ranges), .regs = rk3399_grf_dphy_regs, + .enable = rk_dphy_enable_rx, + .disable = rk_dphy_disable_rx, }; static const struct of_device_id rk_dphy_dt_ids[] = { -- 2.33.0 _______________________________________________ Linux-rockchip mailing list Linux-rockchip@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip ^ permalink raw reply related [flat|nested] 56+ messages in thread
* Re: [PATCH v1 1/5] phy: phy-rockchip-dphy-rx0: refactor for tx1rx1 addition 2021-08-30 18:07 ` Mikhail Rudenko (?) (?) @ 2021-08-30 20:45 ` Heiko Stübner -1 siblings, 0 replies; 56+ messages in thread From: Heiko Stübner @ 2021-08-30 20:45 UTC (permalink / raw) To: linux-phy, Mikhail Rudenko Cc: linux-media, Mikhail Rudenko, Kishon Vijay Abraham I, Vinod Koul, linux-arm-kernel, linux-rockchip, linux-kernel Hi Mikhail, Am Montag, 30. August 2021, 20:07:50 CEST schrieb Mikhail Rudenko: > In order to accommodate for rk3399 tx1rx1 addition, make > enable/disable function calls indirect via function pointers in > rk_dphy_drv_data. Also rename rk_dphy_write and rk_dphy_enable to > avoid naming clashes. You're a bit too late to the party :-( . The tx1rx1 dphy is living _inside_ the 2nd DSI controller and is configured through it. So having the same peripheral in the dts with different compatibles does break the devicetree-describes-hardware-not-Linux-implementation-details paradigm. Therefore my approach was to handle the switch between tx and rx modes inside the dsi driver. This got merged for 5.15 as well, see [0] [1]. So sadly this series is somewhat obsolete, but you should find the building blocks for camera support in linux-next already. Regards Heiko [0] https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=71f68fe7f12182ed968cfbbd1ef018721e4dee30 [1] https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=68e0277204c733dff19073686e2ac48239b06fbc > > Signed-off-by: Mikhail Rudenko <mike.rudenko@gmail.com> > --- > drivers/phy/rockchip/phy-rockchip-dphy-rx0.c | 38 +++++++++++++------- > 1 file changed, 25 insertions(+), 13 deletions(-) > > diff --git a/drivers/phy/rockchip/phy-rockchip-dphy-rx0.c b/drivers/phy/rockchip/phy-rockchip-dphy-rx0.c > index 4df9476ef2a9..72145cdfb036 100644 > --- a/drivers/phy/rockchip/phy-rockchip-dphy-rx0.c > +++ b/drivers/phy/rockchip/phy-rockchip-dphy-rx0.c > @@ -138,12 +138,17 @@ static const struct dphy_reg rk3399_grf_dphy_regs[] = { > [GRF_DPHY_RX0_TESTDOUT] = PHY_REG(RK3399_GRF_SOC_STATUS1, 8, 0), > }; > > +struct rk_dphy; > + > struct rk_dphy_drv_data { > const char * const *clks; > unsigned int num_clks; > const struct hsfreq_range *hsfreq_ranges; > unsigned int num_hsfreq_ranges; > const struct dphy_reg *regs; > + > + void (*enable)(struct rk_dphy *priv); > + void (*disable)(struct rk_dphy *priv); > }; > > struct rk_dphy { > @@ -170,7 +175,7 @@ static inline void rk_dphy_write_grf(struct rk_dphy *priv, > regmap_write(priv->grf, reg->offset, val); > } > > -static void rk_dphy_write(struct rk_dphy *priv, u8 test_code, u8 test_data) > +static void rk_dphy_write_mipi_rx(struct rk_dphy *priv, u8 test_code, u8 test_data) > { > rk_dphy_write_grf(priv, GRF_DPHY_RX0_TESTDIN, test_code); > rk_dphy_write_grf(priv, GRF_DPHY_RX0_TESTEN, 1); > @@ -186,7 +191,7 @@ static void rk_dphy_write(struct rk_dphy *priv, u8 test_code, u8 test_data) > rk_dphy_write_grf(priv, GRF_DPHY_RX0_TESTCLK, 1); > } > > -static void rk_dphy_enable(struct rk_dphy *priv) > +static void rk_dphy_enable_rx(struct rk_dphy *priv) > { > rk_dphy_write_grf(priv, GRF_DPHY_RX0_FORCERXMODE, 0); > rk_dphy_write_grf(priv, GRF_DPHY_RX0_FORCETXSTOPMODE, 0); > @@ -206,22 +211,27 @@ static void rk_dphy_enable(struct rk_dphy *priv) > usleep_range(100, 150); > > /* set clock lane */ > - /* HS hsfreq_range & lane 0 settle bypass */ > - rk_dphy_write(priv, CLOCK_LANE_HS_RX_CONTROL, 0); > + /* HS hsfreq_range & lane 0 settle bypass */ > + rk_dphy_write_mipi_rx(priv, CLOCK_LANE_HS_RX_CONTROL, 0); > /* HS RX Control of lane0 */ > - rk_dphy_write(priv, LANE0_HS_RX_CONTROL, priv->hsfreq << 1); > + rk_dphy_write_mipi_rx(priv, LANE0_HS_RX_CONTROL, priv->hsfreq << 1); > /* HS RX Control of lane1 */ > - rk_dphy_write(priv, LANE1_HS_RX_CONTROL, priv->hsfreq << 1); > + rk_dphy_write_mipi_rx(priv, LANE1_HS_RX_CONTROL, priv->hsfreq << 1); > /* HS RX Control of lane2 */ > - rk_dphy_write(priv, LANE2_HS_RX_CONTROL, priv->hsfreq << 1); > + rk_dphy_write_mipi_rx(priv, LANE2_HS_RX_CONTROL, priv->hsfreq << 1); > /* HS RX Control of lane3 */ > - rk_dphy_write(priv, LANE3_HS_RX_CONTROL, priv->hsfreq << 1); > + rk_dphy_write_mipi_rx(priv, LANE3_HS_RX_CONTROL, priv->hsfreq << 1); > /* HS RX Data Lanes Settle State Time Control */ > - rk_dphy_write(priv, LANES_THS_SETTLE_CONTROL, > - THS_SETTLE_COUNTER_THRESHOLD); > + rk_dphy_write_mipi_rx(priv, LANES_THS_SETTLE_CONTROL, > + THS_SETTLE_COUNTER_THRESHOLD); > > /* Normal operation */ > - rk_dphy_write(priv, 0x0, 0); > + rk_dphy_write_mipi_rx(priv, 0x0, 0); > +} > + > +static void rk_dphy_disable_rx(struct rk_dphy *priv) > +{ > + rk_dphy_write_grf(priv, GRF_DPHY_RX0_ENABLE, 0); > } > > static int rk_dphy_configure(struct phy *phy, union phy_configure_opts *opts) > @@ -266,7 +276,7 @@ static int rk_dphy_power_on(struct phy *phy) > if (ret) > return ret; > > - rk_dphy_enable(priv); > + priv->drv_data->enable(priv); > > return 0; > } > @@ -275,7 +285,7 @@ static int rk_dphy_power_off(struct phy *phy) > { > struct rk_dphy *priv = phy_get_drvdata(phy); > > - rk_dphy_write_grf(priv, GRF_DPHY_RX0_ENABLE, 0); > + priv->drv_data->disable(priv); > clk_bulk_disable(priv->drv_data->num_clks, priv->clks); > return 0; > } > @@ -310,6 +320,8 @@ static const struct rk_dphy_drv_data rk3399_mipidphy_drv_data = { > .hsfreq_ranges = rk3399_mipidphy_hsfreq_ranges, > .num_hsfreq_ranges = ARRAY_SIZE(rk3399_mipidphy_hsfreq_ranges), > .regs = rk3399_grf_dphy_regs, > + .enable = rk_dphy_enable_rx, > + .disable = rk_dphy_disable_rx, > }; > > static const struct of_device_id rk_dphy_dt_ids[] = { > -- linux-phy mailing list linux-phy@lists.infradead.org https://lists.infradead.org/mailman/listinfo/linux-phy ^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH v1 1/5] phy: phy-rockchip-dphy-rx0: refactor for tx1rx1 addition @ 2021-08-30 20:45 ` Heiko Stübner 0 siblings, 0 replies; 56+ messages in thread From: Heiko Stübner @ 2021-08-30 20:45 UTC (permalink / raw) To: linux-phy, Mikhail Rudenko Cc: linux-media, Mikhail Rudenko, Kishon Vijay Abraham I, Vinod Koul, linux-arm-kernel, linux-rockchip, linux-kernel Hi Mikhail, Am Montag, 30. August 2021, 20:07:50 CEST schrieb Mikhail Rudenko: > In order to accommodate for rk3399 tx1rx1 addition, make > enable/disable function calls indirect via function pointers in > rk_dphy_drv_data. Also rename rk_dphy_write and rk_dphy_enable to > avoid naming clashes. You're a bit too late to the party :-( . The tx1rx1 dphy is living _inside_ the 2nd DSI controller and is configured through it. So having the same peripheral in the dts with different compatibles does break the devicetree-describes-hardware-not-Linux-implementation-details paradigm. Therefore my approach was to handle the switch between tx and rx modes inside the dsi driver. This got merged for 5.15 as well, see [0] [1]. So sadly this series is somewhat obsolete, but you should find the building blocks for camera support in linux-next already. Regards Heiko [0] https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=71f68fe7f12182ed968cfbbd1ef018721e4dee30 [1] https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=68e0277204c733dff19073686e2ac48239b06fbc > > Signed-off-by: Mikhail Rudenko <mike.rudenko@gmail.com> > --- > drivers/phy/rockchip/phy-rockchip-dphy-rx0.c | 38 +++++++++++++------- > 1 file changed, 25 insertions(+), 13 deletions(-) > > diff --git a/drivers/phy/rockchip/phy-rockchip-dphy-rx0.c b/drivers/phy/rockchip/phy-rockchip-dphy-rx0.c > index 4df9476ef2a9..72145cdfb036 100644 > --- a/drivers/phy/rockchip/phy-rockchip-dphy-rx0.c > +++ b/drivers/phy/rockchip/phy-rockchip-dphy-rx0.c > @@ -138,12 +138,17 @@ static const struct dphy_reg rk3399_grf_dphy_regs[] = { > [GRF_DPHY_RX0_TESTDOUT] = PHY_REG(RK3399_GRF_SOC_STATUS1, 8, 0), > }; > > +struct rk_dphy; > + > struct rk_dphy_drv_data { > const char * const *clks; > unsigned int num_clks; > const struct hsfreq_range *hsfreq_ranges; > unsigned int num_hsfreq_ranges; > const struct dphy_reg *regs; > + > + void (*enable)(struct rk_dphy *priv); > + void (*disable)(struct rk_dphy *priv); > }; > > struct rk_dphy { > @@ -170,7 +175,7 @@ static inline void rk_dphy_write_grf(struct rk_dphy *priv, > regmap_write(priv->grf, reg->offset, val); > } > > -static void rk_dphy_write(struct rk_dphy *priv, u8 test_code, u8 test_data) > +static void rk_dphy_write_mipi_rx(struct rk_dphy *priv, u8 test_code, u8 test_data) > { > rk_dphy_write_grf(priv, GRF_DPHY_RX0_TESTDIN, test_code); > rk_dphy_write_grf(priv, GRF_DPHY_RX0_TESTEN, 1); > @@ -186,7 +191,7 @@ static void rk_dphy_write(struct rk_dphy *priv, u8 test_code, u8 test_data) > rk_dphy_write_grf(priv, GRF_DPHY_RX0_TESTCLK, 1); > } > > -static void rk_dphy_enable(struct rk_dphy *priv) > +static void rk_dphy_enable_rx(struct rk_dphy *priv) > { > rk_dphy_write_grf(priv, GRF_DPHY_RX0_FORCERXMODE, 0); > rk_dphy_write_grf(priv, GRF_DPHY_RX0_FORCETXSTOPMODE, 0); > @@ -206,22 +211,27 @@ static void rk_dphy_enable(struct rk_dphy *priv) > usleep_range(100, 150); > > /* set clock lane */ > - /* HS hsfreq_range & lane 0 settle bypass */ > - rk_dphy_write(priv, CLOCK_LANE_HS_RX_CONTROL, 0); > + /* HS hsfreq_range & lane 0 settle bypass */ > + rk_dphy_write_mipi_rx(priv, CLOCK_LANE_HS_RX_CONTROL, 0); > /* HS RX Control of lane0 */ > - rk_dphy_write(priv, LANE0_HS_RX_CONTROL, priv->hsfreq << 1); > + rk_dphy_write_mipi_rx(priv, LANE0_HS_RX_CONTROL, priv->hsfreq << 1); > /* HS RX Control of lane1 */ > - rk_dphy_write(priv, LANE1_HS_RX_CONTROL, priv->hsfreq << 1); > + rk_dphy_write_mipi_rx(priv, LANE1_HS_RX_CONTROL, priv->hsfreq << 1); > /* HS RX Control of lane2 */ > - rk_dphy_write(priv, LANE2_HS_RX_CONTROL, priv->hsfreq << 1); > + rk_dphy_write_mipi_rx(priv, LANE2_HS_RX_CONTROL, priv->hsfreq << 1); > /* HS RX Control of lane3 */ > - rk_dphy_write(priv, LANE3_HS_RX_CONTROL, priv->hsfreq << 1); > + rk_dphy_write_mipi_rx(priv, LANE3_HS_RX_CONTROL, priv->hsfreq << 1); > /* HS RX Data Lanes Settle State Time Control */ > - rk_dphy_write(priv, LANES_THS_SETTLE_CONTROL, > - THS_SETTLE_COUNTER_THRESHOLD); > + rk_dphy_write_mipi_rx(priv, LANES_THS_SETTLE_CONTROL, > + THS_SETTLE_COUNTER_THRESHOLD); > > /* Normal operation */ > - rk_dphy_write(priv, 0x0, 0); > + rk_dphy_write_mipi_rx(priv, 0x0, 0); > +} > + > +static void rk_dphy_disable_rx(struct rk_dphy *priv) > +{ > + rk_dphy_write_grf(priv, GRF_DPHY_RX0_ENABLE, 0); > } > > static int rk_dphy_configure(struct phy *phy, union phy_configure_opts *opts) > @@ -266,7 +276,7 @@ static int rk_dphy_power_on(struct phy *phy) > if (ret) > return ret; > > - rk_dphy_enable(priv); > + priv->drv_data->enable(priv); > > return 0; > } > @@ -275,7 +285,7 @@ static int rk_dphy_power_off(struct phy *phy) > { > struct rk_dphy *priv = phy_get_drvdata(phy); > > - rk_dphy_write_grf(priv, GRF_DPHY_RX0_ENABLE, 0); > + priv->drv_data->disable(priv); > clk_bulk_disable(priv->drv_data->num_clks, priv->clks); > return 0; > } > @@ -310,6 +320,8 @@ static const struct rk_dphy_drv_data rk3399_mipidphy_drv_data = { > .hsfreq_ranges = rk3399_mipidphy_hsfreq_ranges, > .num_hsfreq_ranges = ARRAY_SIZE(rk3399_mipidphy_hsfreq_ranges), > .regs = rk3399_grf_dphy_regs, > + .enable = rk_dphy_enable_rx, > + .disable = rk_dphy_disable_rx, > }; > > static const struct of_device_id rk_dphy_dt_ids[] = { > ^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH v1 1/5] phy: phy-rockchip-dphy-rx0: refactor for tx1rx1 addition @ 2021-08-30 20:45 ` Heiko Stübner 0 siblings, 0 replies; 56+ messages in thread From: Heiko Stübner @ 2021-08-30 20:45 UTC (permalink / raw) To: linux-phy, Mikhail Rudenko Cc: linux-media, Mikhail Rudenko, Kishon Vijay Abraham I, Vinod Koul, linux-arm-kernel, linux-rockchip, linux-kernel Hi Mikhail, Am Montag, 30. August 2021, 20:07:50 CEST schrieb Mikhail Rudenko: > In order to accommodate for rk3399 tx1rx1 addition, make > enable/disable function calls indirect via function pointers in > rk_dphy_drv_data. Also rename rk_dphy_write and rk_dphy_enable to > avoid naming clashes. You're a bit too late to the party :-( . The tx1rx1 dphy is living _inside_ the 2nd DSI controller and is configured through it. So having the same peripheral in the dts with different compatibles does break the devicetree-describes-hardware-not-Linux-implementation-details paradigm. Therefore my approach was to handle the switch between tx and rx modes inside the dsi driver. This got merged for 5.15 as well, see [0] [1]. So sadly this series is somewhat obsolete, but you should find the building blocks for camera support in linux-next already. Regards Heiko [0] https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=71f68fe7f12182ed968cfbbd1ef018721e4dee30 [1] https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=68e0277204c733dff19073686e2ac48239b06fbc > > Signed-off-by: Mikhail Rudenko <mike.rudenko@gmail.com> > --- > drivers/phy/rockchip/phy-rockchip-dphy-rx0.c | 38 +++++++++++++------- > 1 file changed, 25 insertions(+), 13 deletions(-) > > diff --git a/drivers/phy/rockchip/phy-rockchip-dphy-rx0.c b/drivers/phy/rockchip/phy-rockchip-dphy-rx0.c > index 4df9476ef2a9..72145cdfb036 100644 > --- a/drivers/phy/rockchip/phy-rockchip-dphy-rx0.c > +++ b/drivers/phy/rockchip/phy-rockchip-dphy-rx0.c > @@ -138,12 +138,17 @@ static const struct dphy_reg rk3399_grf_dphy_regs[] = { > [GRF_DPHY_RX0_TESTDOUT] = PHY_REG(RK3399_GRF_SOC_STATUS1, 8, 0), > }; > > +struct rk_dphy; > + > struct rk_dphy_drv_data { > const char * const *clks; > unsigned int num_clks; > const struct hsfreq_range *hsfreq_ranges; > unsigned int num_hsfreq_ranges; > const struct dphy_reg *regs; > + > + void (*enable)(struct rk_dphy *priv); > + void (*disable)(struct rk_dphy *priv); > }; > > struct rk_dphy { > @@ -170,7 +175,7 @@ static inline void rk_dphy_write_grf(struct rk_dphy *priv, > regmap_write(priv->grf, reg->offset, val); > } > > -static void rk_dphy_write(struct rk_dphy *priv, u8 test_code, u8 test_data) > +static void rk_dphy_write_mipi_rx(struct rk_dphy *priv, u8 test_code, u8 test_data) > { > rk_dphy_write_grf(priv, GRF_DPHY_RX0_TESTDIN, test_code); > rk_dphy_write_grf(priv, GRF_DPHY_RX0_TESTEN, 1); > @@ -186,7 +191,7 @@ static void rk_dphy_write(struct rk_dphy *priv, u8 test_code, u8 test_data) > rk_dphy_write_grf(priv, GRF_DPHY_RX0_TESTCLK, 1); > } > > -static void rk_dphy_enable(struct rk_dphy *priv) > +static void rk_dphy_enable_rx(struct rk_dphy *priv) > { > rk_dphy_write_grf(priv, GRF_DPHY_RX0_FORCERXMODE, 0); > rk_dphy_write_grf(priv, GRF_DPHY_RX0_FORCETXSTOPMODE, 0); > @@ -206,22 +211,27 @@ static void rk_dphy_enable(struct rk_dphy *priv) > usleep_range(100, 150); > > /* set clock lane */ > - /* HS hsfreq_range & lane 0 settle bypass */ > - rk_dphy_write(priv, CLOCK_LANE_HS_RX_CONTROL, 0); > + /* HS hsfreq_range & lane 0 settle bypass */ > + rk_dphy_write_mipi_rx(priv, CLOCK_LANE_HS_RX_CONTROL, 0); > /* HS RX Control of lane0 */ > - rk_dphy_write(priv, LANE0_HS_RX_CONTROL, priv->hsfreq << 1); > + rk_dphy_write_mipi_rx(priv, LANE0_HS_RX_CONTROL, priv->hsfreq << 1); > /* HS RX Control of lane1 */ > - rk_dphy_write(priv, LANE1_HS_RX_CONTROL, priv->hsfreq << 1); > + rk_dphy_write_mipi_rx(priv, LANE1_HS_RX_CONTROL, priv->hsfreq << 1); > /* HS RX Control of lane2 */ > - rk_dphy_write(priv, LANE2_HS_RX_CONTROL, priv->hsfreq << 1); > + rk_dphy_write_mipi_rx(priv, LANE2_HS_RX_CONTROL, priv->hsfreq << 1); > /* HS RX Control of lane3 */ > - rk_dphy_write(priv, LANE3_HS_RX_CONTROL, priv->hsfreq << 1); > + rk_dphy_write_mipi_rx(priv, LANE3_HS_RX_CONTROL, priv->hsfreq << 1); > /* HS RX Data Lanes Settle State Time Control */ > - rk_dphy_write(priv, LANES_THS_SETTLE_CONTROL, > - THS_SETTLE_COUNTER_THRESHOLD); > + rk_dphy_write_mipi_rx(priv, LANES_THS_SETTLE_CONTROL, > + THS_SETTLE_COUNTER_THRESHOLD); > > /* Normal operation */ > - rk_dphy_write(priv, 0x0, 0); > + rk_dphy_write_mipi_rx(priv, 0x0, 0); > +} > + > +static void rk_dphy_disable_rx(struct rk_dphy *priv) > +{ > + rk_dphy_write_grf(priv, GRF_DPHY_RX0_ENABLE, 0); > } > > static int rk_dphy_configure(struct phy *phy, union phy_configure_opts *opts) > @@ -266,7 +276,7 @@ static int rk_dphy_power_on(struct phy *phy) > if (ret) > return ret; > > - rk_dphy_enable(priv); > + priv->drv_data->enable(priv); > > return 0; > } > @@ -275,7 +285,7 @@ static int rk_dphy_power_off(struct phy *phy) > { > struct rk_dphy *priv = phy_get_drvdata(phy); > > - rk_dphy_write_grf(priv, GRF_DPHY_RX0_ENABLE, 0); > + priv->drv_data->disable(priv); > clk_bulk_disable(priv->drv_data->num_clks, priv->clks); > return 0; > } > @@ -310,6 +320,8 @@ static const struct rk_dphy_drv_data rk3399_mipidphy_drv_data = { > .hsfreq_ranges = rk3399_mipidphy_hsfreq_ranges, > .num_hsfreq_ranges = ARRAY_SIZE(rk3399_mipidphy_hsfreq_ranges), > .regs = rk3399_grf_dphy_regs, > + .enable = rk_dphy_enable_rx, > + .disable = rk_dphy_disable_rx, > }; > > static const struct of_device_id rk_dphy_dt_ids[] = { > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH v1 1/5] phy: phy-rockchip-dphy-rx0: refactor for tx1rx1 addition @ 2021-08-30 20:45 ` Heiko Stübner 0 siblings, 0 replies; 56+ messages in thread From: Heiko Stübner @ 2021-08-30 20:45 UTC (permalink / raw) To: linux-phy, Mikhail Rudenko Cc: linux-media, Mikhail Rudenko, Kishon Vijay Abraham I, Vinod Koul, linux-arm-kernel, linux-rockchip, linux-kernel Hi Mikhail, Am Montag, 30. August 2021, 20:07:50 CEST schrieb Mikhail Rudenko: > In order to accommodate for rk3399 tx1rx1 addition, make > enable/disable function calls indirect via function pointers in > rk_dphy_drv_data. Also rename rk_dphy_write and rk_dphy_enable to > avoid naming clashes. You're a bit too late to the party :-( . The tx1rx1 dphy is living _inside_ the 2nd DSI controller and is configured through it. So having the same peripheral in the dts with different compatibles does break the devicetree-describes-hardware-not-Linux-implementation-details paradigm. Therefore my approach was to handle the switch between tx and rx modes inside the dsi driver. This got merged for 5.15 as well, see [0] [1]. So sadly this series is somewhat obsolete, but you should find the building blocks for camera support in linux-next already. Regards Heiko [0] https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=71f68fe7f12182ed968cfbbd1ef018721e4dee30 [1] https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=68e0277204c733dff19073686e2ac48239b06fbc > > Signed-off-by: Mikhail Rudenko <mike.rudenko@gmail.com> > --- > drivers/phy/rockchip/phy-rockchip-dphy-rx0.c | 38 +++++++++++++------- > 1 file changed, 25 insertions(+), 13 deletions(-) > > diff --git a/drivers/phy/rockchip/phy-rockchip-dphy-rx0.c b/drivers/phy/rockchip/phy-rockchip-dphy-rx0.c > index 4df9476ef2a9..72145cdfb036 100644 > --- a/drivers/phy/rockchip/phy-rockchip-dphy-rx0.c > +++ b/drivers/phy/rockchip/phy-rockchip-dphy-rx0.c > @@ -138,12 +138,17 @@ static const struct dphy_reg rk3399_grf_dphy_regs[] = { > [GRF_DPHY_RX0_TESTDOUT] = PHY_REG(RK3399_GRF_SOC_STATUS1, 8, 0), > }; > > +struct rk_dphy; > + > struct rk_dphy_drv_data { > const char * const *clks; > unsigned int num_clks; > const struct hsfreq_range *hsfreq_ranges; > unsigned int num_hsfreq_ranges; > const struct dphy_reg *regs; > + > + void (*enable)(struct rk_dphy *priv); > + void (*disable)(struct rk_dphy *priv); > }; > > struct rk_dphy { > @@ -170,7 +175,7 @@ static inline void rk_dphy_write_grf(struct rk_dphy *priv, > regmap_write(priv->grf, reg->offset, val); > } > > -static void rk_dphy_write(struct rk_dphy *priv, u8 test_code, u8 test_data) > +static void rk_dphy_write_mipi_rx(struct rk_dphy *priv, u8 test_code, u8 test_data) > { > rk_dphy_write_grf(priv, GRF_DPHY_RX0_TESTDIN, test_code); > rk_dphy_write_grf(priv, GRF_DPHY_RX0_TESTEN, 1); > @@ -186,7 +191,7 @@ static void rk_dphy_write(struct rk_dphy *priv, u8 test_code, u8 test_data) > rk_dphy_write_grf(priv, GRF_DPHY_RX0_TESTCLK, 1); > } > > -static void rk_dphy_enable(struct rk_dphy *priv) > +static void rk_dphy_enable_rx(struct rk_dphy *priv) > { > rk_dphy_write_grf(priv, GRF_DPHY_RX0_FORCERXMODE, 0); > rk_dphy_write_grf(priv, GRF_DPHY_RX0_FORCETXSTOPMODE, 0); > @@ -206,22 +211,27 @@ static void rk_dphy_enable(struct rk_dphy *priv) > usleep_range(100, 150); > > /* set clock lane */ > - /* HS hsfreq_range & lane 0 settle bypass */ > - rk_dphy_write(priv, CLOCK_LANE_HS_RX_CONTROL, 0); > + /* HS hsfreq_range & lane 0 settle bypass */ > + rk_dphy_write_mipi_rx(priv, CLOCK_LANE_HS_RX_CONTROL, 0); > /* HS RX Control of lane0 */ > - rk_dphy_write(priv, LANE0_HS_RX_CONTROL, priv->hsfreq << 1); > + rk_dphy_write_mipi_rx(priv, LANE0_HS_RX_CONTROL, priv->hsfreq << 1); > /* HS RX Control of lane1 */ > - rk_dphy_write(priv, LANE1_HS_RX_CONTROL, priv->hsfreq << 1); > + rk_dphy_write_mipi_rx(priv, LANE1_HS_RX_CONTROL, priv->hsfreq << 1); > /* HS RX Control of lane2 */ > - rk_dphy_write(priv, LANE2_HS_RX_CONTROL, priv->hsfreq << 1); > + rk_dphy_write_mipi_rx(priv, LANE2_HS_RX_CONTROL, priv->hsfreq << 1); > /* HS RX Control of lane3 */ > - rk_dphy_write(priv, LANE3_HS_RX_CONTROL, priv->hsfreq << 1); > + rk_dphy_write_mipi_rx(priv, LANE3_HS_RX_CONTROL, priv->hsfreq << 1); > /* HS RX Data Lanes Settle State Time Control */ > - rk_dphy_write(priv, LANES_THS_SETTLE_CONTROL, > - THS_SETTLE_COUNTER_THRESHOLD); > + rk_dphy_write_mipi_rx(priv, LANES_THS_SETTLE_CONTROL, > + THS_SETTLE_COUNTER_THRESHOLD); > > /* Normal operation */ > - rk_dphy_write(priv, 0x0, 0); > + rk_dphy_write_mipi_rx(priv, 0x0, 0); > +} > + > +static void rk_dphy_disable_rx(struct rk_dphy *priv) > +{ > + rk_dphy_write_grf(priv, GRF_DPHY_RX0_ENABLE, 0); > } > > static int rk_dphy_configure(struct phy *phy, union phy_configure_opts *opts) > @@ -266,7 +276,7 @@ static int rk_dphy_power_on(struct phy *phy) > if (ret) > return ret; > > - rk_dphy_enable(priv); > + priv->drv_data->enable(priv); > > return 0; > } > @@ -275,7 +285,7 @@ static int rk_dphy_power_off(struct phy *phy) > { > struct rk_dphy *priv = phy_get_drvdata(phy); > > - rk_dphy_write_grf(priv, GRF_DPHY_RX0_ENABLE, 0); > + priv->drv_data->disable(priv); > clk_bulk_disable(priv->drv_data->num_clks, priv->clks); > return 0; > } > @@ -310,6 +320,8 @@ static const struct rk_dphy_drv_data rk3399_mipidphy_drv_data = { > .hsfreq_ranges = rk3399_mipidphy_hsfreq_ranges, > .num_hsfreq_ranges = ARRAY_SIZE(rk3399_mipidphy_hsfreq_ranges), > .regs = rk3399_grf_dphy_regs, > + .enable = rk_dphy_enable_rx, > + .disable = rk_dphy_disable_rx, > }; > > static const struct of_device_id rk_dphy_dt_ids[] = { > _______________________________________________ Linux-rockchip mailing list Linux-rockchip@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip ^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH v1 1/5] phy: phy-rockchip-dphy-rx0: refactor for tx1rx1 addition 2021-08-30 20:45 ` Heiko Stübner (?) (?) @ 2021-08-31 0:41 ` Ezequiel Garcia -1 siblings, 0 replies; 56+ messages in thread From: Ezequiel Garcia @ 2021-08-31 0:41 UTC (permalink / raw) To: Heiko Stübner Cc: linux-phy, Mikhail Rudenko, linux-media, Kishon Vijay Abraham I, Vinod Koul, linux-arm-kernel, open list:ARM/Rockchip SoC..., Linux Kernel Mailing List Hi Heiko, On Mon, 30 Aug 2021 at 17:46, Heiko Stübner <heiko@sntech.de> wrote: > > Hi Mikhail, > > Am Montag, 30. August 2021, 20:07:50 CEST schrieb Mikhail Rudenko: > > In order to accommodate for rk3399 tx1rx1 addition, make > > enable/disable function calls indirect via function pointers in > > rk_dphy_drv_data. Also rename rk_dphy_write and rk_dphy_enable to > > avoid naming clashes. > > You're a bit too late to the party :-( . > > The tx1rx1 dphy is living _inside_ the 2nd DSI controller and is > configured through it. > Would you be so kind to push a patch adding some comments to drivers/phy/rockchip/phy-rockchip-dphy-rx0.c with this information? Thanks, Ezequiel -- linux-phy mailing list linux-phy@lists.infradead.org https://lists.infradead.org/mailman/listinfo/linux-phy ^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH v1 1/5] phy: phy-rockchip-dphy-rx0: refactor for tx1rx1 addition @ 2021-08-31 0:41 ` Ezequiel Garcia 0 siblings, 0 replies; 56+ messages in thread From: Ezequiel Garcia @ 2021-08-31 0:41 UTC (permalink / raw) To: Heiko Stübner Cc: linux-phy, Mikhail Rudenko, linux-media, Kishon Vijay Abraham I, Vinod Koul, linux-arm-kernel, open list:ARM/Rockchip SoC..., Linux Kernel Mailing List Hi Heiko, On Mon, 30 Aug 2021 at 17:46, Heiko Stübner <heiko@sntech.de> wrote: > > Hi Mikhail, > > Am Montag, 30. August 2021, 20:07:50 CEST schrieb Mikhail Rudenko: > > In order to accommodate for rk3399 tx1rx1 addition, make > > enable/disable function calls indirect via function pointers in > > rk_dphy_drv_data. Also rename rk_dphy_write and rk_dphy_enable to > > avoid naming clashes. > > You're a bit too late to the party :-( . > > The tx1rx1 dphy is living _inside_ the 2nd DSI controller and is > configured through it. > Would you be so kind to push a patch adding some comments to drivers/phy/rockchip/phy-rockchip-dphy-rx0.c with this information? Thanks, Ezequiel ^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH v1 1/5] phy: phy-rockchip-dphy-rx0: refactor for tx1rx1 addition @ 2021-08-31 0:41 ` Ezequiel Garcia 0 siblings, 0 replies; 56+ messages in thread From: Ezequiel Garcia @ 2021-08-31 0:41 UTC (permalink / raw) To: Heiko Stübner Cc: linux-phy, Mikhail Rudenko, linux-media, Kishon Vijay Abraham I, Vinod Koul, linux-arm-kernel, open list:ARM/Rockchip SoC..., Linux Kernel Mailing List Hi Heiko, On Mon, 30 Aug 2021 at 17:46, Heiko Stübner <heiko@sntech.de> wrote: > > Hi Mikhail, > > Am Montag, 30. August 2021, 20:07:50 CEST schrieb Mikhail Rudenko: > > In order to accommodate for rk3399 tx1rx1 addition, make > > enable/disable function calls indirect via function pointers in > > rk_dphy_drv_data. Also rename rk_dphy_write and rk_dphy_enable to > > avoid naming clashes. > > You're a bit too late to the party :-( . > > The tx1rx1 dphy is living _inside_ the 2nd DSI controller and is > configured through it. > Would you be so kind to push a patch adding some comments to drivers/phy/rockchip/phy-rockchip-dphy-rx0.c with this information? Thanks, Ezequiel _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH v1 1/5] phy: phy-rockchip-dphy-rx0: refactor for tx1rx1 addition @ 2021-08-31 0:41 ` Ezequiel Garcia 0 siblings, 0 replies; 56+ messages in thread From: Ezequiel Garcia @ 2021-08-31 0:41 UTC (permalink / raw) To: Heiko Stübner Cc: linux-phy, Mikhail Rudenko, linux-media, Kishon Vijay Abraham I, Vinod Koul, linux-arm-kernel, open list:ARM/Rockchip SoC..., Linux Kernel Mailing List Hi Heiko, On Mon, 30 Aug 2021 at 17:46, Heiko Stübner <heiko@sntech.de> wrote: > > Hi Mikhail, > > Am Montag, 30. August 2021, 20:07:50 CEST schrieb Mikhail Rudenko: > > In order to accommodate for rk3399 tx1rx1 addition, make > > enable/disable function calls indirect via function pointers in > > rk_dphy_drv_data. Also rename rk_dphy_write and rk_dphy_enable to > > avoid naming clashes. > > You're a bit too late to the party :-( . > > The tx1rx1 dphy is living _inside_ the 2nd DSI controller and is > configured through it. > Would you be so kind to push a patch adding some comments to drivers/phy/rockchip/phy-rockchip-dphy-rx0.c with this information? Thanks, Ezequiel _______________________________________________ Linux-rockchip mailing list Linux-rockchip@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip ^ permalink raw reply [flat|nested] 56+ messages in thread
* [PATCH v1 2/5] phy: phy-rockchip-dphy-rx0: add support for tx1rx1 in receive mode 2021-08-30 18:07 ` Mikhail Rudenko (?) (?) @ 2021-08-30 18:07 ` Mikhail Rudenko -1 siblings, 0 replies; 56+ messages in thread From: Mikhail Rudenko @ 2021-08-30 18:07 UTC (permalink / raw) To: linux-phy Cc: linux-media, Mikhail Rudenko, Kishon Vijay Abraham I, Vinod Koul, Heiko Stuebner, linux-arm-kernel, linux-rockchip, linux-kernel Implement RX mode of RK3399 TX1RX1 MIPI D-PHY. Unlike RX0 phy, it uses both mmio registers and grf for configuration. Add necessary register definitions, mmio register access functions, enable/disable functions, rk_dphy_drv_data instance and compatible string for tx1rx1. Probe function is adjusted accordingly. Additionally, individual init function is implemented, since, according to the comments in Rockchip BSP kernel, "According to the sequence of RK3399_TXRX_DPHY, the setting of isp0 mipi will affect txrx dphy in default state of grf_soc_con24." Signed-off-by: Mikhail Rudenko <mike.rudenko@gmail.com> --- drivers/phy/rockchip/phy-rockchip-dphy-rx0.c | 193 +++++++++++++++++-- 1 file changed, 172 insertions(+), 21 deletions(-) diff --git a/drivers/phy/rockchip/phy-rockchip-dphy-rx0.c b/drivers/phy/rockchip/phy-rockchip-dphy-rx0.c index 72145cdfb036..3ce307b49e51 100644 --- a/drivers/phy/rockchip/phy-rockchip-dphy-rx0.c +++ b/drivers/phy/rockchip/phy-rockchip-dphy-rx0.c @@ -34,6 +34,12 @@ #define RK3399_GRF_SOC_CON24 0x6260 #define RK3399_GRF_SOC_CON25 0x6264 #define RK3399_GRF_SOC_STATUS1 0xe2a4 +#define RK3399_GRF_IO_VSEL 0x0900 + +#define RK3399_PHY_TEST_CTRL0 0xb4 +#define RK3399_PHY_TEST_CTRL1 0xb8 +#define RK3399_PHY_SHUTDOWNZ 0xa0 +#define RK3399_PHY_RSTZ 0xa0 #define CLOCK_LANE_HS_RX_CONTROL 0x34 #define LANE0_HS_RX_CONTROL 0x44 @@ -43,6 +49,11 @@ #define LANES_THS_SETTLE_CONTROL 0x75 #define THS_SETTLE_COUNTER_THRESHOLD 0x04 +#define PHY_TESTEN_ADDR (0x1 << 16) +#define PHY_TESTEN_DATA (0x0 << 16) +#define PHY_TESTCLK (0x1 << 1) +#define PHY_TESTCLR (0x1 << 0) + struct hsfreq_range { u16 range_h; u8 cfg_bit; @@ -61,12 +72,6 @@ static const struct hsfreq_range rk3399_mipidphy_hsfreq_ranges[] = { { 1399, 0x1c }, { 1449, 0x2c }, { 1500, 0x3c } }; -static const char * const rk3399_mipidphy_clks[] = { - "dphy-ref", - "dphy-cfg", - "grf", -}; - enum dphy_reg_id { GRF_DPHY_RX0_TURNDISABLE = 0, GRF_DPHY_RX0_FORCERXMODE, @@ -99,6 +104,14 @@ enum dphy_reg_id { /* below is for rk3399 only */ GRF_DPHY_RX0_CLK_INV_SEL, GRF_DPHY_RX1_CLK_INV_SEL, + GRF_DPHY_TX1RX1_SRC_SEL, +}; + +enum txrx_reg_id { + TXRX_PHY_TEST_CTRL0 = 0, + TXRX_PHY_TEST_CTRL1, + TXRX_PHY_SHUTDOWNZ, + TXRX_PHY_RSTZ, }; struct dphy_reg { @@ -127,7 +140,7 @@ static const struct dphy_reg rk3399_grf_dphy_regs[] = { [GRF_DPHY_TX1RX1_FORCETXSTOPMODE] = PHY_REG(RK3399_GRF_SOC_CON23, 4, 8), [GRF_DPHY_TX1RX1_TURNDISABLE] = PHY_REG(RK3399_GRF_SOC_CON23, 4, 12), [GRF_DPHY_TX1RX1_TURNREQUEST] = PHY_REG(RK3399_GRF_SOC_CON24, 4, 0), - [GRF_DPHY_RX1_SRC_SEL] = PHY_REG(RK3399_GRF_SOC_CON24, 1, 4), + [GRF_DPHY_TX1RX1_SRC_SEL] = PHY_REG(RK3399_GRF_SOC_CON24, 1, 4), [GRF_DPHY_TX1RX1_BASEDIR] = PHY_REG(RK3399_GRF_SOC_CON24, 1, 5), [GRF_DPHY_TX1RX1_ENABLECLK] = PHY_REG(RK3399_GRF_SOC_CON24, 1, 6), [GRF_DPHY_TX1RX1_MASTERSLAVEZ] = PHY_REG(RK3399_GRF_SOC_CON24, 1, 7), @@ -136,6 +149,21 @@ static const struct dphy_reg rk3399_grf_dphy_regs[] = { [GRF_DPHY_RX0_TESTCLK] = PHY_REG(RK3399_GRF_SOC_CON25, 1, 9), [GRF_DPHY_RX0_TESTCLR] = PHY_REG(RK3399_GRF_SOC_CON25, 1, 10), [GRF_DPHY_RX0_TESTDOUT] = PHY_REG(RK3399_GRF_SOC_STATUS1, 8, 0), + [GRF_DVP_V18SEL] = PHY_REG(RK3399_GRF_IO_VSEL, 1, 1), +}; + +struct txrx_reg { + u32 offset; +}; + +#define TXRX_REG(_offset) \ + { .offset = _offset, } + +static const struct txrx_reg rk3399_txrx_regs[] = { + [TXRX_PHY_TEST_CTRL0] = TXRX_REG(RK3399_PHY_TEST_CTRL0), + [TXRX_PHY_TEST_CTRL1] = TXRX_REG(RK3399_PHY_TEST_CTRL1), + [TXRX_PHY_SHUTDOWNZ] = TXRX_REG(RK3399_PHY_SHUTDOWNZ), + [TXRX_PHY_RSTZ] = TXRX_REG(RK3399_PHY_RSTZ), }; struct rk_dphy; @@ -146,15 +174,18 @@ struct rk_dphy_drv_data { const struct hsfreq_range *hsfreq_ranges; unsigned int num_hsfreq_ranges; const struct dphy_reg *regs; + const struct txrx_reg *txrx_regs; void (*enable)(struct rk_dphy *priv); void (*disable)(struct rk_dphy *priv); + void (*individual_init)(struct rk_dphy *priv); }; struct rk_dphy { struct device *dev; struct regmap *grf; struct clk_bulk_data *clks; + void __iomem *txrx_base_addr; const struct rk_dphy_drv_data *drv_data; struct phy_configure_opts_mipi_dphy config; @@ -234,6 +265,74 @@ static void rk_dphy_disable_rx(struct rk_dphy *priv) rk_dphy_write_grf(priv, GRF_DPHY_RX0_ENABLE, 0); } +static inline void rk_dphy_write_tx1rx1(struct rk_dphy *priv, + int index, u32 value) +{ + const struct txrx_reg *reg = &priv->drv_data->txrx_regs[index]; + + if (reg->offset) + writel(value, priv->txrx_base_addr + reg->offset); +} + +static void rk_dphy_write_mipi_tx1rx1(struct rk_dphy *priv, unsigned char addr, + unsigned char data) +{ + /* + * TESTEN =1,TESTDIN=addr + * TESTCLK=0 + * TESTEN =0,TESTDIN=data + * TESTCLK=1 + */ + rk_dphy_write_tx1rx1(priv, TXRX_PHY_TEST_CTRL1, PHY_TESTEN_ADDR | addr); + rk_dphy_write_tx1rx1(priv, TXRX_PHY_TEST_CTRL0, 0x00); + rk_dphy_write_tx1rx1(priv, TXRX_PHY_TEST_CTRL1, PHY_TESTEN_DATA | data); + rk_dphy_write_tx1rx1(priv, TXRX_PHY_TEST_CTRL0, 0x02); +} + +static void rk_dphy_enable_txrx(struct rk_dphy *priv) +{ + rk_dphy_write_tx1rx1(priv, TXRX_PHY_TEST_CTRL0, PHY_TESTCLR | PHY_TESTCLK); + usleep_range(100, 150); + + rk_dphy_write_grf(priv, GRF_DPHY_TX1RX1_MASTERSLAVEZ, 0); + rk_dphy_write_grf(priv, GRF_DPHY_TX1RX1_BASEDIR, 1); + + rk_dphy_write_grf(priv, GRF_DPHY_TX1RX1_FORCERXMODE, 0); + rk_dphy_write_grf(priv, GRF_DPHY_TX1RX1_FORCETXSTOPMODE, 0); + rk_dphy_write_grf(priv, GRF_DPHY_TX1RX1_TURNREQUEST, 0); + rk_dphy_write_grf(priv, GRF_DPHY_TX1RX1_TURNDISABLE, 0xf); + usleep_range(100, 150); + + rk_dphy_write_tx1rx1(priv, TXRX_PHY_TEST_CTRL0, PHY_TESTCLK); + usleep_range(100, 150); + + rk_dphy_write_mipi_tx1rx1(priv, CLOCK_LANE_HS_RX_CONTROL, 0); + rk_dphy_write_mipi_tx1rx1(priv, LANE0_HS_RX_CONTROL, priv->hsfreq << 1); + rk_dphy_write_mipi_tx1rx1(priv, LANE1_HS_RX_CONTROL, 0); + rk_dphy_write_mipi_tx1rx1(priv, LANE2_HS_RX_CONTROL, 0); + rk_dphy_write_mipi_tx1rx1(priv, LANE3_HS_RX_CONTROL, 0); + + rk_dphy_write_grf(priv, GRF_DPHY_TX1RX1_ENABLE, GENMASK(priv->config.lanes - 1, 0)); + usleep_range(100, 150); +} + +static void rk_dphy_disable_txrx(struct rk_dphy *priv) +{ + rk_dphy_write_grf(priv, GRF_DPHY_TX1RX1_ENABLE, 0); +} + +static void rk3399_mipidphy_individual_init(struct rk_dphy *priv) +{ + /* + * According to the sequence of RK3399_TXRX_DPHY, the setting of isp0 mipi + * will affect txrx dphy in default state of grf_soc_con24. + */ + rk_dphy_write_grf(priv, GRF_DPHY_TX1RX1_SRC_SEL, 0); + rk_dphy_write_grf(priv, GRF_DPHY_TX1RX1_MASTERSLAVEZ, 0); + rk_dphy_write_grf(priv, GRF_DPHY_TX1RX1_BASEDIR, 0); + rk_dphy_write_grf(priv, GRF_DVP_V18SEL, 0x1); +} + static int rk_dphy_configure(struct phy *phy, union phy_configure_opts *opts) { struct rk_dphy *priv = phy_get_drvdata(phy); @@ -314,20 +413,50 @@ static const struct phy_ops rk_dphy_ops = { .owner = THIS_MODULE, }; -static const struct rk_dphy_drv_data rk3399_mipidphy_drv_data = { - .clks = rk3399_mipidphy_clks, - .num_clks = ARRAY_SIZE(rk3399_mipidphy_clks), +static const char * const rk3399_mipidphy_rx_clks[] = { + "dphy-ref", + "dphy-cfg", + "grf", +}; + +static const char * const rk3399_mipidphy_txrx_clks[] = { + "dphy-ref", + "dphy-cfg", + "grf", + "dsi", +}; + +static const struct rk_dphy_drv_data rk3399_mipidphy_rx_drv_data = { + .clks = rk3399_mipidphy_rx_clks, + .num_clks = ARRAY_SIZE(rk3399_mipidphy_rx_clks), .hsfreq_ranges = rk3399_mipidphy_hsfreq_ranges, .num_hsfreq_ranges = ARRAY_SIZE(rk3399_mipidphy_hsfreq_ranges), .regs = rk3399_grf_dphy_regs, .enable = rk_dphy_enable_rx, .disable = rk_dphy_disable_rx, + .individual_init = rk3399_mipidphy_individual_init, +}; + +static const struct rk_dphy_drv_data rk3399_mipidphy_txrx_drv_data = { + .clks = rk3399_mipidphy_txrx_clks, + .num_clks = ARRAY_SIZE(rk3399_mipidphy_txrx_clks), + .hsfreq_ranges = rk3399_mipidphy_hsfreq_ranges, + .num_hsfreq_ranges = ARRAY_SIZE(rk3399_mipidphy_hsfreq_ranges), + .regs = rk3399_grf_dphy_regs, + .txrx_regs = rk3399_txrx_regs, + .enable = rk_dphy_enable_txrx, + .disable = rk_dphy_disable_txrx, + .individual_init = rk3399_mipidphy_individual_init, }; static const struct of_device_id rk_dphy_dt_ids[] = { { .compatible = "rockchip,rk3399-mipi-dphy-rx0", - .data = &rk3399_mipidphy_drv_data, + .data = &rk3399_mipidphy_rx_drv_data, + }, + { + .compatible = "rockchip,rk3399-mipi-dphy-tx1rx1", + .data = &rk3399_mipidphy_txrx_drv_data, }, {} }; @@ -345,26 +474,42 @@ static int rk_dphy_probe(struct platform_device *pdev) unsigned int i; int ret; - if (!dev->parent || !dev->parent->of_node) - return -ENODEV; - priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); if (!priv) return -ENOMEM; priv->dev = dev; - priv->grf = syscon_node_to_regmap(dev->parent->of_node); - if (IS_ERR(priv->grf)) { - dev_err(dev, "Can't find GRF syscon\n"); - return -ENODEV; - } - of_id = of_match_device(rk_dphy_dt_ids, dev); if (!of_id) return -EINVAL; drv_data = of_id->data; priv->drv_data = drv_data; + + if (!drv_data->txrx_regs) { + if (!dev->parent || !dev->parent->of_node) + return -ENODEV; + + priv->grf = syscon_node_to_regmap(dev->parent->of_node); + if (IS_ERR(priv->grf)) { + dev_err(dev, "Can't find GRF syscon\n"); + return -ENODEV; + } + } else { + priv->grf = syscon_regmap_lookup_by_phandle(dev->of_node, + "rockchip,grf"); + if (IS_ERR(priv->grf)) { + dev_err(dev, "Can't find GRF syscon\n"); + return -ENODEV; + } + + priv->txrx_base_addr = devm_platform_ioremap_resource(pdev, 0); + if (IS_ERR(priv->txrx_base_addr)) { + dev_err(dev, "Failed to ioremap resource\n"); + return PTR_ERR(priv->txrx_base_addr); + } + } + priv->clks = devm_kcalloc(&pdev->dev, drv_data->num_clks, sizeof(*priv->clks), GFP_KERNEL); if (!priv->clks) @@ -383,8 +528,14 @@ static int rk_dphy_probe(struct platform_device *pdev) phy_set_drvdata(phy, priv); phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate); + if (IS_ERR(phy_provider)) { + dev_err(dev, "failed to register phy provider\n"); + return PTR_ERR(phy_provider); + } - return PTR_ERR_OR_ZERO(phy_provider); + drv_data->individual_init(priv); + + return 0; } static struct platform_driver rk_dphy_driver = { -- 2.33.0 -- linux-phy mailing list linux-phy@lists.infradead.org https://lists.infradead.org/mailman/listinfo/linux-phy ^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH v1 2/5] phy: phy-rockchip-dphy-rx0: add support for tx1rx1 in receive mode @ 2021-08-30 18:07 ` Mikhail Rudenko 0 siblings, 0 replies; 56+ messages in thread From: Mikhail Rudenko @ 2021-08-30 18:07 UTC (permalink / raw) To: linux-phy Cc: linux-media, Mikhail Rudenko, Kishon Vijay Abraham I, Vinod Koul, Heiko Stuebner, linux-arm-kernel, linux-rockchip, linux-kernel Implement RX mode of RK3399 TX1RX1 MIPI D-PHY. Unlike RX0 phy, it uses both mmio registers and grf for configuration. Add necessary register definitions, mmio register access functions, enable/disable functions, rk_dphy_drv_data instance and compatible string for tx1rx1. Probe function is adjusted accordingly. Additionally, individual init function is implemented, since, according to the comments in Rockchip BSP kernel, "According to the sequence of RK3399_TXRX_DPHY, the setting of isp0 mipi will affect txrx dphy in default state of grf_soc_con24." Signed-off-by: Mikhail Rudenko <mike.rudenko@gmail.com> --- drivers/phy/rockchip/phy-rockchip-dphy-rx0.c | 193 +++++++++++++++++-- 1 file changed, 172 insertions(+), 21 deletions(-) diff --git a/drivers/phy/rockchip/phy-rockchip-dphy-rx0.c b/drivers/phy/rockchip/phy-rockchip-dphy-rx0.c index 72145cdfb036..3ce307b49e51 100644 --- a/drivers/phy/rockchip/phy-rockchip-dphy-rx0.c +++ b/drivers/phy/rockchip/phy-rockchip-dphy-rx0.c @@ -34,6 +34,12 @@ #define RK3399_GRF_SOC_CON24 0x6260 #define RK3399_GRF_SOC_CON25 0x6264 #define RK3399_GRF_SOC_STATUS1 0xe2a4 +#define RK3399_GRF_IO_VSEL 0x0900 + +#define RK3399_PHY_TEST_CTRL0 0xb4 +#define RK3399_PHY_TEST_CTRL1 0xb8 +#define RK3399_PHY_SHUTDOWNZ 0xa0 +#define RK3399_PHY_RSTZ 0xa0 #define CLOCK_LANE_HS_RX_CONTROL 0x34 #define LANE0_HS_RX_CONTROL 0x44 @@ -43,6 +49,11 @@ #define LANES_THS_SETTLE_CONTROL 0x75 #define THS_SETTLE_COUNTER_THRESHOLD 0x04 +#define PHY_TESTEN_ADDR (0x1 << 16) +#define PHY_TESTEN_DATA (0x0 << 16) +#define PHY_TESTCLK (0x1 << 1) +#define PHY_TESTCLR (0x1 << 0) + struct hsfreq_range { u16 range_h; u8 cfg_bit; @@ -61,12 +72,6 @@ static const struct hsfreq_range rk3399_mipidphy_hsfreq_ranges[] = { { 1399, 0x1c }, { 1449, 0x2c }, { 1500, 0x3c } }; -static const char * const rk3399_mipidphy_clks[] = { - "dphy-ref", - "dphy-cfg", - "grf", -}; - enum dphy_reg_id { GRF_DPHY_RX0_TURNDISABLE = 0, GRF_DPHY_RX0_FORCERXMODE, @@ -99,6 +104,14 @@ enum dphy_reg_id { /* below is for rk3399 only */ GRF_DPHY_RX0_CLK_INV_SEL, GRF_DPHY_RX1_CLK_INV_SEL, + GRF_DPHY_TX1RX1_SRC_SEL, +}; + +enum txrx_reg_id { + TXRX_PHY_TEST_CTRL0 = 0, + TXRX_PHY_TEST_CTRL1, + TXRX_PHY_SHUTDOWNZ, + TXRX_PHY_RSTZ, }; struct dphy_reg { @@ -127,7 +140,7 @@ static const struct dphy_reg rk3399_grf_dphy_regs[] = { [GRF_DPHY_TX1RX1_FORCETXSTOPMODE] = PHY_REG(RK3399_GRF_SOC_CON23, 4, 8), [GRF_DPHY_TX1RX1_TURNDISABLE] = PHY_REG(RK3399_GRF_SOC_CON23, 4, 12), [GRF_DPHY_TX1RX1_TURNREQUEST] = PHY_REG(RK3399_GRF_SOC_CON24, 4, 0), - [GRF_DPHY_RX1_SRC_SEL] = PHY_REG(RK3399_GRF_SOC_CON24, 1, 4), + [GRF_DPHY_TX1RX1_SRC_SEL] = PHY_REG(RK3399_GRF_SOC_CON24, 1, 4), [GRF_DPHY_TX1RX1_BASEDIR] = PHY_REG(RK3399_GRF_SOC_CON24, 1, 5), [GRF_DPHY_TX1RX1_ENABLECLK] = PHY_REG(RK3399_GRF_SOC_CON24, 1, 6), [GRF_DPHY_TX1RX1_MASTERSLAVEZ] = PHY_REG(RK3399_GRF_SOC_CON24, 1, 7), @@ -136,6 +149,21 @@ static const struct dphy_reg rk3399_grf_dphy_regs[] = { [GRF_DPHY_RX0_TESTCLK] = PHY_REG(RK3399_GRF_SOC_CON25, 1, 9), [GRF_DPHY_RX0_TESTCLR] = PHY_REG(RK3399_GRF_SOC_CON25, 1, 10), [GRF_DPHY_RX0_TESTDOUT] = PHY_REG(RK3399_GRF_SOC_STATUS1, 8, 0), + [GRF_DVP_V18SEL] = PHY_REG(RK3399_GRF_IO_VSEL, 1, 1), +}; + +struct txrx_reg { + u32 offset; +}; + +#define TXRX_REG(_offset) \ + { .offset = _offset, } + +static const struct txrx_reg rk3399_txrx_regs[] = { + [TXRX_PHY_TEST_CTRL0] = TXRX_REG(RK3399_PHY_TEST_CTRL0), + [TXRX_PHY_TEST_CTRL1] = TXRX_REG(RK3399_PHY_TEST_CTRL1), + [TXRX_PHY_SHUTDOWNZ] = TXRX_REG(RK3399_PHY_SHUTDOWNZ), + [TXRX_PHY_RSTZ] = TXRX_REG(RK3399_PHY_RSTZ), }; struct rk_dphy; @@ -146,15 +174,18 @@ struct rk_dphy_drv_data { const struct hsfreq_range *hsfreq_ranges; unsigned int num_hsfreq_ranges; const struct dphy_reg *regs; + const struct txrx_reg *txrx_regs; void (*enable)(struct rk_dphy *priv); void (*disable)(struct rk_dphy *priv); + void (*individual_init)(struct rk_dphy *priv); }; struct rk_dphy { struct device *dev; struct regmap *grf; struct clk_bulk_data *clks; + void __iomem *txrx_base_addr; const struct rk_dphy_drv_data *drv_data; struct phy_configure_opts_mipi_dphy config; @@ -234,6 +265,74 @@ static void rk_dphy_disable_rx(struct rk_dphy *priv) rk_dphy_write_grf(priv, GRF_DPHY_RX0_ENABLE, 0); } +static inline void rk_dphy_write_tx1rx1(struct rk_dphy *priv, + int index, u32 value) +{ + const struct txrx_reg *reg = &priv->drv_data->txrx_regs[index]; + + if (reg->offset) + writel(value, priv->txrx_base_addr + reg->offset); +} + +static void rk_dphy_write_mipi_tx1rx1(struct rk_dphy *priv, unsigned char addr, + unsigned char data) +{ + /* + * TESTEN =1,TESTDIN=addr + * TESTCLK=0 + * TESTEN =0,TESTDIN=data + * TESTCLK=1 + */ + rk_dphy_write_tx1rx1(priv, TXRX_PHY_TEST_CTRL1, PHY_TESTEN_ADDR | addr); + rk_dphy_write_tx1rx1(priv, TXRX_PHY_TEST_CTRL0, 0x00); + rk_dphy_write_tx1rx1(priv, TXRX_PHY_TEST_CTRL1, PHY_TESTEN_DATA | data); + rk_dphy_write_tx1rx1(priv, TXRX_PHY_TEST_CTRL0, 0x02); +} + +static void rk_dphy_enable_txrx(struct rk_dphy *priv) +{ + rk_dphy_write_tx1rx1(priv, TXRX_PHY_TEST_CTRL0, PHY_TESTCLR | PHY_TESTCLK); + usleep_range(100, 150); + + rk_dphy_write_grf(priv, GRF_DPHY_TX1RX1_MASTERSLAVEZ, 0); + rk_dphy_write_grf(priv, GRF_DPHY_TX1RX1_BASEDIR, 1); + + rk_dphy_write_grf(priv, GRF_DPHY_TX1RX1_FORCERXMODE, 0); + rk_dphy_write_grf(priv, GRF_DPHY_TX1RX1_FORCETXSTOPMODE, 0); + rk_dphy_write_grf(priv, GRF_DPHY_TX1RX1_TURNREQUEST, 0); + rk_dphy_write_grf(priv, GRF_DPHY_TX1RX1_TURNDISABLE, 0xf); + usleep_range(100, 150); + + rk_dphy_write_tx1rx1(priv, TXRX_PHY_TEST_CTRL0, PHY_TESTCLK); + usleep_range(100, 150); + + rk_dphy_write_mipi_tx1rx1(priv, CLOCK_LANE_HS_RX_CONTROL, 0); + rk_dphy_write_mipi_tx1rx1(priv, LANE0_HS_RX_CONTROL, priv->hsfreq << 1); + rk_dphy_write_mipi_tx1rx1(priv, LANE1_HS_RX_CONTROL, 0); + rk_dphy_write_mipi_tx1rx1(priv, LANE2_HS_RX_CONTROL, 0); + rk_dphy_write_mipi_tx1rx1(priv, LANE3_HS_RX_CONTROL, 0); + + rk_dphy_write_grf(priv, GRF_DPHY_TX1RX1_ENABLE, GENMASK(priv->config.lanes - 1, 0)); + usleep_range(100, 150); +} + +static void rk_dphy_disable_txrx(struct rk_dphy *priv) +{ + rk_dphy_write_grf(priv, GRF_DPHY_TX1RX1_ENABLE, 0); +} + +static void rk3399_mipidphy_individual_init(struct rk_dphy *priv) +{ + /* + * According to the sequence of RK3399_TXRX_DPHY, the setting of isp0 mipi + * will affect txrx dphy in default state of grf_soc_con24. + */ + rk_dphy_write_grf(priv, GRF_DPHY_TX1RX1_SRC_SEL, 0); + rk_dphy_write_grf(priv, GRF_DPHY_TX1RX1_MASTERSLAVEZ, 0); + rk_dphy_write_grf(priv, GRF_DPHY_TX1RX1_BASEDIR, 0); + rk_dphy_write_grf(priv, GRF_DVP_V18SEL, 0x1); +} + static int rk_dphy_configure(struct phy *phy, union phy_configure_opts *opts) { struct rk_dphy *priv = phy_get_drvdata(phy); @@ -314,20 +413,50 @@ static const struct phy_ops rk_dphy_ops = { .owner = THIS_MODULE, }; -static const struct rk_dphy_drv_data rk3399_mipidphy_drv_data = { - .clks = rk3399_mipidphy_clks, - .num_clks = ARRAY_SIZE(rk3399_mipidphy_clks), +static const char * const rk3399_mipidphy_rx_clks[] = { + "dphy-ref", + "dphy-cfg", + "grf", +}; + +static const char * const rk3399_mipidphy_txrx_clks[] = { + "dphy-ref", + "dphy-cfg", + "grf", + "dsi", +}; + +static const struct rk_dphy_drv_data rk3399_mipidphy_rx_drv_data = { + .clks = rk3399_mipidphy_rx_clks, + .num_clks = ARRAY_SIZE(rk3399_mipidphy_rx_clks), .hsfreq_ranges = rk3399_mipidphy_hsfreq_ranges, .num_hsfreq_ranges = ARRAY_SIZE(rk3399_mipidphy_hsfreq_ranges), .regs = rk3399_grf_dphy_regs, .enable = rk_dphy_enable_rx, .disable = rk_dphy_disable_rx, + .individual_init = rk3399_mipidphy_individual_init, +}; + +static const struct rk_dphy_drv_data rk3399_mipidphy_txrx_drv_data = { + .clks = rk3399_mipidphy_txrx_clks, + .num_clks = ARRAY_SIZE(rk3399_mipidphy_txrx_clks), + .hsfreq_ranges = rk3399_mipidphy_hsfreq_ranges, + .num_hsfreq_ranges = ARRAY_SIZE(rk3399_mipidphy_hsfreq_ranges), + .regs = rk3399_grf_dphy_regs, + .txrx_regs = rk3399_txrx_regs, + .enable = rk_dphy_enable_txrx, + .disable = rk_dphy_disable_txrx, + .individual_init = rk3399_mipidphy_individual_init, }; static const struct of_device_id rk_dphy_dt_ids[] = { { .compatible = "rockchip,rk3399-mipi-dphy-rx0", - .data = &rk3399_mipidphy_drv_data, + .data = &rk3399_mipidphy_rx_drv_data, + }, + { + .compatible = "rockchip,rk3399-mipi-dphy-tx1rx1", + .data = &rk3399_mipidphy_txrx_drv_data, }, {} }; @@ -345,26 +474,42 @@ static int rk_dphy_probe(struct platform_device *pdev) unsigned int i; int ret; - if (!dev->parent || !dev->parent->of_node) - return -ENODEV; - priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); if (!priv) return -ENOMEM; priv->dev = dev; - priv->grf = syscon_node_to_regmap(dev->parent->of_node); - if (IS_ERR(priv->grf)) { - dev_err(dev, "Can't find GRF syscon\n"); - return -ENODEV; - } - of_id = of_match_device(rk_dphy_dt_ids, dev); if (!of_id) return -EINVAL; drv_data = of_id->data; priv->drv_data = drv_data; + + if (!drv_data->txrx_regs) { + if (!dev->parent || !dev->parent->of_node) + return -ENODEV; + + priv->grf = syscon_node_to_regmap(dev->parent->of_node); + if (IS_ERR(priv->grf)) { + dev_err(dev, "Can't find GRF syscon\n"); + return -ENODEV; + } + } else { + priv->grf = syscon_regmap_lookup_by_phandle(dev->of_node, + "rockchip,grf"); + if (IS_ERR(priv->grf)) { + dev_err(dev, "Can't find GRF syscon\n"); + return -ENODEV; + } + + priv->txrx_base_addr = devm_platform_ioremap_resource(pdev, 0); + if (IS_ERR(priv->txrx_base_addr)) { + dev_err(dev, "Failed to ioremap resource\n"); + return PTR_ERR(priv->txrx_base_addr); + } + } + priv->clks = devm_kcalloc(&pdev->dev, drv_data->num_clks, sizeof(*priv->clks), GFP_KERNEL); if (!priv->clks) @@ -383,8 +528,14 @@ static int rk_dphy_probe(struct platform_device *pdev) phy_set_drvdata(phy, priv); phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate); + if (IS_ERR(phy_provider)) { + dev_err(dev, "failed to register phy provider\n"); + return PTR_ERR(phy_provider); + } - return PTR_ERR_OR_ZERO(phy_provider); + drv_data->individual_init(priv); + + return 0; } static struct platform_driver rk_dphy_driver = { -- 2.33.0 ^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH v1 2/5] phy: phy-rockchip-dphy-rx0: add support for tx1rx1 in receive mode @ 2021-08-30 18:07 ` Mikhail Rudenko 0 siblings, 0 replies; 56+ messages in thread From: Mikhail Rudenko @ 2021-08-30 18:07 UTC (permalink / raw) To: linux-phy Cc: linux-media, Mikhail Rudenko, Kishon Vijay Abraham I, Vinod Koul, Heiko Stuebner, linux-arm-kernel, linux-rockchip, linux-kernel Implement RX mode of RK3399 TX1RX1 MIPI D-PHY. Unlike RX0 phy, it uses both mmio registers and grf for configuration. Add necessary register definitions, mmio register access functions, enable/disable functions, rk_dphy_drv_data instance and compatible string for tx1rx1. Probe function is adjusted accordingly. Additionally, individual init function is implemented, since, according to the comments in Rockchip BSP kernel, "According to the sequence of RK3399_TXRX_DPHY, the setting of isp0 mipi will affect txrx dphy in default state of grf_soc_con24." Signed-off-by: Mikhail Rudenko <mike.rudenko@gmail.com> --- drivers/phy/rockchip/phy-rockchip-dphy-rx0.c | 193 +++++++++++++++++-- 1 file changed, 172 insertions(+), 21 deletions(-) diff --git a/drivers/phy/rockchip/phy-rockchip-dphy-rx0.c b/drivers/phy/rockchip/phy-rockchip-dphy-rx0.c index 72145cdfb036..3ce307b49e51 100644 --- a/drivers/phy/rockchip/phy-rockchip-dphy-rx0.c +++ b/drivers/phy/rockchip/phy-rockchip-dphy-rx0.c @@ -34,6 +34,12 @@ #define RK3399_GRF_SOC_CON24 0x6260 #define RK3399_GRF_SOC_CON25 0x6264 #define RK3399_GRF_SOC_STATUS1 0xe2a4 +#define RK3399_GRF_IO_VSEL 0x0900 + +#define RK3399_PHY_TEST_CTRL0 0xb4 +#define RK3399_PHY_TEST_CTRL1 0xb8 +#define RK3399_PHY_SHUTDOWNZ 0xa0 +#define RK3399_PHY_RSTZ 0xa0 #define CLOCK_LANE_HS_RX_CONTROL 0x34 #define LANE0_HS_RX_CONTROL 0x44 @@ -43,6 +49,11 @@ #define LANES_THS_SETTLE_CONTROL 0x75 #define THS_SETTLE_COUNTER_THRESHOLD 0x04 +#define PHY_TESTEN_ADDR (0x1 << 16) +#define PHY_TESTEN_DATA (0x0 << 16) +#define PHY_TESTCLK (0x1 << 1) +#define PHY_TESTCLR (0x1 << 0) + struct hsfreq_range { u16 range_h; u8 cfg_bit; @@ -61,12 +72,6 @@ static const struct hsfreq_range rk3399_mipidphy_hsfreq_ranges[] = { { 1399, 0x1c }, { 1449, 0x2c }, { 1500, 0x3c } }; -static const char * const rk3399_mipidphy_clks[] = { - "dphy-ref", - "dphy-cfg", - "grf", -}; - enum dphy_reg_id { GRF_DPHY_RX0_TURNDISABLE = 0, GRF_DPHY_RX0_FORCERXMODE, @@ -99,6 +104,14 @@ enum dphy_reg_id { /* below is for rk3399 only */ GRF_DPHY_RX0_CLK_INV_SEL, GRF_DPHY_RX1_CLK_INV_SEL, + GRF_DPHY_TX1RX1_SRC_SEL, +}; + +enum txrx_reg_id { + TXRX_PHY_TEST_CTRL0 = 0, + TXRX_PHY_TEST_CTRL1, + TXRX_PHY_SHUTDOWNZ, + TXRX_PHY_RSTZ, }; struct dphy_reg { @@ -127,7 +140,7 @@ static const struct dphy_reg rk3399_grf_dphy_regs[] = { [GRF_DPHY_TX1RX1_FORCETXSTOPMODE] = PHY_REG(RK3399_GRF_SOC_CON23, 4, 8), [GRF_DPHY_TX1RX1_TURNDISABLE] = PHY_REG(RK3399_GRF_SOC_CON23, 4, 12), [GRF_DPHY_TX1RX1_TURNREQUEST] = PHY_REG(RK3399_GRF_SOC_CON24, 4, 0), - [GRF_DPHY_RX1_SRC_SEL] = PHY_REG(RK3399_GRF_SOC_CON24, 1, 4), + [GRF_DPHY_TX1RX1_SRC_SEL] = PHY_REG(RK3399_GRF_SOC_CON24, 1, 4), [GRF_DPHY_TX1RX1_BASEDIR] = PHY_REG(RK3399_GRF_SOC_CON24, 1, 5), [GRF_DPHY_TX1RX1_ENABLECLK] = PHY_REG(RK3399_GRF_SOC_CON24, 1, 6), [GRF_DPHY_TX1RX1_MASTERSLAVEZ] = PHY_REG(RK3399_GRF_SOC_CON24, 1, 7), @@ -136,6 +149,21 @@ static const struct dphy_reg rk3399_grf_dphy_regs[] = { [GRF_DPHY_RX0_TESTCLK] = PHY_REG(RK3399_GRF_SOC_CON25, 1, 9), [GRF_DPHY_RX0_TESTCLR] = PHY_REG(RK3399_GRF_SOC_CON25, 1, 10), [GRF_DPHY_RX0_TESTDOUT] = PHY_REG(RK3399_GRF_SOC_STATUS1, 8, 0), + [GRF_DVP_V18SEL] = PHY_REG(RK3399_GRF_IO_VSEL, 1, 1), +}; + +struct txrx_reg { + u32 offset; +}; + +#define TXRX_REG(_offset) \ + { .offset = _offset, } + +static const struct txrx_reg rk3399_txrx_regs[] = { + [TXRX_PHY_TEST_CTRL0] = TXRX_REG(RK3399_PHY_TEST_CTRL0), + [TXRX_PHY_TEST_CTRL1] = TXRX_REG(RK3399_PHY_TEST_CTRL1), + [TXRX_PHY_SHUTDOWNZ] = TXRX_REG(RK3399_PHY_SHUTDOWNZ), + [TXRX_PHY_RSTZ] = TXRX_REG(RK3399_PHY_RSTZ), }; struct rk_dphy; @@ -146,15 +174,18 @@ struct rk_dphy_drv_data { const struct hsfreq_range *hsfreq_ranges; unsigned int num_hsfreq_ranges; const struct dphy_reg *regs; + const struct txrx_reg *txrx_regs; void (*enable)(struct rk_dphy *priv); void (*disable)(struct rk_dphy *priv); + void (*individual_init)(struct rk_dphy *priv); }; struct rk_dphy { struct device *dev; struct regmap *grf; struct clk_bulk_data *clks; + void __iomem *txrx_base_addr; const struct rk_dphy_drv_data *drv_data; struct phy_configure_opts_mipi_dphy config; @@ -234,6 +265,74 @@ static void rk_dphy_disable_rx(struct rk_dphy *priv) rk_dphy_write_grf(priv, GRF_DPHY_RX0_ENABLE, 0); } +static inline void rk_dphy_write_tx1rx1(struct rk_dphy *priv, + int index, u32 value) +{ + const struct txrx_reg *reg = &priv->drv_data->txrx_regs[index]; + + if (reg->offset) + writel(value, priv->txrx_base_addr + reg->offset); +} + +static void rk_dphy_write_mipi_tx1rx1(struct rk_dphy *priv, unsigned char addr, + unsigned char data) +{ + /* + * TESTEN =1,TESTDIN=addr + * TESTCLK=0 + * TESTEN =0,TESTDIN=data + * TESTCLK=1 + */ + rk_dphy_write_tx1rx1(priv, TXRX_PHY_TEST_CTRL1, PHY_TESTEN_ADDR | addr); + rk_dphy_write_tx1rx1(priv, TXRX_PHY_TEST_CTRL0, 0x00); + rk_dphy_write_tx1rx1(priv, TXRX_PHY_TEST_CTRL1, PHY_TESTEN_DATA | data); + rk_dphy_write_tx1rx1(priv, TXRX_PHY_TEST_CTRL0, 0x02); +} + +static void rk_dphy_enable_txrx(struct rk_dphy *priv) +{ + rk_dphy_write_tx1rx1(priv, TXRX_PHY_TEST_CTRL0, PHY_TESTCLR | PHY_TESTCLK); + usleep_range(100, 150); + + rk_dphy_write_grf(priv, GRF_DPHY_TX1RX1_MASTERSLAVEZ, 0); + rk_dphy_write_grf(priv, GRF_DPHY_TX1RX1_BASEDIR, 1); + + rk_dphy_write_grf(priv, GRF_DPHY_TX1RX1_FORCERXMODE, 0); + rk_dphy_write_grf(priv, GRF_DPHY_TX1RX1_FORCETXSTOPMODE, 0); + rk_dphy_write_grf(priv, GRF_DPHY_TX1RX1_TURNREQUEST, 0); + rk_dphy_write_grf(priv, GRF_DPHY_TX1RX1_TURNDISABLE, 0xf); + usleep_range(100, 150); + + rk_dphy_write_tx1rx1(priv, TXRX_PHY_TEST_CTRL0, PHY_TESTCLK); + usleep_range(100, 150); + + rk_dphy_write_mipi_tx1rx1(priv, CLOCK_LANE_HS_RX_CONTROL, 0); + rk_dphy_write_mipi_tx1rx1(priv, LANE0_HS_RX_CONTROL, priv->hsfreq << 1); + rk_dphy_write_mipi_tx1rx1(priv, LANE1_HS_RX_CONTROL, 0); + rk_dphy_write_mipi_tx1rx1(priv, LANE2_HS_RX_CONTROL, 0); + rk_dphy_write_mipi_tx1rx1(priv, LANE3_HS_RX_CONTROL, 0); + + rk_dphy_write_grf(priv, GRF_DPHY_TX1RX1_ENABLE, GENMASK(priv->config.lanes - 1, 0)); + usleep_range(100, 150); +} + +static void rk_dphy_disable_txrx(struct rk_dphy *priv) +{ + rk_dphy_write_grf(priv, GRF_DPHY_TX1RX1_ENABLE, 0); +} + +static void rk3399_mipidphy_individual_init(struct rk_dphy *priv) +{ + /* + * According to the sequence of RK3399_TXRX_DPHY, the setting of isp0 mipi + * will affect txrx dphy in default state of grf_soc_con24. + */ + rk_dphy_write_grf(priv, GRF_DPHY_TX1RX1_SRC_SEL, 0); + rk_dphy_write_grf(priv, GRF_DPHY_TX1RX1_MASTERSLAVEZ, 0); + rk_dphy_write_grf(priv, GRF_DPHY_TX1RX1_BASEDIR, 0); + rk_dphy_write_grf(priv, GRF_DVP_V18SEL, 0x1); +} + static int rk_dphy_configure(struct phy *phy, union phy_configure_opts *opts) { struct rk_dphy *priv = phy_get_drvdata(phy); @@ -314,20 +413,50 @@ static const struct phy_ops rk_dphy_ops = { .owner = THIS_MODULE, }; -static const struct rk_dphy_drv_data rk3399_mipidphy_drv_data = { - .clks = rk3399_mipidphy_clks, - .num_clks = ARRAY_SIZE(rk3399_mipidphy_clks), +static const char * const rk3399_mipidphy_rx_clks[] = { + "dphy-ref", + "dphy-cfg", + "grf", +}; + +static const char * const rk3399_mipidphy_txrx_clks[] = { + "dphy-ref", + "dphy-cfg", + "grf", + "dsi", +}; + +static const struct rk_dphy_drv_data rk3399_mipidphy_rx_drv_data = { + .clks = rk3399_mipidphy_rx_clks, + .num_clks = ARRAY_SIZE(rk3399_mipidphy_rx_clks), .hsfreq_ranges = rk3399_mipidphy_hsfreq_ranges, .num_hsfreq_ranges = ARRAY_SIZE(rk3399_mipidphy_hsfreq_ranges), .regs = rk3399_grf_dphy_regs, .enable = rk_dphy_enable_rx, .disable = rk_dphy_disable_rx, + .individual_init = rk3399_mipidphy_individual_init, +}; + +static const struct rk_dphy_drv_data rk3399_mipidphy_txrx_drv_data = { + .clks = rk3399_mipidphy_txrx_clks, + .num_clks = ARRAY_SIZE(rk3399_mipidphy_txrx_clks), + .hsfreq_ranges = rk3399_mipidphy_hsfreq_ranges, + .num_hsfreq_ranges = ARRAY_SIZE(rk3399_mipidphy_hsfreq_ranges), + .regs = rk3399_grf_dphy_regs, + .txrx_regs = rk3399_txrx_regs, + .enable = rk_dphy_enable_txrx, + .disable = rk_dphy_disable_txrx, + .individual_init = rk3399_mipidphy_individual_init, }; static const struct of_device_id rk_dphy_dt_ids[] = { { .compatible = "rockchip,rk3399-mipi-dphy-rx0", - .data = &rk3399_mipidphy_drv_data, + .data = &rk3399_mipidphy_rx_drv_data, + }, + { + .compatible = "rockchip,rk3399-mipi-dphy-tx1rx1", + .data = &rk3399_mipidphy_txrx_drv_data, }, {} }; @@ -345,26 +474,42 @@ static int rk_dphy_probe(struct platform_device *pdev) unsigned int i; int ret; - if (!dev->parent || !dev->parent->of_node) - return -ENODEV; - priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); if (!priv) return -ENOMEM; priv->dev = dev; - priv->grf = syscon_node_to_regmap(dev->parent->of_node); - if (IS_ERR(priv->grf)) { - dev_err(dev, "Can't find GRF syscon\n"); - return -ENODEV; - } - of_id = of_match_device(rk_dphy_dt_ids, dev); if (!of_id) return -EINVAL; drv_data = of_id->data; priv->drv_data = drv_data; + + if (!drv_data->txrx_regs) { + if (!dev->parent || !dev->parent->of_node) + return -ENODEV; + + priv->grf = syscon_node_to_regmap(dev->parent->of_node); + if (IS_ERR(priv->grf)) { + dev_err(dev, "Can't find GRF syscon\n"); + return -ENODEV; + } + } else { + priv->grf = syscon_regmap_lookup_by_phandle(dev->of_node, + "rockchip,grf"); + if (IS_ERR(priv->grf)) { + dev_err(dev, "Can't find GRF syscon\n"); + return -ENODEV; + } + + priv->txrx_base_addr = devm_platform_ioremap_resource(pdev, 0); + if (IS_ERR(priv->txrx_base_addr)) { + dev_err(dev, "Failed to ioremap resource\n"); + return PTR_ERR(priv->txrx_base_addr); + } + } + priv->clks = devm_kcalloc(&pdev->dev, drv_data->num_clks, sizeof(*priv->clks), GFP_KERNEL); if (!priv->clks) @@ -383,8 +528,14 @@ static int rk_dphy_probe(struct platform_device *pdev) phy_set_drvdata(phy, priv); phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate); + if (IS_ERR(phy_provider)) { + dev_err(dev, "failed to register phy provider\n"); + return PTR_ERR(phy_provider); + } - return PTR_ERR_OR_ZERO(phy_provider); + drv_data->individual_init(priv); + + return 0; } static struct platform_driver rk_dphy_driver = { -- 2.33.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH v1 2/5] phy: phy-rockchip-dphy-rx0: add support for tx1rx1 in receive mode @ 2021-08-30 18:07 ` Mikhail Rudenko 0 siblings, 0 replies; 56+ messages in thread From: Mikhail Rudenko @ 2021-08-30 18:07 UTC (permalink / raw) To: linux-phy Cc: linux-media, Mikhail Rudenko, Kishon Vijay Abraham I, Vinod Koul, Heiko Stuebner, linux-arm-kernel, linux-rockchip, linux-kernel Implement RX mode of RK3399 TX1RX1 MIPI D-PHY. Unlike RX0 phy, it uses both mmio registers and grf for configuration. Add necessary register definitions, mmio register access functions, enable/disable functions, rk_dphy_drv_data instance and compatible string for tx1rx1. Probe function is adjusted accordingly. Additionally, individual init function is implemented, since, according to the comments in Rockchip BSP kernel, "According to the sequence of RK3399_TXRX_DPHY, the setting of isp0 mipi will affect txrx dphy in default state of grf_soc_con24." Signed-off-by: Mikhail Rudenko <mike.rudenko@gmail.com> --- drivers/phy/rockchip/phy-rockchip-dphy-rx0.c | 193 +++++++++++++++++-- 1 file changed, 172 insertions(+), 21 deletions(-) diff --git a/drivers/phy/rockchip/phy-rockchip-dphy-rx0.c b/drivers/phy/rockchip/phy-rockchip-dphy-rx0.c index 72145cdfb036..3ce307b49e51 100644 --- a/drivers/phy/rockchip/phy-rockchip-dphy-rx0.c +++ b/drivers/phy/rockchip/phy-rockchip-dphy-rx0.c @@ -34,6 +34,12 @@ #define RK3399_GRF_SOC_CON24 0x6260 #define RK3399_GRF_SOC_CON25 0x6264 #define RK3399_GRF_SOC_STATUS1 0xe2a4 +#define RK3399_GRF_IO_VSEL 0x0900 + +#define RK3399_PHY_TEST_CTRL0 0xb4 +#define RK3399_PHY_TEST_CTRL1 0xb8 +#define RK3399_PHY_SHUTDOWNZ 0xa0 +#define RK3399_PHY_RSTZ 0xa0 #define CLOCK_LANE_HS_RX_CONTROL 0x34 #define LANE0_HS_RX_CONTROL 0x44 @@ -43,6 +49,11 @@ #define LANES_THS_SETTLE_CONTROL 0x75 #define THS_SETTLE_COUNTER_THRESHOLD 0x04 +#define PHY_TESTEN_ADDR (0x1 << 16) +#define PHY_TESTEN_DATA (0x0 << 16) +#define PHY_TESTCLK (0x1 << 1) +#define PHY_TESTCLR (0x1 << 0) + struct hsfreq_range { u16 range_h; u8 cfg_bit; @@ -61,12 +72,6 @@ static const struct hsfreq_range rk3399_mipidphy_hsfreq_ranges[] = { { 1399, 0x1c }, { 1449, 0x2c }, { 1500, 0x3c } }; -static const char * const rk3399_mipidphy_clks[] = { - "dphy-ref", - "dphy-cfg", - "grf", -}; - enum dphy_reg_id { GRF_DPHY_RX0_TURNDISABLE = 0, GRF_DPHY_RX0_FORCERXMODE, @@ -99,6 +104,14 @@ enum dphy_reg_id { /* below is for rk3399 only */ GRF_DPHY_RX0_CLK_INV_SEL, GRF_DPHY_RX1_CLK_INV_SEL, + GRF_DPHY_TX1RX1_SRC_SEL, +}; + +enum txrx_reg_id { + TXRX_PHY_TEST_CTRL0 = 0, + TXRX_PHY_TEST_CTRL1, + TXRX_PHY_SHUTDOWNZ, + TXRX_PHY_RSTZ, }; struct dphy_reg { @@ -127,7 +140,7 @@ static const struct dphy_reg rk3399_grf_dphy_regs[] = { [GRF_DPHY_TX1RX1_FORCETXSTOPMODE] = PHY_REG(RK3399_GRF_SOC_CON23, 4, 8), [GRF_DPHY_TX1RX1_TURNDISABLE] = PHY_REG(RK3399_GRF_SOC_CON23, 4, 12), [GRF_DPHY_TX1RX1_TURNREQUEST] = PHY_REG(RK3399_GRF_SOC_CON24, 4, 0), - [GRF_DPHY_RX1_SRC_SEL] = PHY_REG(RK3399_GRF_SOC_CON24, 1, 4), + [GRF_DPHY_TX1RX1_SRC_SEL] = PHY_REG(RK3399_GRF_SOC_CON24, 1, 4), [GRF_DPHY_TX1RX1_BASEDIR] = PHY_REG(RK3399_GRF_SOC_CON24, 1, 5), [GRF_DPHY_TX1RX1_ENABLECLK] = PHY_REG(RK3399_GRF_SOC_CON24, 1, 6), [GRF_DPHY_TX1RX1_MASTERSLAVEZ] = PHY_REG(RK3399_GRF_SOC_CON24, 1, 7), @@ -136,6 +149,21 @@ static const struct dphy_reg rk3399_grf_dphy_regs[] = { [GRF_DPHY_RX0_TESTCLK] = PHY_REG(RK3399_GRF_SOC_CON25, 1, 9), [GRF_DPHY_RX0_TESTCLR] = PHY_REG(RK3399_GRF_SOC_CON25, 1, 10), [GRF_DPHY_RX0_TESTDOUT] = PHY_REG(RK3399_GRF_SOC_STATUS1, 8, 0), + [GRF_DVP_V18SEL] = PHY_REG(RK3399_GRF_IO_VSEL, 1, 1), +}; + +struct txrx_reg { + u32 offset; +}; + +#define TXRX_REG(_offset) \ + { .offset = _offset, } + +static const struct txrx_reg rk3399_txrx_regs[] = { + [TXRX_PHY_TEST_CTRL0] = TXRX_REG(RK3399_PHY_TEST_CTRL0), + [TXRX_PHY_TEST_CTRL1] = TXRX_REG(RK3399_PHY_TEST_CTRL1), + [TXRX_PHY_SHUTDOWNZ] = TXRX_REG(RK3399_PHY_SHUTDOWNZ), + [TXRX_PHY_RSTZ] = TXRX_REG(RK3399_PHY_RSTZ), }; struct rk_dphy; @@ -146,15 +174,18 @@ struct rk_dphy_drv_data { const struct hsfreq_range *hsfreq_ranges; unsigned int num_hsfreq_ranges; const struct dphy_reg *regs; + const struct txrx_reg *txrx_regs; void (*enable)(struct rk_dphy *priv); void (*disable)(struct rk_dphy *priv); + void (*individual_init)(struct rk_dphy *priv); }; struct rk_dphy { struct device *dev; struct regmap *grf; struct clk_bulk_data *clks; + void __iomem *txrx_base_addr; const struct rk_dphy_drv_data *drv_data; struct phy_configure_opts_mipi_dphy config; @@ -234,6 +265,74 @@ static void rk_dphy_disable_rx(struct rk_dphy *priv) rk_dphy_write_grf(priv, GRF_DPHY_RX0_ENABLE, 0); } +static inline void rk_dphy_write_tx1rx1(struct rk_dphy *priv, + int index, u32 value) +{ + const struct txrx_reg *reg = &priv->drv_data->txrx_regs[index]; + + if (reg->offset) + writel(value, priv->txrx_base_addr + reg->offset); +} + +static void rk_dphy_write_mipi_tx1rx1(struct rk_dphy *priv, unsigned char addr, + unsigned char data) +{ + /* + * TESTEN =1,TESTDIN=addr + * TESTCLK=0 + * TESTEN =0,TESTDIN=data + * TESTCLK=1 + */ + rk_dphy_write_tx1rx1(priv, TXRX_PHY_TEST_CTRL1, PHY_TESTEN_ADDR | addr); + rk_dphy_write_tx1rx1(priv, TXRX_PHY_TEST_CTRL0, 0x00); + rk_dphy_write_tx1rx1(priv, TXRX_PHY_TEST_CTRL1, PHY_TESTEN_DATA | data); + rk_dphy_write_tx1rx1(priv, TXRX_PHY_TEST_CTRL0, 0x02); +} + +static void rk_dphy_enable_txrx(struct rk_dphy *priv) +{ + rk_dphy_write_tx1rx1(priv, TXRX_PHY_TEST_CTRL0, PHY_TESTCLR | PHY_TESTCLK); + usleep_range(100, 150); + + rk_dphy_write_grf(priv, GRF_DPHY_TX1RX1_MASTERSLAVEZ, 0); + rk_dphy_write_grf(priv, GRF_DPHY_TX1RX1_BASEDIR, 1); + + rk_dphy_write_grf(priv, GRF_DPHY_TX1RX1_FORCERXMODE, 0); + rk_dphy_write_grf(priv, GRF_DPHY_TX1RX1_FORCETXSTOPMODE, 0); + rk_dphy_write_grf(priv, GRF_DPHY_TX1RX1_TURNREQUEST, 0); + rk_dphy_write_grf(priv, GRF_DPHY_TX1RX1_TURNDISABLE, 0xf); + usleep_range(100, 150); + + rk_dphy_write_tx1rx1(priv, TXRX_PHY_TEST_CTRL0, PHY_TESTCLK); + usleep_range(100, 150); + + rk_dphy_write_mipi_tx1rx1(priv, CLOCK_LANE_HS_RX_CONTROL, 0); + rk_dphy_write_mipi_tx1rx1(priv, LANE0_HS_RX_CONTROL, priv->hsfreq << 1); + rk_dphy_write_mipi_tx1rx1(priv, LANE1_HS_RX_CONTROL, 0); + rk_dphy_write_mipi_tx1rx1(priv, LANE2_HS_RX_CONTROL, 0); + rk_dphy_write_mipi_tx1rx1(priv, LANE3_HS_RX_CONTROL, 0); + + rk_dphy_write_grf(priv, GRF_DPHY_TX1RX1_ENABLE, GENMASK(priv->config.lanes - 1, 0)); + usleep_range(100, 150); +} + +static void rk_dphy_disable_txrx(struct rk_dphy *priv) +{ + rk_dphy_write_grf(priv, GRF_DPHY_TX1RX1_ENABLE, 0); +} + +static void rk3399_mipidphy_individual_init(struct rk_dphy *priv) +{ + /* + * According to the sequence of RK3399_TXRX_DPHY, the setting of isp0 mipi + * will affect txrx dphy in default state of grf_soc_con24. + */ + rk_dphy_write_grf(priv, GRF_DPHY_TX1RX1_SRC_SEL, 0); + rk_dphy_write_grf(priv, GRF_DPHY_TX1RX1_MASTERSLAVEZ, 0); + rk_dphy_write_grf(priv, GRF_DPHY_TX1RX1_BASEDIR, 0); + rk_dphy_write_grf(priv, GRF_DVP_V18SEL, 0x1); +} + static int rk_dphy_configure(struct phy *phy, union phy_configure_opts *opts) { struct rk_dphy *priv = phy_get_drvdata(phy); @@ -314,20 +413,50 @@ static const struct phy_ops rk_dphy_ops = { .owner = THIS_MODULE, }; -static const struct rk_dphy_drv_data rk3399_mipidphy_drv_data = { - .clks = rk3399_mipidphy_clks, - .num_clks = ARRAY_SIZE(rk3399_mipidphy_clks), +static const char * const rk3399_mipidphy_rx_clks[] = { + "dphy-ref", + "dphy-cfg", + "grf", +}; + +static const char * const rk3399_mipidphy_txrx_clks[] = { + "dphy-ref", + "dphy-cfg", + "grf", + "dsi", +}; + +static const struct rk_dphy_drv_data rk3399_mipidphy_rx_drv_data = { + .clks = rk3399_mipidphy_rx_clks, + .num_clks = ARRAY_SIZE(rk3399_mipidphy_rx_clks), .hsfreq_ranges = rk3399_mipidphy_hsfreq_ranges, .num_hsfreq_ranges = ARRAY_SIZE(rk3399_mipidphy_hsfreq_ranges), .regs = rk3399_grf_dphy_regs, .enable = rk_dphy_enable_rx, .disable = rk_dphy_disable_rx, + .individual_init = rk3399_mipidphy_individual_init, +}; + +static const struct rk_dphy_drv_data rk3399_mipidphy_txrx_drv_data = { + .clks = rk3399_mipidphy_txrx_clks, + .num_clks = ARRAY_SIZE(rk3399_mipidphy_txrx_clks), + .hsfreq_ranges = rk3399_mipidphy_hsfreq_ranges, + .num_hsfreq_ranges = ARRAY_SIZE(rk3399_mipidphy_hsfreq_ranges), + .regs = rk3399_grf_dphy_regs, + .txrx_regs = rk3399_txrx_regs, + .enable = rk_dphy_enable_txrx, + .disable = rk_dphy_disable_txrx, + .individual_init = rk3399_mipidphy_individual_init, }; static const struct of_device_id rk_dphy_dt_ids[] = { { .compatible = "rockchip,rk3399-mipi-dphy-rx0", - .data = &rk3399_mipidphy_drv_data, + .data = &rk3399_mipidphy_rx_drv_data, + }, + { + .compatible = "rockchip,rk3399-mipi-dphy-tx1rx1", + .data = &rk3399_mipidphy_txrx_drv_data, }, {} }; @@ -345,26 +474,42 @@ static int rk_dphy_probe(struct platform_device *pdev) unsigned int i; int ret; - if (!dev->parent || !dev->parent->of_node) - return -ENODEV; - priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); if (!priv) return -ENOMEM; priv->dev = dev; - priv->grf = syscon_node_to_regmap(dev->parent->of_node); - if (IS_ERR(priv->grf)) { - dev_err(dev, "Can't find GRF syscon\n"); - return -ENODEV; - } - of_id = of_match_device(rk_dphy_dt_ids, dev); if (!of_id) return -EINVAL; drv_data = of_id->data; priv->drv_data = drv_data; + + if (!drv_data->txrx_regs) { + if (!dev->parent || !dev->parent->of_node) + return -ENODEV; + + priv->grf = syscon_node_to_regmap(dev->parent->of_node); + if (IS_ERR(priv->grf)) { + dev_err(dev, "Can't find GRF syscon\n"); + return -ENODEV; + } + } else { + priv->grf = syscon_regmap_lookup_by_phandle(dev->of_node, + "rockchip,grf"); + if (IS_ERR(priv->grf)) { + dev_err(dev, "Can't find GRF syscon\n"); + return -ENODEV; + } + + priv->txrx_base_addr = devm_platform_ioremap_resource(pdev, 0); + if (IS_ERR(priv->txrx_base_addr)) { + dev_err(dev, "Failed to ioremap resource\n"); + return PTR_ERR(priv->txrx_base_addr); + } + } + priv->clks = devm_kcalloc(&pdev->dev, drv_data->num_clks, sizeof(*priv->clks), GFP_KERNEL); if (!priv->clks) @@ -383,8 +528,14 @@ static int rk_dphy_probe(struct platform_device *pdev) phy_set_drvdata(phy, priv); phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate); + if (IS_ERR(phy_provider)) { + dev_err(dev, "failed to register phy provider\n"); + return PTR_ERR(phy_provider); + } - return PTR_ERR_OR_ZERO(phy_provider); + drv_data->individual_init(priv); + + return 0; } static struct platform_driver rk_dphy_driver = { -- 2.33.0 _______________________________________________ Linux-rockchip mailing list Linux-rockchip@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip ^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH v1 3/5] phy: rename phy-rockchip-dphy-rx0 to phy-rockchip-dphy-rx 2021-08-30 18:07 ` Mikhail Rudenko (?) (?) @ 2021-08-30 18:07 ` Mikhail Rudenko -1 siblings, 0 replies; 56+ messages in thread From: Mikhail Rudenko @ 2021-08-30 18:07 UTC (permalink / raw) To: linux-phy Cc: linux-media, Mikhail Rudenko, Kishon Vijay Abraham I, Vinod Koul, Heiko Stuebner, Ezequiel Garcia, Tiezhu Yang, linux-arm-kernel, linux-rockchip, linux-kernel Since the driver now supports both rx0 and tx1rx1 phys, rename module and Kconfig option to phy-rockchip-dphy-rx and PHY_ROCKCHIP_DPHY_RX respectively. Signed-off-by: Mikhail Rudenko <mike.rudenko@gmail.com> --- drivers/phy/rockchip/Kconfig | 8 ++++---- drivers/phy/rockchip/Makefile | 2 +- .../{phy-rockchip-dphy-rx0.c => phy-rockchip-dphy-rx.c} | 0 3 files changed, 5 insertions(+), 5 deletions(-) rename drivers/phy/rockchip/{phy-rockchip-dphy-rx0.c => phy-rockchip-dphy-rx.c} (100%) diff --git a/drivers/phy/rockchip/Kconfig b/drivers/phy/rockchip/Kconfig index e812adad7242..6096ca9a07f9 100644 --- a/drivers/phy/rockchip/Kconfig +++ b/drivers/phy/rockchip/Kconfig @@ -9,17 +9,17 @@ config PHY_ROCKCHIP_DP help Enable this to support the Rockchip Display Port PHY. -config PHY_ROCKCHIP_DPHY_RX0 +config PHY_ROCKCHIP_DPHY_RX tristate "Rockchip MIPI Synopsys DPHY RX0 driver" depends on ARCH_ROCKCHIP || COMPILE_TEST select GENERIC_PHY_MIPI_DPHY select GENERIC_PHY help - Enable this to support the Rockchip MIPI Synopsys DPHY RX0 - associated to the Rockchip ISP module present in RK3399 SoCs. + Enable this to support the Rockchip MIPI Synopsys DPHY RX + associated to the Rockchip ISP modules present in RK3399 SoCs. To compile this driver as a module, choose M here: the module - will be called phy-rockchip-dphy-rx0. + will be called phy-rockchip-dphy-rx. config PHY_ROCKCHIP_EMMC tristate "Rockchip EMMC PHY Driver" diff --git a/drivers/phy/rockchip/Makefile b/drivers/phy/rockchip/Makefile index f0eec212b2aa..2d28526808a6 100644 --- a/drivers/phy/rockchip/Makefile +++ b/drivers/phy/rockchip/Makefile @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 obj-$(CONFIG_PHY_ROCKCHIP_DP) += phy-rockchip-dp.o -obj-$(CONFIG_PHY_ROCKCHIP_DPHY_RX0) += phy-rockchip-dphy-rx0.o +obj-$(CONFIG_PHY_ROCKCHIP_DPHY_RX) += phy-rockchip-dphy-rx.o obj-$(CONFIG_PHY_ROCKCHIP_EMMC) += phy-rockchip-emmc.o obj-$(CONFIG_PHY_ROCKCHIP_INNO_CSIDPHY) += phy-rockchip-inno-csidphy.o obj-$(CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY) += phy-rockchip-inno-dsidphy.o diff --git a/drivers/phy/rockchip/phy-rockchip-dphy-rx0.c b/drivers/phy/rockchip/phy-rockchip-dphy-rx.c similarity index 100% rename from drivers/phy/rockchip/phy-rockchip-dphy-rx0.c rename to drivers/phy/rockchip/phy-rockchip-dphy-rx.c -- 2.33.0 -- linux-phy mailing list linux-phy@lists.infradead.org https://lists.infradead.org/mailman/listinfo/linux-phy ^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH v1 3/5] phy: rename phy-rockchip-dphy-rx0 to phy-rockchip-dphy-rx @ 2021-08-30 18:07 ` Mikhail Rudenko 0 siblings, 0 replies; 56+ messages in thread From: Mikhail Rudenko @ 2021-08-30 18:07 UTC (permalink / raw) To: linux-phy Cc: linux-media, Mikhail Rudenko, Kishon Vijay Abraham I, Vinod Koul, Heiko Stuebner, Ezequiel Garcia, Tiezhu Yang, linux-arm-kernel, linux-rockchip, linux-kernel Since the driver now supports both rx0 and tx1rx1 phys, rename module and Kconfig option to phy-rockchip-dphy-rx and PHY_ROCKCHIP_DPHY_RX respectively. Signed-off-by: Mikhail Rudenko <mike.rudenko@gmail.com> --- drivers/phy/rockchip/Kconfig | 8 ++++---- drivers/phy/rockchip/Makefile | 2 +- .../{phy-rockchip-dphy-rx0.c => phy-rockchip-dphy-rx.c} | 0 3 files changed, 5 insertions(+), 5 deletions(-) rename drivers/phy/rockchip/{phy-rockchip-dphy-rx0.c => phy-rockchip-dphy-rx.c} (100%) diff --git a/drivers/phy/rockchip/Kconfig b/drivers/phy/rockchip/Kconfig index e812adad7242..6096ca9a07f9 100644 --- a/drivers/phy/rockchip/Kconfig +++ b/drivers/phy/rockchip/Kconfig @@ -9,17 +9,17 @@ config PHY_ROCKCHIP_DP help Enable this to support the Rockchip Display Port PHY. -config PHY_ROCKCHIP_DPHY_RX0 +config PHY_ROCKCHIP_DPHY_RX tristate "Rockchip MIPI Synopsys DPHY RX0 driver" depends on ARCH_ROCKCHIP || COMPILE_TEST select GENERIC_PHY_MIPI_DPHY select GENERIC_PHY help - Enable this to support the Rockchip MIPI Synopsys DPHY RX0 - associated to the Rockchip ISP module present in RK3399 SoCs. + Enable this to support the Rockchip MIPI Synopsys DPHY RX + associated to the Rockchip ISP modules present in RK3399 SoCs. To compile this driver as a module, choose M here: the module - will be called phy-rockchip-dphy-rx0. + will be called phy-rockchip-dphy-rx. config PHY_ROCKCHIP_EMMC tristate "Rockchip EMMC PHY Driver" diff --git a/drivers/phy/rockchip/Makefile b/drivers/phy/rockchip/Makefile index f0eec212b2aa..2d28526808a6 100644 --- a/drivers/phy/rockchip/Makefile +++ b/drivers/phy/rockchip/Makefile @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 obj-$(CONFIG_PHY_ROCKCHIP_DP) += phy-rockchip-dp.o -obj-$(CONFIG_PHY_ROCKCHIP_DPHY_RX0) += phy-rockchip-dphy-rx0.o +obj-$(CONFIG_PHY_ROCKCHIP_DPHY_RX) += phy-rockchip-dphy-rx.o obj-$(CONFIG_PHY_ROCKCHIP_EMMC) += phy-rockchip-emmc.o obj-$(CONFIG_PHY_ROCKCHIP_INNO_CSIDPHY) += phy-rockchip-inno-csidphy.o obj-$(CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY) += phy-rockchip-inno-dsidphy.o diff --git a/drivers/phy/rockchip/phy-rockchip-dphy-rx0.c b/drivers/phy/rockchip/phy-rockchip-dphy-rx.c similarity index 100% rename from drivers/phy/rockchip/phy-rockchip-dphy-rx0.c rename to drivers/phy/rockchip/phy-rockchip-dphy-rx.c -- 2.33.0 ^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH v1 3/5] phy: rename phy-rockchip-dphy-rx0 to phy-rockchip-dphy-rx @ 2021-08-30 18:07 ` Mikhail Rudenko 0 siblings, 0 replies; 56+ messages in thread From: Mikhail Rudenko @ 2021-08-30 18:07 UTC (permalink / raw) To: linux-phy Cc: linux-media, Mikhail Rudenko, Kishon Vijay Abraham I, Vinod Koul, Heiko Stuebner, Ezequiel Garcia, Tiezhu Yang, linux-arm-kernel, linux-rockchip, linux-kernel Since the driver now supports both rx0 and tx1rx1 phys, rename module and Kconfig option to phy-rockchip-dphy-rx and PHY_ROCKCHIP_DPHY_RX respectively. Signed-off-by: Mikhail Rudenko <mike.rudenko@gmail.com> --- drivers/phy/rockchip/Kconfig | 8 ++++---- drivers/phy/rockchip/Makefile | 2 +- .../{phy-rockchip-dphy-rx0.c => phy-rockchip-dphy-rx.c} | 0 3 files changed, 5 insertions(+), 5 deletions(-) rename drivers/phy/rockchip/{phy-rockchip-dphy-rx0.c => phy-rockchip-dphy-rx.c} (100%) diff --git a/drivers/phy/rockchip/Kconfig b/drivers/phy/rockchip/Kconfig index e812adad7242..6096ca9a07f9 100644 --- a/drivers/phy/rockchip/Kconfig +++ b/drivers/phy/rockchip/Kconfig @@ -9,17 +9,17 @@ config PHY_ROCKCHIP_DP help Enable this to support the Rockchip Display Port PHY. -config PHY_ROCKCHIP_DPHY_RX0 +config PHY_ROCKCHIP_DPHY_RX tristate "Rockchip MIPI Synopsys DPHY RX0 driver" depends on ARCH_ROCKCHIP || COMPILE_TEST select GENERIC_PHY_MIPI_DPHY select GENERIC_PHY help - Enable this to support the Rockchip MIPI Synopsys DPHY RX0 - associated to the Rockchip ISP module present in RK3399 SoCs. + Enable this to support the Rockchip MIPI Synopsys DPHY RX + associated to the Rockchip ISP modules present in RK3399 SoCs. To compile this driver as a module, choose M here: the module - will be called phy-rockchip-dphy-rx0. + will be called phy-rockchip-dphy-rx. config PHY_ROCKCHIP_EMMC tristate "Rockchip EMMC PHY Driver" diff --git a/drivers/phy/rockchip/Makefile b/drivers/phy/rockchip/Makefile index f0eec212b2aa..2d28526808a6 100644 --- a/drivers/phy/rockchip/Makefile +++ b/drivers/phy/rockchip/Makefile @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 obj-$(CONFIG_PHY_ROCKCHIP_DP) += phy-rockchip-dp.o -obj-$(CONFIG_PHY_ROCKCHIP_DPHY_RX0) += phy-rockchip-dphy-rx0.o +obj-$(CONFIG_PHY_ROCKCHIP_DPHY_RX) += phy-rockchip-dphy-rx.o obj-$(CONFIG_PHY_ROCKCHIP_EMMC) += phy-rockchip-emmc.o obj-$(CONFIG_PHY_ROCKCHIP_INNO_CSIDPHY) += phy-rockchip-inno-csidphy.o obj-$(CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY) += phy-rockchip-inno-dsidphy.o diff --git a/drivers/phy/rockchip/phy-rockchip-dphy-rx0.c b/drivers/phy/rockchip/phy-rockchip-dphy-rx.c similarity index 100% rename from drivers/phy/rockchip/phy-rockchip-dphy-rx0.c rename to drivers/phy/rockchip/phy-rockchip-dphy-rx.c -- 2.33.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH v1 3/5] phy: rename phy-rockchip-dphy-rx0 to phy-rockchip-dphy-rx @ 2021-08-30 18:07 ` Mikhail Rudenko 0 siblings, 0 replies; 56+ messages in thread From: Mikhail Rudenko @ 2021-08-30 18:07 UTC (permalink / raw) To: linux-phy Cc: linux-media, Mikhail Rudenko, Kishon Vijay Abraham I, Vinod Koul, Heiko Stuebner, Ezequiel Garcia, Tiezhu Yang, linux-arm-kernel, linux-rockchip, linux-kernel Since the driver now supports both rx0 and tx1rx1 phys, rename module and Kconfig option to phy-rockchip-dphy-rx and PHY_ROCKCHIP_DPHY_RX respectively. Signed-off-by: Mikhail Rudenko <mike.rudenko@gmail.com> --- drivers/phy/rockchip/Kconfig | 8 ++++---- drivers/phy/rockchip/Makefile | 2 +- .../{phy-rockchip-dphy-rx0.c => phy-rockchip-dphy-rx.c} | 0 3 files changed, 5 insertions(+), 5 deletions(-) rename drivers/phy/rockchip/{phy-rockchip-dphy-rx0.c => phy-rockchip-dphy-rx.c} (100%) diff --git a/drivers/phy/rockchip/Kconfig b/drivers/phy/rockchip/Kconfig index e812adad7242..6096ca9a07f9 100644 --- a/drivers/phy/rockchip/Kconfig +++ b/drivers/phy/rockchip/Kconfig @@ -9,17 +9,17 @@ config PHY_ROCKCHIP_DP help Enable this to support the Rockchip Display Port PHY. -config PHY_ROCKCHIP_DPHY_RX0 +config PHY_ROCKCHIP_DPHY_RX tristate "Rockchip MIPI Synopsys DPHY RX0 driver" depends on ARCH_ROCKCHIP || COMPILE_TEST select GENERIC_PHY_MIPI_DPHY select GENERIC_PHY help - Enable this to support the Rockchip MIPI Synopsys DPHY RX0 - associated to the Rockchip ISP module present in RK3399 SoCs. + Enable this to support the Rockchip MIPI Synopsys DPHY RX + associated to the Rockchip ISP modules present in RK3399 SoCs. To compile this driver as a module, choose M here: the module - will be called phy-rockchip-dphy-rx0. + will be called phy-rockchip-dphy-rx. config PHY_ROCKCHIP_EMMC tristate "Rockchip EMMC PHY Driver" diff --git a/drivers/phy/rockchip/Makefile b/drivers/phy/rockchip/Makefile index f0eec212b2aa..2d28526808a6 100644 --- a/drivers/phy/rockchip/Makefile +++ b/drivers/phy/rockchip/Makefile @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 obj-$(CONFIG_PHY_ROCKCHIP_DP) += phy-rockchip-dp.o -obj-$(CONFIG_PHY_ROCKCHIP_DPHY_RX0) += phy-rockchip-dphy-rx0.o +obj-$(CONFIG_PHY_ROCKCHIP_DPHY_RX) += phy-rockchip-dphy-rx.o obj-$(CONFIG_PHY_ROCKCHIP_EMMC) += phy-rockchip-emmc.o obj-$(CONFIG_PHY_ROCKCHIP_INNO_CSIDPHY) += phy-rockchip-inno-csidphy.o obj-$(CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY) += phy-rockchip-inno-dsidphy.o diff --git a/drivers/phy/rockchip/phy-rockchip-dphy-rx0.c b/drivers/phy/rockchip/phy-rockchip-dphy-rx.c similarity index 100% rename from drivers/phy/rockchip/phy-rockchip-dphy-rx0.c rename to drivers/phy/rockchip/phy-rockchip-dphy-rx.c -- 2.33.0 _______________________________________________ Linux-rockchip mailing list Linux-rockchip@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip ^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH v1 4/5] dt-bindings: phy: phy-rockchip-dphy-rx0: add support for tx1rx1 phy 2021-08-30 18:07 ` Mikhail Rudenko (?) (?) @ 2021-08-30 18:07 ` Mikhail Rudenko -1 siblings, 0 replies; 56+ messages in thread From: Mikhail Rudenko @ 2021-08-30 18:07 UTC (permalink / raw) To: linux-phy Cc: linux-media, Mikhail Rudenko, Kishon Vijay Abraham I, Vinod Koul, Rob Herring, Heiko Stuebner, Helen Koike, Ezequiel Garcia, devicetree, linux-arm-kernel, linux-rockchip, linux-kernel RK3399 TX1RX1 D-PHY is not a child of GRF and uses reg, thus add corresponding properties conditionally. It also requires DSI clock to operate, so check for it. Since we now support both rx0 and tx1rx1, rename the schema to rockchip-mipi-dphy-rx.yaml. Signed-off-by: Mikhail Rudenko <mike.rudenko@gmail.com> --- ...hy-rx0.yaml => rockchip-mipi-dphy-rx.yaml} | 39 +++++++++++++++++-- 1 file changed, 35 insertions(+), 4 deletions(-) rename Documentation/devicetree/bindings/phy/{rockchip-mipi-dphy-rx0.yaml => rockchip-mipi-dphy-rx.yaml} (65%) diff --git a/Documentation/devicetree/bindings/phy/rockchip-mipi-dphy-rx0.yaml b/Documentation/devicetree/bindings/phy/rockchip-mipi-dphy-rx.yaml similarity index 65% rename from Documentation/devicetree/bindings/phy/rockchip-mipi-dphy-rx0.yaml rename to Documentation/devicetree/bindings/phy/rockchip-mipi-dphy-rx.yaml index 7d888d358823..f42319448fc9 100644 --- a/Documentation/devicetree/bindings/phy/rockchip-mipi-dphy-rx0.yaml +++ b/Documentation/devicetree/bindings/phy/rockchip-mipi-dphy-rx.yaml @@ -1,10 +1,10 @@ # SPDX-License-Identifier: (GPL-2.0+ OR MIT) %YAML 1.2 --- -$id: http://devicetree.org/schemas/phy/rockchip-mipi-dphy-rx0.yaml# +$id: http://devicetree.org/schemas/phy/rockchip-mipi-dphy-rx.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# -title: Rockchip SoC MIPI RX0 D-PHY Device Tree Bindings +title: Rockchip SoC MIPI RX0/TX1RX1 D-PHY Device Tree Bindings maintainers: - Helen Koike <helen.koike@collabora.com> @@ -16,19 +16,28 @@ description: | properties: compatible: - const: rockchip,rk3399-mipi-dphy-rx0 + enum: + - rockchip,rk3399-mipi-dphy-rx0 + - rockchip,rk3399-mipi-dphy-tx1rx1 + + reg: + maxItems: 1 clocks: + minItems: 3 items: - description: MIPI D-PHY ref clock - - description: MIPI D-PHY RX0 cfg clock + - description: MIPI D-PHY RX0/TX1RX1 cfg clock - description: Video in/out general register file clock + - description: MIPI D-PHY DSI clock clock-names: + minItems: 3 items: - const: dphy-ref - const: dphy-cfg - const: grf + - const: dsi '#phy-cells': const: 0 @@ -37,6 +46,12 @@ properties: description: Video in/out power domain. maxItems: 1 + rockchip,grf: + $ref: /schemas/types.yaml#/definitions/phandle + description: + The phandle of the syscon node for the general register file + (GRF), required for TX1RX1 MIPI D-PHY on RK3399. + required: - compatible - clocks @@ -44,6 +59,22 @@ required: - '#phy-cells' - power-domains +if: + properties: + compatible: + contains: + const: rockchip,rk3399-mipi-dphy-tx1rx1 +then: + required: + - reg + - rockchip,grf + + properties: + clocks: + minItems: 4 + clock-names: + minItems: 4 + additionalProperties: false examples: -- 2.33.0 -- linux-phy mailing list linux-phy@lists.infradead.org https://lists.infradead.org/mailman/listinfo/linux-phy ^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH v1 4/5] dt-bindings: phy: phy-rockchip-dphy-rx0: add support for tx1rx1 phy @ 2021-08-30 18:07 ` Mikhail Rudenko 0 siblings, 0 replies; 56+ messages in thread From: Mikhail Rudenko @ 2021-08-30 18:07 UTC (permalink / raw) To: linux-phy Cc: linux-media, Mikhail Rudenko, Kishon Vijay Abraham I, Vinod Koul, Rob Herring, Heiko Stuebner, Helen Koike, Ezequiel Garcia, devicetree, linux-arm-kernel, linux-rockchip, linux-kernel RK3399 TX1RX1 D-PHY is not a child of GRF and uses reg, thus add corresponding properties conditionally. It also requires DSI clock to operate, so check for it. Since we now support both rx0 and tx1rx1, rename the schema to rockchip-mipi-dphy-rx.yaml. Signed-off-by: Mikhail Rudenko <mike.rudenko@gmail.com> --- ...hy-rx0.yaml => rockchip-mipi-dphy-rx.yaml} | 39 +++++++++++++++++-- 1 file changed, 35 insertions(+), 4 deletions(-) rename Documentation/devicetree/bindings/phy/{rockchip-mipi-dphy-rx0.yaml => rockchip-mipi-dphy-rx.yaml} (65%) diff --git a/Documentation/devicetree/bindings/phy/rockchip-mipi-dphy-rx0.yaml b/Documentation/devicetree/bindings/phy/rockchip-mipi-dphy-rx.yaml similarity index 65% rename from Documentation/devicetree/bindings/phy/rockchip-mipi-dphy-rx0.yaml rename to Documentation/devicetree/bindings/phy/rockchip-mipi-dphy-rx.yaml index 7d888d358823..f42319448fc9 100644 --- a/Documentation/devicetree/bindings/phy/rockchip-mipi-dphy-rx0.yaml +++ b/Documentation/devicetree/bindings/phy/rockchip-mipi-dphy-rx.yaml @@ -1,10 +1,10 @@ # SPDX-License-Identifier: (GPL-2.0+ OR MIT) %YAML 1.2 --- -$id: http://devicetree.org/schemas/phy/rockchip-mipi-dphy-rx0.yaml# +$id: http://devicetree.org/schemas/phy/rockchip-mipi-dphy-rx.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# -title: Rockchip SoC MIPI RX0 D-PHY Device Tree Bindings +title: Rockchip SoC MIPI RX0/TX1RX1 D-PHY Device Tree Bindings maintainers: - Helen Koike <helen.koike@collabora.com> @@ -16,19 +16,28 @@ description: | properties: compatible: - const: rockchip,rk3399-mipi-dphy-rx0 + enum: + - rockchip,rk3399-mipi-dphy-rx0 + - rockchip,rk3399-mipi-dphy-tx1rx1 + + reg: + maxItems: 1 clocks: + minItems: 3 items: - description: MIPI D-PHY ref clock - - description: MIPI D-PHY RX0 cfg clock + - description: MIPI D-PHY RX0/TX1RX1 cfg clock - description: Video in/out general register file clock + - description: MIPI D-PHY DSI clock clock-names: + minItems: 3 items: - const: dphy-ref - const: dphy-cfg - const: grf + - const: dsi '#phy-cells': const: 0 @@ -37,6 +46,12 @@ properties: description: Video in/out power domain. maxItems: 1 + rockchip,grf: + $ref: /schemas/types.yaml#/definitions/phandle + description: + The phandle of the syscon node for the general register file + (GRF), required for TX1RX1 MIPI D-PHY on RK3399. + required: - compatible - clocks @@ -44,6 +59,22 @@ required: - '#phy-cells' - power-domains +if: + properties: + compatible: + contains: + const: rockchip,rk3399-mipi-dphy-tx1rx1 +then: + required: + - reg + - rockchip,grf + + properties: + clocks: + minItems: 4 + clock-names: + minItems: 4 + additionalProperties: false examples: -- 2.33.0 ^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH v1 4/5] dt-bindings: phy: phy-rockchip-dphy-rx0: add support for tx1rx1 phy @ 2021-08-30 18:07 ` Mikhail Rudenko 0 siblings, 0 replies; 56+ messages in thread From: Mikhail Rudenko @ 2021-08-30 18:07 UTC (permalink / raw) To: linux-phy Cc: linux-media, Mikhail Rudenko, Kishon Vijay Abraham I, Vinod Koul, Rob Herring, Heiko Stuebner, Helen Koike, Ezequiel Garcia, devicetree, linux-arm-kernel, linux-rockchip, linux-kernel RK3399 TX1RX1 D-PHY is not a child of GRF and uses reg, thus add corresponding properties conditionally. It also requires DSI clock to operate, so check for it. Since we now support both rx0 and tx1rx1, rename the schema to rockchip-mipi-dphy-rx.yaml. Signed-off-by: Mikhail Rudenko <mike.rudenko@gmail.com> --- ...hy-rx0.yaml => rockchip-mipi-dphy-rx.yaml} | 39 +++++++++++++++++-- 1 file changed, 35 insertions(+), 4 deletions(-) rename Documentation/devicetree/bindings/phy/{rockchip-mipi-dphy-rx0.yaml => rockchip-mipi-dphy-rx.yaml} (65%) diff --git a/Documentation/devicetree/bindings/phy/rockchip-mipi-dphy-rx0.yaml b/Documentation/devicetree/bindings/phy/rockchip-mipi-dphy-rx.yaml similarity index 65% rename from Documentation/devicetree/bindings/phy/rockchip-mipi-dphy-rx0.yaml rename to Documentation/devicetree/bindings/phy/rockchip-mipi-dphy-rx.yaml index 7d888d358823..f42319448fc9 100644 --- a/Documentation/devicetree/bindings/phy/rockchip-mipi-dphy-rx0.yaml +++ b/Documentation/devicetree/bindings/phy/rockchip-mipi-dphy-rx.yaml @@ -1,10 +1,10 @@ # SPDX-License-Identifier: (GPL-2.0+ OR MIT) %YAML 1.2 --- -$id: http://devicetree.org/schemas/phy/rockchip-mipi-dphy-rx0.yaml# +$id: http://devicetree.org/schemas/phy/rockchip-mipi-dphy-rx.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# -title: Rockchip SoC MIPI RX0 D-PHY Device Tree Bindings +title: Rockchip SoC MIPI RX0/TX1RX1 D-PHY Device Tree Bindings maintainers: - Helen Koike <helen.koike@collabora.com> @@ -16,19 +16,28 @@ description: | properties: compatible: - const: rockchip,rk3399-mipi-dphy-rx0 + enum: + - rockchip,rk3399-mipi-dphy-rx0 + - rockchip,rk3399-mipi-dphy-tx1rx1 + + reg: + maxItems: 1 clocks: + minItems: 3 items: - description: MIPI D-PHY ref clock - - description: MIPI D-PHY RX0 cfg clock + - description: MIPI D-PHY RX0/TX1RX1 cfg clock - description: Video in/out general register file clock + - description: MIPI D-PHY DSI clock clock-names: + minItems: 3 items: - const: dphy-ref - const: dphy-cfg - const: grf + - const: dsi '#phy-cells': const: 0 @@ -37,6 +46,12 @@ properties: description: Video in/out power domain. maxItems: 1 + rockchip,grf: + $ref: /schemas/types.yaml#/definitions/phandle + description: + The phandle of the syscon node for the general register file + (GRF), required for TX1RX1 MIPI D-PHY on RK3399. + required: - compatible - clocks @@ -44,6 +59,22 @@ required: - '#phy-cells' - power-domains +if: + properties: + compatible: + contains: + const: rockchip,rk3399-mipi-dphy-tx1rx1 +then: + required: + - reg + - rockchip,grf + + properties: + clocks: + minItems: 4 + clock-names: + minItems: 4 + additionalProperties: false examples: -- 2.33.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH v1 4/5] dt-bindings: phy: phy-rockchip-dphy-rx0: add support for tx1rx1 phy @ 2021-08-30 18:07 ` Mikhail Rudenko 0 siblings, 0 replies; 56+ messages in thread From: Mikhail Rudenko @ 2021-08-30 18:07 UTC (permalink / raw) To: linux-phy Cc: linux-media, Mikhail Rudenko, Kishon Vijay Abraham I, Vinod Koul, Rob Herring, Heiko Stuebner, Helen Koike, Ezequiel Garcia, devicetree, linux-arm-kernel, linux-rockchip, linux-kernel RK3399 TX1RX1 D-PHY is not a child of GRF and uses reg, thus add corresponding properties conditionally. It also requires DSI clock to operate, so check for it. Since we now support both rx0 and tx1rx1, rename the schema to rockchip-mipi-dphy-rx.yaml. Signed-off-by: Mikhail Rudenko <mike.rudenko@gmail.com> --- ...hy-rx0.yaml => rockchip-mipi-dphy-rx.yaml} | 39 +++++++++++++++++-- 1 file changed, 35 insertions(+), 4 deletions(-) rename Documentation/devicetree/bindings/phy/{rockchip-mipi-dphy-rx0.yaml => rockchip-mipi-dphy-rx.yaml} (65%) diff --git a/Documentation/devicetree/bindings/phy/rockchip-mipi-dphy-rx0.yaml b/Documentation/devicetree/bindings/phy/rockchip-mipi-dphy-rx.yaml similarity index 65% rename from Documentation/devicetree/bindings/phy/rockchip-mipi-dphy-rx0.yaml rename to Documentation/devicetree/bindings/phy/rockchip-mipi-dphy-rx.yaml index 7d888d358823..f42319448fc9 100644 --- a/Documentation/devicetree/bindings/phy/rockchip-mipi-dphy-rx0.yaml +++ b/Documentation/devicetree/bindings/phy/rockchip-mipi-dphy-rx.yaml @@ -1,10 +1,10 @@ # SPDX-License-Identifier: (GPL-2.0+ OR MIT) %YAML 1.2 --- -$id: http://devicetree.org/schemas/phy/rockchip-mipi-dphy-rx0.yaml# +$id: http://devicetree.org/schemas/phy/rockchip-mipi-dphy-rx.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# -title: Rockchip SoC MIPI RX0 D-PHY Device Tree Bindings +title: Rockchip SoC MIPI RX0/TX1RX1 D-PHY Device Tree Bindings maintainers: - Helen Koike <helen.koike@collabora.com> @@ -16,19 +16,28 @@ description: | properties: compatible: - const: rockchip,rk3399-mipi-dphy-rx0 + enum: + - rockchip,rk3399-mipi-dphy-rx0 + - rockchip,rk3399-mipi-dphy-tx1rx1 + + reg: + maxItems: 1 clocks: + minItems: 3 items: - description: MIPI D-PHY ref clock - - description: MIPI D-PHY RX0 cfg clock + - description: MIPI D-PHY RX0/TX1RX1 cfg clock - description: Video in/out general register file clock + - description: MIPI D-PHY DSI clock clock-names: + minItems: 3 items: - const: dphy-ref - const: dphy-cfg - const: grf + - const: dsi '#phy-cells': const: 0 @@ -37,6 +46,12 @@ properties: description: Video in/out power domain. maxItems: 1 + rockchip,grf: + $ref: /schemas/types.yaml#/definitions/phandle + description: + The phandle of the syscon node for the general register file + (GRF), required for TX1RX1 MIPI D-PHY on RK3399. + required: - compatible - clocks @@ -44,6 +59,22 @@ required: - '#phy-cells' - power-domains +if: + properties: + compatible: + contains: + const: rockchip,rk3399-mipi-dphy-tx1rx1 +then: + required: + - reg + - rockchip,grf + + properties: + clocks: + minItems: 4 + clock-names: + minItems: 4 + additionalProperties: false examples: -- 2.33.0 _______________________________________________ Linux-rockchip mailing list Linux-rockchip@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip ^ permalink raw reply related [flat|nested] 56+ messages in thread
* Re: [PATCH v1 4/5] dt-bindings: phy: phy-rockchip-dphy-rx0: add support for tx1rx1 phy 2021-08-30 18:07 ` Mikhail Rudenko (?) (?) @ 2021-08-30 21:00 ` Johan Jonker -1 siblings, 0 replies; 56+ messages in thread From: Johan Jonker @ 2021-08-30 21:00 UTC (permalink / raw) To: Mikhail Rudenko, linux-phy Cc: linux-media, Kishon Vijay Abraham I, Vinod Koul, Rob Herring, Heiko Stuebner, Helen Koike, Ezequiel Garcia, devicetree, linux-arm-kernel, linux-rockchip, linux-kernel Hi Mikhail, Some comments below. Have a look if it is useful. On 8/30/21 8:07 PM, Mikhail Rudenko wrote: > RK3399 TX1RX1 D-PHY is not a child of GRF and uses reg, thus add > corresponding properties conditionally. It also requires DSI clock to > operate, so check for it. Since we now support both rx0 and tx1rx1, > rename the schema to rockchip-mipi-dphy-rx.yaml. > > Signed-off-by: Mikhail Rudenko <mike.rudenko@gmail.com> > --- > ...hy-rx0.yaml => rockchip-mipi-dphy-rx.yaml} | 39 +++++++++++++++++-- > 1 file changed, 35 insertions(+), 4 deletions(-) > rename Documentation/devicetree/bindings/phy/{rockchip-mipi-dphy-rx0.yaml => rockchip-mipi-dphy-rx.yaml} (65%) > > diff --git a/Documentation/devicetree/bindings/phy/rockchip-mipi-dphy-rx0.yaml b/Documentation/devicetree/bindings/phy/rockchip-mipi-dphy-rx.yaml > similarity index 65% > rename from Documentation/devicetree/bindings/phy/rockchip-mipi-dphy-rx0.yaml > rename to Documentation/devicetree/bindings/phy/rockchip-mipi-dphy-rx.yaml > index 7d888d358823..f42319448fc9 100644 > --- a/Documentation/devicetree/bindings/phy/rockchip-mipi-dphy-rx0.yaml > +++ b/Documentation/devicetree/bindings/phy/rockchip-mipi-dphy-rx.yaml > @@ -1,10 +1,10 @@ > # SPDX-License-Identifier: (GPL-2.0+ OR MIT) > %YAML 1.2 > --- > -$id: http://devicetree.org/schemas/phy/rockchip-mipi-dphy-rx0.yaml# > +$id: http://devicetree.org/schemas/phy/rockchip-mipi-dphy-rx.yaml# > $schema: http://devicetree.org/meta-schemas/core.yaml# > > -title: Rockchip SoC MIPI RX0 D-PHY Device Tree Bindings > +title: Rockchip SoC MIPI RX0/TX1RX1 D-PHY Device Tree Bindings > > maintainers: > - Helen Koike <helen.koike@collabora.com> > @@ -16,19 +16,28 @@ description: | > > properties: > compatible: > - const: rockchip,rk3399-mipi-dphy-rx0 > + enum: > + - rockchip,rk3399-mipi-dphy-rx0 > + - rockchip,rk3399-mipi-dphy-tx1rx1 > + > + reg: > + maxItems: 1 This allows every node to have a reg property. > > clocks: > + minItems: 3 > items: > - description: MIPI D-PHY ref clock > - - description: MIPI D-PHY RX0 cfg clock > + - description: MIPI D-PHY RX0/TX1RX1 cfg clock > - description: Video in/out general register file clock > + - description: MIPI D-PHY DSI clock > > clock-names: > + minItems: 3 > items: > - const: dphy-ref > - const: dphy-cfg > - const: grf > + - const: dsi > > '#phy-cells': > const: 0 > @@ -37,6 +46,12 @@ properties: > description: Video in/out power domain. > maxItems: 1 > > + rockchip,grf: > + $ref: /schemas/types.yaml#/definitions/phandle > + description: > + The phandle of the syscon node for the general register file > + (GRF), required for TX1RX1 MIPI D-PHY on RK3399. This allows every node to have a rockchip,grf property. > + > required: > - compatible > - clocks > @@ -44,6 +59,22 @@ required: > - '#phy-cells' > - power-domains > > +if: > + properties: > + compatible: > + contains: > + const: rockchip,rk3399-mipi-dphy-tx1rx1 > +then: > + required: Move/swap the properties section above the required section. > + - reg > + - rockchip,grf > + > + properties: reg: maxItems: 1 > + clocks: > + minItems: 4 > + clock-names: > + minItems: 4 rockchip,grf: $ref: /schemas/types.yaml#/definitions/phandle description: The phandle of the syscon node for the general register file(GRF). ", required for TX1RX1 MIPI D-PHY on RK3399." This phrase is already said/done with the "required:" section above > additionalProperties: false > > examples: > -- linux-phy mailing list linux-phy@lists.infradead.org https://lists.infradead.org/mailman/listinfo/linux-phy ^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH v1 4/5] dt-bindings: phy: phy-rockchip-dphy-rx0: add support for tx1rx1 phy @ 2021-08-30 21:00 ` Johan Jonker 0 siblings, 0 replies; 56+ messages in thread From: Johan Jonker @ 2021-08-30 21:00 UTC (permalink / raw) To: Mikhail Rudenko, linux-phy Cc: linux-media, Kishon Vijay Abraham I, Vinod Koul, Rob Herring, Heiko Stuebner, Helen Koike, Ezequiel Garcia, devicetree, linux-arm-kernel, linux-rockchip, linux-kernel Hi Mikhail, Some comments below. Have a look if it is useful. On 8/30/21 8:07 PM, Mikhail Rudenko wrote: > RK3399 TX1RX1 D-PHY is not a child of GRF and uses reg, thus add > corresponding properties conditionally. It also requires DSI clock to > operate, so check for it. Since we now support both rx0 and tx1rx1, > rename the schema to rockchip-mipi-dphy-rx.yaml. > > Signed-off-by: Mikhail Rudenko <mike.rudenko@gmail.com> > --- > ...hy-rx0.yaml => rockchip-mipi-dphy-rx.yaml} | 39 +++++++++++++++++-- > 1 file changed, 35 insertions(+), 4 deletions(-) > rename Documentation/devicetree/bindings/phy/{rockchip-mipi-dphy-rx0.yaml => rockchip-mipi-dphy-rx.yaml} (65%) > > diff --git a/Documentation/devicetree/bindings/phy/rockchip-mipi-dphy-rx0.yaml b/Documentation/devicetree/bindings/phy/rockchip-mipi-dphy-rx.yaml > similarity index 65% > rename from Documentation/devicetree/bindings/phy/rockchip-mipi-dphy-rx0.yaml > rename to Documentation/devicetree/bindings/phy/rockchip-mipi-dphy-rx.yaml > index 7d888d358823..f42319448fc9 100644 > --- a/Documentation/devicetree/bindings/phy/rockchip-mipi-dphy-rx0.yaml > +++ b/Documentation/devicetree/bindings/phy/rockchip-mipi-dphy-rx.yaml > @@ -1,10 +1,10 @@ > # SPDX-License-Identifier: (GPL-2.0+ OR MIT) > %YAML 1.2 > --- > -$id: http://devicetree.org/schemas/phy/rockchip-mipi-dphy-rx0.yaml# > +$id: http://devicetree.org/schemas/phy/rockchip-mipi-dphy-rx.yaml# > $schema: http://devicetree.org/meta-schemas/core.yaml# > > -title: Rockchip SoC MIPI RX0 D-PHY Device Tree Bindings > +title: Rockchip SoC MIPI RX0/TX1RX1 D-PHY Device Tree Bindings > > maintainers: > - Helen Koike <helen.koike@collabora.com> > @@ -16,19 +16,28 @@ description: | > > properties: > compatible: > - const: rockchip,rk3399-mipi-dphy-rx0 > + enum: > + - rockchip,rk3399-mipi-dphy-rx0 > + - rockchip,rk3399-mipi-dphy-tx1rx1 > + > + reg: > + maxItems: 1 This allows every node to have a reg property. > > clocks: > + minItems: 3 > items: > - description: MIPI D-PHY ref clock > - - description: MIPI D-PHY RX0 cfg clock > + - description: MIPI D-PHY RX0/TX1RX1 cfg clock > - description: Video in/out general register file clock > + - description: MIPI D-PHY DSI clock > > clock-names: > + minItems: 3 > items: > - const: dphy-ref > - const: dphy-cfg > - const: grf > + - const: dsi > > '#phy-cells': > const: 0 > @@ -37,6 +46,12 @@ properties: > description: Video in/out power domain. > maxItems: 1 > > + rockchip,grf: > + $ref: /schemas/types.yaml#/definitions/phandle > + description: > + The phandle of the syscon node for the general register file > + (GRF), required for TX1RX1 MIPI D-PHY on RK3399. This allows every node to have a rockchip,grf property. > + > required: > - compatible > - clocks > @@ -44,6 +59,22 @@ required: > - '#phy-cells' > - power-domains > > +if: > + properties: > + compatible: > + contains: > + const: rockchip,rk3399-mipi-dphy-tx1rx1 > +then: > + required: Move/swap the properties section above the required section. > + - reg > + - rockchip,grf > + > + properties: reg: maxItems: 1 > + clocks: > + minItems: 4 > + clock-names: > + minItems: 4 rockchip,grf: $ref: /schemas/types.yaml#/definitions/phandle description: The phandle of the syscon node for the general register file(GRF). ", required for TX1RX1 MIPI D-PHY on RK3399." This phrase is already said/done with the "required:" section above > additionalProperties: false > > examples: > ^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH v1 4/5] dt-bindings: phy: phy-rockchip-dphy-rx0: add support for tx1rx1 phy @ 2021-08-30 21:00 ` Johan Jonker 0 siblings, 0 replies; 56+ messages in thread From: Johan Jonker @ 2021-08-30 21:00 UTC (permalink / raw) To: Mikhail Rudenko, linux-phy Cc: linux-media, Kishon Vijay Abraham I, Vinod Koul, Rob Herring, Heiko Stuebner, Helen Koike, Ezequiel Garcia, devicetree, linux-arm-kernel, linux-rockchip, linux-kernel Hi Mikhail, Some comments below. Have a look if it is useful. On 8/30/21 8:07 PM, Mikhail Rudenko wrote: > RK3399 TX1RX1 D-PHY is not a child of GRF and uses reg, thus add > corresponding properties conditionally. It also requires DSI clock to > operate, so check for it. Since we now support both rx0 and tx1rx1, > rename the schema to rockchip-mipi-dphy-rx.yaml. > > Signed-off-by: Mikhail Rudenko <mike.rudenko@gmail.com> > --- > ...hy-rx0.yaml => rockchip-mipi-dphy-rx.yaml} | 39 +++++++++++++++++-- > 1 file changed, 35 insertions(+), 4 deletions(-) > rename Documentation/devicetree/bindings/phy/{rockchip-mipi-dphy-rx0.yaml => rockchip-mipi-dphy-rx.yaml} (65%) > > diff --git a/Documentation/devicetree/bindings/phy/rockchip-mipi-dphy-rx0.yaml b/Documentation/devicetree/bindings/phy/rockchip-mipi-dphy-rx.yaml > similarity index 65% > rename from Documentation/devicetree/bindings/phy/rockchip-mipi-dphy-rx0.yaml > rename to Documentation/devicetree/bindings/phy/rockchip-mipi-dphy-rx.yaml > index 7d888d358823..f42319448fc9 100644 > --- a/Documentation/devicetree/bindings/phy/rockchip-mipi-dphy-rx0.yaml > +++ b/Documentation/devicetree/bindings/phy/rockchip-mipi-dphy-rx.yaml > @@ -1,10 +1,10 @@ > # SPDX-License-Identifier: (GPL-2.0+ OR MIT) > %YAML 1.2 > --- > -$id: http://devicetree.org/schemas/phy/rockchip-mipi-dphy-rx0.yaml# > +$id: http://devicetree.org/schemas/phy/rockchip-mipi-dphy-rx.yaml# > $schema: http://devicetree.org/meta-schemas/core.yaml# > > -title: Rockchip SoC MIPI RX0 D-PHY Device Tree Bindings > +title: Rockchip SoC MIPI RX0/TX1RX1 D-PHY Device Tree Bindings > > maintainers: > - Helen Koike <helen.koike@collabora.com> > @@ -16,19 +16,28 @@ description: | > > properties: > compatible: > - const: rockchip,rk3399-mipi-dphy-rx0 > + enum: > + - rockchip,rk3399-mipi-dphy-rx0 > + - rockchip,rk3399-mipi-dphy-tx1rx1 > + > + reg: > + maxItems: 1 This allows every node to have a reg property. > > clocks: > + minItems: 3 > items: > - description: MIPI D-PHY ref clock > - - description: MIPI D-PHY RX0 cfg clock > + - description: MIPI D-PHY RX0/TX1RX1 cfg clock > - description: Video in/out general register file clock > + - description: MIPI D-PHY DSI clock > > clock-names: > + minItems: 3 > items: > - const: dphy-ref > - const: dphy-cfg > - const: grf > + - const: dsi > > '#phy-cells': > const: 0 > @@ -37,6 +46,12 @@ properties: > description: Video in/out power domain. > maxItems: 1 > > + rockchip,grf: > + $ref: /schemas/types.yaml#/definitions/phandle > + description: > + The phandle of the syscon node for the general register file > + (GRF), required for TX1RX1 MIPI D-PHY on RK3399. This allows every node to have a rockchip,grf property. > + > required: > - compatible > - clocks > @@ -44,6 +59,22 @@ required: > - '#phy-cells' > - power-domains > > +if: > + properties: > + compatible: > + contains: > + const: rockchip,rk3399-mipi-dphy-tx1rx1 > +then: > + required: Move/swap the properties section above the required section. > + - reg > + - rockchip,grf > + > + properties: reg: maxItems: 1 > + clocks: > + minItems: 4 > + clock-names: > + minItems: 4 rockchip,grf: $ref: /schemas/types.yaml#/definitions/phandle description: The phandle of the syscon node for the general register file(GRF). ", required for TX1RX1 MIPI D-PHY on RK3399." This phrase is already said/done with the "required:" section above > additionalProperties: false > > examples: > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH v1 4/5] dt-bindings: phy: phy-rockchip-dphy-rx0: add support for tx1rx1 phy @ 2021-08-30 21:00 ` Johan Jonker 0 siblings, 0 replies; 56+ messages in thread From: Johan Jonker @ 2021-08-30 21:00 UTC (permalink / raw) To: Mikhail Rudenko, linux-phy Cc: linux-media, Kishon Vijay Abraham I, Vinod Koul, Rob Herring, Heiko Stuebner, Helen Koike, Ezequiel Garcia, devicetree, linux-arm-kernel, linux-rockchip, linux-kernel Hi Mikhail, Some comments below. Have a look if it is useful. On 8/30/21 8:07 PM, Mikhail Rudenko wrote: > RK3399 TX1RX1 D-PHY is not a child of GRF and uses reg, thus add > corresponding properties conditionally. It also requires DSI clock to > operate, so check for it. Since we now support both rx0 and tx1rx1, > rename the schema to rockchip-mipi-dphy-rx.yaml. > > Signed-off-by: Mikhail Rudenko <mike.rudenko@gmail.com> > --- > ...hy-rx0.yaml => rockchip-mipi-dphy-rx.yaml} | 39 +++++++++++++++++-- > 1 file changed, 35 insertions(+), 4 deletions(-) > rename Documentation/devicetree/bindings/phy/{rockchip-mipi-dphy-rx0.yaml => rockchip-mipi-dphy-rx.yaml} (65%) > > diff --git a/Documentation/devicetree/bindings/phy/rockchip-mipi-dphy-rx0.yaml b/Documentation/devicetree/bindings/phy/rockchip-mipi-dphy-rx.yaml > similarity index 65% > rename from Documentation/devicetree/bindings/phy/rockchip-mipi-dphy-rx0.yaml > rename to Documentation/devicetree/bindings/phy/rockchip-mipi-dphy-rx.yaml > index 7d888d358823..f42319448fc9 100644 > --- a/Documentation/devicetree/bindings/phy/rockchip-mipi-dphy-rx0.yaml > +++ b/Documentation/devicetree/bindings/phy/rockchip-mipi-dphy-rx.yaml > @@ -1,10 +1,10 @@ > # SPDX-License-Identifier: (GPL-2.0+ OR MIT) > %YAML 1.2 > --- > -$id: http://devicetree.org/schemas/phy/rockchip-mipi-dphy-rx0.yaml# > +$id: http://devicetree.org/schemas/phy/rockchip-mipi-dphy-rx.yaml# > $schema: http://devicetree.org/meta-schemas/core.yaml# > > -title: Rockchip SoC MIPI RX0 D-PHY Device Tree Bindings > +title: Rockchip SoC MIPI RX0/TX1RX1 D-PHY Device Tree Bindings > > maintainers: > - Helen Koike <helen.koike@collabora.com> > @@ -16,19 +16,28 @@ description: | > > properties: > compatible: > - const: rockchip,rk3399-mipi-dphy-rx0 > + enum: > + - rockchip,rk3399-mipi-dphy-rx0 > + - rockchip,rk3399-mipi-dphy-tx1rx1 > + > + reg: > + maxItems: 1 This allows every node to have a reg property. > > clocks: > + minItems: 3 > items: > - description: MIPI D-PHY ref clock > - - description: MIPI D-PHY RX0 cfg clock > + - description: MIPI D-PHY RX0/TX1RX1 cfg clock > - description: Video in/out general register file clock > + - description: MIPI D-PHY DSI clock > > clock-names: > + minItems: 3 > items: > - const: dphy-ref > - const: dphy-cfg > - const: grf > + - const: dsi > > '#phy-cells': > const: 0 > @@ -37,6 +46,12 @@ properties: > description: Video in/out power domain. > maxItems: 1 > > + rockchip,grf: > + $ref: /schemas/types.yaml#/definitions/phandle > + description: > + The phandle of the syscon node for the general register file > + (GRF), required for TX1RX1 MIPI D-PHY on RK3399. This allows every node to have a rockchip,grf property. > + > required: > - compatible > - clocks > @@ -44,6 +59,22 @@ required: > - '#phy-cells' > - power-domains > > +if: > + properties: > + compatible: > + contains: > + const: rockchip,rk3399-mipi-dphy-tx1rx1 > +then: > + required: Move/swap the properties section above the required section. > + - reg > + - rockchip,grf > + > + properties: reg: maxItems: 1 > + clocks: > + minItems: 4 > + clock-names: > + minItems: 4 rockchip,grf: $ref: /schemas/types.yaml#/definitions/phandle description: The phandle of the syscon node for the general register file(GRF). ", required for TX1RX1 MIPI D-PHY on RK3399." This phrase is already said/done with the "required:" section above > additionalProperties: false > > examples: > _______________________________________________ Linux-rockchip mailing list Linux-rockchip@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip ^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH v1 4/5] dt-bindings: phy: phy-rockchip-dphy-rx0: add support for tx1rx1 phy 2021-08-30 21:00 ` Johan Jonker (?) (?) @ 2021-08-30 22:06 ` Johan Jonker -1 siblings, 0 replies; 56+ messages in thread From: Johan Jonker @ 2021-08-30 22:06 UTC (permalink / raw) To: Mikhail Rudenko, linux-phy Cc: linux-media, Kishon Vijay Abraham I, Vinod Koul, Rob Herring, Heiko Stuebner, Helen Koike, Ezequiel Garcia, devicetree, linux-arm-kernel, linux-rockchip, linux-kernel Hi Mikhail, The file in the link below is in need for a YAML conversion. Could you help? Documentation/devicetree/bindings/display/rockchip/dw_mipi_dsi_rockchip.txt - compatible: one of "rockchip,px30-mipi-dsi", "snps,dw-mipi-dsi" "rockchip,rk3288-mipi-dsi", "snps,dw-mipi-dsi" "rockchip,rk3399-mipi-dsi", "snps,dw-mipi-dsi" On 8/30/21 11:00 PM, Johan Jonker wrote: > Some comments below. Have a look if it is useful. > -- linux-phy mailing list linux-phy@lists.infradead.org https://lists.infradead.org/mailman/listinfo/linux-phy ^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH v1 4/5] dt-bindings: phy: phy-rockchip-dphy-rx0: add support for tx1rx1 phy @ 2021-08-30 22:06 ` Johan Jonker 0 siblings, 0 replies; 56+ messages in thread From: Johan Jonker @ 2021-08-30 22:06 UTC (permalink / raw) To: Mikhail Rudenko, linux-phy Cc: linux-media, Kishon Vijay Abraham I, Vinod Koul, Rob Herring, Heiko Stuebner, Helen Koike, Ezequiel Garcia, devicetree, linux-arm-kernel, linux-rockchip, linux-kernel Hi Mikhail, The file in the link below is in need for a YAML conversion. Could you help? Documentation/devicetree/bindings/display/rockchip/dw_mipi_dsi_rockchip.txt - compatible: one of "rockchip,px30-mipi-dsi", "snps,dw-mipi-dsi" "rockchip,rk3288-mipi-dsi", "snps,dw-mipi-dsi" "rockchip,rk3399-mipi-dsi", "snps,dw-mipi-dsi" On 8/30/21 11:00 PM, Johan Jonker wrote: > Some comments below. Have a look if it is useful. > ^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH v1 4/5] dt-bindings: phy: phy-rockchip-dphy-rx0: add support for tx1rx1 phy @ 2021-08-30 22:06 ` Johan Jonker 0 siblings, 0 replies; 56+ messages in thread From: Johan Jonker @ 2021-08-30 22:06 UTC (permalink / raw) To: Mikhail Rudenko, linux-phy Cc: linux-media, Kishon Vijay Abraham I, Vinod Koul, Rob Herring, Heiko Stuebner, Helen Koike, Ezequiel Garcia, devicetree, linux-arm-kernel, linux-rockchip, linux-kernel Hi Mikhail, The file in the link below is in need for a YAML conversion. Could you help? Documentation/devicetree/bindings/display/rockchip/dw_mipi_dsi_rockchip.txt - compatible: one of "rockchip,px30-mipi-dsi", "snps,dw-mipi-dsi" "rockchip,rk3288-mipi-dsi", "snps,dw-mipi-dsi" "rockchip,rk3399-mipi-dsi", "snps,dw-mipi-dsi" On 8/30/21 11:00 PM, Johan Jonker wrote: > Some comments below. Have a look if it is useful. > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH v1 4/5] dt-bindings: phy: phy-rockchip-dphy-rx0: add support for tx1rx1 phy @ 2021-08-30 22:06 ` Johan Jonker 0 siblings, 0 replies; 56+ messages in thread From: Johan Jonker @ 2021-08-30 22:06 UTC (permalink / raw) To: Mikhail Rudenko, linux-phy Cc: linux-media, Kishon Vijay Abraham I, Vinod Koul, Rob Herring, Heiko Stuebner, Helen Koike, Ezequiel Garcia, devicetree, linux-arm-kernel, linux-rockchip, linux-kernel Hi Mikhail, The file in the link below is in need for a YAML conversion. Could you help? Documentation/devicetree/bindings/display/rockchip/dw_mipi_dsi_rockchip.txt - compatible: one of "rockchip,px30-mipi-dsi", "snps,dw-mipi-dsi" "rockchip,rk3288-mipi-dsi", "snps,dw-mipi-dsi" "rockchip,rk3399-mipi-dsi", "snps,dw-mipi-dsi" On 8/30/21 11:00 PM, Johan Jonker wrote: > Some comments below. Have a look if it is useful. > _______________________________________________ Linux-rockchip mailing list Linux-rockchip@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip ^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH v1 4/5] dt-bindings: phy: phy-rockchip-dphy-rx0: add support for tx1rx1 phy 2021-08-30 18:07 ` Mikhail Rudenko (?) (?) @ 2021-08-31 0:03 ` Rob Herring -1 siblings, 0 replies; 56+ messages in thread From: Rob Herring @ 2021-08-31 0:03 UTC (permalink / raw) To: Mikhail Rudenko Cc: Kishon Vijay Abraham I, Helen Koike, linux-arm-kernel, Ezequiel Garcia, devicetree, linux-kernel, Vinod Koul, linux-phy, Rob Herring, linux-rockchip, Heiko Stuebner, linux-media On Mon, 30 Aug 2021 21:07:53 +0300, Mikhail Rudenko wrote: > RK3399 TX1RX1 D-PHY is not a child of GRF and uses reg, thus add > corresponding properties conditionally. It also requires DSI clock to > operate, so check for it. Since we now support both rx0 and tx1rx1, > rename the schema to rockchip-mipi-dphy-rx.yaml. > > Signed-off-by: Mikhail Rudenko <mike.rudenko@gmail.com> > --- > ...hy-rx0.yaml => rockchip-mipi-dphy-rx.yaml} | 39 +++++++++++++++++-- > 1 file changed, 35 insertions(+), 4 deletions(-) > rename Documentation/devicetree/bindings/phy/{rockchip-mipi-dphy-rx0.yaml => rockchip-mipi-dphy-rx.yaml} (65%) > My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check' on your patch (DT_CHECKER_FLAGS is new in v5.13): yamllint warnings/errors: dtschema/dtc warnings/errors: Unknown file referenced: [Errno 2] No such file or directory: '/usr/local/lib/python3.8/dist-packages/dtschema/schemas/phy/rockchip-mipi-dphy-rx0.yaml' xargs: dt-doc-validate: exited with status 255; aborting make[1]: *** Deleting file 'Documentation/devicetree/bindings/soc/rockchip/grf.example.dt.yaml' Unknown file referenced: [Errno 2] No such file or directory: '/usr/local/lib/python3.8/dist-packages/dtschema/schemas/phy/rockchip-mipi-dphy-rx0.yaml' make[1]: *** [scripts/Makefile.lib:380: Documentation/devicetree/bindings/soc/rockchip/grf.example.dt.yaml] Error 255 make[1]: *** Waiting for unfinished jobs.... make: *** [Makefile:1419: dt_binding_check] Error 2 doc reference errors (make refcheckdocs): See https://patchwork.ozlabs.org/patch/1522296 This check can fail if there are any dependencies. The base for a patch series is generally the most recent rc1. If you already ran 'make dt_binding_check' and didn't see the above error(s), then make sure 'yamllint' is installed and dt-schema is up to date: pip3 install dtschema --upgrade Please check and re-submit. -- linux-phy mailing list linux-phy@lists.infradead.org https://lists.infradead.org/mailman/listinfo/linux-phy ^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH v1 4/5] dt-bindings: phy: phy-rockchip-dphy-rx0: add support for tx1rx1 phy @ 2021-08-31 0:03 ` Rob Herring 0 siblings, 0 replies; 56+ messages in thread From: Rob Herring @ 2021-08-31 0:03 UTC (permalink / raw) To: Mikhail Rudenko Cc: Kishon Vijay Abraham I, Helen Koike, linux-arm-kernel, Ezequiel Garcia, devicetree, linux-kernel, Vinod Koul, linux-phy, Rob Herring, linux-rockchip, Heiko Stuebner, linux-media On Mon, 30 Aug 2021 21:07:53 +0300, Mikhail Rudenko wrote: > RK3399 TX1RX1 D-PHY is not a child of GRF and uses reg, thus add > corresponding properties conditionally. It also requires DSI clock to > operate, so check for it. Since we now support both rx0 and tx1rx1, > rename the schema to rockchip-mipi-dphy-rx.yaml. > > Signed-off-by: Mikhail Rudenko <mike.rudenko@gmail.com> > --- > ...hy-rx0.yaml => rockchip-mipi-dphy-rx.yaml} | 39 +++++++++++++++++-- > 1 file changed, 35 insertions(+), 4 deletions(-) > rename Documentation/devicetree/bindings/phy/{rockchip-mipi-dphy-rx0.yaml => rockchip-mipi-dphy-rx.yaml} (65%) > My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check' on your patch (DT_CHECKER_FLAGS is new in v5.13): yamllint warnings/errors: dtschema/dtc warnings/errors: Unknown file referenced: [Errno 2] No such file or directory: '/usr/local/lib/python3.8/dist-packages/dtschema/schemas/phy/rockchip-mipi-dphy-rx0.yaml' xargs: dt-doc-validate: exited with status 255; aborting make[1]: *** Deleting file 'Documentation/devicetree/bindings/soc/rockchip/grf.example.dt.yaml' Unknown file referenced: [Errno 2] No such file or directory: '/usr/local/lib/python3.8/dist-packages/dtschema/schemas/phy/rockchip-mipi-dphy-rx0.yaml' make[1]: *** [scripts/Makefile.lib:380: Documentation/devicetree/bindings/soc/rockchip/grf.example.dt.yaml] Error 255 make[1]: *** Waiting for unfinished jobs.... make: *** [Makefile:1419: dt_binding_check] Error 2 doc reference errors (make refcheckdocs): See https://patchwork.ozlabs.org/patch/1522296 This check can fail if there are any dependencies. The base for a patch series is generally the most recent rc1. If you already ran 'make dt_binding_check' and didn't see the above error(s), then make sure 'yamllint' is installed and dt-schema is up to date: pip3 install dtschema --upgrade Please check and re-submit. ^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH v1 4/5] dt-bindings: phy: phy-rockchip-dphy-rx0: add support for tx1rx1 phy @ 2021-08-31 0:03 ` Rob Herring 0 siblings, 0 replies; 56+ messages in thread From: Rob Herring @ 2021-08-31 0:03 UTC (permalink / raw) To: Mikhail Rudenko Cc: Kishon Vijay Abraham I, Helen Koike, linux-arm-kernel, Ezequiel Garcia, devicetree, linux-kernel, Vinod Koul, linux-phy, Rob Herring, linux-rockchip, Heiko Stuebner, linux-media On Mon, 30 Aug 2021 21:07:53 +0300, Mikhail Rudenko wrote: > RK3399 TX1RX1 D-PHY is not a child of GRF and uses reg, thus add > corresponding properties conditionally. It also requires DSI clock to > operate, so check for it. Since we now support both rx0 and tx1rx1, > rename the schema to rockchip-mipi-dphy-rx.yaml. > > Signed-off-by: Mikhail Rudenko <mike.rudenko@gmail.com> > --- > ...hy-rx0.yaml => rockchip-mipi-dphy-rx.yaml} | 39 +++++++++++++++++-- > 1 file changed, 35 insertions(+), 4 deletions(-) > rename Documentation/devicetree/bindings/phy/{rockchip-mipi-dphy-rx0.yaml => rockchip-mipi-dphy-rx.yaml} (65%) > My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check' on your patch (DT_CHECKER_FLAGS is new in v5.13): yamllint warnings/errors: dtschema/dtc warnings/errors: Unknown file referenced: [Errno 2] No such file or directory: '/usr/local/lib/python3.8/dist-packages/dtschema/schemas/phy/rockchip-mipi-dphy-rx0.yaml' xargs: dt-doc-validate: exited with status 255; aborting make[1]: *** Deleting file 'Documentation/devicetree/bindings/soc/rockchip/grf.example.dt.yaml' Unknown file referenced: [Errno 2] No such file or directory: '/usr/local/lib/python3.8/dist-packages/dtschema/schemas/phy/rockchip-mipi-dphy-rx0.yaml' make[1]: *** [scripts/Makefile.lib:380: Documentation/devicetree/bindings/soc/rockchip/grf.example.dt.yaml] Error 255 make[1]: *** Waiting for unfinished jobs.... make: *** [Makefile:1419: dt_binding_check] Error 2 doc reference errors (make refcheckdocs): See https://patchwork.ozlabs.org/patch/1522296 This check can fail if there are any dependencies. The base for a patch series is generally the most recent rc1. If you already ran 'make dt_binding_check' and didn't see the above error(s), then make sure 'yamllint' is installed and dt-schema is up to date: pip3 install dtschema --upgrade Please check and re-submit. _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH v1 4/5] dt-bindings: phy: phy-rockchip-dphy-rx0: add support for tx1rx1 phy @ 2021-08-31 0:03 ` Rob Herring 0 siblings, 0 replies; 56+ messages in thread From: Rob Herring @ 2021-08-31 0:03 UTC (permalink / raw) To: Mikhail Rudenko Cc: Kishon Vijay Abraham I, Helen Koike, linux-arm-kernel, Ezequiel Garcia, devicetree, linux-kernel, Vinod Koul, linux-phy, Rob Herring, linux-rockchip, Heiko Stuebner, linux-media On Mon, 30 Aug 2021 21:07:53 +0300, Mikhail Rudenko wrote: > RK3399 TX1RX1 D-PHY is not a child of GRF and uses reg, thus add > corresponding properties conditionally. It also requires DSI clock to > operate, so check for it. Since we now support both rx0 and tx1rx1, > rename the schema to rockchip-mipi-dphy-rx.yaml. > > Signed-off-by: Mikhail Rudenko <mike.rudenko@gmail.com> > --- > ...hy-rx0.yaml => rockchip-mipi-dphy-rx.yaml} | 39 +++++++++++++++++-- > 1 file changed, 35 insertions(+), 4 deletions(-) > rename Documentation/devicetree/bindings/phy/{rockchip-mipi-dphy-rx0.yaml => rockchip-mipi-dphy-rx.yaml} (65%) > My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check' on your patch (DT_CHECKER_FLAGS is new in v5.13): yamllint warnings/errors: dtschema/dtc warnings/errors: Unknown file referenced: [Errno 2] No such file or directory: '/usr/local/lib/python3.8/dist-packages/dtschema/schemas/phy/rockchip-mipi-dphy-rx0.yaml' xargs: dt-doc-validate: exited with status 255; aborting make[1]: *** Deleting file 'Documentation/devicetree/bindings/soc/rockchip/grf.example.dt.yaml' Unknown file referenced: [Errno 2] No such file or directory: '/usr/local/lib/python3.8/dist-packages/dtschema/schemas/phy/rockchip-mipi-dphy-rx0.yaml' make[1]: *** [scripts/Makefile.lib:380: Documentation/devicetree/bindings/soc/rockchip/grf.example.dt.yaml] Error 255 make[1]: *** Waiting for unfinished jobs.... make: *** [Makefile:1419: dt_binding_check] Error 2 doc reference errors (make refcheckdocs): See https://patchwork.ozlabs.org/patch/1522296 This check can fail if there are any dependencies. The base for a patch series is generally the most recent rc1. If you already ran 'make dt_binding_check' and didn't see the above error(s), then make sure 'yamllint' is installed and dt-schema is up to date: pip3 install dtschema --upgrade Please check and re-submit. _______________________________________________ Linux-rockchip mailing list Linux-rockchip@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip ^ permalink raw reply [flat|nested] 56+ messages in thread
* [PATCH v1 5/5] arm64: dts: rockchip: add mipi-dphy-tx1rx1 for rk3399 2021-08-30 18:07 ` Mikhail Rudenko (?) (?) @ 2021-08-30 18:07 ` Mikhail Rudenko -1 siblings, 0 replies; 56+ messages in thread From: Mikhail Rudenko @ 2021-08-30 18:07 UTC (permalink / raw) To: linux-phy Cc: linux-media, Mikhail Rudenko, Rob Herring, Heiko Stuebner, Johan Jonker, Marc Zyngier, Helen Koike, Elaine Zhang, Shunqian Zheng, Robin Murphy, devicetree, linux-arm-kernel, linux-rockchip, linux-kernel Add DT node for RX mode of RK3399 TX1RX1 D-PHY. Signed-off-by: Mikhail Rudenko <mike.rudenko@gmail.com> --- arch/arm64/boot/dts/rockchip/rk3399.dtsi | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi index 3871c7fd83b0..2e4513275a87 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi @@ -1902,6 +1902,21 @@ mipi1_in_vopl: endpoint@1 { }; }; + mipi_dphy_tx1rx1: mipi-dphy-tx1rx1@ff968000 { + compatible = "rockchip,rk3399-mipi-dphy-tx1rx1"; + reg = <0x0 0xff968000 0x0 0x8000>; + clocks = <&cru SCLK_MIPIDPHY_REF>, + <&cru SCLK_DPHY_TX1RX1_CFG>, + <&cru PCLK_VIO_GRF>, + <&cru PCLK_MIPI_DSI1>; + clock-names = "dphy-ref", "dphy-cfg", + "grf", "dsi"; + rockchip,grf = <&grf>; + power-domains = <&power RK3399_PD_VIO>; + #phy-cells = <0>; + status = "disabled"; + }; + edp: edp@ff970000 { compatible = "rockchip,rk3399-edp"; reg = <0x0 0xff970000 0x0 0x8000>; -- 2.33.0 -- linux-phy mailing list linux-phy@lists.infradead.org https://lists.infradead.org/mailman/listinfo/linux-phy ^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH v1 5/5] arm64: dts: rockchip: add mipi-dphy-tx1rx1 for rk3399 @ 2021-08-30 18:07 ` Mikhail Rudenko 0 siblings, 0 replies; 56+ messages in thread From: Mikhail Rudenko @ 2021-08-30 18:07 UTC (permalink / raw) To: linux-phy Cc: linux-media, Mikhail Rudenko, Rob Herring, Heiko Stuebner, Johan Jonker, Marc Zyngier, Helen Koike, Elaine Zhang, Shunqian Zheng, Robin Murphy, devicetree, linux-arm-kernel, linux-rockchip, linux-kernel Add DT node for RX mode of RK3399 TX1RX1 D-PHY. Signed-off-by: Mikhail Rudenko <mike.rudenko@gmail.com> --- arch/arm64/boot/dts/rockchip/rk3399.dtsi | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi index 3871c7fd83b0..2e4513275a87 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi @@ -1902,6 +1902,21 @@ mipi1_in_vopl: endpoint@1 { }; }; + mipi_dphy_tx1rx1: mipi-dphy-tx1rx1@ff968000 { + compatible = "rockchip,rk3399-mipi-dphy-tx1rx1"; + reg = <0x0 0xff968000 0x0 0x8000>; + clocks = <&cru SCLK_MIPIDPHY_REF>, + <&cru SCLK_DPHY_TX1RX1_CFG>, + <&cru PCLK_VIO_GRF>, + <&cru PCLK_MIPI_DSI1>; + clock-names = "dphy-ref", "dphy-cfg", + "grf", "dsi"; + rockchip,grf = <&grf>; + power-domains = <&power RK3399_PD_VIO>; + #phy-cells = <0>; + status = "disabled"; + }; + edp: edp@ff970000 { compatible = "rockchip,rk3399-edp"; reg = <0x0 0xff970000 0x0 0x8000>; -- 2.33.0 ^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH v1 5/5] arm64: dts: rockchip: add mipi-dphy-tx1rx1 for rk3399 @ 2021-08-30 18:07 ` Mikhail Rudenko 0 siblings, 0 replies; 56+ messages in thread From: Mikhail Rudenko @ 2021-08-30 18:07 UTC (permalink / raw) To: linux-phy Cc: linux-media, Mikhail Rudenko, Rob Herring, Heiko Stuebner, Johan Jonker, Marc Zyngier, Helen Koike, Elaine Zhang, Shunqian Zheng, Robin Murphy, devicetree, linux-arm-kernel, linux-rockchip, linux-kernel Add DT node for RX mode of RK3399 TX1RX1 D-PHY. Signed-off-by: Mikhail Rudenko <mike.rudenko@gmail.com> --- arch/arm64/boot/dts/rockchip/rk3399.dtsi | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi index 3871c7fd83b0..2e4513275a87 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi @@ -1902,6 +1902,21 @@ mipi1_in_vopl: endpoint@1 { }; }; + mipi_dphy_tx1rx1: mipi-dphy-tx1rx1@ff968000 { + compatible = "rockchip,rk3399-mipi-dphy-tx1rx1"; + reg = <0x0 0xff968000 0x0 0x8000>; + clocks = <&cru SCLK_MIPIDPHY_REF>, + <&cru SCLK_DPHY_TX1RX1_CFG>, + <&cru PCLK_VIO_GRF>, + <&cru PCLK_MIPI_DSI1>; + clock-names = "dphy-ref", "dphy-cfg", + "grf", "dsi"; + rockchip,grf = <&grf>; + power-domains = <&power RK3399_PD_VIO>; + #phy-cells = <0>; + status = "disabled"; + }; + edp: edp@ff970000 { compatible = "rockchip,rk3399-edp"; reg = <0x0 0xff970000 0x0 0x8000>; -- 2.33.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH v1 5/5] arm64: dts: rockchip: add mipi-dphy-tx1rx1 for rk3399 @ 2021-08-30 18:07 ` Mikhail Rudenko 0 siblings, 0 replies; 56+ messages in thread From: Mikhail Rudenko @ 2021-08-30 18:07 UTC (permalink / raw) To: linux-phy Cc: linux-media, Mikhail Rudenko, Rob Herring, Heiko Stuebner, Johan Jonker, Marc Zyngier, Helen Koike, Elaine Zhang, Shunqian Zheng, Robin Murphy, devicetree, linux-arm-kernel, linux-rockchip, linux-kernel Add DT node for RX mode of RK3399 TX1RX1 D-PHY. Signed-off-by: Mikhail Rudenko <mike.rudenko@gmail.com> --- arch/arm64/boot/dts/rockchip/rk3399.dtsi | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi index 3871c7fd83b0..2e4513275a87 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi @@ -1902,6 +1902,21 @@ mipi1_in_vopl: endpoint@1 { }; }; + mipi_dphy_tx1rx1: mipi-dphy-tx1rx1@ff968000 { + compatible = "rockchip,rk3399-mipi-dphy-tx1rx1"; + reg = <0x0 0xff968000 0x0 0x8000>; + clocks = <&cru SCLK_MIPIDPHY_REF>, + <&cru SCLK_DPHY_TX1RX1_CFG>, + <&cru PCLK_VIO_GRF>, + <&cru PCLK_MIPI_DSI1>; + clock-names = "dphy-ref", "dphy-cfg", + "grf", "dsi"; + rockchip,grf = <&grf>; + power-domains = <&power RK3399_PD_VIO>; + #phy-cells = <0>; + status = "disabled"; + }; + edp: edp@ff970000 { compatible = "rockchip,rk3399-edp"; reg = <0x0 0xff970000 0x0 0x8000>; -- 2.33.0 _______________________________________________ Linux-rockchip mailing list Linux-rockchip@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip ^ permalink raw reply related [flat|nested] 56+ messages in thread
* Re: [PATCH v1 5/5] arm64: dts: rockchip: add mipi-dphy-tx1rx1 for rk3399 2021-08-30 18:07 ` Mikhail Rudenko (?) (?) @ 2021-08-30 21:12 ` Johan Jonker -1 siblings, 0 replies; 56+ messages in thread From: Johan Jonker @ 2021-08-30 21:12 UTC (permalink / raw) To: Mikhail Rudenko, linux-phy Cc: linux-media, Rob Herring, Heiko Stuebner, Marc Zyngier, Helen Koike, Elaine Zhang, Shunqian Zheng, Robin Murphy, devicetree, linux-arm-kernel, linux-rockchip, linux-kernel Hi Mikhail, On 8/30/21 8:07 PM, Mikhail Rudenko wrote: > Add DT node for RX mode of RK3399 TX1RX1 D-PHY. > > Signed-off-by: Mikhail Rudenko <mike.rudenko@gmail.com> > --- > arch/arm64/boot/dts/rockchip/rk3399.dtsi | 15 +++++++++++++++ > 1 file changed, 15 insertions(+) > > diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi > index 3871c7fd83b0..2e4513275a87 100644 > --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi > +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi > @@ -1902,6 +1902,21 @@ mipi1_in_vopl: endpoint@1 { > }; > }; > > + mipi_dphy_tx1rx1: mipi-dphy-tx1rx1@ff968000 { > + compatible = "rockchip,rk3399-mipi-dphy-tx1rx1"; > + reg = <0x0 0xff968000 0x0 0x8000>; > + clocks = <&cru SCLK_MIPIDPHY_REF>, > + <&cru SCLK_DPHY_TX1RX1_CFG>, > + <&cru PCLK_VIO_GRF>, > + <&cru PCLK_MIPI_DSI1>; > + clock-names = "dphy-ref", "dphy-cfg", > + "grf", "dsi"; Could you fix the alignment a bit with extra spaces? > + rockchip,grf = <&grf>; > + power-domains = <&power RK3399_PD_VIO>; Sort in alphabetical order. > + #phy-cells = <0>; > + status = "disabled"; > + }; > + > edp: edp@ff970000 { > compatible = "rockchip,rk3399-edp"; > reg = <0x0 0xff970000 0x0 0x8000>; > -- linux-phy mailing list linux-phy@lists.infradead.org https://lists.infradead.org/mailman/listinfo/linux-phy ^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH v1 5/5] arm64: dts: rockchip: add mipi-dphy-tx1rx1 for rk3399 @ 2021-08-30 21:12 ` Johan Jonker 0 siblings, 0 replies; 56+ messages in thread From: Johan Jonker @ 2021-08-30 21:12 UTC (permalink / raw) To: Mikhail Rudenko, linux-phy Cc: linux-media, Rob Herring, Heiko Stuebner, Marc Zyngier, Helen Koike, Elaine Zhang, Shunqian Zheng, Robin Murphy, devicetree, linux-arm-kernel, linux-rockchip, linux-kernel Hi Mikhail, On 8/30/21 8:07 PM, Mikhail Rudenko wrote: > Add DT node for RX mode of RK3399 TX1RX1 D-PHY. > > Signed-off-by: Mikhail Rudenko <mike.rudenko@gmail.com> > --- > arch/arm64/boot/dts/rockchip/rk3399.dtsi | 15 +++++++++++++++ > 1 file changed, 15 insertions(+) > > diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi > index 3871c7fd83b0..2e4513275a87 100644 > --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi > +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi > @@ -1902,6 +1902,21 @@ mipi1_in_vopl: endpoint@1 { > }; > }; > > + mipi_dphy_tx1rx1: mipi-dphy-tx1rx1@ff968000 { > + compatible = "rockchip,rk3399-mipi-dphy-tx1rx1"; > + reg = <0x0 0xff968000 0x0 0x8000>; > + clocks = <&cru SCLK_MIPIDPHY_REF>, > + <&cru SCLK_DPHY_TX1RX1_CFG>, > + <&cru PCLK_VIO_GRF>, > + <&cru PCLK_MIPI_DSI1>; > + clock-names = "dphy-ref", "dphy-cfg", > + "grf", "dsi"; Could you fix the alignment a bit with extra spaces? > + rockchip,grf = <&grf>; > + power-domains = <&power RK3399_PD_VIO>; Sort in alphabetical order. > + #phy-cells = <0>; > + status = "disabled"; > + }; > + > edp: edp@ff970000 { > compatible = "rockchip,rk3399-edp"; > reg = <0x0 0xff970000 0x0 0x8000>; > ^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH v1 5/5] arm64: dts: rockchip: add mipi-dphy-tx1rx1 for rk3399 @ 2021-08-30 21:12 ` Johan Jonker 0 siblings, 0 replies; 56+ messages in thread From: Johan Jonker @ 2021-08-30 21:12 UTC (permalink / raw) To: Mikhail Rudenko, linux-phy Cc: linux-media, Rob Herring, Heiko Stuebner, Marc Zyngier, Helen Koike, Elaine Zhang, Shunqian Zheng, Robin Murphy, devicetree, linux-arm-kernel, linux-rockchip, linux-kernel Hi Mikhail, On 8/30/21 8:07 PM, Mikhail Rudenko wrote: > Add DT node for RX mode of RK3399 TX1RX1 D-PHY. > > Signed-off-by: Mikhail Rudenko <mike.rudenko@gmail.com> > --- > arch/arm64/boot/dts/rockchip/rk3399.dtsi | 15 +++++++++++++++ > 1 file changed, 15 insertions(+) > > diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi > index 3871c7fd83b0..2e4513275a87 100644 > --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi > +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi > @@ -1902,6 +1902,21 @@ mipi1_in_vopl: endpoint@1 { > }; > }; > > + mipi_dphy_tx1rx1: mipi-dphy-tx1rx1@ff968000 { > + compatible = "rockchip,rk3399-mipi-dphy-tx1rx1"; > + reg = <0x0 0xff968000 0x0 0x8000>; > + clocks = <&cru SCLK_MIPIDPHY_REF>, > + <&cru SCLK_DPHY_TX1RX1_CFG>, > + <&cru PCLK_VIO_GRF>, > + <&cru PCLK_MIPI_DSI1>; > + clock-names = "dphy-ref", "dphy-cfg", > + "grf", "dsi"; Could you fix the alignment a bit with extra spaces? > + rockchip,grf = <&grf>; > + power-domains = <&power RK3399_PD_VIO>; Sort in alphabetical order. > + #phy-cells = <0>; > + status = "disabled"; > + }; > + > edp: edp@ff970000 { > compatible = "rockchip,rk3399-edp"; > reg = <0x0 0xff970000 0x0 0x8000>; > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH v1 5/5] arm64: dts: rockchip: add mipi-dphy-tx1rx1 for rk3399 @ 2021-08-30 21:12 ` Johan Jonker 0 siblings, 0 replies; 56+ messages in thread From: Johan Jonker @ 2021-08-30 21:12 UTC (permalink / raw) To: Mikhail Rudenko, linux-phy Cc: linux-media, Rob Herring, Heiko Stuebner, Marc Zyngier, Helen Koike, Elaine Zhang, Shunqian Zheng, Robin Murphy, devicetree, linux-arm-kernel, linux-rockchip, linux-kernel Hi Mikhail, On 8/30/21 8:07 PM, Mikhail Rudenko wrote: > Add DT node for RX mode of RK3399 TX1RX1 D-PHY. > > Signed-off-by: Mikhail Rudenko <mike.rudenko@gmail.com> > --- > arch/arm64/boot/dts/rockchip/rk3399.dtsi | 15 +++++++++++++++ > 1 file changed, 15 insertions(+) > > diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi > index 3871c7fd83b0..2e4513275a87 100644 > --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi > +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi > @@ -1902,6 +1902,21 @@ mipi1_in_vopl: endpoint@1 { > }; > }; > > + mipi_dphy_tx1rx1: mipi-dphy-tx1rx1@ff968000 { > + compatible = "rockchip,rk3399-mipi-dphy-tx1rx1"; > + reg = <0x0 0xff968000 0x0 0x8000>; > + clocks = <&cru SCLK_MIPIDPHY_REF>, > + <&cru SCLK_DPHY_TX1RX1_CFG>, > + <&cru PCLK_VIO_GRF>, > + <&cru PCLK_MIPI_DSI1>; > + clock-names = "dphy-ref", "dphy-cfg", > + "grf", "dsi"; Could you fix the alignment a bit with extra spaces? > + rockchip,grf = <&grf>; > + power-domains = <&power RK3399_PD_VIO>; Sort in alphabetical order. > + #phy-cells = <0>; > + status = "disabled"; > + }; > + > edp: edp@ff970000 { > compatible = "rockchip,rk3399-edp"; > reg = <0x0 0xff970000 0x0 0x8000>; > _______________________________________________ Linux-rockchip mailing list Linux-rockchip@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip ^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH v1 5/5] arm64: dts: rockchip: add mipi-dphy-tx1rx1 for rk3399 2021-08-30 21:12 ` Johan Jonker (?) (?) @ 2021-08-30 21:50 ` Johan Jonker -1 siblings, 0 replies; 56+ messages in thread From: Johan Jonker @ 2021-08-30 21:50 UTC (permalink / raw) To: Mikhail Rudenko, linux-phy Cc: linux-media, Rob Herring, Heiko Stuebner, Marc Zyngier, Helen Koike, Elaine Zhang, Shunqian Zheng, Robin Murphy, devicetree, linux-arm-kernel, linux-rockchip, linux-kernel On 8/30/21 11:12 PM, Johan Jonker wrote: > Hi Mikhail, > > On 8/30/21 8:07 PM, Mikhail Rudenko wrote: >> Add DT node for RX mode of RK3399 TX1RX1 D-PHY. >> >> Signed-off-by: Mikhail Rudenko <mike.rudenko@gmail.com> >> --- >> arch/arm64/boot/dts/rockchip/rk3399.dtsi | 15 +++++++++++++++ >> 1 file changed, 15 insertions(+) >> >> diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi >> index 3871c7fd83b0..2e4513275a87 100644 >> --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi >> +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi >> @@ -1902,6 +1902,21 @@ mipi1_in_vopl: endpoint@1 { >> }; >> }; >> >> + mipi_dphy_tx1rx1: mipi-dphy-tx1rx1@ff968000 { >> + compatible = "rockchip,rk3399-mipi-dphy-tx1rx1"; mipi_dsi1: mipi@ff968000 { compatible = "rockchip,rk3399-mipi-dsi", "snps,dw-mipi-dsi"; reg = <0x0 0xff968000 0x0 0x8000>; Sorry, there's already a node in mainline. Excuse... See Heiko's comment. >> + reg = <0x0 0xff968000 0x0 0x8000>; > >> + clocks = <&cru SCLK_MIPIDPHY_REF>, >> + <&cru SCLK_DPHY_TX1RX1_CFG>, >> + <&cru PCLK_VIO_GRF>, >> + <&cru PCLK_MIPI_DSI1>; >> + clock-names = "dphy-ref", "dphy-cfg", >> + "grf", "dsi"; > > Could you fix the alignment a bit with extra spaces? > >> + rockchip,grf = <&grf>; >> + power-domains = <&power RK3399_PD_VIO>; > > Sort in alphabetical order. > >> + #phy-cells = <0>; >> + status = "disabled"; >> + }; >> + >> edp: edp@ff970000 { >> compatible = "rockchip,rk3399-edp"; >> reg = <0x0 0xff970000 0x0 0x8000>; >> -- linux-phy mailing list linux-phy@lists.infradead.org https://lists.infradead.org/mailman/listinfo/linux-phy ^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH v1 5/5] arm64: dts: rockchip: add mipi-dphy-tx1rx1 for rk3399 @ 2021-08-30 21:50 ` Johan Jonker 0 siblings, 0 replies; 56+ messages in thread From: Johan Jonker @ 2021-08-30 21:50 UTC (permalink / raw) To: Mikhail Rudenko, linux-phy Cc: linux-media, Rob Herring, Heiko Stuebner, Marc Zyngier, Helen Koike, Elaine Zhang, Shunqian Zheng, Robin Murphy, devicetree, linux-arm-kernel, linux-rockchip, linux-kernel On 8/30/21 11:12 PM, Johan Jonker wrote: > Hi Mikhail, > > On 8/30/21 8:07 PM, Mikhail Rudenko wrote: >> Add DT node for RX mode of RK3399 TX1RX1 D-PHY. >> >> Signed-off-by: Mikhail Rudenko <mike.rudenko@gmail.com> >> --- >> arch/arm64/boot/dts/rockchip/rk3399.dtsi | 15 +++++++++++++++ >> 1 file changed, 15 insertions(+) >> >> diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi >> index 3871c7fd83b0..2e4513275a87 100644 >> --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi >> +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi >> @@ -1902,6 +1902,21 @@ mipi1_in_vopl: endpoint@1 { >> }; >> }; >> >> + mipi_dphy_tx1rx1: mipi-dphy-tx1rx1@ff968000 { >> + compatible = "rockchip,rk3399-mipi-dphy-tx1rx1"; mipi_dsi1: mipi@ff968000 { compatible = "rockchip,rk3399-mipi-dsi", "snps,dw-mipi-dsi"; reg = <0x0 0xff968000 0x0 0x8000>; Sorry, there's already a node in mainline. Excuse... See Heiko's comment. >> + reg = <0x0 0xff968000 0x0 0x8000>; > >> + clocks = <&cru SCLK_MIPIDPHY_REF>, >> + <&cru SCLK_DPHY_TX1RX1_CFG>, >> + <&cru PCLK_VIO_GRF>, >> + <&cru PCLK_MIPI_DSI1>; >> + clock-names = "dphy-ref", "dphy-cfg", >> + "grf", "dsi"; > > Could you fix the alignment a bit with extra spaces? > >> + rockchip,grf = <&grf>; >> + power-domains = <&power RK3399_PD_VIO>; > > Sort in alphabetical order. > >> + #phy-cells = <0>; >> + status = "disabled"; >> + }; >> + >> edp: edp@ff970000 { >> compatible = "rockchip,rk3399-edp"; >> reg = <0x0 0xff970000 0x0 0x8000>; >> ^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH v1 5/5] arm64: dts: rockchip: add mipi-dphy-tx1rx1 for rk3399 @ 2021-08-30 21:50 ` Johan Jonker 0 siblings, 0 replies; 56+ messages in thread From: Johan Jonker @ 2021-08-30 21:50 UTC (permalink / raw) To: Mikhail Rudenko, linux-phy Cc: linux-media, Rob Herring, Heiko Stuebner, Marc Zyngier, Helen Koike, Elaine Zhang, Shunqian Zheng, Robin Murphy, devicetree, linux-arm-kernel, linux-rockchip, linux-kernel On 8/30/21 11:12 PM, Johan Jonker wrote: > Hi Mikhail, > > On 8/30/21 8:07 PM, Mikhail Rudenko wrote: >> Add DT node for RX mode of RK3399 TX1RX1 D-PHY. >> >> Signed-off-by: Mikhail Rudenko <mike.rudenko@gmail.com> >> --- >> arch/arm64/boot/dts/rockchip/rk3399.dtsi | 15 +++++++++++++++ >> 1 file changed, 15 insertions(+) >> >> diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi >> index 3871c7fd83b0..2e4513275a87 100644 >> --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi >> +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi >> @@ -1902,6 +1902,21 @@ mipi1_in_vopl: endpoint@1 { >> }; >> }; >> >> + mipi_dphy_tx1rx1: mipi-dphy-tx1rx1@ff968000 { >> + compatible = "rockchip,rk3399-mipi-dphy-tx1rx1"; mipi_dsi1: mipi@ff968000 { compatible = "rockchip,rk3399-mipi-dsi", "snps,dw-mipi-dsi"; reg = <0x0 0xff968000 0x0 0x8000>; Sorry, there's already a node in mainline. Excuse... See Heiko's comment. >> + reg = <0x0 0xff968000 0x0 0x8000>; > >> + clocks = <&cru SCLK_MIPIDPHY_REF>, >> + <&cru SCLK_DPHY_TX1RX1_CFG>, >> + <&cru PCLK_VIO_GRF>, >> + <&cru PCLK_MIPI_DSI1>; >> + clock-names = "dphy-ref", "dphy-cfg", >> + "grf", "dsi"; > > Could you fix the alignment a bit with extra spaces? > >> + rockchip,grf = <&grf>; >> + power-domains = <&power RK3399_PD_VIO>; > > Sort in alphabetical order. > >> + #phy-cells = <0>; >> + status = "disabled"; >> + }; >> + >> edp: edp@ff970000 { >> compatible = "rockchip,rk3399-edp"; >> reg = <0x0 0xff970000 0x0 0x8000>; >> _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH v1 5/5] arm64: dts: rockchip: add mipi-dphy-tx1rx1 for rk3399 @ 2021-08-30 21:50 ` Johan Jonker 0 siblings, 0 replies; 56+ messages in thread From: Johan Jonker @ 2021-08-30 21:50 UTC (permalink / raw) To: Mikhail Rudenko, linux-phy Cc: linux-media, Rob Herring, Heiko Stuebner, Marc Zyngier, Helen Koike, Elaine Zhang, Shunqian Zheng, Robin Murphy, devicetree, linux-arm-kernel, linux-rockchip, linux-kernel On 8/30/21 11:12 PM, Johan Jonker wrote: > Hi Mikhail, > > On 8/30/21 8:07 PM, Mikhail Rudenko wrote: >> Add DT node for RX mode of RK3399 TX1RX1 D-PHY. >> >> Signed-off-by: Mikhail Rudenko <mike.rudenko@gmail.com> >> --- >> arch/arm64/boot/dts/rockchip/rk3399.dtsi | 15 +++++++++++++++ >> 1 file changed, 15 insertions(+) >> >> diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi >> index 3871c7fd83b0..2e4513275a87 100644 >> --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi >> +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi >> @@ -1902,6 +1902,21 @@ mipi1_in_vopl: endpoint@1 { >> }; >> }; >> >> + mipi_dphy_tx1rx1: mipi-dphy-tx1rx1@ff968000 { >> + compatible = "rockchip,rk3399-mipi-dphy-tx1rx1"; mipi_dsi1: mipi@ff968000 { compatible = "rockchip,rk3399-mipi-dsi", "snps,dw-mipi-dsi"; reg = <0x0 0xff968000 0x0 0x8000>; Sorry, there's already a node in mainline. Excuse... See Heiko's comment. >> + reg = <0x0 0xff968000 0x0 0x8000>; > >> + clocks = <&cru SCLK_MIPIDPHY_REF>, >> + <&cru SCLK_DPHY_TX1RX1_CFG>, >> + <&cru PCLK_VIO_GRF>, >> + <&cru PCLK_MIPI_DSI1>; >> + clock-names = "dphy-ref", "dphy-cfg", >> + "grf", "dsi"; > > Could you fix the alignment a bit with extra spaces? > >> + rockchip,grf = <&grf>; >> + power-domains = <&power RK3399_PD_VIO>; > > Sort in alphabetical order. > >> + #phy-cells = <0>; >> + status = "disabled"; >> + }; >> + >> edp: edp@ff970000 { >> compatible = "rockchip,rk3399-edp"; >> reg = <0x0 0xff970000 0x0 0x8000>; >> _______________________________________________ Linux-rockchip mailing list Linux-rockchip@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip ^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH v1 0/5] phy: phy-rockchip-dphy-rx0: add support for tx1rx1 rx mode 2021-08-30 18:07 ` Mikhail Rudenko (?) (?) @ 2021-08-31 12:58 ` Mikhail Rudenko -1 siblings, 0 replies; 56+ messages in thread From: Mikhail Rudenko @ 2021-08-31 12:58 UTC (permalink / raw) To: linux-phy Cc: linux-media, Mikhail Rudenko, devicetree, linux-arm-kernel, linux-rockchip, linux-kernel Hi all, thank you for reviewing this and sorry for me failing my prior research and overlooking existing Heiko's solution [1] [2]. [1] https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=71f68fe7f12182ed968cfbbd1ef018721e4dee30 [2] https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=68e0277204c733dff19073686e2ac48239b06fbc -- Regards, Mikhail -- linux-phy mailing list linux-phy@lists.infradead.org https://lists.infradead.org/mailman/listinfo/linux-phy ^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH v1 0/5] phy: phy-rockchip-dphy-rx0: add support for tx1rx1 rx mode @ 2021-08-31 12:58 ` Mikhail Rudenko 0 siblings, 0 replies; 56+ messages in thread From: Mikhail Rudenko @ 2021-08-31 12:58 UTC (permalink / raw) To: linux-phy Cc: linux-media, Mikhail Rudenko, devicetree, linux-arm-kernel, linux-rockchip, linux-kernel Hi all, thank you for reviewing this and sorry for me failing my prior research and overlooking existing Heiko's solution [1] [2]. [1] https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=71f68fe7f12182ed968cfbbd1ef018721e4dee30 [2] https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=68e0277204c733dff19073686e2ac48239b06fbc -- Regards, Mikhail ^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH v1 0/5] phy: phy-rockchip-dphy-rx0: add support for tx1rx1 rx mode @ 2021-08-31 12:58 ` Mikhail Rudenko 0 siblings, 0 replies; 56+ messages in thread From: Mikhail Rudenko @ 2021-08-31 12:58 UTC (permalink / raw) To: linux-phy Cc: linux-media, Mikhail Rudenko, devicetree, linux-arm-kernel, linux-rockchip, linux-kernel Hi all, thank you for reviewing this and sorry for me failing my prior research and overlooking existing Heiko's solution [1] [2]. [1] https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=71f68fe7f12182ed968cfbbd1ef018721e4dee30 [2] https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=68e0277204c733dff19073686e2ac48239b06fbc -- Regards, Mikhail _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH v1 0/5] phy: phy-rockchip-dphy-rx0: add support for tx1rx1 rx mode @ 2021-08-31 12:58 ` Mikhail Rudenko 0 siblings, 0 replies; 56+ messages in thread From: Mikhail Rudenko @ 2021-08-31 12:58 UTC (permalink / raw) To: linux-phy Cc: linux-media, Mikhail Rudenko, devicetree, linux-arm-kernel, linux-rockchip, linux-kernel Hi all, thank you for reviewing this and sorry for me failing my prior research and overlooking existing Heiko's solution [1] [2]. [1] https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=71f68fe7f12182ed968cfbbd1ef018721e4dee30 [2] https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=68e0277204c733dff19073686e2ac48239b06fbc -- Regards, Mikhail _______________________________________________ Linux-rockchip mailing list Linux-rockchip@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip ^ permalink raw reply [flat|nested] 56+ messages in thread
end of thread, other threads:[~2021-08-31 13:34 UTC | newest] Thread overview: 56+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2021-08-30 18:07 [PATCH v1 0/5] phy: phy-rockchip-dphy-rx0: add support for tx1rx1 rx mode Mikhail Rudenko 2021-08-30 18:07 ` Mikhail Rudenko 2021-08-30 18:07 ` Mikhail Rudenko 2021-08-30 18:07 ` Mikhail Rudenko 2021-08-30 18:07 ` [PATCH v1 1/5] phy: phy-rockchip-dphy-rx0: refactor for tx1rx1 addition Mikhail Rudenko 2021-08-30 18:07 ` Mikhail Rudenko 2021-08-30 18:07 ` Mikhail Rudenko 2021-08-30 18:07 ` Mikhail Rudenko 2021-08-30 20:45 ` Heiko Stübner 2021-08-30 20:45 ` Heiko Stübner 2021-08-30 20:45 ` Heiko Stübner 2021-08-30 20:45 ` Heiko Stübner 2021-08-31 0:41 ` Ezequiel Garcia 2021-08-31 0:41 ` Ezequiel Garcia 2021-08-31 0:41 ` Ezequiel Garcia 2021-08-31 0:41 ` Ezequiel Garcia 2021-08-30 18:07 ` [PATCH v1 2/5] phy: phy-rockchip-dphy-rx0: add support for tx1rx1 in receive mode Mikhail Rudenko 2021-08-30 18:07 ` Mikhail Rudenko 2021-08-30 18:07 ` Mikhail Rudenko 2021-08-30 18:07 ` Mikhail Rudenko 2021-08-30 18:07 ` [PATCH v1 3/5] phy: rename phy-rockchip-dphy-rx0 to phy-rockchip-dphy-rx Mikhail Rudenko 2021-08-30 18:07 ` Mikhail Rudenko 2021-08-30 18:07 ` Mikhail Rudenko 2021-08-30 18:07 ` Mikhail Rudenko 2021-08-30 18:07 ` [PATCH v1 4/5] dt-bindings: phy: phy-rockchip-dphy-rx0: add support for tx1rx1 phy Mikhail Rudenko 2021-08-30 18:07 ` Mikhail Rudenko 2021-08-30 18:07 ` Mikhail Rudenko 2021-08-30 18:07 ` Mikhail Rudenko 2021-08-30 21:00 ` Johan Jonker 2021-08-30 21:00 ` Johan Jonker 2021-08-30 21:00 ` Johan Jonker 2021-08-30 21:00 ` Johan Jonker 2021-08-30 22:06 ` Johan Jonker 2021-08-30 22:06 ` Johan Jonker 2021-08-30 22:06 ` Johan Jonker 2021-08-30 22:06 ` Johan Jonker 2021-08-31 0:03 ` Rob Herring 2021-08-31 0:03 ` Rob Herring 2021-08-31 0:03 ` Rob Herring 2021-08-31 0:03 ` Rob Herring 2021-08-30 18:07 ` [PATCH v1 5/5] arm64: dts: rockchip: add mipi-dphy-tx1rx1 for rk3399 Mikhail Rudenko 2021-08-30 18:07 ` Mikhail Rudenko 2021-08-30 18:07 ` Mikhail Rudenko 2021-08-30 18:07 ` Mikhail Rudenko 2021-08-30 21:12 ` Johan Jonker 2021-08-30 21:12 ` Johan Jonker 2021-08-30 21:12 ` Johan Jonker 2021-08-30 21:12 ` Johan Jonker 2021-08-30 21:50 ` Johan Jonker 2021-08-30 21:50 ` Johan Jonker 2021-08-30 21:50 ` Johan Jonker 2021-08-30 21:50 ` Johan Jonker 2021-08-31 12:58 ` [PATCH v1 0/5] phy: phy-rockchip-dphy-rx0: add support for tx1rx1 rx mode Mikhail Rudenko 2021-08-31 12:58 ` Mikhail Rudenko 2021-08-31 12:58 ` Mikhail Rudenko 2021-08-31 12:58 ` Mikhail Rudenko
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.