* [PATCH 1/2] phy: rockchip-emmc: output tap delay dt property
2020-12-02 8:25 [PATCH 0/2] phy: rockchip: set otapdlysec for in dts Chris Ruehl
@ 2020-12-02 8:25 ` Chris Ruehl
2020-12-02 8:25 ` [PATCH 2/2] devicetree: phy: rockchip-emmc add output-tapdelay-select Chris Ruehl
2020-12-05 8:10 ` [PATCH 0/2] phy: rockchip: set otapdlysec for in dts Vinod Koul
2 siblings, 0 replies; 5+ messages in thread
From: Chris Ruehl @ 2020-12-02 8:25 UTC (permalink / raw)
Cc: devicetree, Chris Ruehl, Kishon Vijay Abraham I, Vinod Koul,
Heiko Stuebner, linux-kernel, linux-arm-kernel, linux-rockchip
Update the rockchip-emmc phy to set the otapdlysec register with
a dt property. This was mentioned from Brian Norris when he sent
the path to set the default value in the driver.
This patch add a dt property 'output-tapdelay-select' u32 and allow
to set the 0x0-0xf. If not set in dts, the old default 0x4 applies.
Tested with our customized rk3399 to tune the eMMC.
Signed-off-by: Chris Ruehl <chris.ruehl@gtsys.com.hk>
---
drivers/phy/rockchip/phy-rockchip-emmc.c | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/drivers/phy/rockchip/phy-rockchip-emmc.c b/drivers/phy/rockchip/phy-rockchip-emmc.c
index 75faee5c0d27..3c7f8c08353c 100644
--- a/drivers/phy/rockchip/phy-rockchip-emmc.c
+++ b/drivers/phy/rockchip/phy-rockchip-emmc.c
@@ -65,6 +65,8 @@
#define PHYCTRL_OTAPDLYENA 0x1
#define PHYCTRL_OTAPDLYENA_MASK 0x1
#define PHYCTRL_OTAPDLYENA_SHIFT 0xb
+#define PHYCTRL_OTAPDLYSEL_DEFAULT 0x4
+#define PHYCTRL_OTAPDLYSEL_MAXVALUE 0xf
#define PHYCTRL_OTAPDLYSEL_MASK 0xf
#define PHYCTRL_OTAPDLYSEL_SHIFT 0x7
#define PHYCTRL_REN_STRB_DISABLE 0x0
@@ -85,6 +87,7 @@ struct rockchip_emmc_phy {
struct clk *emmcclk;
unsigned int drive_impedance;
unsigned int enable_strobe_pulldown;
+ unsigned int output_tapdelay_select;
};
static int rockchip_emmc_phy_power(struct phy *phy, bool on_off)
@@ -297,7 +300,7 @@ static int rockchip_emmc_phy_power_on(struct phy *phy)
/* Output tap delay */
regmap_write(rk_phy->reg_base,
rk_phy->reg_offset + GRF_EMMCPHY_CON0,
- HIWORD_UPDATE(4,
+ HIWORD_UPDATE(rk_phy->output_tapdelay_select,
PHYCTRL_OTAPDLYSEL_MASK,
PHYCTRL_OTAPDLYSEL_SHIFT));
@@ -373,6 +376,7 @@ static int rockchip_emmc_phy_probe(struct platform_device *pdev)
rk_phy->reg_base = grf;
rk_phy->drive_impedance = PHYCTRL_DR_50OHM;
rk_phy->enable_strobe_pulldown = PHYCTRL_REN_STRB_DISABLE;
+ rk_phy->output_tapdelay_select = PHYCTRL_OTAPDLYSEL_DEFAULT;
if (!of_property_read_u32(dev->of_node, "drive-impedance-ohm", &val))
rk_phy->drive_impedance = convert_drive_impedance_ohm(pdev, val);
@@ -380,6 +384,13 @@ static int rockchip_emmc_phy_probe(struct platform_device *pdev)
if (of_property_read_bool(dev->of_node, "enable-strobe-pulldown"))
rk_phy->enable_strobe_pulldown = PHYCTRL_REN_STRB_ENABLE;
+ if (!of_property_read_u32(dev->of_node, "output-tapdelay-select", &val)) {
+ if (val <= PHYCTRL_OTAPDLYSEL_MAXVALUE)
+ rk_phy->output_tapdelay_select = val;
+ else
+ dev_err(dev, "output-tapdelay-select exceeds limit, apply default\n");
+ }
+
generic_phy = devm_phy_create(dev, dev->of_node, &ops);
if (IS_ERR(generic_phy)) {
dev_err(dev, "failed to create PHY\n");
--
2.20.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] devicetree: phy: rockchip-emmc add output-tapdelay-select
2020-12-02 8:25 [PATCH 0/2] phy: rockchip: set otapdlysec for in dts Chris Ruehl
2020-12-02 8:25 ` [PATCH 1/2] phy: rockchip-emmc: output tap delay dt property Chris Ruehl
@ 2020-12-02 8:25 ` Chris Ruehl
2020-12-07 17:21 ` Rob Herring
2020-12-05 8:10 ` [PATCH 0/2] phy: rockchip: set otapdlysec for in dts Vinod Koul
2 siblings, 1 reply; 5+ messages in thread
From: Chris Ruehl @ 2020-12-02 8:25 UTC (permalink / raw)
Cc: devicetree, Chris Ruehl, Kishon Vijay Abraham I, Vinod Koul,
Rob Herring, Heiko Stuebner, linux-kernel, linux-arm-kernel,
linux-rockchip
Update the rockchip-emmc-phy.txt and add the u32 property
'output-tapdelay-select'. This allow to set the otapdlysec register.
Tested with our customized rk3399 board to tune eMMC.
Signed-off-by: Chris Ruehl <chris.ruehl@gtsys.com.hk>
---
Documentation/devicetree/bindings/phy/rockchip-emmc-phy.txt | 3 +++
1 file changed, 3 insertions(+)
diff --git a/Documentation/devicetree/bindings/phy/rockchip-emmc-phy.txt b/Documentation/devicetree/bindings/phy/rockchip-emmc-phy.txt
index 3e4d2d79a65d..00aa2d349e55 100644
--- a/Documentation/devicetree/bindings/phy/rockchip-emmc-phy.txt
+++ b/Documentation/devicetree/bindings/phy/rockchip-emmc-phy.txt
@@ -18,6 +18,9 @@ Optional properties:
If not set, the default value of 50 will be applied.
- enable-strobe-pulldown: Enable internal pull-down for the strobe line.
If not set, pull-down is not used.
+ - output-tapdelay-select: Specifies the phyctrl_otapdlysec register.
+ If not set, the register defaults to 0x4.
+ Maximum value 0xf.
Example:
--
2.20.1
^ permalink raw reply related [flat|nested] 5+ messages in thread