[PATCH v2 2/5] phy: rockchip: inno-usb2: Simplify rockchip,usbgrf handling
neil.armstrong at linaro.org
neil.armstrong at linaro.org
Wed May 6 07:42:04 PDT 2026
On 5/5/26 19:04, Heiko Stuebner wrote:
> From: Jonas Karlman <jonas at kwiboo.se>
>
> The logic to decide if usbgrf or grf should be used is more complex than
> it needs to be. For RK3568, RV1108 and soon RK3528 we can assign the
> rockchip,usbgrf regmap directly to grf instead of doing a usbgrf and grf
> dance.
>
> Simplify the code to only use the grf regmap and handle the logic of
> what regmap should be used in driver probe instead.
>
> The only expected change from this is that RK3528 can be supported
> because of an addition of a of_property_present() check.
>
> Signed-off-by: Jonas Karlman <jonas at kwiboo.se>
> Signed-off-by: Heiko Stuebner <heiko at sntech.de>
> ---
> drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 68 +++++--------------
> 1 file changed, 18 insertions(+), 50 deletions(-)
>
> diff --git a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
> index 8f4c08e599aa..7cec45192393 100644
> --- a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
> +++ b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
> @@ -228,7 +228,6 @@ struct rockchip_usb2phy_port {
> * struct rockchip_usb2phy - usb2.0 phy driver data.
> * @dev: pointer to device.
> * @grf: General Register Files regmap.
> - * @usbgrf: USB General Register Files regmap.
> * @clks: array of phy input clocks.
> * @clk480m: clock struct of phy output clk.
> * @clk480m_hw: clock struct of phy output clk management.
> @@ -246,7 +245,6 @@ struct rockchip_usb2phy_port {
> struct rockchip_usb2phy {
> struct device *dev;
> struct regmap *grf;
> - struct regmap *usbgrf;
> struct clk_bulk_data *clks;
> struct clk *clk480m;
> struct clk_hw clk480m_hw;
> @@ -261,11 +259,6 @@ struct rockchip_usb2phy {
> struct rockchip_usb2phy_port ports[USB2PHY_NUM_PORTS];
> };
>
> -static inline struct regmap *get_reg_base(struct rockchip_usb2phy *rphy)
> -{
> - return rphy->usbgrf == NULL ? rphy->grf : rphy->usbgrf;
> -}
> -
> static inline int property_enable(struct regmap *base,
> const struct usb2phy_reg *reg, bool en)
> {
> @@ -323,12 +316,11 @@ static int rockchip_usb2phy_clk480m_prepare(struct clk_hw *hw)
> {
> struct rockchip_usb2phy *rphy =
> container_of(hw, struct rockchip_usb2phy, clk480m_hw);
> - struct regmap *base = get_reg_base(rphy);
> int ret;
>
> /* turn on 480m clk output if it is off */
> - if (!property_enabled(base, &rphy->phy_cfg->clkout_ctl)) {
> - ret = property_enable(base, &rphy->phy_cfg->clkout_ctl, true);
> + if (!property_enabled(rphy->grf, &rphy->phy_cfg->clkout_ctl)) {
> + ret = property_enable(rphy->grf, &rphy->phy_cfg->clkout_ctl, true);
> if (ret)
> return ret;
>
> @@ -343,19 +335,17 @@ static void rockchip_usb2phy_clk480m_unprepare(struct clk_hw *hw)
> {
> struct rockchip_usb2phy *rphy =
> container_of(hw, struct rockchip_usb2phy, clk480m_hw);
> - struct regmap *base = get_reg_base(rphy);
>
> /* turn off 480m clk output */
> - property_enable(base, &rphy->phy_cfg->clkout_ctl, false);
> + property_enable(rphy->grf, &rphy->phy_cfg->clkout_ctl, false);
> }
>
> static int rockchip_usb2phy_clk480m_prepared(struct clk_hw *hw)
> {
> struct rockchip_usb2phy *rphy =
> container_of(hw, struct rockchip_usb2phy, clk480m_hw);
> - struct regmap *base = get_reg_base(rphy);
>
> - return property_enabled(base, &rphy->phy_cfg->clkout_ctl);
> + return property_enabled(rphy->grf, &rphy->phy_cfg->clkout_ctl);
> }
>
> static unsigned long
> @@ -574,7 +564,6 @@ static int rockchip_usb2phy_power_on(struct phy *phy)
> {
> struct rockchip_usb2phy_port *rport = phy_get_drvdata(phy);
> struct rockchip_usb2phy *rphy = dev_get_drvdata(phy->dev.parent);
> - struct regmap *base = get_reg_base(rphy);
> int ret;
>
> dev_dbg(&rport->phy->dev, "port power on\n");
> @@ -586,7 +575,7 @@ static int rockchip_usb2phy_power_on(struct phy *phy)
> if (ret)
> return ret;
>
> - ret = property_enable(base, &rport->port_cfg->phy_sus, false);
> + ret = property_enable(rphy->grf, &rport->port_cfg->phy_sus, false);
> if (ret) {
> clk_disable_unprepare(rphy->clk480m);
> return ret;
> @@ -615,7 +604,6 @@ static int rockchip_usb2phy_power_off(struct phy *phy)
> {
> struct rockchip_usb2phy_port *rport = phy_get_drvdata(phy);
> struct rockchip_usb2phy *rphy = dev_get_drvdata(phy->dev.parent);
> - struct regmap *base = get_reg_base(rphy);
> int ret;
>
> dev_dbg(&rport->phy->dev, "port power off\n");
> @@ -623,7 +611,7 @@ static int rockchip_usb2phy_power_off(struct phy *phy)
> if (rport->suspended)
> return 0;
>
> - ret = property_enable(base, &rport->port_cfg->phy_sus, true);
> + ret = property_enable(rphy->grf, &rport->port_cfg->phy_sus, true);
> if (ret)
> return ret;
>
> @@ -787,28 +775,22 @@ static const char *chg_to_string(enum power_supply_type chg_type)
> static void rockchip_chg_enable_dcd(struct rockchip_usb2phy *rphy,
> bool en)
> {
> - struct regmap *base = get_reg_base(rphy);
> -
> - property_enable(base, &rphy->phy_cfg->chg_det.rdm_pdwn_en, en);
> - property_enable(base, &rphy->phy_cfg->chg_det.idp_src_en, en);
> + property_enable(rphy->grf, &rphy->phy_cfg->chg_det.rdm_pdwn_en, en);
> + property_enable(rphy->grf, &rphy->phy_cfg->chg_det.idp_src_en, en);
> }
>
> static void rockchip_chg_enable_primary_det(struct rockchip_usb2phy *rphy,
> bool en)
> {
> - struct regmap *base = get_reg_base(rphy);
> -
> - property_enable(base, &rphy->phy_cfg->chg_det.vdp_src_en, en);
> - property_enable(base, &rphy->phy_cfg->chg_det.idm_sink_en, en);
> + property_enable(rphy->grf, &rphy->phy_cfg->chg_det.vdp_src_en, en);
> + property_enable(rphy->grf, &rphy->phy_cfg->chg_det.idm_sink_en, en);
> }
>
> static void rockchip_chg_enable_secondary_det(struct rockchip_usb2phy *rphy,
> bool en)
> {
> - struct regmap *base = get_reg_base(rphy);
> -
> - property_enable(base, &rphy->phy_cfg->chg_det.vdm_src_en, en);
> - property_enable(base, &rphy->phy_cfg->chg_det.idp_sink_en, en);
> + property_enable(rphy->grf, &rphy->phy_cfg->chg_det.vdm_src_en, en);
> + property_enable(rphy->grf, &rphy->phy_cfg->chg_det.idp_sink_en, en);
> }
>
> #define CHG_DCD_POLL_TIME (100 * HZ / 1000)
> @@ -820,7 +802,6 @@ static void rockchip_chg_detect_work(struct work_struct *work)
> struct rockchip_usb2phy_port *rport =
> container_of(work, struct rockchip_usb2phy_port, chg_work.work);
> struct rockchip_usb2phy *rphy = dev_get_drvdata(rport->phy->dev.parent);
> - struct regmap *base = get_reg_base(rphy);
> bool is_dcd, tmout, vout, vbus_attach;
> unsigned long delay;
>
> @@ -834,7 +815,7 @@ static void rockchip_chg_detect_work(struct work_struct *work)
> rockchip_usb2phy_power_off(rport->phy);
> /* put the controller in non-driving mode */
> if (!vbus_attach)
> - property_enable(base, &rphy->phy_cfg->chg_det.opmode, false);
> + property_enable(rphy->grf, &rphy->phy_cfg->chg_det.opmode, false);
> /* Start DCD processing stage 1 */
> rockchip_chg_enable_dcd(rphy, true);
> rphy->chg_state = USB_CHG_STATE_WAIT_FOR_DCD;
> @@ -898,7 +879,7 @@ static void rockchip_chg_detect_work(struct work_struct *work)
> case USB_CHG_STATE_DETECTED:
> /* put the controller in normal mode */
> if (!vbus_attach)
> - property_enable(base, &rphy->phy_cfg->chg_det.opmode, true);
> + property_enable(rphy->grf, &rphy->phy_cfg->chg_det.opmode, true);
> rockchip_usb2phy_otg_sm_work(&rport->otg_sm_work.work);
> dev_dbg(&rport->phy->dev, "charger = %s\n",
> chg_to_string(rphy->chg_type));
> @@ -1353,27 +1334,14 @@ static int rockchip_usb2phy_probe(struct platform_device *pdev)
> if (!rphy)
> return -ENOMEM;
>
> - if (!dev->parent || !dev->parent->of_node) {
> + if (!dev->parent || !dev->parent->of_node ||
> + of_property_present(np, "rockchip,usbgrf")) {
> rphy->grf = syscon_regmap_lookup_by_phandle(np, "rockchip,usbgrf");
> - if (IS_ERR(rphy->grf)) {
> - dev_err(dev, "failed to locate usbgrf\n");
> - return PTR_ERR(rphy->grf);
> - }
> } else {
> rphy->grf = syscon_node_to_regmap(dev->parent->of_node);
> - if (IS_ERR(rphy->grf))
> - return PTR_ERR(rphy->grf);
> - }
> -
> - if (of_device_is_compatible(np, "rockchip,rv1108-usb2phy")) {
> - rphy->usbgrf =
> - syscon_regmap_lookup_by_phandle(dev->of_node,
> - "rockchip,usbgrf");
> - if (IS_ERR(rphy->usbgrf))
> - return PTR_ERR(rphy->usbgrf);
> - } else {
> - rphy->usbgrf = NULL;
> }
> + if (IS_ERR(rphy->grf))
> + return PTR_ERR(rphy->grf);
>
> if (of_property_read_u32_index(np, "reg", 0, ®)) {
> dev_err(dev, "the reg property is not assigned in %pOFn node\n", np);
Reviewed-by: Neil Armstrong <neil.armstrong at linaro.org>
Thanks,
Neil
More information about the linux-phy
mailing list