From patchwork Mon Jun 3 22:23:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 165686 Delivered-To: patches@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp5036583ili; Mon, 3 Jun 2019 15:23:24 -0700 (PDT) X-Received: by 2002:a63:f509:: with SMTP id w9mr32108534pgh.134.1559600604541; Mon, 03 Jun 2019 15:23:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559600604; cv=none; d=google.com; s=arc-20160816; b=Rre1E2eUPx0xUiik6jlJDY9RnExPlyDh7TZM49vnfaUmOsNO07WD52ObNtkrrhzI+n RMfYrAyz//eh2pGVGQYwaV+LwSucUV07s/Tvq2xlRs+aTn6jbO1lZDH5/MXry3XHsJGB 4Y8FMu058Cc+IVyD5g4I2SAKGYe7XN2bdnMtiDtSN64CzGRqXCXSSIg5MNWmV/PieJsG QAKPMtFjPv36xn0XJghe/zQqETdD9ulAQVdzw/YPWqjLB5IfkcOvH5Qo9w5ewba68Ywp +BxhK9euPwV2diebTp+p8cTA4HDNFHptMCvRd83l5j77WO2Hr4Cub2IRVM89qqRphgwp 5QdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=LNT+l1wAM3ExTzu8kAKF3OCBx9DgMUq0svFdafuGiNA=; b=uh6SMr/Q8rzb37oB8DwjGWDmaRwVcBkdAwHWw/vw4IiQuo6rQb0dmBla3vU2U6xhhJ O12TUwUv/I5UipaZPxC0wZAN5f/yJoIIO1FKleXiAHA5LMFvVWfqukvpMDRybzFFMXUU D7DC++iuq7wMBGVp1N2Op9st1C3iM2LDEuDTJaFhnh5sMNq1fyPe2Hr728/zHk2FM24c jGssRP8gsjgnf9N1dOwsEnhSjtZfEwny2BvkaDk17QEkyl3Uev6X508JRCY1RvYAZCUY MBx05MTrReR8VJLm0U960q7zcri+sgPHHlLFJm4hSmELs0rYbE5RNoSu/URSBSZGEQtw blNQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=RSBsA1sZ; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id r3sor16520562pgv.46.2019.06.03.15.23.24 for (Google Transport Security); Mon, 03 Jun 2019 15:23:24 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=RSBsA1sZ; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=LNT+l1wAM3ExTzu8kAKF3OCBx9DgMUq0svFdafuGiNA=; b=RSBsA1sZKPZQGT93W+BOBhN5ctHJdvI/euEzW7VqiT83w1yWpIWw4F/wIqRqPuBPwS fKKXmI7hYcUhj2RyZNzKSmcpjmoEaL7XupXMPJuTkR2lVWLlisrIugg7hmQkbPvjMd11 TI4j3rZ7FVM6Q1tbomdGo9f+hjO/SHPgwZHEc4+U8bGfygVQjH8fBTvna0n+vG7X7BZH fP7IlskzUXfs5JGj25rr8StP0H9MVGbAcfJ/7GqoHkA6x2b7dLsD0IWUu/viyPUyni1e Pf7Lqj0MYVvoMTGhuoBESr2O0GaOh9VC5kl77CtY6mKwGQOSU0OwIbluEKvLvB1gYuqt d8yQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=LNT+l1wAM3ExTzu8kAKF3OCBx9DgMUq0svFdafuGiNA=; b=nXsNckYxjBAqbYrDtIMj6tFojHgKOXnyu9RSf137mmqJyuiLkXk3pCLB2DlAVCgNWG 7f8cvVUMJbbWoxTe10+xjR6CKkRBBFSHNNHGaZJcnPveyZ+oPDHg9QBFfwuiBdYiAqnK t0BdRvS6ZRYBHkEwcpxtkARIF6YsjSwOVh0/GT6z3Q4amf1sQb0Bu/RX5eGug9/tntJA ER/8R0p+ADDnD7sOL1EG+KUn/8xJYFhObGN1mVGrlfnKwV3UmtZG2XnfcUSl5/G2Mlat smDhWy2Vi+tr8kiOybGdMPV86r2oxpl+NGU1RSvZKdVJ23sv/4GM8SH4vOtqFELSXfkY OdZQ== X-Gm-Message-State: APjAAAWKEJoKLUXRSURwZ4ivffUKyo3v9sieMVS+G9wDHVvQoWi5g9o1 d0ojb89jXDMT2+Mh03rnkKyFbXQJ X-Google-Smtp-Source: APXvYqyvzQyIVZPpUnCKtqlHVvAak9rWtp9S1Ze02w7DQsnHXT0RcsdjgSSK837eelbF8SsQY965ew== X-Received: by 2002:a63:4c54:: with SMTP id m20mr31550310pgl.316.1559600604132; Mon, 03 Jun 2019 15:23:24 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:692:26ff:feda:3a81]) by smtp.gmail.com with ESMTPSA id g8sm14320588pjp.17.2019.06.03.15.23.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Jun 2019 15:23:23 -0700 (PDT) From: John Stultz To: lkml Cc: John Stultz , Andy Gross , David Brown , Bjorn Andersson , Amit Pundir , Rob Herring , Mark Rutland , Sebastian Reichel , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH 2/3 v2] reset: qcom-pon: Add support for gen2 pon Date: Mon, 3 Jun 2019 22:23:18 +0000 Message-Id: <20190603222319.62842-2-john.stultz@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190603222319.62842-1-john.stultz@linaro.org> References: <20190603222319.62842-1-john.stultz@linaro.org> 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 Reviewed-by: Bjorn Andersson Signed-off-by: John Stultz v2: * Split out dts changes into separate path * Minor cleanups and remove unused variables --- drivers/power/reset/qcom-pon.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) -- 2.17.1 diff --git a/drivers/power/reset/qcom-pon.c b/drivers/power/reset/qcom-pon.c index 3fa1642d4c543..22a743a0bf28c 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,7 +34,7 @@ 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"); @@ -60,6 +64,7 @@ static int pm8916_pon_probe(struct platform_device *pdev) return error; pon->reboot_mode.dev = &pdev->dev; + pon->reason_shift = (long)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 +78,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);