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=-8.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_MUTT 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 269B3C04AB6 for ; Fri, 31 May 2019 23:53:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DED5B27044 for ; Fri, 31 May 2019 23:53:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="iDSL6asy" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726883AbfEaXxG (ORCPT ); Fri, 31 May 2019 19:53:06 -0400 Received: from mail-pg1-f195.google.com ([209.85.215.195]:43360 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726483AbfEaXxF (ORCPT ); Fri, 31 May 2019 19:53:05 -0400 Received: by mail-pg1-f195.google.com with SMTP id f25so4864825pgv.10 for ; Fri, 31 May 2019 16:53:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=YVUicJtFNpg9LS2eUN0p9C4lJlLU1ZzpFVm+kG4Mmsc=; b=iDSL6asy9oJDz0ITouJHC9YafFm5lbev0OPiiaK24otvLODJhfsbItMp64HA5gYbnk FcBXYnFutIm0Ab6zw0HRENRW6tLRmPqJJbisOBiFyNuwG6hX3QvVOEhyJL266jK7BvRJ cILKe/3cYdsVvKmYb/SS3Ha0BLqGkrh5q8TjRflH6vzIbtUUpIr27Y5cAOJWFFJkU3wL iOu9j9EU/JtJ6o9UGZrI06O1w/50K1C/DR85OvziZw3D1uu7AYElTN30UtEOMxwizCRV wU5bgUsH+64LAO7SGRz1xziIYxbGuKRkgABFipjBfmpZv2Ek0QLvACZwvYTB53EoBI58 LXMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=YVUicJtFNpg9LS2eUN0p9C4lJlLU1ZzpFVm+kG4Mmsc=; b=BrmG5Pw+vytTlFUJMgO764LuIdvi0rky9jCgYWdeovwu68Z6pmykCMBi+Yd93o7UzQ ih+nv5PQESqdqG4Gq10BIb/nELQcZ+CwwWvkEKk3bAvgjepTD6Plfvcd+I0Sh6K5Xken 1DWc5gZxNuSbMzWyzPVvRmNgnMiWq1UXz+/ZelTjYTrb1pEBkH8VPfOmZv10JuYG8Fkp dy+TY0R9csxa0xFCNDRfhOiIo0sOK/LhZO9hOKHsAjuoZC2JbXjh5k/PmYgWZeV+E1+i CpwB0za7zslb5jwpHjD97fUFGvDe/RJqzqwpF9FLRSbA0lJsPXp43CHE4VqxN1t/UIMI 8zxA== X-Gm-Message-State: APjAAAU78fDqbJon0DiBS3+pXa4KelCwi3PUUOOuGFreOJOKD8EvDiqL 5aU9UA8HHFeQf2HcG0bwtwfcrQ== X-Google-Smtp-Source: APXvYqwSKeci9s9z03nIWTNGcxZdnmy4Xkzan3hUzZWZb8b36coZ9Y/IOVc3WKClr6VnRIt/9wSQ5Q== X-Received: by 2002:aa7:8ece:: with SMTP id b14mr3524226pfr.244.1559346785080; Fri, 31 May 2019 16:53:05 -0700 (PDT) Received: from minitux (104-188-17-28.lightspeed.sndgca.sbcglobal.net. [104.188.17.28]) by smtp.gmail.com with ESMTPSA id a11sm8293347pff.128.2019.05.31.16.53.04 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 31 May 2019 16:53:04 -0700 (PDT) Date: Fri, 31 May 2019 16:53:02 -0700 From: Bjorn Andersson To: John Stultz Cc: lkml , Andy Gross , David Brown , Amit Pundir , Rob Herring , Mark Rutland , Sebastian Reichel , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org Subject: Re: [RFC][PATCH 2/2] reset: qcom-pon: Add support for gen2 pon Message-ID: <20190531235302.GD25597@minitux> References: <20190531234734.102842-1-john.stultz@linaro.org> <20190531234734.102842-2-john.stultz@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190531234734.102842-2-john.stultz@linaro.org> User-Agent: Mutt/1.11.3 (2019-02-01) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri 31 May 16:47 PDT 2019, John Stultz wrote: > Add support for gen2 pon register so "reboot bootloader" can > work on pixel3 and db845. > > Cc: Andy Gross > Cc: David Brown > Cc: Bjorn Andersson > Cc: Amit Pundir > Cc: Rob Herring > Cc: Mark Rutland > Cc: Sebastian Reichel > Cc: linux-arm-msm@vger.kernel.org > Cc: devicetree@vger.kernel.org > Signed-off-by: John Stultz > --- > arch/arm64/boot/dts/qcom/pm8998.dtsi | 2 +- > drivers/power/reset/qcom-pon.c | 15 ++++++++++++--- > 2 files changed, 13 insertions(+), 4 deletions(-) > > diff --git a/arch/arm64/boot/dts/qcom/pm8998.dtsi b/arch/arm64/boot/dts/qcom/pm8998.dtsi > index d3ca35a940fb..051a52df80f9 100644 > --- a/arch/arm64/boot/dts/qcom/pm8998.dtsi > +++ b/arch/arm64/boot/dts/qcom/pm8998.dtsi > @@ -39,7 +39,7 @@ > #size-cells = <0>; > > pm8998_pon: pon@800 { > - compatible = "qcom,pm8916-pon"; > + compatible = "qcom,pm8998-pon"; > > reg = <0x800>; > mode-bootloader = <0x2>; We want to take this through arm-soc and the rest through Sebastian's tree, so please provide the dts update in a separate commit. Apart from that this looks good! Reviewed-by: Bjorn Andersson Regards, Bjorn > diff --git a/drivers/power/reset/qcom-pon.c b/drivers/power/reset/qcom-pon.c > index 3fa1642d4c54..d0336a1612a4 100644 > --- a/drivers/power/reset/qcom-pon.c > +++ b/drivers/power/reset/qcom-pon.c > @@ -14,11 +14,15 @@ > > #define PON_SOFT_RB_SPARE 0x8f > > +#define GEN1_REASON_SHIFT 2 > +#define GEN2_REASON_SHIFT 1 > + > struct pm8916_pon { > struct device *dev; > struct regmap *regmap; > u32 baseaddr; > struct reboot_mode_driver reboot_mode; > + long reason_shift; > }; > > static int pm8916_reboot_mode_write(struct reboot_mode_driver *reboot, > @@ -30,15 +34,18 @@ static int pm8916_reboot_mode_write(struct reboot_mode_driver *reboot, > > ret = regmap_update_bits(pon->regmap, > pon->baseaddr + PON_SOFT_RB_SPARE, > - 0xfc, magic << 2); > + 0xfc, magic << pon->reason_shift); > if (ret < 0) > dev_err(pon->dev, "update reboot mode bits failed\n"); > > return ret; > } > > +static const struct of_device_id pm8916_pon_id_table[]; > + > static int pm8916_pon_probe(struct platform_device *pdev) > { > + const struct of_device_id *match; > struct pm8916_pon *pon; > int error; > > @@ -60,6 +67,7 @@ static int pm8916_pon_probe(struct platform_device *pdev) > return error; > > pon->reboot_mode.dev = &pdev->dev; > + pon->reason_shift = of_device_get_match_data(&pdev->dev); > pon->reboot_mode.write = pm8916_reboot_mode_write; > error = devm_reboot_mode_register(&pdev->dev, &pon->reboot_mode); > if (error) { > @@ -73,8 +81,9 @@ static int pm8916_pon_probe(struct platform_device *pdev) > } > > static const struct of_device_id pm8916_pon_id_table[] = { > - { .compatible = "qcom,pm8916-pon" }, > - { .compatible = "qcom,pms405-pon" }, > + { .compatible = "qcom,pm8916-pon", .data = (void *)GEN1_REASON_SHIFT }, > + { .compatible = "qcom,pms405-pon", .data = (void *)GEN1_REASON_SHIFT }, > + { .compatible = "qcom,pm8998-pon", .data = (void *)GEN2_REASON_SHIFT }, > { } > }; > MODULE_DEVICE_TABLE(of, pm8916_pon_id_table); > -- > 2.17.1 >