Add support for DPHY TX on J721E
Subsystems (2)
v2 cover Add support for DPHY TX on J721E
Following series of patches adds support for DPHY TX on TI's J721E SoC. New compatible is added and required cdns dphy ops are implemented. The series also adds band ctrl configuration required for dphy tx
v2:
-Fix a build error reported by kernel test robot <[email protected]>
which uses clang compiler. Did not get the error with GNU Toolchain 9.2-2019.12
Rahul T R (3):
phy: dt-bindings: cdns,dphy: Add compatible for dphy on j721e
phy: cdns-dphy: Add band config for dphy tx
phy: cdns-dphy: Add support for DPHY TX on J721e
.../devicetree/bindings/phy/cdns,dphy.yaml | 5 +- drivers/phy/cadence/Kconfig | 10 ++ drivers/phy/cadence/cdns-dphy.c | 114 +++++++++++++++++- 3 files changed, 126 insertions(+), 3 deletions(-)
Signature · 1 line
2.36.1
PATCH v2 1/3 phy: dt-bindings: cdns,dphy: Add compatible for dphy on j721e
Add compatible to support dphy tx on j721e
--- Documentation/devicetree/bindings/phy/cdns,dphy.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
Documentation/devicetree/bindings/phy/cdns,dphy.yaml +3 -2
@@ -11,8 +11,9 @@ maintainers: properties: compatible: - items: - - const: cdns,dphy + enum: + - cdns,dphy + - ti,j721e-dphy reg: maxItems: 1
Signature · 1 line
2.36.1
Re: [PATCH v2 1/3] phy: dt-bindings: cdns,dphy: Add compatible for dphy on j721e
Hi Rahul,
Thank you for the patch.
Quoted 3 lines · Rahul T R
Add compatible to support dphy tx on j721e
Signed-off-by Rahul T R <[email protected]>
Quoted 20 lines
--- Documentation/devicetree/bindings/phy/cdns,dphy.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)Documentation/devicetree/bindings/phy/cdns,dphy.yaml +3
-2@@ -11,8 +11,9 @@ maintainers: properties: compatible: - items: - - const: cdns,dphy + enum: + - cdns,dphy + - ti,j721e-dphy reg: maxItems: 1
Signature · 3 lines
Regards, Laurent Pinchart
PATCH v2 2/3 phy: cdns-dphy: Add band config for dphy tx
In reply to Rahul T RAdd support for band ctrl config for dphy tx.
--- drivers/phy/cadence/cdns-dphy.c | 52 ++++++++++++++++++++++++++++++++- 1 file changed, 51 insertions(+), 1 deletion(-)
drivers/phy/cadence/cdns-dphy.c +51 -1
@@ -4,6 +4,7 @@*/ #include <linux/bitops.h> +#include <linux/bitfield.h> #include <linux/clk.h> #include <linux/io.h> #include <linux/module.h>
@@ -45,6 +46,10 @@#define DPHY_CMN_OPDIV_FROM_REG BIT(6)#define DPHY_CMN_OPDIV (x) ((x) << 7) +#define DPHY_BAND_CFG DPHY_PCS(0x0) +#define DPHY_BAND_CFG_LEFT_BAND GENMASK(4, 0) +#define DPHY_BAND_CFG_RIGHT_BAND GENMASK(9, 5) +#define DPHY_PSM_CFG DPHY_PCS(0x4)#define DPHY_PSM_CFG_FROM_REG BIT(0)#define DPHY_PSM_CLK_DIV (x) ((x) << 1)
@@ -92,6 +97,22 @@ struct cdns_dphy {struct phy *phy; }; +struct cdns_dphy_band { +unsigned int min_rate; +unsigned int max_rate; +}; + +/* Order of bands is important since the index is the band number. */ +static struct cdns_dphy_band tx_bands[] = { + {80 ,100 }, {100 ,120 }, {120 ,160 }, {160 ,200 }, {200 ,240 }, + {240 ,320 }, {320 ,390 }, {390 ,450 }, {450 ,510 }, {510 ,560 }, + {560 ,640 }, {640 ,690 }, {690 ,770 }, {770 ,870 }, {870 ,950 }, + {950 ,1000 }, {1000 ,1200 }, {1200 ,1400 }, {1400 ,1600 }, {1600 ,1800 }, + {1800 ,2000 }, {2000 ,2200 }, {2200 ,2500 } +}; + +static int num_tx_bands =ARRAY_SIZE (tx_bands); + static int cdns_dsi_get_dphy_pll_cfg(struct cdns_dphy *dphy, struct cdns_dphy_cfg *cfg, struct phy_configure_opts_mipi_dphy *opts,
@@ -232,6 +253,26 @@ static int cdns_dphy_config_from_opts(struct phy *phy,return 0 ; } +static int cdns_dphy_tx_get_band_ctrl (unsigned long hs_clk_rate) +{ +unsigned int rate; +int i; + + rate = hs_clk_rate /1000000UL ; + +if (rate < tx_bands[0 ].min_rate || rate >= tx_bands[num_tx_bands -1 ].max_rate) +return -EOPNOTSUPP ; + +for (i =0 ; i < num_tx_bands; i++) { +if (rate >= tx_bands[i].min_rate && rate < tx_bands[i].max_rate) +return i; + } + +/* Unreachable. */ +WARN (1 ,"Reached unreachable code." ); +return -EINVAL ; +} +static int cdns_dphy_validate (struct phy *phy,enum phy_mode mode,int submode,union phy_configure_opts *opts) {
@@ -247,7 +288,8 @@ static int cdns_dphy_configure(struct phy *phy, union phy_configure_opts *opts) {struct cdns_dphy *dphy =phy_get_drvdata (phy);struct cdns_dphy_cfg cfg = {0 }; -int ret; +int ret, band_ctrl; +unsigned int reg; ret =cdns_dphy_config_from_opts (phy, &opts->mipi_dphy, &cfg);if (ret)
@@ -276,6 +318,14 @@ static int cdns_dphy_configure(struct phy *phy, union phy_configure_opts *opts)*/ cdns_dphy_set_pll_cfg (dphy, &cfg); + band_ctrl =cdns_dphy_tx_get_band_ctrl (opts->mipi_dphy.hs_clk_rate); +if (band_ctrl <0 ) +return band_ctrl; + + reg =FIELD_PREP (DPHY_BAND_CFG_LEFT_BAND , band_ctrl) | +FIELD_PREP (DPHY_BAND_CFG_RIGHT_BAND , band_ctrl); +writel (reg, dphy->regs +DPHY_BAND_CFG ); +return 0 ; }
Signature · 1 line
2.36.1
Re: [PATCH v2 2/3] phy: cdns-dphy: Add band config for dphy tx
Hi Rahul,
Thank you for the patch.
Quoted 12 lines · Rahul T R
Add support for band ctrl config for dphy tx.
Signed-off-by Rahul T R <[email protected]>--- drivers/phy/cadence/cdns-dphy.c | 52 ++++++++++++++++++++++++++++++++- 1 file changed, 51 insertions(+), 1 deletion(-)drivers/phy/cadence/cdns-dphy.c +0
-0
drivers/phy/cadence/cdns-dphy.c line 7
Quoted 4 lines
drivers/phy/cadence/cdns-dphy.c +1
-0@@ -4,6 +4,7 @@*/ #include <linux/bitops.h> +#include <linux/bitfield.h>
Nitpicking, bitfield goes before bitops :-)
Quoted 15 lines
drivers/phy/cadence/cdns-dphy.c +4
-0#include <linux/clk.h> #include <linux/io.h> #include <linux/module.h> @@ -45,6 +46,10 @@#define DPHY_CMN_OPDIV_FROM_REG BIT(6)#define DPHY_CMN_OPDIV (x) ((x) << 7) +#define DPHY_BAND_CFG DPHY_PCS(0x0) +#define DPHY_BAND_CFG_LEFT_BAND GENMASK(4, 0) +#define DPHY_BAND_CFG_RIGHT_BAND GENMASK(9, 5) +#define DPHY_PSM_CFG DPHY_PCS(0x4)#define DPHY_PSM_CFG_FROM_REG BIT(0)#define DPHY_PSM_CLK_DIV (x) ((x) << 1)
drivers/phy/cadence/cdns-dphy.c struct cdns_dphy { · line 106
Quoted 10 lines
drivers/phy/cadence/cdns-dphy.c +7
-0@@ -92,6 +97,22 @@ struct cdns_dphy {struct phy *phy; }; +struct cdns_dphy_band { +unsigned int min_rate; +unsigned int max_rate; +}; + +/* Order of bands is important since the index is the band number. */ +static struct cdns_dphy_band tx_bands[] = {
static const
drivers/phy/cadence/cdns-dphy.c struct cdns_dphy { · line 111
Quoted 5 lines
drivers/phy/cadence/cdns-dphy.c +5
-0+ {80, 100}, {100, 120}, {120, 160}, {160, 200}, {200, 240}, + {240, 320}, {320, 390}, {390, 450}, {450, 510}, {510, 560}, + {560, 640}, {640, 690}, {690, 770}, {770, 870}, {870, 950}, + {950, 1000}, {1000, 1200}, {1200, 1400}, {1400, 1600}, {1600, 1800}, + {1800, 2000}, {2000, 2200}, {2200, 2500}
The max_rate value of band N is always equal to the min_rate value of band N+1. Could we store one only ?
drivers/phy/cadence/cdns-dphy.c struct cdns_dphy { · line 114
Quoted 3 lines
drivers/phy/cadence/cdns-dphy.c +3
-0+}; + +static int num_tx_bands =ARRAY_SIZE (tx_bands);
You can use ARRAY_SIZE(tx_bands) directly below and drop this.
Quoted 15 lines
drivers/phy/cadence/cdns-dphy.c +8
-0+ static int cdns_dsi_get_dphy_pll_cfg(struct cdns_dphy *dphy, struct cdns_dphy_cfg *cfg, struct phy_configure_opts_mipi_dphy *opts,@@ -232,6 +253,26 @@ static int cdns_dphy_config_from_opts(struct phy *phy,return 0 ; } +static int cdns_dphy_tx_get_band_ctrl (unsigned long hs_clk_rate) +{ +unsigned int rate; +int i; + + rate = hs_clk_rate /1000000UL ; +
drivers/phy/cadence/cdns-dphy.c static int cdns_dphy_config_from_opts(struct phy *phy, · line 272
Quoted 10 lines
drivers/phy/cadence/cdns-dphy.c +10
-0+if (rate < tx_bands[0 ].min_rate || rate >= tx_bands[num_tx_bands -1 ].max_rate) +return -EOPNOTSUPP ; + +for (i =0 ; i < num_tx_bands; i++) { +if (rate >= tx_bands[i].min_rate && rate < tx_bands[i].max_rate) +return i; + } + +/* Unreachable. */ +WARN (1 ,"Reached unreachable code." );
I'd drop the WARN() if it's really unreachable.
Quoted 31 lines
drivers/phy/cadence/cdns-dphy.c +13
-1+return -EINVAL ; +} +static int cdns_dphy_validate (struct phy *phy,enum phy_mode mode,int submode,union phy_configure_opts *opts) {@@ -247,7 +288,8 @@ static int cdns_dphy_configure(struct phy *phy, union phy_configure_opts *opts) {struct cdns_dphy *dphy =phy_get_drvdata (phy);struct cdns_dphy_cfg cfg = {0 }; -int ret; +int ret, band_ctrl; +unsigned int reg; ret =cdns_dphy_config_from_opts (phy, &opts->mipi_dphy, &cfg);if (ret)@@ -276,6 +318,14 @@ static int cdns_dphy_configure(struct phy *phy, union phy_configure_opts *opts)*/ cdns_dphy_set_pll_cfg (dphy, &cfg); + band_ctrl =cdns_dphy_tx_get_band_ctrl (opts->mipi_dphy.hs_clk_rate); +if (band_ctrl <0 ) +return band_ctrl; + + reg =FIELD_PREP (DPHY_BAND_CFG_LEFT_BAND , band_ctrl) | +FIELD_PREP (DPHY_BAND_CFG_RIGHT_BAND , band_ctrl); +writel (reg, dphy->regs +DPHY_BAND_CFG ); +return 0 ; }
Signature · 3 lines
Regards, Laurent Pinchart
Re: [PATCH v2 2/3] phy: cdns-dphy: Add band config for dphy tx
Quoted 86 lines · Laurent Pinchart
Hi Rahul,
Thank you for the patch.
Quoted 12 lines · Rahul T R
Add support for band ctrl config for dphy tx.
Signed-off-by Rahul T R <[email protected]>--- drivers/phy/cadence/cdns-dphy.c | 52 ++++++++++++++++++++++++++++++++- 1 file changed, 51 insertions(+), 1 deletion(-)drivers/phy/cadence/cdns-dphy.c +0
-0drivers/phy/cadence/cdns-dphy.c line 7
Quoted 4 lines
drivers/phy/cadence/cdns-dphy.c +1
-0@@ -4,6 +4,7 @@*/ #include <linux/bitops.h> +#include <linux/bitfield.h> Nitpicking, bitfield goes before bitops :-)
Quoted 15 lines
drivers/phy/cadence/cdns-dphy.c +4
-0#include <linux/clk.h> #include <linux/io.h> #include <linux/module.h> @@ -45,6 +46,10 @@#define DPHY_CMN_OPDIV_FROM_REG BIT(6)#define DPHY_CMN_OPDIV (x) ((x) << 7) +#define DPHY_BAND_CFG DPHY_PCS(0x0) +#define DPHY_BAND_CFG_LEFT_BAND GENMASK(4, 0) +#define DPHY_BAND_CFG_RIGHT_BAND GENMASK(9, 5) +#define DPHY_PSM_CFG DPHY_PCS(0x4)#define DPHY_PSM_CFG_FROM_REG BIT(0)#define DPHY_PSM_CLK_DIV (x) ((x) << 1)drivers/phy/cadence/cdns-dphy.c struct cdns_dphy { · line 106
Quoted 10 lines
drivers/phy/cadence/cdns-dphy.c +7
-0@@ -92,6 +97,22 @@ struct cdns_dphy {struct phy *phy; }; +struct cdns_dphy_band { +unsigned int min_rate; +unsigned int max_rate; +}; + +/* Order of bands is important since the index is the band number. */ +static struct cdns_dphy_band tx_bands[] = {static const
drivers/phy/cadence/cdns-dphy.c struct cdns_dphy { · line 111
Quoted 5 lines
drivers/phy/cadence/cdns-dphy.c +5
-0+ {80, 100}, {100, 120}, {120, 160}, {160, 200}, {200, 240}, + {240, 320}, {320, 390}, {390, 450}, {450, 510}, {510, 560}, + {560, 640}, {640, 690}, {690, 770}, {770, 870}, {870, 950}, + {950, 1000}, {1000, 1200}, {1200, 1400}, {1400, 1600}, {1600, 1800}, + {1800, 2000}, {2000, 2200}, {2200, 2500}The
max_ratevalue of band N is always equal to themin_ratevalue of band N+1. Could we store one only ?drivers/phy/cadence/cdns-dphy.c struct cdns_dphy { · line 114
Quoted 3 lines
drivers/phy/cadence/cdns-dphy.c +3
-0+}; + +static int num_tx_bands =ARRAY_SIZE (tx_bands);You can use
ARRAY_SIZE(tx_bands)directly below and drop this.Quoted 19 lines
drivers/phy/cadence/cdns-dphy.c +12
-0+ static int cdns_dsi_get_dphy_pll_cfg(struct cdns_dphy *dphy, struct cdns_dphy_cfg *cfg, struct phy_configure_opts_mipi_dphy *opts,@@ -232,6 +253,26 @@ static int cdns_dphy_config_from_opts(struct phy *phy,return 0 ; } +static int cdns_dphy_tx_get_band_ctrl (unsigned long hs_clk_rate) +{ +unsigned int rate; +int i; + + rate = hs_clk_rate /1000000UL ; + +if (rate < tx_bands[0 ].min_rate || rate >= tx_bands[num_tx_bands -1 ].max_rate) +return -EOPNOTSUPP ; + +for (i =0 ; i < num_tx_bands; i++) {
Quoted 9 lines
drivers/phy/cadence/cdns-dphy.c static int cdns_dphy_config_from_opts(struct phy *phy, · line 272
Quoted 6 lines
drivers/phy/cadence/cdns-dphy.c +6
-0+if (rate >= tx_bands[i].min_rate && rate < tx_bands[i].max_rate) +return i; + } + +/* Unreachable. */ +WARN (1 ,"Reached unreachable code." );I'd drop the
WARN()if it's really unreachable.
Hi Laurent,
Thanks for the review!
I have sent a v3, addressing
all the comments
Please review
Regards
Rahul T R
Quoted 36 lines
Quoted 31 lines
drivers/phy/cadence/cdns-dphy.c +13
-1+return -EINVAL ; +} +static int cdns_dphy_validate (struct phy *phy,enum phy_mode mode,int submode,union phy_configure_opts *opts) {@@ -247,7 +288,8 @@ static int cdns_dphy_configure(struct phy *phy, union phy_configure_opts *opts) {struct cdns_dphy *dphy =phy_get_drvdata (phy);struct cdns_dphy_cfg cfg = {0 }; -int ret; +int ret, band_ctrl; +unsigned int reg; ret =cdns_dphy_config_from_opts (phy, &opts->mipi_dphy, &cfg);if (ret)@@ -276,6 +318,14 @@ static int cdns_dphy_configure(struct phy *phy, union phy_configure_opts *opts)*/ cdns_dphy_set_pll_cfg (dphy, &cfg); + band_ctrl =cdns_dphy_tx_get_band_ctrl (opts->mipi_dphy.hs_clk_rate); +if (band_ctrl <0 ) +return band_ctrl; + + reg =FIELD_PREP (DPHY_BAND_CFG_LEFT_BAND , band_ctrl) | +FIELD_PREP (DPHY_BAND_CFG_RIGHT_BAND , band_ctrl); +writel (reg, dphy->regs +DPHY_BAND_CFG ); +return 0 ; }Signature · 3 lines
Regards, Laurent Pinchart
PATCH v2 3/3 phy: cdns-dphy: Add support for DPHY TX on J721e
In reply to Rahul T RAdd support new compatible for dphy-tx on j721e
and implement dphy ops required.
--- drivers/phy/cadence/Kconfig | 10 ++++++ drivers/phy/cadence/cdns-dphy.c | 62 +++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+)
drivers/phy/cadence/Kconfig +10 -0
@@ -22,6 +22,16 @@ config PHY_CADENCE_DPHY system. If M is selected, the module will be called cdns-dphy. +if PHY_CADENCE_DPHY + +config PHY_CADENCE_DPHY_J721E + depends on ARCH_K3 || COMPILE_TEST + bool "J721E DPHY TX Wiz support" + default y + help + Support J721E Cadence DPHY TX Wiz configuration. +endif + config PHY_CADENCE_DPHY_RX tristate "Cadence D-PHY Rx Support" depends on HAS_IOMEM && OF
drivers/phy/cadence/cdns-dphy.c +62 -0
98 lines not on this page · raw message
Signature · 1 line
2.36.1