From patchwork Sat Feb 27 18:19:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Kocialkowski X-Patchwork-Id: 589430 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 41CD014029E for ; Sun, 28 Feb 2016 05:22:40 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 70E34B37F4; Sat, 27 Feb 2016 19:21:14 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id XSPwnJDIKD7u; Sat, 27 Feb 2016 19:21:14 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 24D7BB37F6; Sat, 27 Feb 2016 19:21:10 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 37345A78C3 for ; Sat, 27 Feb 2016 19:20:58 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id jVQs_ILQN7HN for ; Sat, 27 Feb 2016 19:20:58 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from gagarine.paulk.fr (gagarine.paulk.fr [109.190.93.129]) by theia.denx.de (Postfix) with ESMTPS id 0D200A78E8 for ; Sat, 27 Feb 2016 19:20:53 +0100 (CET) Received: by gagarine.paulk.fr (Postfix, from userid 65534) id 4EC4C20339; Sat, 27 Feb 2016 19:20:52 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on gagarine.paulk.fr X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=unavailable autolearn_force=no version=3.4.0 Received: from armstrong.paulk.fr (armstrong.paulk.fr [82.233.88.171]) by gagarine.paulk.fr (Postfix) with ESMTPS id DB65E20327; Sat, 27 Feb 2016 19:19:15 +0100 (CET) Received: from localhost.localdomain (aldrin [192.168.0.128]) by armstrong.paulk.fr (Postfix) with ESMTP id 7B355378F5; Sat, 27 Feb 2016 19:19:12 +0100 (CET) From: Paul Kocialkowski To: u-boot@lists.denx.de Date: Sat, 27 Feb 2016 19:19:04 +0100 Message-Id: <1456597155-10711-17-git-send-email-contact@paulk.fr> X-Mailer: git-send-email 2.6.4 In-Reply-To: <1456597155-10711-1-git-send-email-contact@paulk.fr> References: <1456597155-10711-1-git-send-email-contact@paulk.fr> Cc: Marek Vasut , Tom Rini , Hashcode Subject: [U-Boot] [PATCH 16/27] power: twl6030: Clear VUSB_IN_PMID bit on USB device setup X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" When booting from USB, the bootrom sets the VUSB_IN_PMID bit of the MISC2 register of the TWL6030. However, U-Boot sets the VUSB_IN_VSYS bit to enable VBUS input. As both bits are contradictory, enabling both disables the input, according to the TWL6030 TRM. Thus, we need to clear the VUSB_IN_PMID bit in case of an USB boot (which could just as well be a memory boot after USB timed out). Signed-off-by: Paul Kocialkowski --- drivers/power/twl6030.c | 1 + include/twl6030.h | 1 + 2 files changed, 2 insertions(+) diff --git a/drivers/power/twl6030.c b/drivers/power/twl6030.c index df43cca..c6d06f1 100644 --- a/drivers/power/twl6030.c +++ b/drivers/power/twl6030.c @@ -259,6 +259,7 @@ void twl6030_usb_device_settings() /* Select the input supply for VUSB regulator */ twl6030_i2c_read_u8(TWL6030_CHIP_PM, TWL6030_MISC2, &value); value |= TWL6030_MISC2_VUSB_IN_VSYS; + value &= ~TWL6030_MISC2_VUSB_IN_PMID; twl6030_i2c_write_u8(TWL6030_CHIP_PM, TWL6030_MISC2, value); } #endif diff --git a/include/twl6030.h b/include/twl6030.h index e68393c..9a1c645 100644 --- a/include/twl6030.h +++ b/include/twl6030.h @@ -48,6 +48,7 @@ #define BB_MEAS (1 << 0) #define TWL6030_MISC2 0xE5 +#define TWL6030_MISC2_VUSB_IN_PMID (1 << 3) #define TWL6030_MISC2_VUSB_IN_VSYS (1 << 4) /* Slave Address 0x49 */