From patchwork Mon Oct 1 05:30:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Masney X-Patchwork-Id: 10621619 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 623D615A7 for ; Mon, 1 Oct 2018 05:37:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 43A3A29181 for ; Mon, 1 Oct 2018 05:37:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 33C5729199; Mon, 1 Oct 2018 05:37:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DB3AC29181 for ; Mon, 1 Oct 2018 05:37:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728619AbeJAMNK (ORCPT ); Mon, 1 Oct 2018 08:13:10 -0400 Received: from onstation.org ([52.200.56.107]:36002 "EHLO onstation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728555AbeJAMNK (ORCPT ); Mon, 1 Oct 2018 08:13:10 -0400 Received: from localhost.localdomain (c-98-239-145-235.hsd1.wv.comcast.net [98.239.145.235]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: masneyb) by onstation.org (Postfix) with ESMTPSA id B67DF971; Mon, 1 Oct 2018 05:30:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=onstation.org; s=default; t=1538371828; bh=HKKpTXpta+eyqFVIIfeNq77LFoLU823CuRecnv9QvLE=; h=From:To:Subject:Date:In-Reply-To:References:From; b=tM6qRJHLEowD2yGv2+nRqmdZUUE0NFNMwy4wuTOzQYEKBWb3fLWzEuzueF+BzE8va 2US7VgtePnXlclz0AyODjf1Lx0fXLT29Dy52dylNrGvrB8z9goVPO+9s0IxfY4sriT t1zf6csnC4I5uY2cx3wbXQK1eyeiRneGcBheO5yE= From: Brian Masney To: andy.gross@linaro.org, sre@kernel.org, robh+dt@kernel.org, mark.rutland@arm.com, david.brown@linaro.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-soc@vger.kernel.org, jonathan@marek.ca Subject: [PATCH RFC 1/5] dt-bindings: power: supply: bq24190_charger: add bq24192 and usb-otg-vbus Date: Mon, 1 Oct 2018 01:30:01 -0400 Message-Id: <20181001053005.18906-2-masneyb@onstation.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181001053005.18906-1-masneyb@onstation.org> References: <20181001053005.18906-1-masneyb@onstation.org> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add support for the ti,bq24192 variant and a child node for the usb-otg-vbus regulator. Signed-off-by: Brian Masney --- Documentation/devicetree/bindings/power/supply/bq24190.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Documentation/devicetree/bindings/power/supply/bq24190.txt b/Documentation/devicetree/bindings/power/supply/bq24190.txt index 9e517d307070..8f2560824a97 100644 --- a/Documentation/devicetree/bindings/power/supply/bq24190.txt +++ b/Documentation/devicetree/bindings/power/supply/bq24190.txt @@ -3,6 +3,7 @@ TI BQ24190 Li-Ion Battery Charger Required properties: - compatible: contains one of the following: * "ti,bq24190" + * "ti,bq24192" * "ti,bq24192i" - reg: integer, I2C address of the charger. - interrupts[-extended]: configuration for charger INT pin. @@ -19,6 +20,12 @@ Optional properties: - ti,system-minimum-microvolt: when power is connected and the battery is below minimum system voltage, the system will be regulated above this setting. +child nodes: +- usb-otg-vbus: + Usage: optional + Description: Regulator that is used to control the VBUS voltage direction for + either USB host mode or for charging on the OTG port. + Notes: - Some circuit boards wire the chip's "OTG" pin high (enabling 500mA default charge current on USB SDP ports, among other features). To simulate this on From patchwork Mon Oct 1 05:30:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Masney X-Patchwork-Id: 10621623 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A187B1895 for ; Mon, 1 Oct 2018 05:37:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 91FC329189 for ; Mon, 1 Oct 2018 05:37:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8680729184; Mon, 1 Oct 2018 05:37:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3338B29189 for ; Mon, 1 Oct 2018 05:37:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728621AbeJAMNL (ORCPT ); Mon, 1 Oct 2018 08:13:11 -0400 Received: from onstation.org ([52.200.56.107]:35998 "EHLO onstation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728616AbeJAMNK (ORCPT ); Mon, 1 Oct 2018 08:13:10 -0400 Received: from localhost.localdomain (c-98-239-145-235.hsd1.wv.comcast.net [98.239.145.235]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: masneyb) by onstation.org (Postfix) with ESMTPSA id 3520C972; Mon, 1 Oct 2018 05:30:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=onstation.org; s=default; t=1538371828; bh=I2yy/b5ZELNTCdDLBtSa03Crd2LWDJA+Mk6VlqD4eWI=; h=From:To:Subject:Date:In-Reply-To:References:From; b=Egg9WR/NlbPgB5a8AaqCMQ/eeux8NxYnWdjrXkeom+EeXDBOTe3cm8D3sqOLeNKSS HBw2106uF0Ny9+3GWaTvLp6CawN0MmlPEzNE7owGTdi1i5M9HmGD22mEn0+/r75nx8 x7ylv7bnCQgOslRSB0evJSZ4OWtJ7+LzEeDdmv8s= From: Brian Masney To: andy.gross@linaro.org, sre@kernel.org, robh+dt@kernel.org, mark.rutland@arm.com, david.brown@linaro.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-soc@vger.kernel.org, jonathan@marek.ca Subject: [PATCH RFC 2/5] power: supply: bq24190_charger: add support for bq24192 variant Date: Mon, 1 Oct 2018 01:30:02 -0400 Message-Id: <20181001053005.18906-3-masneyb@onstation.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181001053005.18906-1-masneyb@onstation.org> References: <20181001053005.18906-1-masneyb@onstation.org> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Jonathan Marek This patch adds support for the bq24192 variant to bq24190_charger. Signed-off-by: Jonathan Marek Signed-off-by: Brian Masney --- drivers/power/supply/bq24190_charger.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/power/supply/bq24190_charger.c b/drivers/power/supply/bq24190_charger.c index b58df04d03b3..e3836145286d 100644 --- a/drivers/power/supply/bq24190_charger.c +++ b/drivers/power/supply/bq24190_charger.c @@ -1638,7 +1638,8 @@ static int bq24190_hw_init(struct bq24190_dev_info *bdi) return ret; if (v != BQ24190_REG_VPRS_PN_24190 && - v != BQ24190_REG_VPRS_PN_24192I) { + v != BQ24190_REG_VPRS_PN_24192 && + v != BQ24190_REG_VPRS_PN_24192I) { dev_err(bdi->dev, "Error unknown model: 0x%02x\n", v); return -ENODEV; } @@ -1931,6 +1932,7 @@ static const struct dev_pm_ops bq24190_pm_ops = { static const struct i2c_device_id bq24190_i2c_ids[] = { { "bq24190" }, + { "bq24192" }, { "bq24192i" }, { }, }; @@ -1939,6 +1941,7 @@ MODULE_DEVICE_TABLE(i2c, bq24190_i2c_ids); #ifdef CONFIG_OF static const struct of_device_id bq24190_of_match[] = { { .compatible = "ti,bq24190", }, + { .compatible = "ti,bq24192", }, { .compatible = "ti,bq24192i", }, { }, }; From patchwork Mon Oct 1 05:30:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Masney X-Patchwork-Id: 10621627 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EA40B188F for ; Mon, 1 Oct 2018 05:37:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DB42A29181 for ; Mon, 1 Oct 2018 05:37:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CF9F329199; Mon, 1 Oct 2018 05:37:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6B73229181 for ; Mon, 1 Oct 2018 05:37:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728616AbeJAMNL (ORCPT ); Mon, 1 Oct 2018 08:13:11 -0400 Received: from onstation.org ([52.200.56.107]:35996 "EHLO onstation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728589AbeJAMNL (ORCPT ); Mon, 1 Oct 2018 08:13:11 -0400 Received: from localhost.localdomain (c-98-239-145-235.hsd1.wv.comcast.net [98.239.145.235]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: masneyb) by onstation.org (Postfix) with ESMTPSA id 259DC9B1; Mon, 1 Oct 2018 05:30:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=onstation.org; s=default; t=1538371829; bh=RI7egdljK2E9SPEeP7dn9S1URzissBZNn+epXn6pfGY=; h=From:To:Subject:Date:In-Reply-To:References:From; b=B3b2H6QE4R6CdSanaZXNKF6KqOJbIIs043E4rSMmJbKOh+snVPbnHyaolFXO+DqGY xyfwJhUf70RZVSU3B3vwRsJ601M85FhUxn1b4ijedbmIPPnctf5BmtEjwD44SzfzdT fl8a9gkljfQqrNGsoJDQ9+/McfLgrxmfg4fMsUN8= From: Brian Masney To: andy.gross@linaro.org, sre@kernel.org, robh+dt@kernel.org, mark.rutland@arm.com, david.brown@linaro.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-soc@vger.kernel.org, jonathan@marek.ca Subject: [PATCH RFC 4/5] power: supply: bq24190_charger: add support for extcon and GPIO for USB OTG support Date: Mon, 1 Oct 2018 01:30:04 -0400 Message-Id: <20181001053005.18906-5-masneyb@onstation.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181001053005.18906-1-masneyb@onstation.org> References: <20181001053005.18906-1-masneyb@onstation.org> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Jonathan Marek Add extcon support so that we can notify USB drivers of cable state changes. This also adds support for an optional GPIO that is changed depending on the cable state. This patch makes the USB OTG work correctly on a LG Nexus 5 (hammerhead) phone. Signed-off-by: Jonathan Marek [masneyb@onstation.org: Fixed EXTCON cable state and USB networking when the cable is unplugged and plugged back in, checkpatch cleanups.] Signed-off-by: Brian Masney Tested-by: Brian Masney --- See my cover letter for a question about how I can convert patch #5 over to use a gpio-hog. drivers/power/supply/bq24190_charger.c | 45 +++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/drivers/power/supply/bq24190_charger.c b/drivers/power/supply/bq24190_charger.c index 933d1cded697..36348668e48a 100644 --- a/drivers/power/supply/bq24190_charger.c +++ b/drivers/power/supply/bq24190_charger.c @@ -21,6 +21,7 @@ #include #include #include +#include #define BQ24190_MANUFACTURER "Texas Instruments" @@ -159,6 +160,8 @@ struct bq24190_dev_info { struct i2c_client *client; struct device *dev; + struct extcon_dev *edev; + struct gpio_desc *gpio_otg; struct power_supply *charger; struct power_supply *battery; struct delayed_work input_current_limit_work; @@ -174,6 +177,11 @@ struct bq24190_dev_info { u8 watchdog; }; +static const unsigned int bq24190_usb_extcon_cable[] = { + EXTCON_USB, + EXTCON_NONE, +}; + /* * The tables below provide a 2-way mapping for the value that goes in * the register field and the real-world value that it represents. @@ -1528,6 +1536,23 @@ static const struct power_supply_desc bq24190_battery_desc = { .property_is_writeable = bq24190_battery_property_is_writeable, }; +static int bq24190_configure_usb_otg(struct bq24190_dev_info *bdi, u8 ss_reg) +{ + bool otg_enabled; + int ret; + + otg_enabled = !!(ss_reg & BQ24190_REG_SS_VBUS_STAT_MASK); + if (bdi->gpio_otg) + gpiod_set_value_cansleep(bdi->gpio_otg, !otg_enabled); + + ret = extcon_set_state_sync(bdi->edev, EXTCON_USB, otg_enabled); + if (ret < 0) + dev_err(bdi->dev, "Can't set extcon state to %d: %d\n", + otg_enabled, ret); + + return ret; +} + static void bq24190_check_status(struct bq24190_dev_info *bdi) { const u8 battery_mask_ss = BQ24190_REG_SS_CHRG_STAT_MASK; @@ -1597,8 +1622,10 @@ static void bq24190_check_status(struct bq24190_dev_info *bdi) bdi->ss_reg = ss_reg; } - if (alert_charger || alert_battery) + if (alert_charger || alert_battery) { power_supply_changed(bdi->charger); + bq24190_configure_usb_otg(bdi, ss_reg); + } if (alert_battery && bdi->battery) power_supply_changed(bdi->battery); @@ -1729,6 +1756,18 @@ static int bq24190_probe(struct i2c_client *client, return -EINVAL; } + bdi->gpio_otg = devm_gpiod_get_optional(dev, "otg-en", GPIOD_OUT_LOW); + if (IS_ERR(bdi->gpio_otg)) + return PTR_ERR(bdi->gpio_otg); + + bdi->edev = devm_extcon_dev_allocate(dev, bq24190_usb_extcon_cable); + if (IS_ERR(bdi->edev)) + return PTR_ERR(bdi->edev); + + ret = devm_extcon_dev_register(dev, bdi->edev); + if (ret < 0) + return ret; + pm_runtime_enable(dev); pm_runtime_use_autosuspend(dev); pm_runtime_set_autosuspend_delay(dev, 600); @@ -1775,6 +1814,10 @@ static int bq24190_probe(struct i2c_client *client, goto out_charger; } + ret = bq24190_configure_usb_otg(bdi, bdi->ss_reg); + if (ret < 0) + goto out_charger; + ret = bq24190_sysfs_create_group(bdi); if (ret < 0) { dev_err(dev, "Can't create sysfs entries\n"); From patchwork Mon Oct 1 05:30:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Masney X-Patchwork-Id: 10621629 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9DA1515A7 for ; Mon, 1 Oct 2018 05:37:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8E99329181 for ; Mon, 1 Oct 2018 05:37:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8292E29184; Mon, 1 Oct 2018 05:37:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 288CC29181 for ; Mon, 1 Oct 2018 05:37:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728589AbeJAMNL (ORCPT ); Mon, 1 Oct 2018 08:13:11 -0400 Received: from onstation.org ([52.200.56.107]:35994 "EHLO onstation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728114AbeJAMNL (ORCPT ); Mon, 1 Oct 2018 08:13:11 -0400 X-Greylist: delayed 403 seconds by postgrey-1.27 at vger.kernel.org; Mon, 01 Oct 2018 08:13:10 EDT Received: from localhost.localdomain (c-98-239-145-235.hsd1.wv.comcast.net [98.239.145.235]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: masneyb) by onstation.org (Postfix) with ESMTPSA id 98D459B2; Mon, 1 Oct 2018 05:30:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=onstation.org; s=default; t=1538371830; bh=yA2WiXTlP9dLrmeDmE35z5ov7S0QuUp4U6jefRVM23E=; h=From:To:Subject:Date:In-Reply-To:References:From; b=qe7WJwEmHKtf84QEJf6mLWA2moQ0EU4yG/sD8vLX+aMqWhw8wP0v91tWDFt/9qYO+ lcXdr7pRZ5qGpKIRdsSS+pZ8wcrZmMBvansKml8eihl1hYM13Dk79Eyga17QNKcoPN SbA5E6l9cu/gIR2U73byBr8C8m26Z2rlAfKPN5rM= From: Brian Masney To: andy.gross@linaro.org, sre@kernel.org, robh+dt@kernel.org, mark.rutland@arm.com, david.brown@linaro.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-soc@vger.kernel.org, jonathan@marek.ca Subject: [PATCH RFC 5/5] ARM: dts: qcom: msm8974-hammerhead: add USB OTG support Date: Mon, 1 Oct 2018 01:30:05 -0400 Message-Id: <20181001053005.18906-6-masneyb@onstation.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181001053005.18906-1-masneyb@onstation.org> References: <20181001053005.18906-1-masneyb@onstation.org> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Jonathan Marek Add the device tree bindings for USB OTG support. Driver was tested using on a LG Nexus 5 (hammerhead) phone. Signed-off-by: Jonathan Marek Signed-off-by: Brian Masney Tested-by: Brian Masney --- See my cover letter for a question about how I can convert this patch over to use a gpio-hog to get rid of the otg-en-gpios property. .../qcom-msm8974-lge-nexus5-hammerhead.dts | 54 +++++++++++++++++++ arch/arm/boot/dts/qcom-msm8974.dtsi | 11 ++++ 2 files changed, 65 insertions(+) diff --git a/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts b/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts index e67d61f25a96..71e308d8628d 100644 --- a/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts +++ b/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts @@ -243,6 +243,16 @@ }; }; + i2c1_pins: i2c1 { + mux { + pins = "gpio2", "gpio3"; + function = "blsp_i2c1"; + + drive-strength = <2>; + bias-disable; + }; + }; + i2c3_pins: i2c3 { mux { pins = "gpio10", "gpio11"; @@ -382,6 +392,25 @@ }; }; + i2c@f9923000 { + status = "ok"; + pinctrl-names = "default"; + pinctrl-0 = <&i2c1_pins>; + clock-frequency = <100000>; + qcom,src-freq = <50000000>; + + charger: bq24192@6b { + compatible = "ti,bq24192"; + reg = <0x6b>; + interrupts-extended = <&spmi_bus 0 0xd5 0 IRQ_TYPE_EDGE_FALLING>; + + omit-battery-class; + + otg-en-gpios = <&pm8941_gpios 35 GPIO_ACTIVE_HIGH>; + usb_otg_vbus: usb-otg-vbus { }; + }; + }; + i2c@f9925000 { status = "ok"; pinctrl-names = "default"; @@ -399,6 +428,31 @@ amstaos,proximity-diodes = <0>; }; }; + + usb@f9a55000 { + status = "ok"; + + phys = <&usb_hs1_phy>; + phy-select = <&tcsr 0xb000 0>; + + extcon = <&charger>, <&usb_id>; + vbus-supply = <&usb_otg_vbus>; + + hnp-disable; + srp-disable; + adp-disable; + + ulpi { + phy@a { + status = "ok"; + + v1p8-supply = <&pm8941_l6>; + v3p3-supply = <&pm8941_l24>; + + qcom,init-seq = /bits/ 8 <0x1 0x64>; + }; + }; + }; }; &spmi_bus { diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi index a808973f9dc7..0bd584695ae8 100644 --- a/arch/arm/boot/dts/qcom-msm8974.dtsi +++ b/arch/arm/boot/dts/qcom-msm8974.dtsi @@ -704,6 +704,17 @@ interrupts = ; }; + i2c@f9923000 { + status = "disabled"; + compatible = "qcom,i2c-qup-v2.1.1"; + reg = <0xf9923000 0x1000>; + interrupts = <0 95 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&gcc GCC_BLSP1_QUP1_I2C_APPS_CLK>, <&gcc GCC_BLSP1_AHB_CLK>; + clock-names = "core", "iface"; + #address-cells = <1>; + #size-cells = <0>; + }; + i2c@f9924000 { status = "disabled"; compatible = "qcom,i2c-qup-v2.1.1";