mirror of
https://github.com/torvalds/linux.git
synced 2026-05-26 16:12:59 +02:00
phy_dp_modes_6.10
This contains the dp submode definition and associated qcom driver change -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEE+vs47OPLdNbVcHzyfBQHDyUjg0cFAmYFvq4ACgkQfBQHDyUj g0cAxA/+N7KQbTUaA/LfygMw1XCrPcvtGgF+xVCkzeZdt8b7pBxfX/Hdg3WXLfx9 UD50cDDrf5BRtHFn6zzk2bjxhJgBXefJI8fHRXtqbhSCD2ffTeTpQtQQD2qfXoGx BTVa2e8Fp1hlLqLn2zlNc/1xXI8oTz7QQ8thgn/KHFlTixA1RJNGEQgCg/Z5oHuQ ZTtzQxDjYSvqTiI6tp5L8ky9cbXB1kYbKfqmb8HnVVI2D/UGgp6xVrUqEuHTOn9e kQkcC2Qa00mAjVXx2B9kL3MHHcw58NDq2zBpir6W6EECnoIXR2cfpcjfe0iR5ceq rjowXRKC7YX9mwdJQJ+Y0qOo1MariapEk9XfsPdKGj4aJYYl8TAFbcq2XqEEX1h6 tjS8kILIsbncRyAdNilJTaXnpFeJg1IXgzEyS6iM7HBl86SzXkdFuv8qNzeINVC1 7J/vhgEA2TFaRSWKbpvqDiLUegdWw5Oz56eZmPmU7KwmY3UXHXE+0dPmdx+h4WBo bl6zxv/wHHPM3FwJcIuZ44Jb2gjYLuAYKv+cLt5GyfXYL7ORs60Zk/wM5RJPYrIw FbaNIeTu6QzS8QYjg9mTryerhecZNLX2djNggzkQhZFmgif/N9RBOpdmXFnBhaO5 lAMF0iIfTOYme66fsBzA+yYizwbC4v/r2wUuxt9CR22hWv2iMFw= =AbAH -----END PGP SIGNATURE----- Merge tag 'phy_dp_modes_6.10' into next phy_dp_modes_6.10 This contains the dp submode definition and associated qcom driver change
This commit is contained in:
Vinod Koul
commit
cfd6f1a1a5
|
|
@ -14,6 +14,7 @@
|
|||
#include <linux/module.h>
|
||||
#include <linux/of.h>
|
||||
#include <linux/phy/phy.h>
|
||||
#include <linux/phy/phy-dp.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/regulator/consumer.h>
|
||||
#include <linux/reset.h>
|
||||
|
|
@ -69,19 +70,21 @@
|
|||
|
||||
#define TXn_TRAN_DRVR_EMP_EN 0x0078
|
||||
|
||||
struct qcom_edp_cfg {
|
||||
bool is_dp;
|
||||
|
||||
/* DP PHY swing and pre_emphasis tables */
|
||||
struct qcom_edp_swing_pre_emph_cfg {
|
||||
const u8 (*swing_hbr_rbr)[4][4];
|
||||
const u8 (*swing_hbr3_hbr2)[4][4];
|
||||
const u8 (*pre_emphasis_hbr_rbr)[4][4];
|
||||
const u8 (*pre_emphasis_hbr3_hbr2)[4][4];
|
||||
};
|
||||
|
||||
struct qcom_edp_phy_cfg {
|
||||
bool is_edp;
|
||||
const struct qcom_edp_swing_pre_emph_cfg *swing_pre_emph_cfg;
|
||||
};
|
||||
|
||||
struct qcom_edp {
|
||||
struct device *dev;
|
||||
const struct qcom_edp_cfg *cfg;
|
||||
const struct qcom_edp_phy_cfg *cfg;
|
||||
|
||||
struct phy *phy;
|
||||
|
||||
|
|
@ -97,6 +100,8 @@ struct qcom_edp {
|
|||
|
||||
struct clk_bulk_data clks[2];
|
||||
struct regulator_bulk_data supplies[2];
|
||||
|
||||
bool is_edp;
|
||||
};
|
||||
|
||||
static const u8 dp_swing_hbr_rbr[4][4] = {
|
||||
|
|
@ -127,8 +132,7 @@ static const u8 dp_pre_emp_hbr2_hbr3[4][4] = {
|
|||
{ 0x04, 0xff, 0xff, 0xff }
|
||||
};
|
||||
|
||||
static const struct qcom_edp_cfg dp_phy_cfg = {
|
||||
.is_dp = true,
|
||||
static const struct qcom_edp_swing_pre_emph_cfg dp_phy_swing_pre_emph_cfg = {
|
||||
.swing_hbr_rbr = &dp_swing_hbr_rbr,
|
||||
.swing_hbr3_hbr2 = &dp_swing_hbr2_hbr3,
|
||||
.pre_emphasis_hbr_rbr = &dp_pre_emp_hbr_rbr,
|
||||
|
|
@ -163,18 +167,28 @@ static const u8 edp_pre_emp_hbr2_hbr3[4][4] = {
|
|||
{ 0x00, 0xff, 0xff, 0xff }
|
||||
};
|
||||
|
||||
static const struct qcom_edp_cfg edp_phy_cfg = {
|
||||
.is_dp = false,
|
||||
static const struct qcom_edp_swing_pre_emph_cfg edp_phy_swing_pre_emph_cfg = {
|
||||
.swing_hbr_rbr = &edp_swing_hbr_rbr,
|
||||
.swing_hbr3_hbr2 = &edp_swing_hbr2_hbr3,
|
||||
.pre_emphasis_hbr_rbr = &edp_pre_emp_hbr_rbr,
|
||||
.pre_emphasis_hbr3_hbr2 = &edp_pre_emp_hbr2_hbr3,
|
||||
};
|
||||
|
||||
static const struct qcom_edp_phy_cfg sc7280_dp_phy_cfg = {
|
||||
};
|
||||
|
||||
static const struct qcom_edp_phy_cfg sc8280xp_dp_phy_cfg = {
|
||||
.swing_pre_emph_cfg = &dp_phy_swing_pre_emph_cfg,
|
||||
};
|
||||
|
||||
static const struct qcom_edp_phy_cfg sc8280xp_edp_phy_cfg = {
|
||||
.is_edp = true,
|
||||
.swing_pre_emph_cfg = &edp_phy_swing_pre_emph_cfg,
|
||||
};
|
||||
|
||||
static int qcom_edp_phy_init(struct phy *phy)
|
||||
{
|
||||
struct qcom_edp *edp = phy_get_drvdata(phy);
|
||||
const struct qcom_edp_cfg *cfg = edp->cfg;
|
||||
int ret;
|
||||
u8 cfg8;
|
||||
|
||||
|
|
@ -201,7 +215,12 @@ static int qcom_edp_phy_init(struct phy *phy)
|
|||
DP_PHY_PD_CTL_PLL_PWRDN | DP_PHY_PD_CTL_DP_CLAMP_EN,
|
||||
edp->edp + DP_PHY_PD_CTL);
|
||||
|
||||
if (cfg && cfg->is_dp)
|
||||
/*
|
||||
* TODO: Re-work the conditions around setting the cfg8 value
|
||||
* when more information becomes available about why this is
|
||||
* even needed.
|
||||
*/
|
||||
if (edp->cfg->swing_pre_emph_cfg && !edp->is_edp)
|
||||
cfg8 = 0xb7;
|
||||
else
|
||||
cfg8 = 0x37;
|
||||
|
|
@ -235,7 +254,7 @@ static int qcom_edp_phy_init(struct phy *phy)
|
|||
|
||||
static int qcom_edp_set_voltages(struct qcom_edp *edp, const struct phy_configure_opts_dp *dp_opts)
|
||||
{
|
||||
const struct qcom_edp_cfg *cfg = edp->cfg;
|
||||
const struct qcom_edp_swing_pre_emph_cfg *cfg = edp->cfg->swing_pre_emph_cfg;
|
||||
unsigned int v_level = 0;
|
||||
unsigned int p_level = 0;
|
||||
u8 ldo_config;
|
||||
|
|
@ -246,6 +265,9 @@ static int qcom_edp_set_voltages(struct qcom_edp *edp, const struct phy_configur
|
|||
if (!cfg)
|
||||
return 0;
|
||||
|
||||
if (edp->is_edp)
|
||||
cfg = &edp_phy_swing_pre_emph_cfg;
|
||||
|
||||
for (i = 0; i < dp_opts->lanes; i++) {
|
||||
v_level = max(v_level, dp_opts->voltage[i]);
|
||||
p_level = max(p_level, dp_opts->pre[i]);
|
||||
|
|
@ -262,7 +284,7 @@ static int qcom_edp_set_voltages(struct qcom_edp *edp, const struct phy_configur
|
|||
if (swing == 0xff || emph == 0xff)
|
||||
return -EINVAL;
|
||||
|
||||
ldo_config = (cfg && cfg->is_dp) ? 0x1 : 0x0;
|
||||
ldo_config = edp->is_edp ? 0x0 : 0x1;
|
||||
|
||||
writel(ldo_config, edp->tx0 + TXn_LDO_CONFIG);
|
||||
writel(swing, edp->tx0 + TXn_TX_DRV_LVL);
|
||||
|
|
@ -448,10 +470,9 @@ static int qcom_edp_set_vco_div(const struct qcom_edp *edp, unsigned long *pixel
|
|||
static int qcom_edp_phy_power_on(struct phy *phy)
|
||||
{
|
||||
const struct qcom_edp *edp = phy_get_drvdata(phy);
|
||||
const struct qcom_edp_cfg *cfg = edp->cfg;
|
||||
u32 bias0_en, drvr0_en, bias1_en, drvr1_en;
|
||||
unsigned long pixel_freq;
|
||||
u8 ldo_config;
|
||||
u8 ldo_config = 0x0;
|
||||
int timeout;
|
||||
int ret;
|
||||
u32 val;
|
||||
|
|
@ -469,7 +490,8 @@ static int qcom_edp_phy_power_on(struct phy *phy)
|
|||
return timeout;
|
||||
|
||||
|
||||
ldo_config = (cfg && cfg->is_dp) ? 0x1 : 0x0;
|
||||
if (edp->cfg->swing_pre_emph_cfg && !edp->is_edp)
|
||||
ldo_config = 0x1;
|
||||
|
||||
writel(ldo_config, edp->tx0 + TXn_LDO_CONFIG);
|
||||
writel(ldo_config, edp->tx1 + TXn_LDO_CONFIG);
|
||||
|
|
@ -590,6 +612,18 @@ static int qcom_edp_phy_power_off(struct phy *phy)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int qcom_edp_phy_set_mode(struct phy *phy, enum phy_mode mode, int submode)
|
||||
{
|
||||
struct qcom_edp *edp = phy_get_drvdata(phy);
|
||||
|
||||
if (mode != PHY_MODE_DP)
|
||||
return -EINVAL;
|
||||
|
||||
edp->is_edp = submode == PHY_SUBMODE_EDP;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int qcom_edp_phy_exit(struct phy *phy)
|
||||
{
|
||||
struct qcom_edp *edp = phy_get_drvdata(phy);
|
||||
|
|
@ -605,6 +639,7 @@ static const struct phy_ops qcom_edp_ops = {
|
|||
.configure = qcom_edp_phy_configure,
|
||||
.power_on = qcom_edp_phy_power_on,
|
||||
.power_off = qcom_edp_phy_power_off,
|
||||
.set_mode = qcom_edp_phy_set_mode,
|
||||
.exit = qcom_edp_phy_exit,
|
||||
.owner = THIS_MODULE,
|
||||
};
|
||||
|
|
@ -782,6 +817,7 @@ static int qcom_edp_phy_probe(struct platform_device *pdev)
|
|||
|
||||
edp->dev = dev;
|
||||
edp->cfg = of_device_get_match_data(&pdev->dev);
|
||||
edp->is_edp = edp->cfg->is_edp;
|
||||
|
||||
edp->edp = devm_platform_ioremap_resource(pdev, 0);
|
||||
if (IS_ERR(edp->edp))
|
||||
|
|
@ -840,10 +876,10 @@ static int qcom_edp_phy_probe(struct platform_device *pdev)
|
|||
}
|
||||
|
||||
static const struct of_device_id qcom_edp_phy_match_table[] = {
|
||||
{ .compatible = "qcom,sc7280-edp-phy" },
|
||||
{ .compatible = "qcom,sc8180x-edp-phy" },
|
||||
{ .compatible = "qcom,sc8280xp-dp-phy", .data = &dp_phy_cfg },
|
||||
{ .compatible = "qcom,sc8280xp-edp-phy", .data = &edp_phy_cfg },
|
||||
{ .compatible = "qcom,sc7280-edp-phy", .data = &sc7280_dp_phy_cfg, },
|
||||
{ .compatible = "qcom,sc8180x-edp-phy", .data = &sc7280_dp_phy_cfg, },
|
||||
{ .compatible = "qcom,sc8280xp-dp-phy", .data = &sc8280xp_dp_phy_cfg, },
|
||||
{ .compatible = "qcom,sc8280xp-edp-phy", .data = &sc8280xp_edp_phy_cfg, },
|
||||
{ }
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, qcom_edp_phy_match_table);
|
||||
|
|
|
|||
|
|
@ -8,6 +8,9 @@
|
|||
|
||||
#include <linux/types.h>
|
||||
|
||||
#define PHY_SUBMODE_DP 0
|
||||
#define PHY_SUBMODE_EDP 1
|
||||
|
||||
/**
|
||||
* struct phy_configure_opts_dp - DisplayPort PHY configuration set
|
||||
*
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user