lkml.org 
[lkml]   [2019]   [Feb]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 087/205] phy: sun4i-usb: add support for missing USB PHY index
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    [ Upstream commit 2659392e5c08dff626e6db1d739adff58a94604d ]

    The new Allwinner H6 SoC's USB2 PHY has two holes -- USB1 (which is a
    3.0 port with dedicated PHY) and USB2 (which doesn't exist at all).

    Add support for this kind of missing USB PHY index.

    Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
    Reviewed-by: Chen-Yu Tsai <wens@csie.org>
    Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/phy/allwinner/phy-sun4i-usb.c | 7 +++++++
    1 file changed, 7 insertions(+)

    diff --git a/drivers/phy/allwinner/phy-sun4i-usb.c b/drivers/phy/allwinner/phy-sun4i-usb.c
    index afedb8cd1990..d1ccff527756 100644
    --- a/drivers/phy/allwinner/phy-sun4i-usb.c
    +++ b/drivers/phy/allwinner/phy-sun4i-usb.c
    @@ -125,6 +125,7 @@ struct sun4i_usb_phy_cfg {
    bool dedicated_clocks;
    bool enable_pmu_unk1;
    bool phy0_dual_route;
    + int missing_phys;
    };

    struct sun4i_usb_phy_data {
    @@ -645,6 +646,9 @@ static struct phy *sun4i_usb_phy_xlate(struct device *dev,
    if (args->args[0] >= data->cfg->num_phys)
    return ERR_PTR(-ENODEV);

    + if (data->cfg->missing_phys & BIT(args->args[0]))
    + return ERR_PTR(-ENODEV);
    +
    return data->phys[args->args[0]].phy;
    }

    @@ -740,6 +744,9 @@ static int sun4i_usb_phy_probe(struct platform_device *pdev)
    struct sun4i_usb_phy *phy = data->phys + i;
    char name[16];

    + if (data->cfg->missing_phys & BIT(i))
    + continue;
    +
    snprintf(name, sizeof(name), "usb%d_vbus", i);
    phy->vbus = devm_regulator_get_optional(dev, name);
    if (IS_ERR(phy->vbus)) {
    --
    2.19.1


    \
     
     \ /
      Last update: 2019-02-11 16:28    [W:2.383 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site