| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Thu, 1 Oct 2009 10:56:12 +0300
From: Roger Quadros <quadros.roger@...il.com>
To: Roger Quadros <ext-roger.quadros@...ia.com>
Cc: sameo@...ux.intel.com, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] twl4030: Fix boot with twl4030 usb transceiver enabled
Samuel,
Please ignore this patch. I mistakenly deleted the MMC regulators.
thanks to Felipe Balbi for pointing this out.
Will resend a v2.
cheers,
-roger.
On Thu, Oct 1, 2009 at 10:36 AM, Roger Quadros
<ext-roger.quadros@...ia.com> 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 <ext-roger.quadros@...ia.com>
> ---
> drivers/mfd/twl4030-core.c | 112 ++++++++++++++++++--------------------------
> 1 files changed, 46 insertions(+), 66 deletions(-)
>
> diff --git a/drivers/mfd/twl4030-core.c b/drivers/mfd/twl4030-core.c
> index e424cf6..dcd27be 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()) {
> @@ -557,70 +601,6 @@ add_children(struct twl4030_platform_data *pdata, unsigned long features)
> return PTR_ERR(child);
> }
>
> - if (twl_has_regulator()) {
> - /*
> - child = add_regulator(TWL4030_REG_VPLL1, pdata->vpll1);
> - if (IS_ERR(child))
> - return PTR_ERR(child);
> - */
> -
> - child = add_regulator(TWL4030_REG_VMMC1, pdata->vmmc1);
> - if (IS_ERR(child))
> - return PTR_ERR(child);
> -
> - child = add_regulator(TWL4030_REG_VDAC, pdata->vdac);
> - if (IS_ERR(child))
> - return PTR_ERR(child);
> -
> - child = add_regulator((features & TWL4030_VAUX2)
> - ? TWL4030_REG_VAUX2_4030
> - : TWL4030_REG_VAUX2,
> - pdata->vaux2);
> - if (IS_ERR(child))
> - 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@...r.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists