From patchwork Sat Feb 27 18:18:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Kocialkowski X-Patchwork-Id: 589416 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 571E8140271 for ; Sun, 28 Feb 2016 05:19:45 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id CD367A7835; Sat, 27 Feb 2016 19:19:40 +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 h-qyUkA0eAil; Sat, 27 Feb 2016 19:19:40 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A2DAFA784B; Sat, 27 Feb 2016 19:19:39 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7A993A773E for ; Sat, 27 Feb 2016 19:19:31 +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 6ONllfjWPMbc for ; Sat, 27 Feb 2016 19:19:31 +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 24A434B94B for ; Sat, 27 Feb 2016 19:19:28 +0100 (CET) Received: by gagarine.paulk.fr (Postfix, from userid 65534) id DBDF220333; Sat, 27 Feb 2016 19:19:27 +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 4D652201D3; Sat, 27 Feb 2016 19:19:12 +0100 (CET) Received: from localhost.localdomain (aldrin [192.168.0.128]) by armstrong.paulk.fr (Postfix) with ESMTP id 3684237707; Sat, 27 Feb 2016 19:19:11 +0100 (CET) From: Paul Kocialkowski To: u-boot@lists.denx.de Date: Sat, 27 Feb 2016 19:18:49 +0100 Message-Id: <1456597155-10711-2-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 01/27] power: twl6030: Some more explicit registers and values definitions 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" This makes the twl6030 mmc and usb-related power registers and values definitions more explicit and clear and adds prefixes to them. Signed-off-by: Paul Kocialkowski --- drivers/power/twl6030.c | 26 +++++++++++++++----------- include/twl6030.h | 14 ++++++++++---- 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/drivers/power/twl6030.c b/drivers/power/twl6030.c index a1c6663..8924f7f 100644 --- a/drivers/power/twl6030.c +++ b/drivers/power/twl6030.c @@ -214,22 +214,26 @@ void twl6030_init_battery_charging(void) void twl6030_power_mmc_init() { - /* set voltage to 3.0 and turnon for APP */ - twl6030_i2c_write_u8(TWL6030_CHIP_PM, VMMC_CFG_VOLTATE, 0x15); - twl6030_i2c_write_u8(TWL6030_CHIP_PM, VMMC_CFG_STATE, 0x21); + /* 3.0V voltage output for VMMC */ + twl6030_i2c_write_u8(TWL6030_CHIP_PM, TWL6030_VMMC_CFG_VOLTAGE, + TWL6030_CFG_VOLTAGE_30); + + /* Enable P1 output for VMMC */ + twl6030_i2c_write_u8(TWL6030_CHIP_PM, TWL6030_VMMC_CFG_STATE, + TWL6030_CFG_STATE_P1 | TWL6030_CFG_STATE_ON); } void twl6030_usb_device_settings() { - u8 data = 0; - - /* Select APP Group and set state to ON */ - twl6030_i2c_write_u8(TWL6030_CHIP_PM, VUSB_CFG_STATE, 0x21); + u8 value = 0; - twl6030_i2c_read_u8(TWL6030_CHIP_PM, MISC2, &data); - data |= 0x10; + /* Enable P1 output for VUSB */ + twl6030_i2c_write_u8(TWL6030_CHIP_PM, TWL6030_VUSB_CFG_STATE, + TWL6030_CFG_STATE_P1 | TWL6030_CFG_STATE_ON); - /* Select the input supply for VBUS regulator */ - twl6030_i2c_write_u8(TWL6030_CHIP_PM, MISC2, data); + /* Select the input supply for VUSB regulator */ + twl6030_i2c_read_u8(TWL6030_CHIP_PM, TWL6030_MISC2, &value); + value |= TWL6030_MISC2_VUSB_IN_VSYS; + twl6030_i2c_write_u8(TWL6030_CHIP_PM, TWL6030_MISC2, value); } #endif diff --git a/include/twl6030.h b/include/twl6030.h index 7898699..bb02d6f 100644 --- a/include/twl6030.h +++ b/include/twl6030.h @@ -20,16 +20,22 @@ #define TWL6030_CHIP_PWM 0x49 /* Slave Address 0x48 */ -#define VMMC_CFG_STATE 0x9A -#define VMMC_CFG_VOLTATE 0x9B -#define VUSB_CFG_STATE 0xA2 +#define TWL6030_VMMC_CFG_STATE 0x9A +#define TWL6030_VMMC_CFG_VOLTAGE 0x9B +#define TWL6030_VUSB_CFG_STATE 0xA2 + +#define TWL6030_CFG_GRP_P1 (1 << 0) +#define TWL6030_CFG_STATE_ON (1 << 0) +#define TWL6030_CFG_STATE_P1 (TWL6030_CFG_GRP_P1 << 5) +#define TWL6030_CFG_VOLTAGE_30 0x15 #define MISC1 0xE4 #define VAC_MEAS (1 << 2) #define VBAT_MEAS (1 << 1) #define BB_MEAS (1 << 0) -#define MISC2 0xE5 +#define TWL6030_MISC2 0xE5 +#define TWL6030_MISC2_VUSB_IN_VSYS (1 << 4) /* Slave Address 0x49 */