From patchwork Sun Jan 17 21:45:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Philipp Klemm X-Patchwork-Id: 365349 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 48AF1C433E0 for ; Sun, 17 Jan 2021 21:46:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0F73E224DE for ; Sun, 17 Jan 2021 21:46:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729350AbhAQVp7 (ORCPT ); Sun, 17 Jan 2021 16:45:59 -0500 Received: from sender11-of-o51.zoho.eu ([31.186.226.237]:21150 "EHLO sender11-of-o51.zoho.eu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728042AbhAQVp7 (ORCPT ); Sun, 17 Jan 2021 16:45:59 -0500 ARC-Seal: i=1; a=rsa-sha256; t=1610919905; cv=none; d=zohomail.eu; s=zohoarc; b=fXg0ZedDL6F5+UCuX8qsi77ZJnh141juaryjFNEgnKLBL0ueaCvVL2tRv8Vyr9CVg0DeMUURzC9VXPApVundBPZImoUB6z67bH4maYnQdh+gzAONusyqqf8lQppezPvu0PXh4cgqy7scXHEbDC1jzLwm8B0NaRC68Ots+/ITxWQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.eu; s=zohoarc; t=1610919905; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Subject:To; bh=vmzPpgKfjlYcJGttA/ZWIIRDeigtax0pvHjvYoBwJMw=; b=e3nlHWJ0LJu6MvTvbTdms2IMU/p/ohIyHZwLwl1iXsbQP/GJ0AheYxgJHQZXHvnELfjGqt9K6aSp2liyeIFHPH67UNwc5DTpLScDz8qXXLX9DHXU67NWcVILN8u6dufU/7x+4J+1Nooqqh8x2EBDVxMcw8wExXHQ2+jKKCg7bZo= ARC-Authentication-Results: i=1; mx.zohomail.eu; spf=pass smtp.mailfrom=philipp@uvos.xyz; dmarc=pass header.from= header.from= Received: from localhost.localdomain (ip-95-222-215-9.hsi15.unitymediagroup.de [95.222.215.9]) by mx.zoho.eu with SMTPS id 1610919903598607.1558062768164; Sun, 17 Jan 2021 22:45:03 +0100 (CET) Date: Sun, 17 Jan 2021 22:45:02 +0100 From: Carl Philipp Klemm To: Sebastian Reichel Cc: devicetree@vger.kernel.org, linux-omap@vger.kernel.org, Arthur Demchenkov , Tony Lindgren , Merlijn Wajer , Pavel Machek Subject: [PATCH 2/5] ARM: dts: add battery phandle to cpcap_charger Message-Id: <20210117224502.0f9a0e80dfd4841ad26a9914@uvos.xyz> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.33; x86_64-unknown-linux-gnu) Mime-Version: 1.0 X-ZohoMailClient: External Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org This is required for power: supply: cpcap-charger: get the battery inserted infomation from cpcap-battery Signed-off-by: Carl Philipp Klemm --- arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi b/arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi index 08a7d3ce383f..842eaa7b89e5 100644 --- a/arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi +++ b/arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi @@ -61,6 +61,7 @@ &cpcap_adc 2 &cpcap_adc 5 io-channel-names = "battdetb", "battp", "vbus", "chg_isense", "batti"; + battery = <&cpcap_battery>; }; cpcap_regulator: regulator { From patchwork Sun Jan 17 21:47:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Philipp Klemm X-Patchwork-Id: 365348 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 87508C433DB for ; Sun, 17 Jan 2021 21:48:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4AFB320791 for ; Sun, 17 Jan 2021 21:48:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729527AbhAQVsl (ORCPT ); Sun, 17 Jan 2021 16:48:41 -0500 Received: from sender11-of-o51.zoho.eu ([31.186.226.237]:21165 "EHLO sender11-of-o51.zoho.eu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728042AbhAQVsj (ORCPT ); Sun, 17 Jan 2021 16:48:39 -0500 ARC-Seal: i=1; a=rsa-sha256; t=1610920066; cv=none; d=zohomail.eu; s=zohoarc; b=Q6Zpp2JXCLlP45v9hxW73pOlhKNMTF42okK9oPAy52C3SqkvJJgag/8l5E5l32oG4xsTURMBOi+nQHQ4wGLhB/zhXPxZlSsS+0Gd+aPOLbZ9W1huxsqJp4jSiQDEPut6F4X+cJgP7f/H37BKgfKXn+jtP5yFDRxDF7sH78DVdME= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.eu; s=zohoarc; t=1610920066; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Subject:To; bh=nndW2GvjBb4LPgtorpR+Ticot9oCoEX8Pzv9Ar2PQAY=; b=KVkZ1dv8DZUeiT6kBNsakSPttTfhXdsMmdYxRR3QkjALsRhwevFy2BN+bpFt+aP8gt7CZPNQ33Tt+VRTZuAwpl35CspPkL5N743Tx4MReUohAZto/B0OJuhb/v4LeLNm5AF2g2T6FNwAsWvqYi8IRiGs7rVlI8k9lmD2yMz6NP8= ARC-Authentication-Results: i=1; mx.zohomail.eu; spf=pass smtp.mailfrom=philipp@uvos.xyz; dmarc=pass header.from= header.from= Received: from localhost.localdomain (ip-95-222-215-9.hsi15.unitymediagroup.de [95.222.215.9]) by mx.zoho.eu with SMTPS id 1610920066357845.413414857171; Sun, 17 Jan 2021 22:47:46 +0100 (CET) Date: Sun, 17 Jan 2021 22:47:45 +0100 From: Carl Philipp Klemm To: Sebastian Reichel Cc: linux-pm@vger.kernel.org, linux-omap@vger.kernel.org, Arthur Demchenkov , Tony Lindgren , Merlijn Wajer , Pavel Machek Subject: [PATCH 4/5] power: supply: cpcap-charger: fix small mistake in current to register conversion Message-Id: <20210117224745.40c38ae352761663db1752c9@uvos.xyz> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.33; x86_64-unknown-linux-gnu) Mime-Version: 1.0 X-ZohoMailClient: External Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org Signed-off-by: Carl Philipp Klemm --- drivers/power/supply/cpcap-charger.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/power/supply/cpcap-charger.c b/drivers/power/supply/cpcap-charger.c index 152090faf5b2..be7d1da7a5a5 100644 --- a/drivers/power/supply/cpcap-charger.c +++ b/drivers/power/supply/cpcap-charger.c @@ -300,7 +300,7 @@ static int cpcap_charger_current_to_regval(int microamp) return CPCAP_REG_CRM_ICHRG(0x0); if (miliamp < 177) return CPCAP_REG_CRM_ICHRG(0x1); - if (miliamp > 1596) + if (miliamp >= 1596) return CPCAP_REG_CRM_ICHRG(0xe); res = microamp / 88666;