From patchwork Sat Feb 27 18:19:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Kocialkowski X-Patchwork-Id: 589439 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 A6AC21401C7 for ; Sun, 28 Feb 2016 05:24:17 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 96901A7903; Sat, 27 Feb 2016 19:22:16 +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 CWrjyi3jmfkQ; Sat, 27 Feb 2016 19:22:16 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 84083A7906; Sat, 27 Feb 2016 19:21:58 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 99F8BB380E for ; Sat, 27 Feb 2016 19:21:35 +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 7trr2TevpkWi for ; Sat, 27 Feb 2016 19:21:35 +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 91752B3803 for ; Sat, 27 Feb 2016 19:21:20 +0100 (CET) Received: by gagarine.paulk.fr (Postfix, from userid 65534) id 0EFCC20327; Sat, 27 Feb 2016 19:21:20 +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 533CC20435; Sat, 27 Feb 2016 19:19:16 +0100 (CET) Received: from localhost.localdomain (aldrin [192.168.0.128]) by armstrong.paulk.fr (Postfix) with ESMTP id 38B0D378FE; Sat, 27 Feb 2016 19:19:13 +0100 (CET) From: Paul Kocialkowski To: u-boot@lists.denx.de Date: Sat, 27 Feb 2016 19:19:13 +0100 Message-Id: <1456597155-10711-26-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 25/27] input: TWL6030 input support for power button, USB and charger 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 adds support for detecting a few inputs exported by the TWL6030. Currently-supported inputs are the power button, USB and charger presence. Signed-off-by: Paul Kocialkowski --- drivers/input/Makefile | 1 + drivers/input/twl6030.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ include/twl6030.h | 21 +++++++++++++++++++++ 3 files changed, 70 insertions(+) create mode 100644 drivers/input/twl6030.c diff --git a/drivers/input/Makefile b/drivers/input/Makefile index 5f15265..9109ac6 100644 --- a/drivers/input/Makefile +++ b/drivers/input/Makefile @@ -10,6 +10,7 @@ obj-$(CONFIG_DM_KEYBOARD) += keyboard-uclass.o obj-$(CONFIG_I8042_KEYB) += i8042.o obj-$(CONFIG_TEGRA_KEYBOARD) += tegra-kbc.o obj-$(CONFIG_TWL4030_INPUT) += twl4030.o +obj-$(CONFIG_TWL6030_INPUT) += twl6030.o obj-$(CONFIG_CROS_EC_KEYB) += cros_ec_keyb.o ifdef CONFIG_PS2KBD obj-y += keyboard.o pc_keyb.o diff --git a/drivers/input/twl6030.c b/drivers/input/twl6030.c new file mode 100644 index 0000000..8de032a --- /dev/null +++ b/drivers/input/twl6030.c @@ -0,0 +1,48 @@ +/* + * TWL6030 input + * + * Copyright (C) 2016 Paul Kocialkowski + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include + +int twl6030_input_power_button(void) +{ + u8 value; + + twl6030_i2c_read_u8(TWL6030_CHIP_PM, TWL6030_STS_HW_CONDITIONS, &value); + + /* Power button is active low. */ + if (value & TWL6030_STS_HW_CONDITIONS_PWRON) + return 0; + + return 1; +} + +int twl6030_input_charger(void) +{ + u8 value; + + twl6030_i2c_read_u8(TWL6030_CHIP_CHARGER, TWL6030_CONTROLLER_STAT1, + &value); + + if (value & TWL6030_CONTROLLER_STAT1_VAC_DET) + return 1; + + return 0; +} + +int twl6030_input_usb(void) +{ + u8 value; + + twl6030_i2c_read_u8(TWL6030_CHIP_CHARGER, TWL6030_CONTROLLER_STAT1, + &value); + + if (value & TWL6030_CONTROLLER_STAT1_VBUS_DET) + return 1; + + return 0; +} diff --git a/include/twl6030.h b/include/twl6030.h index 26c27a4..40e2c11 100644 --- a/include/twl6030.h +++ b/include/twl6030.h @@ -20,6 +20,10 @@ #define TWL6030_CHIP_PWM 0x49 /* Slave Address 0x48 */ +#define TWL6030_STS_HW_CONDITIONS 0x21 + +#define TWL6030_STS_HW_CONDITIONS_PWRON (1 << 0) + #define TWL6030_PHOENIX_DEV_ON 0x25 #define TWL6030_PHOENIX_APP_DEVOFF (1 << 0) @@ -59,6 +63,11 @@ /* Slave Address 0x49 */ +#define TWL6030_CONTROLLER_STAT1 0xE3 + +#define TWL6030_CONTROLLER_STAT1_VAC_DET (1 << 3) +#define TWL6030_CONTROLLER_STAT1_VBUS_DET (1 << 2) + /* Battery CHARGER REGISTERS */ #define CONTROLLER_INT_MASK 0xE0 #define CONTROLLER_CTRL1 0xE1 @@ -188,6 +197,10 @@ static inline int twl6030_i2c_read_u8(u8 chip_no, u8 reg, u8 *val) return i2c_read(chip_no, reg, 1, val, 1); } +/* + * Power + */ + void twl6030_power_off(void); void twl6030_init_battery_charging(void); void twl6030_usb_device_settings(void); @@ -197,4 +210,12 @@ int twl6030_get_battery_voltage(void); int twl6030_get_battery_current(void); void twl6030_power_mmc_init(int dev_index); +/* + * Input + */ + +int twl6030_input_power_button(void); +int twl6030_input_charger(void); +int twl6030_input_usb(void); + #endif /* TWL6030_H */