| Message ID | 1402064411-18244-1-git-send-email-gautam.vivek@samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, 6 Jun 2014, Vivek Gautam wrote: > Facilitate getting required 3.3V and 1.0V VDD supply for > EHCI controller on Exynos. > > With patches for regulators' nodes merged in 3.15: > c8c253f ARM: dts: Add regulator entries to smdk5420 > 275dcd2 ARM: dts: add max77686 pmic node for smdk5250, > > certain perripherals will now need to ensure that, > they request VDD regulators in their drivers, and enable > them so as to make them working. "Certain peripherals"? Don't you mean "certain controllers"? Does this mean some controllers don't need to use the VDD regulators? > @@ -193,7 +196,31 @@ static int exynos_ehci_probe(struct platform_device *pdev) > > err = exynos_ehci_get_phy(&pdev->dev, exynos_ehci); > if (err) > - goto fail_clk; > + goto fail_regulator1; > + > + exynos_ehci->vdd33 = devm_regulator_get(&pdev->dev, "vdd33"); > + if (!IS_ERR(exynos_ehci->vdd33)) { > + err = regulator_enable(exynos_ehci->vdd33); > + if (err) { > + dev_err(&pdev->dev, > + "Failed to enable 3.3V Vdd supply\n"); > + goto fail_regulator1; > + } > + } else { > + dev_warn(&pdev->dev, "Regulator 3.3V Vdd supply not found\n"); > + } What if this is one of the controllers that don't need to use a VDD regulator? Do you really want to print out a warning in that case? Should you call devm_regulator_get_optional() instead? Alan Stern
On Thursday, June 12, 2014 12:39 AM, Alan Stern wrote: > On Fri, 6 Jun 2014, Vivek Gautam wrote: > > > Facilitate getting required 3.3V and 1.0V VDD supply for > > EHCI controller on Exynos. > > > > With patches for regulators' nodes merged in 3.15: > > c8c253f ARM: dts: Add regulator entries to smdk5420 > > 275dcd2 ARM: dts: add max77686 pmic node for smdk5250, > > > > certain perripherals will now need to ensure that, > > they request VDD regulators in their drivers, and enable > > them so as to make them working. > > "Certain peripherals"? Don't you mean "certain controllers"? > > Does this mean some controllers don't need to use the VDD regulators? > > > @@ -193,7 +196,31 @@ static int exynos_ehci_probe(struct platform_device *pdev) > > > > err = exynos_ehci_get_phy(&pdev->dev, exynos_ehci); > > if (err) > > - goto fail_clk; > > + goto fail_regulator1; > > + > > + exynos_ehci->vdd33 = devm_regulator_get(&pdev->dev, "vdd33"); > > + if (!IS_ERR(exynos_ehci->vdd33)) { > > + err = regulator_enable(exynos_ehci->vdd33); > > + if (err) { > > + dev_err(&pdev->dev, > > + "Failed to enable 3.3V Vdd supply\n"); > > + goto fail_regulator1; > > + } > > + } else { > > + dev_warn(&pdev->dev, "Regulator 3.3V Vdd supply not found\n"); > > + } > > What if this is one of the controllers that don't need to use a VDD > regulator? Do you really want to print out a warning in that case? > Should you call devm_regulator_get_optional() instead? I agree with Alan's suggestion. This warning message is not proper, when USB controllers that don't need a VDD regulator are used. The devm_regulator_get_optional() looks better. Best regards, Jingoo Han
Hi, On Wed, Jun 11, 2014 at 9:09 PM, Alan Stern <stern@rowland.harvard.edu> wrote: > On Fri, 6 Jun 2014, Vivek Gautam wrote: > >> Facilitate getting required 3.3V and 1.0V VDD supply for >> EHCI controller on Exynos. >> >> With patches for regulators' nodes merged in 3.15: >> c8c253f ARM: dts: Add regulator entries to smdk5420 >> 275dcd2 ARM: dts: add max77686 pmic node for smdk5250, >> >> certain perripherals will now need to ensure that, >> they request VDD regulators in their drivers, and enable >> them so as to make them working. > > "Certain peripherals"? Don't you mean "certain controllers"? Right, 'certain controllers'. > > Does this mean some controllers don't need to use the VDD regulators? Actually until the two patches got merged, the USB controllers were depending on bootloader for the VDD supply, wherein it was enabled, which ofcourse was bad. And by 'certain' i meant that above mentioned dt patches enable only the minimum number of regulators for the system, however leaves other for the drivers to enable. Anyways, i will re-do this commit message. > >> @@ -193,7 +196,31 @@ static int exynos_ehci_probe(struct platform_device *pdev) >> >> err = exynos_ehci_get_phy(&pdev->dev, exynos_ehci); >> if (err) >> - goto fail_clk; >> + goto fail_regulator1; >> + >> + exynos_ehci->vdd33 = devm_regulator_get(&pdev->dev, "vdd33"); >> + if (!IS_ERR(exynos_ehci->vdd33)) { >> + err = regulator_enable(exynos_ehci->vdd33); >> + if (err) { >> + dev_err(&pdev->dev, >> + "Failed to enable 3.3V Vdd supply\n"); >> + goto fail_regulator1; >> + } >> + } else { >> + dev_warn(&pdev->dev, "Regulator 3.3V Vdd supply not found\n"); >> + } > > What if this is one of the controllers that don't need to use a VDD > regulator? Do you really want to print out a warning in that case? > Should you call devm_regulator_get_optional() instead? Right, better to use devm_regulator_get_optional(). Thanks for pointing this out.
diff --git a/drivers/usb/host/ehci-exynos.c b/drivers/usb/host/ehci-exynos.c index d1c7621..b788ddd 100644 --- a/drivers/usb/host/ehci-exynos.c +++ b/drivers/usb/host/ehci-exynos.c @@ -21,6 +21,7 @@ #include <linux/of_gpio.h> #include <linux/phy/phy.h> #include <linux/platform_device.h> +#include <linux/regulator/consumer.h> #include <linux/usb/phy.h> #include <linux/usb/samsung_usb_phy.h> #include <linux/usb.h> @@ -50,6 +51,8 @@ struct exynos_ehci_hcd { struct usb_phy *phy; struct usb_otg *otg; struct phy *phy_g[PHY_NUMBER]; + struct regulator *vdd33; + struct regulator *vdd10; }; #define to_exynos_ehci(hcd) (struct exynos_ehci_hcd *)(hcd_to_ehci(hcd)->priv) @@ -193,7 +196,31 @@ static int exynos_ehci_probe(struct platform_device *pdev) err = exynos_ehci_get_phy(&pdev->dev, exynos_ehci); if (err) - goto fail_clk; + goto fail_regulator1; + + exynos_ehci->vdd33 = devm_regulator_get(&pdev->dev, "vdd33"); + if (!IS_ERR(exynos_ehci->vdd33)) { + err = regulator_enable(exynos_ehci->vdd33); + if (err) { + dev_err(&pdev->dev, + "Failed to enable 3.3V Vdd supply\n"); + goto fail_regulator1; + } + } else { + dev_warn(&pdev->dev, "Regulator 3.3V Vdd supply not found\n"); + } + + exynos_ehci->vdd10 = devm_regulator_get(&pdev->dev, "vdd10"); + if (!IS_ERR(exynos_ehci->vdd10)) { + err = regulator_enable(exynos_ehci->vdd10); + if (err) { + dev_err(&pdev->dev, + "Failed to enable 1.0V Vdd supply\n"); + goto fail_regulator2; + } + } else { + dev_warn(&pdev->dev, "Regulator 1.0V Vdd supply not found\n"); + } skip_phy: @@ -262,6 +289,10 @@ fail_add_hcd: fail_io: clk_disable_unprepare(exynos_ehci->clk); fail_clk: + regulator_disable(exynos_ehci->vdd10); +fail_regulator2: + regulator_disable(exynos_ehci->vdd33); +fail_regulator1: usb_put_hcd(hcd); return err; } @@ -280,6 +311,11 @@ static int exynos_ehci_remove(struct platform_device *pdev) clk_disable_unprepare(exynos_ehci->clk); + if (!IS_ERR(exynos_ehci->vdd33)) + regulator_disable(exynos_ehci->vdd33); + if (!IS_ERR(exynos_ehci->vdd10)) + regulator_disable(exynos_ehci->vdd10); + usb_put_hcd(hcd); return 0; @@ -305,6 +341,11 @@ static int exynos_ehci_suspend(struct device *dev) clk_disable_unprepare(exynos_ehci->clk); + if (!IS_ERR(exynos_ehci->vdd33)) + regulator_disable(exynos_ehci->vdd33); + if (!IS_ERR(exynos_ehci->vdd10)) + regulator_disable(exynos_ehci->vdd10); + return rc; } @@ -314,6 +355,22 @@ static int exynos_ehci_resume(struct device *dev) struct exynos_ehci_hcd *exynos_ehci = to_exynos_ehci(hcd); int ret; + if (!IS_ERR(exynos_ehci->vdd33)) { + ret = regulator_enable(exynos_ehci->vdd33); + if (ret) { + dev_err(dev, "Failed to enable 3.3V Vdd supply\n"); + return ret; + } + } + + if (!IS_ERR(exynos_ehci->vdd10)) { + ret = regulator_enable(exynos_ehci->vdd10); + if (ret) { + dev_err(dev, "Failed to enable 1.0V Vdd supply\n"); + return ret; + } + } + clk_prepare_enable(exynos_ehci->clk); if (exynos_ehci->otg)
Facilitate getting required 3.3V and 1.0V VDD supply for EHCI controller on Exynos. With patches for regulators' nodes merged in 3.15: c8c253f ARM: dts: Add regulator entries to smdk5420 275dcd2 ARM: dts: add max77686 pmic node for smdk5250, certain perripherals will now need to ensure that, they request VDD regulators in their drivers, and enable them so as to make them working. Signed-off-by: Vivek Gautam <gautam.vivek@samsung.com> Cc: Jingoo Han <jg1.han@samsung.com> --- Changes from v1: - Addressed review comments for making the regulators optional, and thus refactored the checks for the obtained regulators. drivers/usb/host/ehci-exynos.c | 59 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 58 insertions(+), 1 deletion(-)