rockchip-dsi for rk3568
Subsystems (3)
v4 cover rockchip-dsi for rk3568
From: Chris Morgan <[email protected]>
This series adds support for the dsi and dphy controllers on the Rockchip RK3568.
Tested on an Anbernic RG503, Anbernic RG353P, and Odroid Go Advance.
Changes since V3:
- Added labels to bindings in rk356x.dtsi file to make it easier to reference in board dts files.
Changes since V2:
- Removed dsi controller patches, as those have been merged upstream.
- Removed notes about rolling back clock drivers. If I set the parent clock of the VOP port I'm using to VPLL and set the clock rate of PLL_VPLL to 500MHz this series works correctly for my panels without rolling anything back (per Heiko this is the correct way).
- Added additional details about refactoring DPHY driver to add 2.5GHz for rk356x. All other devices still have a max speed of 1GHz.
- Notified Heiko that the BIT(5) for both PLL_POST_DIV_ENABLE and PLL_POST_DIV_ENABLE_MASK is deliberate, because of how the phy_update_bits() works.
Changes since RFCv1:
- Identified cause of image shift (clock changes).
- Noted that driver works now.
- Added devicetree nodes for rk356x.dtsi.
Chris Morgan (3):
dt-bindings: phy-rockchip-inno-dsidphy: add compatible for rk3568 phy/rockchip: inno-dsidphy: Add support for rk3568
arm64: dts: rockchip: Add DSI and DSI-DPHY nodes to rk356x
.../bindings/phy/rockchip,px30-dsi-dphy.yaml | 1 + arch/arm64/boot/dts/rockchip/rk356x.dtsi | 80 +++++++ .../phy/rockchip/phy-rockchip-inno-dsidphy.c | 204 ++++++++++++++---- 3 files changed, 239 insertions(+), 46 deletions(-)
Signature · 1 line
2.25.1
PATCH v4 1/3 dt-bindings: phy-rockchip-inno-dsidphy: add compatible for rk3568
From: Chris Morgan <[email protected]>
Add a compatible string for the rk3568 dsi-dphy.
--- .../devicetree/bindings/phy/rockchip,px30-dsi-dphy.yaml | 1 + 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/phy/rockchip,px30-dsi-dphy.yaml +1 -0
@@ -18,6 +18,7 @@ properties: - rockchip,px30-dsi-dphy - rockchip,rk3128-dsi-dphy - rockchip,rk3368-dsi-dphy + - rockchip,rk3568-dsi-dphy reg: maxItems: 1
Signature · 1 line
2.25.1
PATCH v4 3/3 arm64: dts: rockchip: Add DSI and DSI-DPHY nodes to rk356x
In reply to Chris MorganFrom: Chris Morgan <[email protected]>
This adds the DSI controller nodes and DSI-DPHY controller nodes to the rk356x device tree.
--- arch/arm64/boot/dts/rockchip/rk356x.dtsi | 80 ++++++++++++++++++++++++ 1 file changed, 80 insertions(+)
arch/arm64/boot/dts/rockchip/rk356x.dtsi +80 -0
@@ -699,6 +699,62 @@ vop_mmu: iommu@fe043e00 { status = "disabled"; }; + dsi0: dsi@fe060000 { + compatible = "rockchip,rk3568-mipi-dsi", "snps,dw-mipi-dsi"; + reg = <0x00 0xfe060000 0x00 0x10000>; + interrupts = <GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>; + clock-names = "pclk", "hclk"; + clocks = <&cru PCLK_DSITX_0>, <&cru HCLK_VO>; + phy-names = "dphy"; + phys = <&dsi_dphy0>; + power-domains = <&power RK3568_PD_VO>; + reset-names = "apb"; + resets = <&cru SRST_P_DSITX_0>; + rockchip,grf = <&grf>; + status = "disabled"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + dsi0_in: port@0 { + reg = <0>; + }; + + dsi0_out: port@1 { + reg = <1>; + }; + }; + }; + + dsi1: dsi@fe070000 { + compatible = "rockchip,rk3568-mipi-dsi", "snps,dw-mipi-dsi"; + reg = <0x0 0xfe070000 0x0 0x10000>; + interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>; + clock-names = "pclk", "hclk"; + clocks = <&cru PCLK_DSITX_1>, <&cru HCLK_VO>; + phy-names = "dphy"; + phys = <&dsi_dphy1>; + power-domains = <&power RK3568_PD_VO>; + reset-names = "apb"; + resets = <&cru SRST_P_DSITX_1>; + rockchip,grf = <&grf>; + status = "disabled"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + dsi1_in: port@0 { + reg = <0>; + }; + + dsi1_out: port@1 { + reg = <1>; + }; + }; + }; + hdmi: hdmi@fe0a0000 { compatible = "rockchip,rk3568-dw-hdmi"; reg = <0x0 0xfe0a0000 0x0 0x20000>;
@@ -1594,6 +1650,30 @@ combphy2: phy@fe840000 { status = "disabled"; }; + dsi_dphy0: mipi-dphy@fe850000 { + compatible = "rockchip,rk3568-dsi-dphy"; + reg = <0x0 0xfe850000 0x0 0x10000>; + clock-names = "ref", "pclk"; + clocks = <&pmucru CLK_MIPIDSIPHY0_REF>, <&cru PCLK_MIPIDSIPHY0>; + #phy-cells = <0>; + power-domains = <&power RK3568_PD_VO>; + reset-names = "apb"; + resets = <&cru SRST_P_MIPIDSIPHY0>; + status = "disabled"; + }; + + dsi_dphy1: mipi-dphy@fe860000 { + compatible = "rockchip,rk3568-dsi-dphy"; + reg = <0x0 0xfe860000 0x0 0x10000>; + clock-names = "ref", "pclk"; + clocks = <&pmucru CLK_MIPIDSIPHY1_REF>, <&cru PCLK_MIPIDSIPHY1>; + #phy-cells = <0>; + power-domains = <&power RK3568_PD_VO>; + reset-names = "apb"; + resets = <&cru SRST_P_MIPIDSIPHY1>; + status = "disabled"; + }; + usb2phy0: usb2phy@fe8a0000 { compatible = "rockchip,rk3568-usb2phy"; reg = <0x0 0xfe8a0000 0x0 0x10000>;
Signature · 1 line
2.25.1
PATCH v4 2/3 phy/rockchip: inno-dsidphy: Add support for rk3568
In reply to Chris MorganFrom: Chris Morgan <[email protected]>
Add support for the Rockchip RK3568 DSI-DPHY. Registers were taken from the BSP kernel driver and wherever possible cross referenced with the TRM.
Refactor the code to allow the different compatible strings to set either a max 1GHz timing table (all existing hardware) or a max 2.5GHz timing table (the new RK356x). This works (for me) on both an RK3326 (PX30) and a new RK3566 device.
--- .../phy/rockchip/phy-rockchip-inno-dsidphy.c | 204 ++++++++++++++---- 1 file changed, 158 insertions(+), 46 deletions(-)
drivers/phy/rockchip/phy-rockchip-inno-dsidphy.c +158 -46
@@ -84,9 +84,25 @@#define DATA_LANE_0_SKEW_PHASE_MASK GENMASK(2, 0)#define DATA_LANE_0_SKEW_PHASE (x) UPDATE(x, 2, 0)/* Analog Register Part: reg08 */ +#define PLL_POST_DIV_ENABLE_MASK BIT(5) +#define PLL_POST_DIV_ENABLE BIT(5)#define SAMPLE_CLOCK_DIRECTION_MASK BIT(4)#define SAMPLE_CLOCK_DIRECTION_REVERSE BIT(4)#define SAMPLE_CLOCK_DIRECTION_FORWARD 0 +#define LOWFRE_EN_MASK BIT(5) +#define PLL_OUTPUT_FREQUENCY_DIV_BY_1 0 +#define PLL_OUTPUT_FREQUENCY_DIV_BY_2 1 +/* Analog Register Part: reg0b */ +#define CLOCK_LANE_VOD_RANGE_SET_MASK GENMASK(3, 0) +#define CLOCK_LANE_VOD_RANGE_SET (x) UPDATE(x, 3, 0) +#define VOD_MIN_RANGE 0x1 +#define VOD_MID_RANGE 0x3 +#define VOD_BIG_RANGE 0x7 +#define VOD_MAX_RANGE 0xf +/* Analog Register Part: reg1E */ +#define PLL_MODE_SEL_MASK GENMASK(6, 5) +#define PLL_MODE_SEL_LVDS_MODE 0 +#define PLL_MODE_SEL_MIPI_MODE BIT(5)/* Digital Register Part: reg00 */ #define REG_DIG_RSTN_MASK BIT(0)#define REG_DIG_RSTN_NORMAL BIT(0)
@@ -102,20 +118,22 @@#define T_LPX_CNT_MASK GENMASK(5, 0)#define T_LPX_CNT (x) UPDATE(x, 5, 0)/* Clock/Data0/Data1/Data2/Data3 Lane Register Part: reg06 */ +#define T_HS_ZERO_CNT_HI_MASK BIT(7) +#define T_HS_ZERO_CNT_HI (x) UPDATE(x, 7, 7)#define T_HS_PREPARE_CNT_MASK GENMASK(6, 0)#define T_HS_PREPARE_CNT (x) UPDATE(x, 6, 0)/* Clock/Data0/Data1/Data2/Data3 Lane Register Part: reg07 */ -#define T_HS_ZERO_CNT_MASK GENMASK(5, 0) -#define T_HS_ZERO_CNT (x) UPDATE(x, 5, 0) +#define T_HS_ZERO_CNT_LO_MASK GENMASK(5, 0) +#define T_HS_ZERO_CNT_LO (x) UPDATE(x, 5, 0)/* Clock/Data0/Data1/Data2/Data3 Lane Register Part: reg08 */ #define T_HS_TRAIL_CNT_MASK GENMASK(6, 0)#define T_HS_TRAIL_CNT (x) UPDATE(x, 6, 0)/* Clock/Data0/Data1/Data2/Data3 Lane Register Part: reg09 */ -#define T_HS_EXIT_CNT_MASK GENMASK(4, 0) -#define T_HS_EXIT_CNT (x) UPDATE(x, 4, 0) +#define T_HS_EXIT_CNT_LO_MASK GENMASK(4, 0) +#define T_HS_EXIT_CNT_LO (x) UPDATE(x, 4, 0)/* Clock/Data0/Data1/Data2/Data3 Lane Register Part: reg0a */ -#define T_CLK_POST_CNT_MASK GENMASK(3, 0) -#define T_CLK_POST_CNT (x) UPDATE(x, 3, 0) +#define T_CLK_POST_CNT_LO_MASK GENMASK(3, 0) +#define T_CLK_POST_CNT_LO (x) UPDATE(x, 3, 0)/* Clock/Data0/Data1/Data2/Data3 Lane Register Part: reg0c */ #define LPDT_TX_PPI_SYNC_MASK BIT(2)#define LPDT_TX_PPI_SYNC_ENABLE BIT(2)
@@ -129,9 +147,13 @@#define T_CLK_PRE_CNT_MASK GENMASK(3, 0)#define T_CLK_PRE_CNT (x) UPDATE(x, 3, 0)/* Clock/Data0/Data1/Data2/Data3 Lane Register Part: reg10 */ +#define T_CLK_POST_CNT_HI_MASK GENMASK(7, 6) +#define T_CLK_POST_CNT_HI (x) UPDATE(x, 7, 6)#define T_TA_GO_CNT_MASK GENMASK(5, 0)#define T_TA_GO_CNT (x) UPDATE(x, 5, 0)/* Clock/Data0/Data1/Data2/Data3 Lane Register Part: reg11 */ +#define T_HS_EXIT_CNT_HI_MASK BIT(6) +#define T_HS_EXIT_CNT_HI (x) UPDATE(x, 6, 6)#define T_TA_SURE_CNT_MASK GENMASK(5, 0)#define T_TA_SURE_CNT (x) UPDATE(x, 5, 0)/* Clock/Data0/Data1/Data2/Data3 Lane Register Part: reg12 */
@@ -169,11 +191,23 @@#define DSI_PHY_STATUS 0xb0#define PHY_LOCK BIT(0) +enum phy_max_rate { +MAX_1GHZ , +MAX_2_5GHZ , +}; + +struct inno_video_phy_plat_data { +const struct inno_mipi_dphy_timing *inno_mipi_dphy_timing_table; +const unsigned int num_timings; +enum phy_max_rate max_rate; +}; +struct inno_dsidphy {struct device *dev;struct clk *ref_clk;struct clk *pclk_phy;struct clk *pclk_host; +const struct inno_video_phy_plat_data *pdata;void __iomem *phy_base;void __iomem *host_base;struct reset_control *rst;
@@ -200,6 +234,53 @@ enum { REGISTER_PART_LVDS, }; +struct inno_mipi_dphy_timing { +unsigned long rate; +u8 lpx; +u8 hs_prepare; +u8 clk_lane_hs_zero; +u8 data_lane_hs_zero; +u8 hs_trail; +}; + +static const +struct inno_mipi_dphy_timing inno_mipi_dphy_timing_table_max_1ghz[] = { + {110000000 ,0x0 ,0x20 ,0x16 ,0x02 ,0x22 }, + {150000000 ,0x0 ,0x06 ,0x16 ,0x03 ,0x45 }, + {200000000 ,0x0 ,0x18 ,0x17 ,0x04 ,0x0b }, + {250000000 ,0x0 ,0x05 ,0x17 ,0x05 ,0x16 }, + {300000000 ,0x0 ,0x51 ,0x18 ,0x06 ,0x2c }, + {400000000 ,0x0 ,0x64 ,0x19 ,0x07 ,0x33 }, + {500000000 ,0x0 ,0x20 ,0x1b ,0x07 ,0x4e }, + {600000000 ,0x0 ,0x6a ,0x1d ,0x08 ,0x3a }, + {700000000 ,0x0 ,0x3e ,0x1e ,0x08 ,0x6a }, + {800000000 ,0x0 ,0x21 ,0x1f ,0x09 ,0x29 }, + {1000000000 ,0x0 ,0x09 ,0x20 ,0x09 ,0x27 }, +}; + +static const +struct inno_mipi_dphy_timing inno_mipi_dphy_timing_table_max_2_5ghz[] = { + {110000000 ,0x02 ,0x7f ,0x16 ,0x02 ,0x02 }, + {150000000 ,0x02 ,0x7f ,0x16 ,0x03 ,0x02 }, + {200000000 ,0x02 ,0x7f ,0x17 ,0x04 ,0x02 }, + {250000000 ,0x02 ,0x7f ,0x17 ,0x05 ,0x04 }, + {300000000 ,0x02 ,0x7f ,0x18 ,0x06 ,0x04 }, + {400000000 ,0x03 ,0x7e ,0x19 ,0x07 ,0x04 }, + {500000000 ,0x03 ,0x7c ,0x1b ,0x07 ,0x08 }, + {600000000 ,0x03 ,0x70 ,0x1d ,0x08 ,0x10 }, + {700000000 ,0x05 ,0x40 ,0x1e ,0x08 ,0x30 }, + {800000000 ,0x05 ,0x02 ,0x1f ,0x09 ,0x30 }, + {1000000000 ,0x05 ,0x08 ,0x20 ,0x09 ,0x30 }, + {1200000000 ,0x06 ,0x03 ,0x32 ,0x14 ,0x0f }, + {1400000000 ,0x09 ,0x03 ,0x32 ,0x14 ,0x0f }, + {1600000000 ,0x0d ,0x42 ,0x36 ,0x0e ,0x0f }, + {1800000000 ,0x0e ,0x47 ,0x7a ,0x0e ,0x0f }, + {2000000000 ,0x11 ,0x64 ,0x7a ,0x0e ,0x0b }, + {2200000000 ,0x13 ,0x64 ,0x7e ,0x15 ,0x0b }, + {2400000000 ,0x13 ,0x33 ,0x7f ,0x15 ,0x6a }, + {2500000000 ,0x15 ,0x54 ,0x7f ,0x15 ,0x6a }, +}; +static inline struct inno_dsidphy *hw_to_inno (struct clk_hw *hw) { return container_of(hw, struct inno_dsidphy, pll.hw);
@@ -290,31 +371,15 @@ static unsigned long inno_dsidphy_pll_calc_rate(struct inno_dsidphy *inno,static void inno_dsidphy_mipi_mode_enable (struct inno_dsidphy *inno) {struct phy_configure_opts_mipi_dphy *cfg = &inno->dphy_cfg; -const struct { -unsigned long rate; -u8 hs_prepare; -u8 clk_lane_hs_zero; -u8 data_lane_hs_zero; -u8 hs_trail; - } timings[] = { - {110000000 ,0x20 ,0x16 ,0x02 ,0x22 }, - {150000000 ,0x06 ,0x16 ,0x03 ,0x45 }, - {200000000 ,0x18 ,0x17 ,0x04 ,0x0b }, - {250000000 ,0x05 ,0x17 ,0x05 ,0x16 }, - {300000000 ,0x51 ,0x18 ,0x06 ,0x2c }, - {400000000 ,0x64 ,0x19 ,0x07 ,0x33 }, - {500000000 ,0x20 ,0x1b ,0x07 ,0x4e }, - {600000000 ,0x6a ,0x1d ,0x08 ,0x3a }, - {700000000 ,0x3e ,0x1e ,0x08 ,0x6a }, - {800000000 ,0x21 ,0x1f ,0x09 ,0x29 }, - {1000000000 ,0x09 ,0x20 ,0x09 ,0x27 }, - }; +const struct inno_mipi_dphy_timing *timings;u32 t_txbyteclkhs, t_txclkesc;u32 txbyteclkhs, txclkesc, esc_clk_div;u32 hs_exit, clk_post, clk_pre, wakeup, lpx, ta_go, ta_sure, ta_wait;u32 hs_prepare, hs_trail, hs_zero, clk_lane_hs_zero, data_lane_hs_zero;unsigned int i; + timings = inno->pdata->inno_mipi_dphy_timing_table; +inno_dsidphy_pll_calc_rate (inno, cfg->hs_clk_rate);/* Select MIPI mode */
@@ -327,6 +392,13 @@ static void inno_dsidphy_mipi_mode_enable(struct inno_dsidphy *inno) REG_FBDIV_HI_MASK, REG_FBDIV_HI(inno->pll.fbdiv));phy_update_bits (inno,REGISTER_PART_ANALOG ,0x04 ,REG_FBDIV_LO_MASK ,REG_FBDIV_LO (inno->pll.fbdiv)); +if (inno->pdata->max_rate ==MAX_2_5GHZ ) { +phy_update_bits (inno,REGISTER_PART_ANALOG ,0x08 , +PLL_POST_DIV_ENABLE_MASK ,PLL_POST_DIV_ENABLE ); +phy_update_bits (inno,REGISTER_PART_ANALOG ,0x0b , +CLOCK_LANE_VOD_RANGE_SET_MASK , +CLOCK_LANE_VOD_RANGE_SET (VOD_MAX_RANGE )); + }/* Enable PLL and LDO */ phy_update_bits(inno, REGISTER_PART_ANALOG, 0x01, REG_LDOPD_MASK | REG_PLLPD_MASK,
@@ -367,14 +439,6 @@ static void inno_dsidphy_mipi_mode_enable(struct inno_dsidphy *inno)*/ clk_pre =DIV_ROUND_UP (cfg->clk_pre,BITS_PER_BYTE ); -/* -* The value of counter for HS Tlpx Time -* Tlpx = Tpin_txbyteclkhs * (2 + value) -*/ - lpx =DIV_ROUND_UP (cfg->lpx, t_txbyteclkhs); -if (lpx >=2 ) - lpx -=2 ; -/* * The value of counter for HS Tta-go * Tta-go for turnaround
@@ -394,13 +458,24 @@ static void inno_dsidphy_mipi_mode_enable(struct inno_dsidphy *inno)*/ ta_wait =DIV_ROUND_UP (cfg->ta_get, t_txclkesc); -for (i =0 ; i <ARRAY_SIZE (timings); i++) +for (i =0 ; i < inno->pdata->num_timings; i++)if (inno->pll.rate <= timings[i].rate)break ; -if (i ==ARRAY_SIZE (timings)) +if (i == inno->pdata->num_timings) --i; +/* +* The value of counter for HS Tlpx Time +* Tlpx = Tpin_txbyteclkhs * (2 + value) +*/ +if (inno->pdata->max_rate ==MAX_1GHZ ) { + lpx =DIV_ROUND_UP (cfg->lpx, t_txbyteclkhs); +if (lpx >=2 ) + lpx -=2 ; + }else + lpx = timings[i].lpx; + hs_prepare = timings[i].hs_prepare; hs_trail = timings[i].hs_trail; clk_lane_hs_zero = timings[i].clk_lane_hs_zero;
@@ -417,14 +492,23 @@ static void inno_dsidphy_mipi_mode_enable(struct inno_dsidphy *inno) T_LPX_CNT(lpx));phy_update_bits (inno, i,0x06 ,T_HS_PREPARE_CNT_MASK ,T_HS_PREPARE_CNT (hs_prepare)); -phy_update_bits (inno, i,0x07 ,T_HS_ZERO_CNT_MASK , -T_HS_ZERO_CNT (hs_zero)); +if (inno->pdata->max_rate ==MAX_2_5GHZ ) +phy_update_bits (inno, i,0x06 ,T_HS_ZERO_CNT_HI_MASK , +T_HS_ZERO_CNT_HI (hs_zero >>6 )); +phy_update_bits (inno, i,0x07 ,T_HS_ZERO_CNT_LO_MASK , +T_HS_ZERO_CNT_LO (hs_zero));phy_update_bits (inno, i,0x08 ,T_HS_TRAIL_CNT_MASK ,T_HS_TRAIL_CNT (hs_trail)); -phy_update_bits (inno, i,0x09 ,T_HS_EXIT_CNT_MASK , -T_HS_EXIT_CNT (hs_exit)); -phy_update_bits (inno, i,0x0a ,T_CLK_POST_CNT_MASK , -T_CLK_POST_CNT (clk_post)); +if (inno->pdata->max_rate ==MAX_2_5GHZ ) +phy_update_bits (inno, i,0x11 ,T_HS_EXIT_CNT_HI_MASK , +T_HS_EXIT_CNT_HI (hs_exit >>5 )); +phy_update_bits (inno, i,0x09 ,T_HS_EXIT_CNT_LO_MASK , +T_HS_EXIT_CNT_LO (hs_exit)); +if (inno->pdata->max_rate ==MAX_2_5GHZ ) +phy_update_bits (inno, i,0x10 ,T_CLK_POST_CNT_HI_MASK , +T_CLK_POST_CNT_HI (clk_post >>4 )); +phy_update_bits (inno, i,0x0a ,T_CLK_POST_CNT_LO_MASK , +T_CLK_POST_CNT_LO (clk_post));phy_update_bits (inno, i,0x0e ,T_CLK_PRE_CNT_MASK ,T_CLK_PRE_CNT (clk_pre)); phy_update_bits(inno, i, 0x0c, T_WAKEUP_CNT_HI_MASK,
@@ -452,8 +536,9 @@ static void inno_dsidphy_lvds_mode_enable(struct inno_dsidphy *inno)/* Sample clock reverse direction */ phy_update_bits (inno,REGISTER_PART_ANALOG ,0x08 , -SAMPLE_CLOCK_DIRECTION_MASK , -SAMPLE_CLOCK_DIRECTION_REVERSE ); +SAMPLE_CLOCK_DIRECTION_MASK |LOWFRE_EN_MASK , +SAMPLE_CLOCK_DIRECTION_REVERSE | +PLL_OUTPUT_FREQUENCY_DIV_BY_1 );/* Select LVDS mode */ phy_update_bits(inno, REGISTER_PART_LVDS, 0x03,
@@ -473,6 +558,10 @@ static void inno_dsidphy_lvds_mode_enable(struct inno_dsidphy *inno)msleep (20 ); +/* Select PLL mode */ +phy_update_bits (inno,REGISTER_PART_ANALOG ,0x1e , +PLL_MODE_SEL_MASK ,PLL_MODE_SEL_LVDS_MODE ); +/* Reset LVDS digital logic */ phy_update_bits(inno, REGISTER_PART_LVDS, 0x00, LVDS_DIGITAL_INTERNAL_RESET_MASK,
@@ -592,6 +681,18 @@ static const struct phy_ops inno_dsidphy_ops = { .owner = THIS_MODULE, }; +static const struct inno_video_phy_plat_data max_1ghz_video_phy_plat_data = { + .inno_mipi_dphy_timing_table = inno_mipi_dphy_timing_table_max_1ghz, + .num_timings =ARRAY_SIZE (inno_mipi_dphy_timing_table_max_1ghz), + .max_rate =MAX_1GHZ , +}; + +static const struct inno_video_phy_plat_data max_2_5ghz_video_phy_plat_data = { + .inno_mipi_dphy_timing_table = inno_mipi_dphy_timing_table_max_2_5ghz, + .num_timings =ARRAY_SIZE (inno_mipi_dphy_timing_table_max_2_5ghz), + .max_rate =MAX_2_5GHZ , +}; +static int inno_dsidphy_probe (struct platform_device *pdev) {struct device *dev = &pdev->dev;
@@ -605,6 +706,7 @@ static int inno_dsidphy_probe(struct platform_device *pdev)return -ENOMEM ; inno->dev = dev; + inno->pdata =of_device_get_match_data (inno->dev);platform_set_drvdata (pdev, inno); inno->phy_base =devm_platform_ioremap_resource (pdev,0 );
@@ -663,9 +765,19 @@ static int inno_dsidphy_remove(struct platform_device *pdev) }static const struct of_device_id inno_dsidphy_of_match[] = { - { .compatible ="rockchip,px30-dsi-dphy" , }, - { .compatible ="rockchip,rk3128-dsi-dphy" , }, - { .compatible ="rockchip,rk3368-dsi-dphy" , }, + { + .compatible ="rockchip,px30-dsi-dphy" , + .data = &max_1ghz_video_phy_plat_data, + }, { + .compatible ="rockchip,rk3128-dsi-dphy" , + .data = &max_1ghz_video_phy_plat_data, + }, { + .compatible ="rockchip,rk3368-dsi-dphy" , + .data = &max_1ghz_video_phy_plat_data, + }, { + .compatible ="rockchip,rk3568-dsi-dphy" , + .data = &max_2_5ghz_video_phy_plat_data, + }, {} };MODULE_DEVICE_TABLE (of, inno_dsidphy_of_match);
Signature · 1 line
2.25.1
Vinod Koul
maintainerQuoted 4 lines · Chris Morgan
From: Chris Morgan <[email protected]>
This series adds support for the dsi and dphy controllers on the Rockchip RK3568.
Applied 1,2, thanks
Signature · 6 lines
~Vinod -- linux-phy mailing list [email protected] https://lists.infradead.org/mailman/listinfo/linux-phy
Re: [PATCH V4 3/3] arm64: dts: rockchip: Add DSI and DSI-DPHY nodes to rk356x
In reply to Chris MorganHi Chris,
Thanks for my comments into account!
Quoted 6 lines · Chris Morgan
From: Chris Morgan <[email protected]>
This adds the DSI controller nodes and DSI-DPHY controller nodes to the rk356x device tree.
Signed-off-by Chris Morgan <[email protected]>
Best regards,
Michael
Quoted 102 lines
--- arch/arm64/boot/dts/rockchip/rk356x.dtsi | 80 ++++++++++++++++++++++++ 1 file changed, 80 insertions(+)arch/arm64/boot/dts/rockchip/rk356x.dtsi +80
-0@@ -699,6 +699,62 @@ vop_mmu: iommu@fe043e00 { status = "disabled"; }; + dsi0: dsi@fe060000 { + compatible = "rockchip,rk3568-mipi-dsi", "snps,dw-mipi-dsi"; + reg = <0x00 0xfe060000 0x00 0x10000>; + interrupts = <GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>; + clock-names = "pclk", "hclk"; + clocks = <&cru PCLK_DSITX_0>, <&cru HCLK_VO>; + phy-names = "dphy"; + phys = <&dsi_dphy0>; + power-domains = <&power RK3568_PD_VO>; + reset-names = "apb"; + resets = <&cru SRST_P_DSITX_0>; + rockchip,grf = <&grf>; + status = "disabled"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + dsi0_in: port@0 { + reg = <0>; + }; + + dsi0_out: port@1 { + reg = <1>; + }; + }; + }; + + dsi1: dsi@fe070000 { + compatible = "rockchip,rk3568-mipi-dsi", "snps,dw-mipi-dsi"; + reg = <0x0 0xfe070000 0x0 0x10000>; + interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>; + clock-names = "pclk", "hclk"; + clocks = <&cru PCLK_DSITX_1>, <&cru HCLK_VO>; + phy-names = "dphy"; + phys = <&dsi_dphy1>; + power-domains = <&power RK3568_PD_VO>; + reset-names = "apb"; + resets = <&cru SRST_P_DSITX_1>; + rockchip,grf = <&grf>; + status = "disabled"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + dsi1_in: port@0 { + reg = <0>; + }; + + dsi1_out: port@1 { + reg = <1>; + }; + }; + }; + hdmi: hdmi@fe0a0000 { compatible = "rockchip,rk3568-dw-hdmi"; reg = <0x0 0xfe0a0000 0x0 0x20000>;@@ -1594,6 +1650,30 @@ combphy2: phy@fe840000 { status = "disabled"; }; + dsi_dphy0: mipi-dphy@fe850000 { + compatible = "rockchip,rk3568-dsi-dphy"; + reg = <0x0 0xfe850000 0x0 0x10000>; + clock-names = "ref", "pclk"; + clocks = <&pmucru CLK_MIPIDSIPHY0_REF>, <&cru PCLK_MIPIDSIPHY0>; + #phy-cells = <0>; + power-domains = <&power RK3568_PD_VO>; + reset-names = "apb"; + resets = <&cru SRST_P_MIPIDSIPHY0>; + status = "disabled"; + }; + + dsi_dphy1: mipi-dphy@fe860000 { + compatible = "rockchip,rk3568-dsi-dphy"; + reg = <0x0 0xfe860000 0x0 0x10000>; + clock-names = "ref", "pclk"; + clocks = <&pmucru CLK_MIPIDSIPHY1_REF>, <&cru PCLK_MIPIDSIPHY1>; + #phy-cells = <0>; + power-domains = <&power RK3568_PD_VO>; + reset-names = "apb"; + resets = <&cru SRST_P_MIPIDSIPHY1>; + status = "disabled"; + }; + usb2phy0: usb2phy@fe8a0000 { compatible = "rockchip,rk3568-usb2phy"; reg = <0x0 0xfe8a0000 0x0 0x10000>;
Signature · 3 lines
linux-phy mailing list [email protected] https://lists.infradead.org/mailman/listinfo/linux-phy
Re: (subset) [PATCH v4 0/3] rockchip-dsi for rk3568
In reply to Chris MorganQuoted 10 lines · Chris Morgan
This series adds support for the dsi and dphy controllers on the Rockchip RK3568.
Tested on an Anbernic RG503, Anbernic RG353P, and Odroid Go Advance.
Changes since V3:
- Added labels to bindings inrk356x.dtsifile to make it easier to reference in board dts files.[...]
Applied, thanks!
[3/3] arm64: dts: rockchip: Add DSI and DSI-DPHY nodes to rk356x
commit: e18d9b093006d8abd53e1ce13c0d5a8d0fcd5f64
Best regards,
Signature · 1 line
Heiko Stuebner <[email protected]>
Re: (subset) [PATCH v4 0/3] rockchip-dsi for rk3568
I am trying to get the MIPI-DSI output to work with the Pine64 7" LCD (a Feiyang panel) on Quartz64-a.
I was able to get the previous DSI Enablement serious (as published on September 6th) working on top of 6.0-RC4, with some help from Chris, but I have not been able to recreate the same success with these latest patches on top of 6.0-RC6.
Has anyone else gotten their MIP-DSI output to work with these latest patches? and, would they be willing to share their kernel config and DTS files with me? I am probably missing one silly thing, but I don't have the skills to figure out what it is.
I would like to get this working and repeatable and then share it with the Pine64 community.
thanks, Philip
Quoted 10 lines · Heiko Stuebner
Quoted 9 lines · Chris Morgan
This series adds support for the dsi and dphy controllers on the Rockchip RK3568.
Tested on an Anbernic RG503, Anbernic RG353P, and Odroid Go Advance.
Changes since V3:
- Added labels to bindings inrk356x.dtsifile to make it easier to reference in board dts files.
Quoted 8 lines
Quoted 1 line
[...]
Applied, thanks!
[3/3] arm64: dts: rockchip: Add DSI and DSI-DPHY nodes to rk356x
commit: e18d9b093006d8abd53e1ce13c0d5a8d0fcd5f64Best regards,
_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip