From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760716AbZJIMcx (ORCPT ); Fri, 9 Oct 2009 08:32:53 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1760678AbZJIMcw (ORCPT ); Fri, 9 Oct 2009 08:32:52 -0400 Received: from mail-bw0-f210.google.com ([209.85.218.210]:55927 "EHLO mail-bw0-f210.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759761AbZJIMcv convert rfc822-to-8bit (ORCPT ); Fri, 9 Oct 2009 08:32:51 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; b=JZ8D5nOsAVeuEiFTLVDqNqK0M5aV4tKCJdB3rABja2M3/eChG8bM0ON2XGeeT3B+hV I3VLjIuzghN+zXsTEhyFS2KNrZFRgrzkAniRsP1Lpdd+XtoimpnL8RTPAReJjKUQ8kC6 gOws4TrUqYoHpyxFuijeIkP6YHpRKJaGrv0MA= MIME-Version: 1.0 In-Reply-To: <1254385536-26912-1-git-send-email-ext-roger.quadros@nokia.com> References: <1254385536-26912-1-git-send-email-ext-roger.quadros@nokia.com> Date: Fri, 9 Oct 2009 15:32:12 +0300 Message-ID: Subject: Re: [PATCH v2] twl4030: Fix boot with twl4030 usb transceiver enabled From: Roger Quadros To: Samuel Ortiz Cc: tony@atomide.com, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, felipe.balbi@nokia.com Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Samuel, What is the status of this patch? Without this patch we are unable to boot on systems using musb usb controller. cheers, -roger. On Thu, Oct 1, 2009 at 11:25 AM, Roger Quadros wrote: > The usb regulator supplies (usb1v5, usb1v8 & usb3v1) must be available > before adding the twl4030_usb child, else twl4030_usb_ldo_init() will > always fail thus causing boot lock-up. > > This patch fixes boot on OMAP systems using the twl4030 usb transceiver. > CONFIG_TWL4030_USB=y > > Signed-off-by: Roger Quadros > --- >  drivers/mfd/twl4030-core.c |   89 ++++++++++++++++++++++--------------------- >  1 files changed, 46 insertions(+), 43 deletions(-) > > diff --git a/drivers/mfd/twl4030-core.c b/drivers/mfd/twl4030-core.c > index e424cf6..e832e97 100644 > --- a/drivers/mfd/twl4030-core.c > +++ b/drivers/mfd/twl4030-core.c > @@ -480,7 +480,6 @@ static int >  add_children(struct twl4030_platform_data *pdata, unsigned long features) >  { >        struct device   *child; > -       struct device   *usb_transceiver = NULL; > >        if (twl_has_bci() && pdata->bci && !(features & TPS_SUBSET)) { >                child = add_child(3, "twl4030_bci", > @@ -532,16 +531,61 @@ add_children(struct twl4030_platform_data *pdata, unsigned long features) >        } > >        if (twl_has_usb() && pdata->usb) { > + > +               static struct regulator_consumer_supply usb1v5 = { > +                       .supply =       "usb1v5", > +               }; > +               static struct regulator_consumer_supply usb1v8 = { > +                       .supply =       "usb1v8", > +               }; > +               static struct regulator_consumer_supply usb3v1 = { > +                       .supply =       "usb3v1", > +               }; > + > +       /* First add the regulators so that they can be used by transceiver */ > +               if (twl_has_regulator()) { > +                       /* this is a template that gets copied */ > +                       struct regulator_init_data usb_fixed = { > +                               .constraints.valid_modes_mask = > +                                       REGULATOR_MODE_NORMAL > +                                       | REGULATOR_MODE_STANDBY, > +                               .constraints.valid_ops_mask = > +                                       REGULATOR_CHANGE_MODE > +                                       | REGULATOR_CHANGE_STATUS, > +                       }; > + > +                       child = add_regulator_linked(TWL4030_REG_VUSB1V5, > +                                                     &usb_fixed, &usb1v5, 1); > +                       if (IS_ERR(child)) > +                               return PTR_ERR(child); > + > +                       child = add_regulator_linked(TWL4030_REG_VUSB1V8, > +                                                     &usb_fixed, &usb1v8, 1); > +                       if (IS_ERR(child)) > +                               return PTR_ERR(child); > + > +                       child = add_regulator_linked(TWL4030_REG_VUSB3V1, > +                                                     &usb_fixed, &usb3v1, 1); > +                       if (IS_ERR(child)) > +                               return PTR_ERR(child); > + > +               } > + >                child = add_child(0, "twl4030_usb", >                                pdata->usb, sizeof(*pdata->usb), >                                true, >                                /* irq0 = USB_PRES, irq1 = USB */ >                                pdata->irq_base + 8 + 2, pdata->irq_base + 4); > + >                if (IS_ERR(child)) >                        return PTR_ERR(child); > >                /* we need to connect regulators to this transceiver */ > -               usb_transceiver = child; > +               if (twl_has_regulator() && child) { > +                       usb1v5.dev = child; > +                       usb1v8.dev = child; > +                       usb3v1.dev = child; > +               } >        } > >        if (twl_has_watchdog()) { > @@ -580,47 +624,6 @@ add_children(struct twl4030_platform_data *pdata, unsigned long features) >                        return PTR_ERR(child); >        } > > -       if (twl_has_regulator() && usb_transceiver) { > -               static struct regulator_consumer_supply usb1v5 = { > -                       .supply =       "usb1v5", > -               }; > -               static struct regulator_consumer_supply usb1v8 = { > -                       .supply =       "usb1v8", > -               }; > -               static struct regulator_consumer_supply usb3v1 = { > -                       .supply =       "usb3v1", > -               }; > - > -               /* this is a template that gets copied */ > -               struct regulator_init_data usb_fixed = { > -                       .constraints.valid_modes_mask = > -                                 REGULATOR_MODE_NORMAL > -                               | REGULATOR_MODE_STANDBY, > -                       .constraints.valid_ops_mask = > -                                 REGULATOR_CHANGE_MODE > -                               | REGULATOR_CHANGE_STATUS, > -               }; > - > -               usb1v5.dev = usb_transceiver; > -               usb1v8.dev = usb_transceiver; > -               usb3v1.dev = usb_transceiver; > - > -               child = add_regulator_linked(TWL4030_REG_VUSB1V5, &usb_fixed, > -                               &usb1v5, 1); > -               if (IS_ERR(child)) > -                       return PTR_ERR(child); > - > -               child = add_regulator_linked(TWL4030_REG_VUSB1V8, &usb_fixed, > -                               &usb1v8, 1); > -               if (IS_ERR(child)) > -                       return PTR_ERR(child); > - > -               child = add_regulator_linked(TWL4030_REG_VUSB3V1, &usb_fixed, > -                               &usb3v1, 1); > -               if (IS_ERR(child)) > -                       return PTR_ERR(child); > -       } > - >        /* maybe add LDOs that are omitted on cost-reduced parts */ >        if (twl_has_regulator() && !(features & TPS_SUBSET)) { >                child = add_regulator(TWL4030_REG_VPLL2, pdata->vpll2); > -- > 1.6.0.4 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at  http://vger.kernel.org/majordomo-info.html > Please read the FAQ at  http://www.tux.org/lkml/ >