From patchwork Fri Jun 14 23:14:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 166935 Delivered-To: patches@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp64772ilk; Fri, 14 Jun 2019 16:14:58 -0700 (PDT) X-Received: by 2002:a63:4001:: with SMTP id n1mr37254210pga.382.1560554098415; Fri, 14 Jun 2019 16:14:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560554098; cv=none; d=google.com; s=arc-20160816; b=lBPVjgarH5qgIvTIcZ/56etW7cerkL81SMvpragNCmRercBjbSdMsLkn1IZjtOCnDH 5m1OaSouiC8RpApNNA82mlqm1iCEUeUIBB+KRtHE9hYhquTwjF/YYBf9vb0D6csN9n9i Q4j8xRUpRYQdG4wQ8/zNLAjVqlRuRH1JnuZ/9J3pvPeT/u9/rtjpZIZMj46GJ+qFktB4 Z8SXnvRNNaQvjPV/UQY1AcYdW4K8I0lMz5vDE870rGk4Z7dRl5eb+OA0TUq924wT0XDJ pL0nLe3VbZA1R6cZGUaeJrmbQ7CUUm14cmvS6HaoyIf07u86gViW3ZPUnNiCM6AoAk6R J1ag== 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=q92u28QYnXiS8Egefrv0KS36SKB7TaYcm7ir9daW/6YG9lcXyKRG/OsiZNVSBeFJpx fZ3CBW3DBuTdFgQqf7Gl8JpWD7lGpLoAvTFhAbKqUx1Jrogl/KX7es9qvV/Yk4zzBUxk AoQp1x07IQj4SEAgiyV03BuOTKGu9433Ds8cFo17gBXAfpim+jjU/sEmJ25btByfwXCx bNbVu0mORS1KUQ1Zk3OQ5gW1OFgfON6jMuom+SX3K2WTj67IU13MtYQrYsW2IF9UDc/S a4qODl8nbr5uU0l6R/Xi7P4gXNuCjE5ROEx+XaGBFC0foqRyEO6P5V7BZbD36sseXUOv ZQQg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wYFDcfZ8; 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 d21sor4484067pgi.44.2019.06.14.16.14.58 for (Google Transport Security); Fri, 14 Jun 2019 16:14:58 -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=wYFDcfZ8; 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=wYFDcfZ8k1FgZfZP+uKORVWTSenE7XCVBZUbUaLM0tiQX93fBu7dfK0YQEg9UDLF6C qqK11P3GuYr7IOpkAdCgbHvbL2OGheySKIFN/6ntMsqCBuZ5dxFwaDsyUCVoWU/NjEPQ Tkn0v2JwZnrnOMOkdiIddAlvO62weHSLlJLhMaPnQTuyUeFVAnhgiNt8T/mqkKgjHE2L 3Sv9ZBZEWg5RTjpR7kWLg+crbIAo+mXxXNYXve0d3c6zXOm9eWklgcY/mSC9UEthVb/X d5E3dQ1y55M5fav9SUthGLm6b5eyL8GEnNmx17/qhPRjwjCarY6MsW56KZf4B6kP8aha 2dmg== 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=ay1PFV1JRntCADNe5xMGPE0M2Bl9mAvKjji8Vn6wlp42fB8TlYQ6HC0Qp9aDBhfcv7 NtVHEMv/0u3fnyNjkG7gWqFTOOqlPT5FepbkBSzBvbnvTz7wx4/KoBcarvJZuAcOBiNb uCzMfMoHDXe/V94wbItl8y0Py8vTSUpAQoJrbfQIvY4P1nE/wa6gjKZwxvQZH5lAa2kl HVsGrfjlcKRgVZqJb8699mfPwEh2gi8Wami57fQrXE1byADYNE2M6NkHNUpXnANirgVl Cl/vOILfuQ8E4EGcM6CBYiRBjgKW1Hl5KycZYWx8obSGwjGXMoP5EUV1uDvzwaqAOUYx q5lw== X-Gm-Message-State: APjAAAUNLBpF5AM+RsQPdpmVyMEyMB7bHzptAg+A6qVPka1XmEDykuyh tGu4ByQG4dN9x8KkzoycexEZduc6 X-Google-Smtp-Source: APXvYqxOD8GTJnH35iTniIMOV5Lz2lveQxN9ZM+F4ldKe83xY1Gf3nvXifB6teZ/Q/hiULACCOiVnw== X-Received: by 2002:a65:65c9:: with SMTP id y9mr38227850pgv.76.1560554098017; Fri, 14 Jun 2019 16:14:58 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:692:26ff:feda:3a81]) by smtp.gmail.com with ESMTPSA id w187sm4486445pfb.4.2019.06.14.16.14.56 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 14 Jun 2019 16:14:57 -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 v3 2/3] reset: qcom-pon: Add support for gen2 pon Date: Fri, 14 Jun 2019 23:14:50 +0000 Message-Id: <20190614231451.45998-2-john.stultz@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190614231451.45998-1-john.stultz@linaro.org> References: <20190614231451.45998-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);