From mboxrd@z Thu Jan 1 00:00:00 1970 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=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED 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 D03AEC47404 for ; Tue, 8 Oct 2019 03:14:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9A7852173B for ; Tue, 8 Oct 2019 03:14:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729794AbfJHDOU convert rfc822-to-8bit (ORCPT ); Mon, 7 Oct 2019 23:14:20 -0400 Received: from mail-ed1-f68.google.com ([209.85.208.68]:39006 "EHLO mail-ed1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729536AbfJHDOT (ORCPT ); Mon, 7 Oct 2019 23:14:19 -0400 Received: by mail-ed1-f68.google.com with SMTP id a15so14307296edt.6; Mon, 07 Oct 2019 20:14:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=gdO29FYVKmAOS1wiTfKH5OiiKXWYsa6tbkzG+3CzWlA=; b=ltuGrqMYWwvxHRNboVx5+Yk00NuIS3cyID81I3oh23dTqkZbo4pxJk4gG76nM/DFWH C/qmTC57L/E4lqFbGmp/LG/lqmAzf5gZZZHBLbu/4bFYaMqDDN4/peXvG6fxy+TuSjVf TiwCX5WglyuBuvAYJk0INbNFaUao4hroFpcFPr6X9zWuq+ZWYKoulQ07AsgNNQWwd3Ou eKbnt3IbcajnweMRMLFmkfkAPrp1IifAMblbal0JNuHa/un/bSHrdTCMzkwcH1d5IKvq TvF8VVWm4DuDwoVaw4oTiPVxhfy4Nhb4h4Acbx4yGufCoIt/Ovlk083M8GQF41f8Mo4W x9yQ== X-Gm-Message-State: APjAAAW4Ly4IsWCOGzqXeTMvgcCprZHpGyeM1ZOOrUZePk51gdoPqkFs rz7BmJG4eUZAwkAxIIVyCKjB/oqCC50= X-Google-Smtp-Source: APXvYqyvRUQeg9NYDeUMbuSY5Cq6uTfmLbhWOLjEOB59QOCqNdu6j3Xi3Bv1MsxeMLwROGkkVS/iVQ== X-Received: by 2002:a50:9a05:: with SMTP id o5mr32139262edb.44.1570504456821; Mon, 07 Oct 2019 20:14:16 -0700 (PDT) Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com. [209.85.221.51]) by smtp.gmail.com with ESMTPSA id e13sm2069871eje.52.2019.10.07.20.14.16 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 07 Oct 2019 20:14:16 -0700 (PDT) Received: by mail-wr1-f51.google.com with SMTP id w12so17538664wro.5; Mon, 07 Oct 2019 20:14:16 -0700 (PDT) X-Received: by 2002:adf:e70a:: with SMTP id c10mr11172941wrm.288.1570504455944; Mon, 07 Oct 2019 20:14:15 -0700 (PDT) MIME-Version: 1.0 References: <20191002112545.58481-1-icenowy@aosc.io> <20191002112545.58481-3-icenowy@aosc.io> In-Reply-To: From: Chen-Yu Tsai Date: Tue, 8 Oct 2019 11:14:06 +0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [linux-sunxi] [PATCH 2/2] power: supply: axp20x_usb_power: add applied max Vbus support for AXP813 To: Icenowy Zheng Cc: Sebastian Reichel , "open list:THERMAL" , linux-kernel , linux-sunxi Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8BIT Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org On Tue, Oct 8, 2019 at 11:09 AM Icenowy Zheng wrote: > 于 2019年10月8日 GMT+08:00 上午12:07:05, Chen-Yu Tsai 写到: > >Hi, > > > >On Wed, Oct 2, 2019 at 7:27 PM Icenowy Zheng wrote: > >> > >> AXP813 PMIC has two Vbus maximum value settings -- one is the default > >> value, which is currently the only supported one; the other is the > >> really applied value, which is set according to the default value if > >the > >> BC detection module detected a charging port, or 500mA if no charging > >> port is detected. > >> > >> Add support for reading and writing of the really applied Vbus > >maxmium > >> value. Interestingly it has a larger range than the default value. > >> > >> Signed-off-by: Icenowy Zheng > >> --- > >> drivers/power/supply/axp20x_usb_power.c | 132 > >+++++++++++++++++++++++- > >> 1 file changed, 129 insertions(+), 3 deletions(-) > >> > >> diff --git a/drivers/power/supply/axp20x_usb_power.c > >b/drivers/power/supply/axp20x_usb_power.c > >> index 5f0a5722b19e..905668a2727f 100644 > >> --- a/drivers/power/supply/axp20x_usb_power.c > >> +++ b/drivers/power/supply/axp20x_usb_power.c > > > >[...] > > > >> @@ -354,6 +451,9 @@ static int axp20x_usb_power_set_property(struct > >power_supply *psy, > >> > >val->intval); > >> return axp20x_usb_power_set_current_max(power, > >val->intval); > >> > >> + case POWER_SUPPLY_PROP_INPUT_CURRENT_LIMIT: > >> + return > >axp20x_usb_power_set_input_current_limit(power, val->intval); > >> + > > > >So I think there are two things that should be adjusted. > > > >First, we should be using POWER_SUPPLY_PROP_INPUT_CURRENT_LIMIT for all > >PMICs. > >As far as the sysfs documents go, CURRENT_MAX is read-only, and should > >refer to > >the hard limit the hardware can support, i.e. maximum power ratings. > >INPUT_CURRENT_LIMIT and INPUT_VOLTAGE_LIMIT are for configurable upper > >and lower > >limits respectively. > > > >Sebastian, is my understanding of this correct? > > > >We already use INPUT_CURRENT_LIMIT for the AXP813 in the axp20x-ac > >driver, and > >it would be nice to have both drivers expose the same attributes. > > > >Second, since the value set in register 0x35 is the one that actually > >has an > >effect, as opposed to just being a default, we should just use that > >one. > > However, that default value is also important, otherwise users will > get dropped back to 500mAh each time they re-insert USB jack. > > Is there a property to export the default value? Not that I know of. I suppose you could piggy back on INPUT_CURRENT_LIMIT and just set both values at the same time. Of course the default value has a smaller range, so you would end up setting the highest value for actual values above its range. > BTW, if possible, apply patch 1 first, because it can raise current to 1.5A > in the default situation. Agreed. ChenYu > >Could you restructure the series based on what I described, with a new > >patch 1 > >switching from CURRENT_MAX to INPUT_CURRENT_LIMIT, and then this patch > >as patch 2? > >And both patches should have Fixes tags and possibly CC stable so they > >get backported > >for people that are using stable kernels? And then the original patch > >2 as patch 3. > > > >ChenYu > > > >> default: > >> return -EINVAL; > >> } > >> @@ -365,7 +465,8 @@ static int axp20x_usb_power_prop_writeable(struct > >power_supply *psy, > >> enum power_supply_property > >psp) > >> { > >> return psp == POWER_SUPPLY_PROP_VOLTAGE_MIN || > >> - psp == POWER_SUPPLY_PROP_CURRENT_MAX; > >> + psp == POWER_SUPPLY_PROP_CURRENT_MAX || > >> + psp == POWER_SUPPLY_PROP_INPUT_CURRENT_LIMIT; > >> } > >> > >> static enum power_supply_property axp20x_usb_power_properties[] = { > >> @@ -386,6 +487,15 @@ static enum power_supply_property > >axp22x_usb_power_properties[] = { > >> POWER_SUPPLY_PROP_CURRENT_MAX, > >> }; > >> > >> +static enum power_supply_property axp813_usb_power_properties[] = { > >> + POWER_SUPPLY_PROP_HEALTH, > >> + POWER_SUPPLY_PROP_PRESENT, > >> + POWER_SUPPLY_PROP_ONLINE, > >> + POWER_SUPPLY_PROP_VOLTAGE_MIN, > >> + POWER_SUPPLY_PROP_CURRENT_MAX, > >> + POWER_SUPPLY_PROP_INPUT_CURRENT_LIMIT, > >> +}; > >> + > >> static const struct power_supply_desc axp20x_usb_power_desc = { > >> .name = "axp20x-usb", > >> .type = POWER_SUPPLY_TYPE_USB, > >> @@ -406,6 +516,16 @@ static const struct power_supply_desc > >axp22x_usb_power_desc = { > >> .set_property = axp20x_usb_power_set_property, > >> }; > >> > >> +static const struct power_supply_desc axp813_usb_power_desc = { > >> + .name = "axp20x-usb", > >> + .type = POWER_SUPPLY_TYPE_USB, > >> + .properties = axp813_usb_power_properties, > >> + .num_properties = ARRAY_SIZE(axp813_usb_power_properties), > >> + .property_is_writeable = axp20x_usb_power_prop_writeable, > >> + .get_property = axp20x_usb_power_get_property, > >> + .set_property = axp20x_usb_power_set_property, > >> +}; > >> + > >> static int configure_iio_channels(struct platform_device *pdev, > >> struct axp20x_usb_power *power) > >> { > >> @@ -487,10 +607,16 @@ static int axp20x_usb_power_probe(struct > >platform_device *pdev) > >> usb_power_desc = &axp20x_usb_power_desc; > >> irq_names = axp20x_irq_names; > >> } else if (power->axp20x_id == AXP221_ID || > >> - power->axp20x_id == AXP223_ID || > >> - power->axp20x_id == AXP813_ID) { > >> + power->axp20x_id == AXP223_ID) { > >> usb_power_desc = &axp22x_usb_power_desc; > >> irq_names = axp22x_irq_names; > >> + } else if (power->axp20x_id == AXP813_ID) { > >> + usb_power_desc = &axp813_usb_power_desc; > >> + irq_names = axp22x_irq_names; > >> + > >> + /* Enable USB Battery Charging specification > >detection */ > >> + regmap_update_bits(axp20x->regmap, AXP288_BC_GLOBAL, > >> + AXP813_BC_EN, AXP813_BC_EN); > > > >This seems like a duplicate of > > > >> } else { > >> dev_err(&pdev->dev, "Unsupported AXP variant: %ld\n", > >> axp20x->variant); > >> -- > >> 2.21.0 > >> > >> -- > >> You received this message because you are subscribed to the Google > >Groups "linux-sunxi" group. > >> To unsubscribe from this group and stop receiving emails from it, > >send an email to linux-sunxi+unsubscribe@googlegroups.com. > >> To view this discussion on the web, visit > >https://groups.google.com/d/msgid/linux-sunxi/20191002112545.58481-3-icenowy%40aosc.io. > > -- > 使用 K-9 Mail 发送自我的Android设备。 > > -- > You received this message because you are subscribed to the Google Groups "linux-sunxi" group. > To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe@googlegroups.com. > To view this discussion on the web, visit https://groups.google.com/d/msgid/linux-sunxi/A6B1EF32-5CDE-4AAE-A7DA-F9A636BE7BF3%40aosc.io.