* [PATCH v3 0/2] ?hci-platform: Add support for controllers with more then one reset line @ 2016-02-24 11:15 ` Hans de Goede 0 siblings, 0 replies; 16+ messages in thread From: Hans de Goede @ 2016-02-24 11:15 UTC (permalink / raw) To: linux-arm-kernel Hi All, Here is a new version of my patch-set to support usb controllers which have multiple resets. These patches apply on top of the related reset-controller patches which have just been merged here: git://git.pengutronix.de/git/pza/linux.git reset/next Changes in v2: -Switch to now shared reset_[de]assert functions Changes in v3: -Adjust for changes to shared-reset reset-controller functions Regards, Hans ^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH v3 0/2] ?hci-platform: Add support for controllers with more then one reset line @ 2016-02-24 11:15 ` Hans de Goede 0 siblings, 0 replies; 16+ messages in thread From: Hans de Goede @ 2016-02-24 11:15 UTC (permalink / raw) To: Greg Kroah-Hartman Cc: Roger Quadros, Alan Stern, Tony Prisk, Florian Fainelli, Maxime Ripard, Arnd Bergmann, linux-usb, linux-sunxi-/JYPxA39Uh5TLH3MbocFFw, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, devicetree Hi All, Here is a new version of my patch-set to support usb controllers which have multiple resets. These patches apply on top of the related reset-controller patches which have just been merged here: git://git.pengutronix.de/git/pza/linux.git reset/next Changes in v2: -Switch to now shared reset_[de]assert functions Changes in v3: -Adjust for changes to shared-reset reset-controller functions Regards, Hans ^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH v3 1/2] ehci-platform: Add support for controllers with multiple reset lines @ 2016-02-24 11:15 ` Hans de Goede 0 siblings, 0 replies; 16+ messages in thread From: Hans de Goede @ 2016-02-24 11:15 UTC (permalink / raw) To: linux-arm-kernel From: Reinder de Haan <patchesrdh@mveas.com> At least the EHCI/OHCI found on the Allwinnner H3 SoC needs multiple reset lines, the controller will not initialize while the reset for its companion is still asserted, which means we need to de-assert 2 resets for the controller to work. Signed-off-by: Reinder de Haan <patchesrdh@mveas.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- Changes in v2: -Use the new reset_control_[de]assert_shared reset-controller functions Changes in v3: -Adjust for changes to shared-reset reset-controller functions --- Documentation/devicetree/bindings/usb/usb-ehci.txt | 2 +- drivers/usb/host/ehci-platform.c | 41 ++++++++++++---------- 2 files changed, 24 insertions(+), 19 deletions(-) diff --git a/Documentation/devicetree/bindings/usb/usb-ehci.txt b/Documentation/devicetree/bindings/usb/usb-ehci.txt index a12d601..0701812 100644 --- a/Documentation/devicetree/bindings/usb/usb-ehci.txt +++ b/Documentation/devicetree/bindings/usb/usb-ehci.txt @@ -18,7 +18,7 @@ Optional properties: - clocks : a list of phandle + clock specifier pairs - phys : phandle + phy specifier pair - phy-names : "usb" - - resets : phandle + reset specifier pair + - resets : a list of phandle + reset specifier pairs Example (Sequoia 440EPx): ehci at e0000300 { diff --git a/drivers/usb/host/ehci-platform.c b/drivers/usb/host/ehci-platform.c index bd7082f2..3f195ba 100644 --- a/drivers/usb/host/ehci-platform.c +++ b/drivers/usb/host/ehci-platform.c @@ -39,11 +39,12 @@ #define DRIVER_DESC "EHCI generic platform driver" #define EHCI_MAX_CLKS 3 +#define EHCI_MAX_RESETS 2 #define hcd_to_ehci_priv(h) ((struct ehci_platform_priv *)hcd_to_ehci(h)->priv) struct ehci_platform_priv { struct clk *clks[EHCI_MAX_CLKS]; - struct reset_control *rst; + struct reset_control *resets[EHCI_MAX_RESETS]; struct phy **phys; int num_phys; bool reset_on_resume; @@ -149,7 +150,7 @@ static int ehci_platform_probe(struct platform_device *dev) struct usb_ehci_pdata *pdata = dev_get_platdata(&dev->dev); struct ehci_platform_priv *priv; struct ehci_hcd *ehci; - int err, irq, phy_num, clk = 0; + int err, irq, phy_num, clk = 0, rst = 0; if (usb_disabled()) return -ENODEV; @@ -232,18 +233,22 @@ static int ehci_platform_probe(struct platform_device *dev) break; } } - } - priv->rst = devm_reset_control_get_optional(&dev->dev, NULL); - if (IS_ERR(priv->rst)) { - err = PTR_ERR(priv->rst); - if (err == -EPROBE_DEFER) - goto err_put_clks; - priv->rst = NULL; - } else { - err = reset_control_deassert(priv->rst); - if (err) - goto err_put_clks; + for (rst = 0; rst < EHCI_MAX_RESETS; rst++) { + priv->resets[rst] = + devm_reset_control_get_shared_by_index( + &dev->dev, rst); + if (IS_ERR(priv->resets[rst])) { + err = PTR_ERR(priv->resets[rst]); + if (err == -EPROBE_DEFER) + goto err_reset; + priv->resets[rst] = NULL; + break; + } + err = reset_control_deassert(priv->resets[rst]); + if (err) + goto err_reset; + } } if (pdata->big_endian_desc) @@ -300,8 +305,8 @@ err_power: if (pdata->power_off) pdata->power_off(dev); err_reset: - if (priv->rst) - reset_control_assert(priv->rst); + while (--rst >= 0) + reset_control_assert(priv->resets[rst]); err_put_clks: while (--clk >= 0) clk_put(priv->clks[clk]); @@ -319,15 +324,15 @@ static int ehci_platform_remove(struct platform_device *dev) struct usb_hcd *hcd = platform_get_drvdata(dev); struct usb_ehci_pdata *pdata = dev_get_platdata(&dev->dev); struct ehci_platform_priv *priv = hcd_to_ehci_priv(hcd); - int clk; + int clk, rst; usb_remove_hcd(hcd); if (pdata->power_off) pdata->power_off(dev); - if (priv->rst) - reset_control_assert(priv->rst); + for (rst = 0; rst < EHCI_MAX_RESETS && priv->resets[rst]; rst++) + reset_control_assert(priv->resets[rst]); for (clk = 0; clk < EHCI_MAX_CLKS && priv->clks[clk]; clk++) clk_put(priv->clks[clk]); -- 2.7.1 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH v3 1/2] ehci-platform: Add support for controllers with multiple reset lines @ 2016-02-24 11:15 ` Hans de Goede 0 siblings, 0 replies; 16+ messages in thread From: Hans de Goede @ 2016-02-24 11:15 UTC (permalink / raw) To: Greg Kroah-Hartman Cc: Roger Quadros, Alan Stern, Tony Prisk, Florian Fainelli, Maxime Ripard, Arnd Bergmann, linux-usb, linux-sunxi-/JYPxA39Uh5TLH3MbocFFw, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, devicetree, Reinder de Haan, Hans de Goede From: Reinder de Haan <patchesrdh-I1/eAgTnXDYAvxtiuMwx3w@public.gmane.org> At least the EHCI/OHCI found on the Allwinnner H3 SoC needs multiple reset lines, the controller will not initialize while the reset for its companion is still asserted, which means we need to de-assert 2 resets for the controller to work. Signed-off-by: Reinder de Haan <patchesrdh-I1/eAgTnXDYAvxtiuMwx3w@public.gmane.org> Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> --- Changes in v2: -Use the new reset_control_[de]assert_shared reset-controller functions Changes in v3: -Adjust for changes to shared-reset reset-controller functions --- Documentation/devicetree/bindings/usb/usb-ehci.txt | 2 +- drivers/usb/host/ehci-platform.c | 41 ++++++++++++---------- 2 files changed, 24 insertions(+), 19 deletions(-) diff --git a/Documentation/devicetree/bindings/usb/usb-ehci.txt b/Documentation/devicetree/bindings/usb/usb-ehci.txt index a12d601..0701812 100644 --- a/Documentation/devicetree/bindings/usb/usb-ehci.txt +++ b/Documentation/devicetree/bindings/usb/usb-ehci.txt @@ -18,7 +18,7 @@ Optional properties: - clocks : a list of phandle + clock specifier pairs - phys : phandle + phy specifier pair - phy-names : "usb" - - resets : phandle + reset specifier pair + - resets : a list of phandle + reset specifier pairs Example (Sequoia 440EPx): ehci@e0000300 { diff --git a/drivers/usb/host/ehci-platform.c b/drivers/usb/host/ehci-platform.c index bd7082f2..3f195ba 100644 --- a/drivers/usb/host/ehci-platform.c +++ b/drivers/usb/host/ehci-platform.c @@ -39,11 +39,12 @@ #define DRIVER_DESC "EHCI generic platform driver" #define EHCI_MAX_CLKS 3 +#define EHCI_MAX_RESETS 2 #define hcd_to_ehci_priv(h) ((struct ehci_platform_priv *)hcd_to_ehci(h)->priv) struct ehci_platform_priv { struct clk *clks[EHCI_MAX_CLKS]; - struct reset_control *rst; + struct reset_control *resets[EHCI_MAX_RESETS]; struct phy **phys; int num_phys; bool reset_on_resume; @@ -149,7 +150,7 @@ static int ehci_platform_probe(struct platform_device *dev) struct usb_ehci_pdata *pdata = dev_get_platdata(&dev->dev); struct ehci_platform_priv *priv; struct ehci_hcd *ehci; - int err, irq, phy_num, clk = 0; + int err, irq, phy_num, clk = 0, rst = 0; if (usb_disabled()) return -ENODEV; @@ -232,18 +233,22 @@ static int ehci_platform_probe(struct platform_device *dev) break; } } - } - priv->rst = devm_reset_control_get_optional(&dev->dev, NULL); - if (IS_ERR(priv->rst)) { - err = PTR_ERR(priv->rst); - if (err == -EPROBE_DEFER) - goto err_put_clks; - priv->rst = NULL; - } else { - err = reset_control_deassert(priv->rst); - if (err) - goto err_put_clks; + for (rst = 0; rst < EHCI_MAX_RESETS; rst++) { + priv->resets[rst] = + devm_reset_control_get_shared_by_index( + &dev->dev, rst); + if (IS_ERR(priv->resets[rst])) { + err = PTR_ERR(priv->resets[rst]); + if (err == -EPROBE_DEFER) + goto err_reset; + priv->resets[rst] = NULL; + break; + } + err = reset_control_deassert(priv->resets[rst]); + if (err) + goto err_reset; + } } if (pdata->big_endian_desc) @@ -300,8 +305,8 @@ err_power: if (pdata->power_off) pdata->power_off(dev); err_reset: - if (priv->rst) - reset_control_assert(priv->rst); + while (--rst >= 0) + reset_control_assert(priv->resets[rst]); err_put_clks: while (--clk >= 0) clk_put(priv->clks[clk]); @@ -319,15 +324,15 @@ static int ehci_platform_remove(struct platform_device *dev) struct usb_hcd *hcd = platform_get_drvdata(dev); struct usb_ehci_pdata *pdata = dev_get_platdata(&dev->dev); struct ehci_platform_priv *priv = hcd_to_ehci_priv(hcd); - int clk; + int clk, rst; usb_remove_hcd(hcd); if (pdata->power_off) pdata->power_off(dev); - if (priv->rst) - reset_control_assert(priv->rst); + for (rst = 0; rst < EHCI_MAX_RESETS && priv->resets[rst]; rst++) + reset_control_assert(priv->resets[rst]); for (clk = 0; clk < EHCI_MAX_CLKS && priv->clks[clk]; clk++) clk_put(priv->clks[clk]); -- 2.7.1 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH v3 1/2] ehci-platform: Add support for controllers with multiple reset lines @ 2016-02-24 11:32 ` kbuild test robot 0 siblings, 0 replies; 16+ messages in thread From: kbuild test robot @ 2016-02-24 11:32 UTC (permalink / raw) To: linux-arm-kernel Hi Reinder, [auto build test ERROR on robh/for-next] [also build test ERROR on v4.5-rc5 next-20160223] [if your patch is applied to the wrong git tree, please drop us a note to help improving the system] url: https://github.com/0day-ci/linux/commits/Hans-de-Goede/ehci-platform-Add-support-for-controllers-with-multiple-reset-lines/20160224-191812 base: https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux for-next config: x86_64-randconfig-x004-201608 (attached as .config) reproduce: # save the attached .config to linux build tree make ARCH=x86_64 All error/warnings (new ones prefixed by >>): drivers/usb/host/ehci-platform.c: In function 'ehci_platform_probe': >> drivers/usb/host/ehci-platform.c:239:5: error: implicit declaration of function 'devm_reset_control_get_shared_by_index' [-Werror=implicit-function-declaration] devm_reset_control_get_shared_by_index( ^ >> drivers/usb/host/ehci-platform.c:238:22: warning: assignment makes pointer from integer without a cast [-Wint-conversion] priv->resets[rst] = ^ cc1: some warnings being treated as errors vim +/devm_reset_control_get_shared_by_index +239 drivers/usb/host/ehci-platform.c 232 priv->clks[clk] = NULL; 233 break; 234 } 235 } 236 237 for (rst = 0; rst < EHCI_MAX_RESETS; rst++) { > 238 priv->resets[rst] = > 239 devm_reset_control_get_shared_by_index( 240 &dev->dev, rst); 241 if (IS_ERR(priv->resets[rst])) { 242 err = PTR_ERR(priv->resets[rst]); --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation -------------- next part -------------- A non-text attachment was scrubbed... Name: .config.gz Type: application/octet-stream Size: 24241 bytes Desc: not available URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20160224/733e3be9/attachment-0001.obj> ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH v3 1/2] ehci-platform: Add support for controllers with multiple reset lines @ 2016-02-24 11:32 ` kbuild test robot 0 siblings, 0 replies; 16+ messages in thread From: kbuild test robot @ 2016-02-24 11:32 UTC (permalink / raw) Cc: kbuild-all-JC7UmRfGjtg, Greg Kroah-Hartman, Roger Quadros, Alan Stern, Tony Prisk, Florian Fainelli, Maxime Ripard, Arnd Bergmann, linux-usb, linux-sunxi-/JYPxA39Uh5TLH3MbocFFw, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, devicetree, Reinder de Haan, Hans de Goede [-- Attachment #1: Type: text/plain, Size: 1735 bytes --] Hi Reinder, [auto build test ERROR on robh/for-next] [also build test ERROR on v4.5-rc5 next-20160223] [if your patch is applied to the wrong git tree, please drop us a note to help improving the system] url: https://github.com/0day-ci/linux/commits/Hans-de-Goede/ehci-platform-Add-support-for-controllers-with-multiple-reset-lines/20160224-191812 base: https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux for-next config: x86_64-randconfig-x004-201608 (attached as .config) reproduce: # save the attached .config to linux build tree make ARCH=x86_64 All error/warnings (new ones prefixed by >>): drivers/usb/host/ehci-platform.c: In function 'ehci_platform_probe': >> drivers/usb/host/ehci-platform.c:239:5: error: implicit declaration of function 'devm_reset_control_get_shared_by_index' [-Werror=implicit-function-declaration] devm_reset_control_get_shared_by_index( ^ >> drivers/usb/host/ehci-platform.c:238:22: warning: assignment makes pointer from integer without a cast [-Wint-conversion] priv->resets[rst] = ^ cc1: some warnings being treated as errors vim +/devm_reset_control_get_shared_by_index +239 drivers/usb/host/ehci-platform.c 232 priv->clks[clk] = NULL; 233 break; 234 } 235 } 236 237 for (rst = 0; rst < EHCI_MAX_RESETS; rst++) { > 238 priv->resets[rst] = > 239 devm_reset_control_get_shared_by_index( 240 &dev->dev, rst); 241 if (IS_ERR(priv->resets[rst])) { 242 err = PTR_ERR(priv->resets[rst]); --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation [-- Attachment #2: .config.gz --] [-- Type: application/octet-stream, Size: 24241 bytes --] ^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH v3 1/2] ehci-platform: Add support for controllers with multiple reset lines @ 2016-02-24 11:37 ` Roger Quadros 0 siblings, 0 replies; 16+ messages in thread From: Roger Quadros @ 2016-02-24 11:37 UTC (permalink / raw) To: linux-arm-kernel Hi, On 24/02/16 13:15, Hans de Goede wrote: > From: Reinder de Haan <patchesrdh@mveas.com> > > At least the EHCI/OHCI found on the Allwinnner H3 SoC needs multiple > reset lines, the controller will not initialize while the reset for > its companion is still asserted, which means we need to de-assert > 2 resets for the controller to work. > > Signed-off-by: Reinder de Haan <patchesrdh@mveas.com> > Signed-off-by: Hans de Goede <hdegoede@redhat.com> > --- > Changes in v2: > -Use the new reset_control_[de]assert_shared reset-controller functions > Changes in v3: > -Adjust for changes to shared-reset reset-controller functions > --- > Documentation/devicetree/bindings/usb/usb-ehci.txt | 2 +- > drivers/usb/host/ehci-platform.c | 41 ++++++++++++---------- > 2 files changed, 24 insertions(+), 19 deletions(-) > > diff --git a/Documentation/devicetree/bindings/usb/usb-ehci.txt b/Documentation/devicetree/bindings/usb/usb-ehci.txt > index a12d601..0701812 100644 > --- a/Documentation/devicetree/bindings/usb/usb-ehci.txt > +++ b/Documentation/devicetree/bindings/usb/usb-ehci.txt > @@ -18,7 +18,7 @@ Optional properties: > - clocks : a list of phandle + clock specifier pairs > - phys : phandle + phy specifier pair > - phy-names : "usb" > - - resets : phandle + reset specifier pair > + - resets : a list of phandle + reset specifier pairs > > Example (Sequoia 440EPx): > ehci at e0000300 { > diff --git a/drivers/usb/host/ehci-platform.c b/drivers/usb/host/ehci-platform.c > index bd7082f2..3f195ba 100644 > --- a/drivers/usb/host/ehci-platform.c > +++ b/drivers/usb/host/ehci-platform.c > @@ -39,11 +39,12 @@ > > #define DRIVER_DESC "EHCI generic platform driver" > #define EHCI_MAX_CLKS 3 > +#define EHCI_MAX_RESETS 2 > #define hcd_to_ehci_priv(h) ((struct ehci_platform_priv *)hcd_to_ehci(h)->priv) > > struct ehci_platform_priv { > struct clk *clks[EHCI_MAX_CLKS]; > - struct reset_control *rst; > + struct reset_control *resets[EHCI_MAX_RESETS]; > struct phy **phys; > int num_phys; > bool reset_on_resume; > @@ -149,7 +150,7 @@ static int ehci_platform_probe(struct platform_device *dev) > struct usb_ehci_pdata *pdata = dev_get_platdata(&dev->dev); > struct ehci_platform_priv *priv; > struct ehci_hcd *ehci; > - int err, irq, phy_num, clk = 0; > + int err, irq, phy_num, clk = 0, rst = 0; > > if (usb_disabled()) > return -ENODEV; > @@ -232,18 +233,22 @@ static int ehci_platform_probe(struct platform_device *dev) > break; > } > } > - } > > - priv->rst = devm_reset_control_get_optional(&dev->dev, NULL); > - if (IS_ERR(priv->rst)) { > - err = PTR_ERR(priv->rst); > - if (err == -EPROBE_DEFER) > - goto err_put_clks; > - priv->rst = NULL; > - } else { > - err = reset_control_deassert(priv->rst); > - if (err) > - goto err_put_clks; > + for (rst = 0; rst < EHCI_MAX_RESETS; rst++) { > + priv->resets[rst] = > + devm_reset_control_get_shared_by_index( > + &dev->dev, rst); > + if (IS_ERR(priv->resets[rst])) { > + err = PTR_ERR(priv->resets[rst]); > + if (err == -EPROBE_DEFER) > + goto err_reset; > + priv->resets[rst] = NULL; > + break; > + } > + err = reset_control_deassert(priv->resets[rst]); > + if (err) > + goto err_reset; > + } Why is this code within "if (dev->of.node)" ? Previous code looked like it worked for non-DT boots as well. > } > > if (pdata->big_endian_desc) > @@ -300,8 +305,8 @@ err_power: > if (pdata->power_off) > pdata->power_off(dev); > err_reset: > - if (priv->rst) > - reset_control_assert(priv->rst); > + while (--rst >= 0) > + reset_control_assert(priv->resets[rst]); > err_put_clks: > while (--clk >= 0) > clk_put(priv->clks[clk]); > @@ -319,15 +324,15 @@ static int ehci_platform_remove(struct platform_device *dev) > struct usb_hcd *hcd = platform_get_drvdata(dev); > struct usb_ehci_pdata *pdata = dev_get_platdata(&dev->dev); > struct ehci_platform_priv *priv = hcd_to_ehci_priv(hcd); > - int clk; > + int clk, rst; > > usb_remove_hcd(hcd); > > if (pdata->power_off) > pdata->power_off(dev); > > - if (priv->rst) > - reset_control_assert(priv->rst); > + for (rst = 0; rst < EHCI_MAX_RESETS && priv->resets[rst]; rst++) > + reset_control_assert(priv->resets[rst]); > > for (clk = 0; clk < EHCI_MAX_CLKS && priv->clks[clk]; clk++) > clk_put(priv->clks[clk]); > cheers, -roger ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH v3 1/2] ehci-platform: Add support for controllers with multiple reset lines @ 2016-02-24 11:37 ` Roger Quadros 0 siblings, 0 replies; 16+ messages in thread From: Roger Quadros @ 2016-02-24 11:37 UTC (permalink / raw) To: Hans de Goede, Greg Kroah-Hartman Cc: Alan Stern, Tony Prisk, Florian Fainelli, Maxime Ripard, Arnd Bergmann, linux-usb, linux-sunxi-/JYPxA39Uh5TLH3MbocFFw, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, devicetree, Reinder de Haan Hi, On 24/02/16 13:15, Hans de Goede wrote: > From: Reinder de Haan <patchesrdh-I1/eAgTnXDYAvxtiuMwx3w@public.gmane.org> > > At least the EHCI/OHCI found on the Allwinnner H3 SoC needs multiple > reset lines, the controller will not initialize while the reset for > its companion is still asserted, which means we need to de-assert > 2 resets for the controller to work. > > Signed-off-by: Reinder de Haan <patchesrdh-I1/eAgTnXDYAvxtiuMwx3w@public.gmane.org> > Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> > --- > Changes in v2: > -Use the new reset_control_[de]assert_shared reset-controller functions > Changes in v3: > -Adjust for changes to shared-reset reset-controller functions > --- > Documentation/devicetree/bindings/usb/usb-ehci.txt | 2 +- > drivers/usb/host/ehci-platform.c | 41 ++++++++++++---------- > 2 files changed, 24 insertions(+), 19 deletions(-) > > diff --git a/Documentation/devicetree/bindings/usb/usb-ehci.txt b/Documentation/devicetree/bindings/usb/usb-ehci.txt > index a12d601..0701812 100644 > --- a/Documentation/devicetree/bindings/usb/usb-ehci.txt > +++ b/Documentation/devicetree/bindings/usb/usb-ehci.txt > @@ -18,7 +18,7 @@ Optional properties: > - clocks : a list of phandle + clock specifier pairs > - phys : phandle + phy specifier pair > - phy-names : "usb" > - - resets : phandle + reset specifier pair > + - resets : a list of phandle + reset specifier pairs > > Example (Sequoia 440EPx): > ehci@e0000300 { > diff --git a/drivers/usb/host/ehci-platform.c b/drivers/usb/host/ehci-platform.c > index bd7082f2..3f195ba 100644 > --- a/drivers/usb/host/ehci-platform.c > +++ b/drivers/usb/host/ehci-platform.c > @@ -39,11 +39,12 @@ > > #define DRIVER_DESC "EHCI generic platform driver" > #define EHCI_MAX_CLKS 3 > +#define EHCI_MAX_RESETS 2 > #define hcd_to_ehci_priv(h) ((struct ehci_platform_priv *)hcd_to_ehci(h)->priv) > > struct ehci_platform_priv { > struct clk *clks[EHCI_MAX_CLKS]; > - struct reset_control *rst; > + struct reset_control *resets[EHCI_MAX_RESETS]; > struct phy **phys; > int num_phys; > bool reset_on_resume; > @@ -149,7 +150,7 @@ static int ehci_platform_probe(struct platform_device *dev) > struct usb_ehci_pdata *pdata = dev_get_platdata(&dev->dev); > struct ehci_platform_priv *priv; > struct ehci_hcd *ehci; > - int err, irq, phy_num, clk = 0; > + int err, irq, phy_num, clk = 0, rst = 0; > > if (usb_disabled()) > return -ENODEV; > @@ -232,18 +233,22 @@ static int ehci_platform_probe(struct platform_device *dev) > break; > } > } > - } > > - priv->rst = devm_reset_control_get_optional(&dev->dev, NULL); > - if (IS_ERR(priv->rst)) { > - err = PTR_ERR(priv->rst); > - if (err == -EPROBE_DEFER) > - goto err_put_clks; > - priv->rst = NULL; > - } else { > - err = reset_control_deassert(priv->rst); > - if (err) > - goto err_put_clks; > + for (rst = 0; rst < EHCI_MAX_RESETS; rst++) { > + priv->resets[rst] = > + devm_reset_control_get_shared_by_index( > + &dev->dev, rst); > + if (IS_ERR(priv->resets[rst])) { > + err = PTR_ERR(priv->resets[rst]); > + if (err == -EPROBE_DEFER) > + goto err_reset; > + priv->resets[rst] = NULL; > + break; > + } > + err = reset_control_deassert(priv->resets[rst]); > + if (err) > + goto err_reset; > + } Why is this code within "if (dev->of.node)" ? Previous code looked like it worked for non-DT boots as well. > } > > if (pdata->big_endian_desc) > @@ -300,8 +305,8 @@ err_power: > if (pdata->power_off) > pdata->power_off(dev); > err_reset: > - if (priv->rst) > - reset_control_assert(priv->rst); > + while (--rst >= 0) > + reset_control_assert(priv->resets[rst]); > err_put_clks: > while (--clk >= 0) > clk_put(priv->clks[clk]); > @@ -319,15 +324,15 @@ static int ehci_platform_remove(struct platform_device *dev) > struct usb_hcd *hcd = platform_get_drvdata(dev); > struct usb_ehci_pdata *pdata = dev_get_platdata(&dev->dev); > struct ehci_platform_priv *priv = hcd_to_ehci_priv(hcd); > - int clk; > + int clk, rst; > > usb_remove_hcd(hcd); > > if (pdata->power_off) > pdata->power_off(dev); > > - if (priv->rst) > - reset_control_assert(priv->rst); > + for (rst = 0; rst < EHCI_MAX_RESETS && priv->resets[rst]; rst++) > + reset_control_assert(priv->resets[rst]); > > for (clk = 0; clk < EHCI_MAX_CLKS && priv->clks[clk]; clk++) > clk_put(priv->clks[clk]); > cheers, -roger ^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH v3 1/2] ehci-platform: Add support for controllers with multiple reset lines @ 2016-02-24 13:22 ` Hans de Goede 0 siblings, 0 replies; 16+ messages in thread From: Hans de Goede @ 2016-02-24 13:22 UTC (permalink / raw) To: linux-arm-kernel Hi, On 24-02-16 12:37, Roger Quadros wrote: > Hi, > > On 24/02/16 13:15, Hans de Goede wrote: >> From: Reinder de Haan <patchesrdh@mveas.com> >> >> At least the EHCI/OHCI found on the Allwinnner H3 SoC needs multiple >> reset lines, the controller will not initialize while the reset for >> its companion is still asserted, which means we need to de-assert >> 2 resets for the controller to work. >> >> Signed-off-by: Reinder de Haan <patchesrdh@mveas.com> >> Signed-off-by: Hans de Goede <hdegoede@redhat.com> >> --- >> Changes in v2: >> -Use the new reset_control_[de]assert_shared reset-controller functions >> Changes in v3: >> -Adjust for changes to shared-reset reset-controller functions >> --- >> Documentation/devicetree/bindings/usb/usb-ehci.txt | 2 +- >> drivers/usb/host/ehci-platform.c | 41 ++++++++++++---------- >> 2 files changed, 24 insertions(+), 19 deletions(-) >> >> diff --git a/Documentation/devicetree/bindings/usb/usb-ehci.txt b/Documentation/devicetree/bindings/usb/usb-ehci.txt >> index a12d601..0701812 100644 >> --- a/Documentation/devicetree/bindings/usb/usb-ehci.txt >> +++ b/Documentation/devicetree/bindings/usb/usb-ehci.txt >> @@ -18,7 +18,7 @@ Optional properties: >> - clocks : a list of phandle + clock specifier pairs >> - phys : phandle + phy specifier pair >> - phy-names : "usb" >> - - resets : phandle + reset specifier pair >> + - resets : a list of phandle + reset specifier pairs >> >> Example (Sequoia 440EPx): >> ehci at e0000300 { >> diff --git a/drivers/usb/host/ehci-platform.c b/drivers/usb/host/ehci-platform.c >> index bd7082f2..3f195ba 100644 >> --- a/drivers/usb/host/ehci-platform.c >> +++ b/drivers/usb/host/ehci-platform.c >> @@ -39,11 +39,12 @@ >> >> #define DRIVER_DESC "EHCI generic platform driver" >> #define EHCI_MAX_CLKS 3 >> +#define EHCI_MAX_RESETS 2 >> #define hcd_to_ehci_priv(h) ((struct ehci_platform_priv *)hcd_to_ehci(h)->priv) >> >> struct ehci_platform_priv { >> struct clk *clks[EHCI_MAX_CLKS]; >> - struct reset_control *rst; >> + struct reset_control *resets[EHCI_MAX_RESETS]; >> struct phy **phys; >> int num_phys; >> bool reset_on_resume; >> @@ -149,7 +150,7 @@ static int ehci_platform_probe(struct platform_device *dev) >> struct usb_ehci_pdata *pdata = dev_get_platdata(&dev->dev); >> struct ehci_platform_priv *priv; >> struct ehci_hcd *ehci; >> - int err, irq, phy_num, clk = 0; >> + int err, irq, phy_num, clk = 0, rst = 0; >> >> if (usb_disabled()) >> return -ENODEV; >> @@ -232,18 +233,22 @@ static int ehci_platform_probe(struct platform_device *dev) >> break; >> } >> } >> - } >> >> - priv->rst = devm_reset_control_get_optional(&dev->dev, NULL); >> - if (IS_ERR(priv->rst)) { >> - err = PTR_ERR(priv->rst); >> - if (err == -EPROBE_DEFER) >> - goto err_put_clks; >> - priv->rst = NULL; >> - } else { >> - err = reset_control_deassert(priv->rst); >> - if (err) >> - goto err_put_clks; >> + for (rst = 0; rst < EHCI_MAX_RESETS; rst++) { >> + priv->resets[rst] = >> + devm_reset_control_get_shared_by_index( >> + &dev->dev, rst); >> + if (IS_ERR(priv->resets[rst])) { >> + err = PTR_ERR(priv->resets[rst]); >> + if (err == -EPROBE_DEFER) >> + goto err_reset; >> + priv->resets[rst] = NULL; >> + break; >> + } >> + err = reset_control_deassert(priv->resets[rst]); >> + if (err) >> + goto err_reset; >> + } > > Why is this code within "if (dev->of.node)" ? > Previous code looked like it worked for non-DT boots as well. Because devm_reset_control_get_shared_by_index() only works for DT platforms (it is safe to call on non DT platforms, it will just always return -EINVAL there) and the old reset paths were ever only used / only ever worked with DT too. Regards, Hans ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH v3 1/2] ehci-platform: Add support for controllers with multiple reset lines @ 2016-02-24 13:22 ` Hans de Goede 0 siblings, 0 replies; 16+ messages in thread From: Hans de Goede @ 2016-02-24 13:22 UTC (permalink / raw) To: Roger Quadros, Greg Kroah-Hartman Cc: Alan Stern, Tony Prisk, Florian Fainelli, Maxime Ripard, Arnd Bergmann, linux-usb, linux-sunxi-/JYPxA39Uh5TLH3MbocFFw, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, devicetree, Reinder de Haan Hi, On 24-02-16 12:37, Roger Quadros wrote: > Hi, > > On 24/02/16 13:15, Hans de Goede wrote: >> From: Reinder de Haan <patchesrdh-I1/eAgTnXDYAvxtiuMwx3w@public.gmane.org> >> >> At least the EHCI/OHCI found on the Allwinnner H3 SoC needs multiple >> reset lines, the controller will not initialize while the reset for >> its companion is still asserted, which means we need to de-assert >> 2 resets for the controller to work. >> >> Signed-off-by: Reinder de Haan <patchesrdh-I1/eAgTnXDYAvxtiuMwx3w@public.gmane.org> >> Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> >> --- >> Changes in v2: >> -Use the new reset_control_[de]assert_shared reset-controller functions >> Changes in v3: >> -Adjust for changes to shared-reset reset-controller functions >> --- >> Documentation/devicetree/bindings/usb/usb-ehci.txt | 2 +- >> drivers/usb/host/ehci-platform.c | 41 ++++++++++++---------- >> 2 files changed, 24 insertions(+), 19 deletions(-) >> >> diff --git a/Documentation/devicetree/bindings/usb/usb-ehci.txt b/Documentation/devicetree/bindings/usb/usb-ehci.txt >> index a12d601..0701812 100644 >> --- a/Documentation/devicetree/bindings/usb/usb-ehci.txt >> +++ b/Documentation/devicetree/bindings/usb/usb-ehci.txt >> @@ -18,7 +18,7 @@ Optional properties: >> - clocks : a list of phandle + clock specifier pairs >> - phys : phandle + phy specifier pair >> - phy-names : "usb" >> - - resets : phandle + reset specifier pair >> + - resets : a list of phandle + reset specifier pairs >> >> Example (Sequoia 440EPx): >> ehci@e0000300 { >> diff --git a/drivers/usb/host/ehci-platform.c b/drivers/usb/host/ehci-platform.c >> index bd7082f2..3f195ba 100644 >> --- a/drivers/usb/host/ehci-platform.c >> +++ b/drivers/usb/host/ehci-platform.c >> @@ -39,11 +39,12 @@ >> >> #define DRIVER_DESC "EHCI generic platform driver" >> #define EHCI_MAX_CLKS 3 >> +#define EHCI_MAX_RESETS 2 >> #define hcd_to_ehci_priv(h) ((struct ehci_platform_priv *)hcd_to_ehci(h)->priv) >> >> struct ehci_platform_priv { >> struct clk *clks[EHCI_MAX_CLKS]; >> - struct reset_control *rst; >> + struct reset_control *resets[EHCI_MAX_RESETS]; >> struct phy **phys; >> int num_phys; >> bool reset_on_resume; >> @@ -149,7 +150,7 @@ static int ehci_platform_probe(struct platform_device *dev) >> struct usb_ehci_pdata *pdata = dev_get_platdata(&dev->dev); >> struct ehci_platform_priv *priv; >> struct ehci_hcd *ehci; >> - int err, irq, phy_num, clk = 0; >> + int err, irq, phy_num, clk = 0, rst = 0; >> >> if (usb_disabled()) >> return -ENODEV; >> @@ -232,18 +233,22 @@ static int ehci_platform_probe(struct platform_device *dev) >> break; >> } >> } >> - } >> >> - priv->rst = devm_reset_control_get_optional(&dev->dev, NULL); >> - if (IS_ERR(priv->rst)) { >> - err = PTR_ERR(priv->rst); >> - if (err == -EPROBE_DEFER) >> - goto err_put_clks; >> - priv->rst = NULL; >> - } else { >> - err = reset_control_deassert(priv->rst); >> - if (err) >> - goto err_put_clks; >> + for (rst = 0; rst < EHCI_MAX_RESETS; rst++) { >> + priv->resets[rst] = >> + devm_reset_control_get_shared_by_index( >> + &dev->dev, rst); >> + if (IS_ERR(priv->resets[rst])) { >> + err = PTR_ERR(priv->resets[rst]); >> + if (err == -EPROBE_DEFER) >> + goto err_reset; >> + priv->resets[rst] = NULL; >> + break; >> + } >> + err = reset_control_deassert(priv->resets[rst]); >> + if (err) >> + goto err_reset; >> + } > > Why is this code within "if (dev->of.node)" ? > Previous code looked like it worked for non-DT boots as well. Because devm_reset_control_get_shared_by_index() only works for DT platforms (it is safe to call on non DT platforms, it will just always return -EINVAL there) and the old reset paths were ever only used / only ever worked with DT too. Regards, Hans ^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH v3 1/2] ehci-platform: Add support for controllers with multiple reset lines @ 2016-02-24 18:47 ` Alan Stern 0 siblings, 0 replies; 16+ messages in thread From: Alan Stern @ 2016-02-24 18:47 UTC (permalink / raw) To: linux-arm-kernel On Wed, 24 Feb 2016, Roger Quadros wrote: > Hi, > > On 24/02/16 13:15, Hans de Goede wrote: > > From: Reinder de Haan <patchesrdh@mveas.com> > > > > At least the EHCI/OHCI found on the Allwinnner H3 SoC needs multiple > > reset lines, the controller will not initialize while the reset for > > its companion is still asserted, which means we need to de-assert > > 2 resets for the controller to work. > > > > Signed-off-by: Reinder de Haan <patchesrdh@mveas.com> > > Signed-off-by: Hans de Goede <hdegoede@redhat.com> > > - } else { > > - err = reset_control_deassert(priv->rst); > > - if (err) > > - goto err_put_clks; > > + for (rst = 0; rst < EHCI_MAX_RESETS; rst++) { > > + priv->resets[rst] = > > + devm_reset_control_get_shared_by_index( > > + &dev->dev, rst); Ugly continuation line. The convention in these files is to indent continuation lines by two tab stops beyond the original source line. Same comment applies to the 2/2 patch. Once that is changed, you can add: Acked-by: Alan Stern <stern@rowland.harvard.edu> to both. Alan Stern ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH v3 1/2] ehci-platform: Add support for controllers with multiple reset lines @ 2016-02-24 18:47 ` Alan Stern 0 siblings, 0 replies; 16+ messages in thread From: Alan Stern @ 2016-02-24 18:47 UTC (permalink / raw) To: Roger Quadros Cc: Hans de Goede, Greg Kroah-Hartman, Tony Prisk, Florian Fainelli, Maxime Ripard, Arnd Bergmann, linux-usb, linux-sunxi-/JYPxA39Uh5TLH3MbocFFw, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, devicetree, Reinder de Haan On Wed, 24 Feb 2016, Roger Quadros wrote: > Hi, > > On 24/02/16 13:15, Hans de Goede wrote: > > From: Reinder de Haan <patchesrdh-I1/eAgTnXDYAvxtiuMwx3w@public.gmane.org> > > > > At least the EHCI/OHCI found on the Allwinnner H3 SoC needs multiple > > reset lines, the controller will not initialize while the reset for > > its companion is still asserted, which means we need to de-assert > > 2 resets for the controller to work. > > > > Signed-off-by: Reinder de Haan <patchesrdh-I1/eAgTnXDYAvxtiuMwx3w@public.gmane.org> > > Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> > > - } else { > > - err = reset_control_deassert(priv->rst); > > - if (err) > > - goto err_put_clks; > > + for (rst = 0; rst < EHCI_MAX_RESETS; rst++) { > > + priv->resets[rst] = > > + devm_reset_control_get_shared_by_index( > > + &dev->dev, rst); Ugly continuation line. The convention in these files is to indent continuation lines by two tab stops beyond the original source line. Same comment applies to the 2/2 patch. Once that is changed, you can add: Acked-by: Alan Stern <stern-nwvwT67g6+6dFdvTe/nMLpVzexx5G7lz@public.gmane.org> to both. Alan Stern -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH v3 2/2] ohci-platform: Add support for controllers with multiple reset lines @ 2016-02-24 11:15 ` Hans de Goede 0 siblings, 0 replies; 16+ messages in thread From: Hans de Goede @ 2016-02-24 11:15 UTC (permalink / raw) To: linux-arm-kernel At least the EHCI/OHCI found on the Allwinnner H3 SoC needs multiple reset lines, the controller will not initialize while the reset for its companion is still asserted, which means we need to de-assert 2 resets for the controller to work. Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- Changes in v2: -New patch in v2 of this patch-set, to complement the identical patch for the ehci-platform code Changes in v3: -Adjust for changes to shared-reset reset-controller functions --- Documentation/devicetree/bindings/usb/usb-ohci.txt | 2 +- drivers/usb/host/ohci-platform.c | 43 ++++++++++++---------- 2 files changed, 24 insertions(+), 21 deletions(-) diff --git a/Documentation/devicetree/bindings/usb/usb-ohci.txt b/Documentation/devicetree/bindings/usb/usb-ohci.txt index 19233b7..9df4569 100644 --- a/Documentation/devicetree/bindings/usb/usb-ohci.txt +++ b/Documentation/devicetree/bindings/usb/usb-ohci.txt @@ -14,7 +14,7 @@ Optional properties: - clocks : a list of phandle + clock specifier pairs - phys : phandle + phy specifier pair - phy-names : "usb" -- resets : phandle + reset specifier pair +- resets : a list of phandle + reset specifier pairs Example: diff --git a/drivers/usb/host/ohci-platform.c b/drivers/usb/host/ohci-platform.c index c2669f18..5fa5813 100644 --- a/drivers/usb/host/ohci-platform.c +++ b/drivers/usb/host/ohci-platform.c @@ -33,11 +33,12 @@ #define DRIVER_DESC "OHCI generic platform driver" #define OHCI_MAX_CLKS 3 +#define OHCI_MAX_RESETS 2 #define hcd_to_ohci_priv(h) ((struct ohci_platform_priv *)hcd_to_ohci(h)->priv) struct ohci_platform_priv { struct clk *clks[OHCI_MAX_CLKS]; - struct reset_control *rst; + struct reset_control *resets[OHCI_MAX_RESETS]; struct phy **phys; int num_phys; }; @@ -117,7 +118,7 @@ static int ohci_platform_probe(struct platform_device *dev) struct usb_ohci_pdata *pdata = dev_get_platdata(&dev->dev); struct ohci_platform_priv *priv; struct ohci_hcd *ohci; - int err, irq, phy_num, clk = 0; + int err, irq, phy_num, clk = 0, rst = 0; if (usb_disabled()) return -ENODEV; @@ -195,19 +196,21 @@ static int ohci_platform_probe(struct platform_device *dev) break; } } - - } - - priv->rst = devm_reset_control_get_optional(&dev->dev, NULL); - if (IS_ERR(priv->rst)) { - err = PTR_ERR(priv->rst); - if (err == -EPROBE_DEFER) - goto err_put_clks; - priv->rst = NULL; - } else { - err = reset_control_deassert(priv->rst); - if (err) - goto err_put_clks; + for (rst = 0; rst < OHCI_MAX_RESETS; rst++) { + priv->resets[rst] = + devm_reset_control_get_shared_by_index( + &dev->dev, rst); + if (IS_ERR(priv->resets[rst])) { + err = PTR_ERR(priv->resets[rst]); + if (err == -EPROBE_DEFER) + goto err_reset; + priv->resets[rst] = NULL; + break; + } + err = reset_control_deassert(priv->resets[rst]); + if (err) + goto err_reset; + } } if (pdata->big_endian_desc) @@ -265,8 +268,8 @@ err_power: if (pdata->power_off) pdata->power_off(dev); err_reset: - if (priv->rst) - reset_control_assert(priv->rst); + while (--rst >= 0) + reset_control_assert(priv->resets[rst]); err_put_clks: while (--clk >= 0) clk_put(priv->clks[clk]); @@ -284,15 +287,15 @@ static int ohci_platform_remove(struct platform_device *dev) struct usb_hcd *hcd = platform_get_drvdata(dev); struct usb_ohci_pdata *pdata = dev_get_platdata(&dev->dev); struct ohci_platform_priv *priv = hcd_to_ohci_priv(hcd); - int clk; + int clk, rst; usb_remove_hcd(hcd); if (pdata->power_off) pdata->power_off(dev); - if (priv->rst) - reset_control_assert(priv->rst); + for (rst = 0; rst < OHCI_MAX_RESETS && priv->resets[rst]; rst++) + reset_control_assert(priv->resets[rst]); for (clk = 0; clk < OHCI_MAX_CLKS && priv->clks[clk]; clk++) clk_put(priv->clks[clk]); -- 2.7.1 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH v3 2/2] ohci-platform: Add support for controllers with multiple reset lines @ 2016-02-24 11:15 ` Hans de Goede 0 siblings, 0 replies; 16+ messages in thread From: Hans de Goede @ 2016-02-24 11:15 UTC (permalink / raw) To: Greg Kroah-Hartman Cc: Roger Quadros, Alan Stern, Tony Prisk, Florian Fainelli, Maxime Ripard, Arnd Bergmann, linux-usb, linux-sunxi-/JYPxA39Uh5TLH3MbocFFw, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, devicetree, Hans de Goede At least the EHCI/OHCI found on the Allwinnner H3 SoC needs multiple reset lines, the controller will not initialize while the reset for its companion is still asserted, which means we need to de-assert 2 resets for the controller to work. Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> --- Changes in v2: -New patch in v2 of this patch-set, to complement the identical patch for the ehci-platform code Changes in v3: -Adjust for changes to shared-reset reset-controller functions --- Documentation/devicetree/bindings/usb/usb-ohci.txt | 2 +- drivers/usb/host/ohci-platform.c | 43 ++++++++++++---------- 2 files changed, 24 insertions(+), 21 deletions(-) diff --git a/Documentation/devicetree/bindings/usb/usb-ohci.txt b/Documentation/devicetree/bindings/usb/usb-ohci.txt index 19233b7..9df4569 100644 --- a/Documentation/devicetree/bindings/usb/usb-ohci.txt +++ b/Documentation/devicetree/bindings/usb/usb-ohci.txt @@ -14,7 +14,7 @@ Optional properties: - clocks : a list of phandle + clock specifier pairs - phys : phandle + phy specifier pair - phy-names : "usb" -- resets : phandle + reset specifier pair +- resets : a list of phandle + reset specifier pairs Example: diff --git a/drivers/usb/host/ohci-platform.c b/drivers/usb/host/ohci-platform.c index c2669f18..5fa5813 100644 --- a/drivers/usb/host/ohci-platform.c +++ b/drivers/usb/host/ohci-platform.c @@ -33,11 +33,12 @@ #define DRIVER_DESC "OHCI generic platform driver" #define OHCI_MAX_CLKS 3 +#define OHCI_MAX_RESETS 2 #define hcd_to_ohci_priv(h) ((struct ohci_platform_priv *)hcd_to_ohci(h)->priv) struct ohci_platform_priv { struct clk *clks[OHCI_MAX_CLKS]; - struct reset_control *rst; + struct reset_control *resets[OHCI_MAX_RESETS]; struct phy **phys; int num_phys; }; @@ -117,7 +118,7 @@ static int ohci_platform_probe(struct platform_device *dev) struct usb_ohci_pdata *pdata = dev_get_platdata(&dev->dev); struct ohci_platform_priv *priv; struct ohci_hcd *ohci; - int err, irq, phy_num, clk = 0; + int err, irq, phy_num, clk = 0, rst = 0; if (usb_disabled()) return -ENODEV; @@ -195,19 +196,21 @@ static int ohci_platform_probe(struct platform_device *dev) break; } } - - } - - priv->rst = devm_reset_control_get_optional(&dev->dev, NULL); - if (IS_ERR(priv->rst)) { - err = PTR_ERR(priv->rst); - if (err == -EPROBE_DEFER) - goto err_put_clks; - priv->rst = NULL; - } else { - err = reset_control_deassert(priv->rst); - if (err) - goto err_put_clks; + for (rst = 0; rst < OHCI_MAX_RESETS; rst++) { + priv->resets[rst] = + devm_reset_control_get_shared_by_index( + &dev->dev, rst); + if (IS_ERR(priv->resets[rst])) { + err = PTR_ERR(priv->resets[rst]); + if (err == -EPROBE_DEFER) + goto err_reset; + priv->resets[rst] = NULL; + break; + } + err = reset_control_deassert(priv->resets[rst]); + if (err) + goto err_reset; + } } if (pdata->big_endian_desc) @@ -265,8 +268,8 @@ err_power: if (pdata->power_off) pdata->power_off(dev); err_reset: - if (priv->rst) - reset_control_assert(priv->rst); + while (--rst >= 0) + reset_control_assert(priv->resets[rst]); err_put_clks: while (--clk >= 0) clk_put(priv->clks[clk]); @@ -284,15 +287,15 @@ static int ohci_platform_remove(struct platform_device *dev) struct usb_hcd *hcd = platform_get_drvdata(dev); struct usb_ohci_pdata *pdata = dev_get_platdata(&dev->dev); struct ohci_platform_priv *priv = hcd_to_ohci_priv(hcd); - int clk; + int clk, rst; usb_remove_hcd(hcd); if (pdata->power_off) pdata->power_off(dev); - if (priv->rst) - reset_control_assert(priv->rst); + for (rst = 0; rst < OHCI_MAX_RESETS && priv->resets[rst]; rst++) + reset_control_assert(priv->resets[rst]); for (clk = 0; clk < OHCI_MAX_CLKS && priv->clks[clk]; clk++) clk_put(priv->clks[clk]); -- 2.7.1 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH v3 2/2] ohci-platform: Add support for controllers with multiple reset lines @ 2016-02-24 11:29 ` kbuild test robot 0 siblings, 0 replies; 16+ messages in thread From: kbuild test robot @ 2016-02-24 11:29 UTC (permalink / raw) To: linux-arm-kernel Hi Hans, [auto build test ERROR on robh/for-next] [also build test ERROR on v4.5-rc5 next-20160223] [if your patch is applied to the wrong git tree, please drop us a note to help improving the system] url: https://github.com/0day-ci/linux/commits/Hans-de-Goede/ehci-platform-Add-support-for-controllers-with-multiple-reset-lines/20160224-191812 base: https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux for-next config: x86_64-randconfig-x004-201608 (attached as .config) reproduce: # save the attached .config to linux build tree make ARCH=x86_64 All error/warnings (new ones prefixed by >>): drivers/usb/host/ohci-platform.c: In function 'ohci_platform_probe': >> drivers/usb/host/ohci-platform.c:201:5: error: implicit declaration of function 'devm_reset_control_get_shared_by_index' [-Werror=implicit-function-declaration] devm_reset_control_get_shared_by_index( ^ >> drivers/usb/host/ohci-platform.c:200:22: warning: assignment makes pointer from integer without a cast [-Wint-conversion] priv->resets[rst] = ^ cc1: some warnings being treated as errors vim +/devm_reset_control_get_shared_by_index +201 drivers/usb/host/ohci-platform.c 194 goto err_put_clks; 195 priv->clks[clk] = NULL; 196 break; 197 } 198 } 199 for (rst = 0; rst < OHCI_MAX_RESETS; rst++) { > 200 priv->resets[rst] = > 201 devm_reset_control_get_shared_by_index( 202 &dev->dev, rst); 203 if (IS_ERR(priv->resets[rst])) { 204 err = PTR_ERR(priv->resets[rst]); --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation -------------- next part -------------- A non-text attachment was scrubbed... Name: .config.gz Type: application/octet-stream Size: 24241 bytes Desc: not available URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20160224/c3f43aad/attachment-0001.obj> ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH v3 2/2] ohci-platform: Add support for controllers with multiple reset lines @ 2016-02-24 11:29 ` kbuild test robot 0 siblings, 0 replies; 16+ messages in thread From: kbuild test robot @ 2016-02-24 11:29 UTC (permalink / raw) Cc: kbuild-all-JC7UmRfGjtg, Greg Kroah-Hartman, Roger Quadros, Alan Stern, Tony Prisk, Florian Fainelli, Maxime Ripard, Arnd Bergmann, linux-usb, linux-sunxi-/JYPxA39Uh5TLH3MbocFFw, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, devicetree, Hans de Goede [-- Attachment #1: Type: text/plain, Size: 2072 bytes --] Hi Hans, [auto build test ERROR on robh/for-next] [also build test ERROR on v4.5-rc5 next-20160223] [if your patch is applied to the wrong git tree, please drop us a note to help improving the system] url: https://github.com/0day-ci/linux/commits/Hans-de-Goede/ehci-platform-Add-support-for-controllers-with-multiple-reset-lines/20160224-191812 base: https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux for-next config: x86_64-randconfig-x004-201608 (attached as .config) reproduce: # save the attached .config to linux build tree make ARCH=x86_64 All error/warnings (new ones prefixed by >>): drivers/usb/host/ohci-platform.c: In function 'ohci_platform_probe': >> drivers/usb/host/ohci-platform.c:201:5: error: implicit declaration of function 'devm_reset_control_get_shared_by_index' [-Werror=implicit-function-declaration] devm_reset_control_get_shared_by_index( ^ >> drivers/usb/host/ohci-platform.c:200:22: warning: assignment makes pointer from integer without a cast [-Wint-conversion] priv->resets[rst] = ^ cc1: some warnings being treated as errors vim +/devm_reset_control_get_shared_by_index +201 drivers/usb/host/ohci-platform.c 194 goto err_put_clks; 195 priv->clks[clk] = NULL; 196 break; 197 } 198 } 199 for (rst = 0; rst < OHCI_MAX_RESETS; rst++) { > 200 priv->resets[rst] = > 201 devm_reset_control_get_shared_by_index( 202 &dev->dev, rst); 203 if (IS_ERR(priv->resets[rst])) { 204 err = PTR_ERR(priv->resets[rst]); --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation -- You received this message because you are subscribed to the Google Groups "linux-sunxi" group. To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/Ez6ZCGd0@public.gmane.org For more options, visit https://groups.google.com/d/optout. [-- Attachment #2: .config.gz --] [-- Type: application/octet-stream, Size: 24241 bytes --] ^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2016-02-24 18:47 UTC | newest] Thread overview: 16+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2016-02-24 11:15 [PATCH v3 0/2] ?hci-platform: Add support for controllers with more then one reset line Hans de Goede 2016-02-24 11:15 ` Hans de Goede 2016-02-24 11:15 ` [PATCH v3 1/2] ehci-platform: Add support for controllers with multiple reset lines Hans de Goede 2016-02-24 11:15 ` Hans de Goede 2016-02-24 11:32 ` kbuild test robot 2016-02-24 11:32 ` kbuild test robot 2016-02-24 11:37 ` Roger Quadros 2016-02-24 11:37 ` Roger Quadros 2016-02-24 13:22 ` Hans de Goede 2016-02-24 13:22 ` Hans de Goede 2016-02-24 18:47 ` Alan Stern 2016-02-24 18:47 ` Alan Stern 2016-02-24 11:15 ` [PATCH v3 2/2] ohci-platform: " Hans de Goede 2016-02-24 11:15 ` Hans de Goede 2016-02-24 11:29 ` kbuild test robot 2016-02-24 11:29 ` kbuild test robot
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.