Commit 90fca074 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'phy-for-5.2-rc_v2' of... 

Merge tag 'phy-for-5.2-rc_v2' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy

 into usb-next

Kishon writes:

phy: for 5.2-rc

  *) Move Tegra124 PLL power supplies to be enabled by xusb-tegra124
  *) Move Tegra210 PLL power supplies to be enabled by xusb-tegra210
  *) Minor fixes: fix memory leaks at error path and addresses coverity.

Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>

* tag 'phy-for-5.2-rc_v2' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy:
  phy: tegra: xusb: Add Tegra210 PLL power supplies
  phy: tegra: xusb: Add Tegra124 PLL power supplies
  dt-bindings: phy: tegra-xusb: List PLL power supplies
  phy: usb: phy-brcm-usb: Remove sysfs attributes upon driver removal
  phy: renesas: rcar-gen2: Fix memory leak at error paths
  phy: qcom-qusb2: fix missing assignment of ret when calling clk_prepare_enable
parents f254e65a e3888cda

Documentation/devicetree/bindings/phy/nvidia,tegra124-xusb-padctl.txt

+12 −0
Original line number Diff line number Diff line
@@ -42,6 +42,18 @@ Required properties: 
- reset-names: Must include the following entries:

  - "padctl"



For Tegra124:

- avdd-pll-utmip-supply: UTMI PLL power supply. Must supply 1.8 V.

- avdd-pll-erefe-supply: PLLE reference PLL power supply. Must supply 1.05 V.

- avdd-pex-pll-supply: PCIe/USB3 PLL power supply. Must supply 1.05 V.

- hvdd-pex-pll-e-supply: High-voltage PLLE power supply. Must supply 3.3 V.



For Tegra210:

- avdd-pll-utmip-supply: UTMI PLL power supply. Must supply 1.8 V.

- avdd-pll-uerefe-supply: PLLE reference PLL power supply. Must supply 1.05 V.

- dvdd-pex-pll-supply: PCIe/USB3 PLL power supply. Must supply 1.05 V.

- hvdd-pex-pll-e-supply: High-voltage PLLE power supply. Must supply 1.8 V.



For Tegra186:

- avdd-pll-erefeut-supply: UPHY brick and reference clock as well as UTMI PHY

  power supply. Must supply 1.8 V.

drivers/phy/broadcom/phy-brcm-usb.c

+8 −0
Original line number Diff line number Diff line
@@ -368,6 +368,13 @@ static int brcm_usb_phy_probe(struct platform_device *pdev) 
	return PTR_ERR_OR_ZERO(phy_provider);

}



static int brcm_usb_phy_remove(struct platform_device *pdev)

{

	sysfs_remove_group(&pdev->dev.kobj, &brcm_usb_phy_group);



	return 0;

}



#ifdef CONFIG_PM_SLEEP

static int brcm_usb_phy_suspend(struct device *dev)

{
@@ -433,6 +440,7 @@ MODULE_DEVICE_TABLE(of, brcm_usb_dt_ids); 


static struct platform_driver brcm_usb_driver = {

	.probe		= brcm_usb_phy_probe,

	.remove		= brcm_usb_phy_remove,

	.driver		= {

		.name	= "brcmstb-usb-phy",

		.owner	= THIS_MODULE,

drivers/phy/qualcomm/phy-qcom-qusb2.c

+1 −1
Original line number Diff line number Diff line
@@ -564,7 +564,7 @@ static int __maybe_unused qusb2_phy_runtime_resume(struct device *dev) 
	}



	if (!qphy->has_se_clk_scheme) {

		clk_prepare_enable(qphy->ref_clk);

		ret = clk_prepare_enable(qphy->ref_clk);

		if (ret) {

			dev_err(dev, "failed to enable ref clk, %d\n", ret);

			goto disable_ahb_clk;

drivers/phy/renesas/phy-rcar-gen2.c

+2 −0
Original line number Diff line number Diff line
@@ -391,6 +391,7 @@ static int rcar_gen2_phy_probe(struct platform_device *pdev) 
		error = of_property_read_u32(np, "reg", &channel_num);

		if (error || channel_num > 2) {

			dev_err(dev, "Invalid \"reg\" property\n");

			of_node_put(np);

			return error;

		}

		channel->select_mask = select_mask[channel_num];
@@ -406,6 +407,7 @@ static int rcar_gen2_phy_probe(struct platform_device *pdev) 
						   data->gen2_phy_ops);

			if (IS_ERR(phy->phy)) {

				dev_err(dev, "Failed to create PHY\n");

				of_node_put(np);

				return PTR_ERR(phy->phy);

			}

			phy_set_drvdata(phy->phy, phy);

drivers/phy/tegra/xusb-tegra124.c

+9 −0
Original line number Diff line number Diff line
@@ -1713,6 +1713,13 @@ static const struct tegra_xusb_padctl_ops tegra124_xusb_padctl_ops = { 
	.hsic_set_idle = tegra124_hsic_set_idle,

};



static const char * const tegra124_xusb_padctl_supply_names[] = {

	"avdd-pll-utmip",

	"avdd-pll-erefe",

	"avdd-pex-pll",

	"hvdd-pex-pll-e",

};



const struct tegra_xusb_padctl_soc tegra124_xusb_padctl_soc = {

	.num_pads = ARRAY_SIZE(tegra124_pads),

	.pads = tegra124_pads,
@@ -1735,6 +1742,8 @@ const struct tegra_xusb_padctl_soc tegra124_xusb_padctl_soc = { 
		},

	},

	.ops = &tegra124_xusb_padctl_ops,

	.supply_names = tegra124_xusb_padctl_supply_names,

	.num_supplies = ARRAY_SIZE(tegra124_xusb_padctl_supply_names),

};

EXPORT_SYMBOL_GPL(tegra124_xusb_padctl_soc);

CRA Git | Maintained and supported by SUSTech CRA and CCSE