Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7FFD9C433EF for ; Fri, 22 Jul 2022 17:24:37 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8C68083C51; Fri, 22 Jul 2022 19:24:34 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="qGu4KcLj"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B5FCE83C5E; Fri, 22 Jul 2022 19:24:32 +0200 (CEST) Received: from mail-oa1-x2a.google.com (mail-oa1-x2a.google.com [IPv6:2001:4860:4864:20::2a]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 12DE280C75 for ; Fri, 22 Jul 2022 19:24:30 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=macroalpha82@gmail.com Received: by mail-oa1-x2a.google.com with SMTP id 586e51a60fabf-10d6e8990b9so7065085fac.7 for ; Fri, 22 Jul 2022 10:24:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Im3DNBg01JHLWBFbx3srYxVZyGb8OEFj30LOzX2LcE4=; b=qGu4KcLjkv4DEhFwBSmInsTx2u6Un6cSTjFwPULomo/0lW+cwgJtzspQEmbtyAMhYt EaVNPLfv9kJ630qigidNWKV9eF8ABO9UO/O4dceCKd/eGWN3YadSrM/z+mbcWGh3dfjw HTTtImlNnqT1+o2LJsNem38dNHooiQ8Dtm24YFdrgtbxfT8lPkDBwLMIx8fkq1HBPFEq PWSAS+LBZw5K36d1MM/qFpkPSnRD/G52tEgqnj1PUugTC9MlowFn966ncXmgcZcXpKvl TD+0IOPgswrHFGGSIqI9f7l3TNzwH98cG20D/lRlH7ESk5eS7r9O9PiL0YtyvLkKuVfQ 8XdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Im3DNBg01JHLWBFbx3srYxVZyGb8OEFj30LOzX2LcE4=; b=YWeBQ7Y2lskyahYA/85ZRji8wFjduhVLaHI2UqyAnHGqePddMrt8As6eP4Rawlgiis jVSscDWjx8JkIr/kdoTMotsHoKbCv82t4lQ2Ap1ngaGONn3zZsxZtpuEoZSYhQfVrjAp uiCKwTmRRHNQ1PX38wf3BCgxptDsbNBGAcZ79rl2sKuQ3xx16qFh9QOfvirngcT12eT9 gPAd2aCVCp9wzwBT49DywFoYocc+7xCt1h9MGGM5oshfb0eEKgH8LA+sou+GN1RtrTwp JJBqP0XSCva4BH1rql35xmO2NEmwbxcogZhSaaQNiUuL/gKRm9ir+wkdzdXCK0wUFrs6 gcIA== X-Gm-Message-State: AJIora9h9mTAtLdlIP160QqXkqKgAQ8rYXi4tXIcFpIxc2cvCz3ketGc u04Bx0ySZckPVjWdkfOl2FfpoXAPgKM= X-Google-Smtp-Source: AGRyM1ueJVNmo4yY06W+9TKMOaLYwT8rJVs37tKaqbKS964i22+6CoItgAGJwyrVZlsceneY+Sof+g== X-Received: by 2002:a05:6870:3326:b0:10d:ab89:40fe with SMTP id x38-20020a056870332600b0010dab8940femr3640294oae.207.1658510668217; Fri, 22 Jul 2022 10:24:28 -0700 (PDT) Received: from wintermute.localdomain (cpe-76-183-134-35.tx.res.rr.com. [76.183.134.35]) by smtp.gmail.com with ESMTPSA id k23-20020a4ad117000000b004359b581401sm2078465oor.25.2022.07.22.10.24.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Jul 2022 10:24:27 -0700 (PDT) From: Chris Morgan To: u-boot@lists.denx.de Cc: kever.yang@rock-chips.com, jh80.chung@samsung.com, msuchanek@suse.de, Chris Morgan Subject: [PATCH] Revert "power: pmic: rk8xx: Support sysreset shutdown method" Date: Fri, 22 Jul 2022 12:24:21 -0500 Message-Id: <20220722172421.30099-1-macroalpha82@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean From: Chris Morgan This reverts commit ad607512f5757f4485968efd5bcf2c0245a8a235. It was found during extensive testing that this causes problems on certain boards. I was able to test this patch on a second device (an Anbernic RG353) and it resulted in similar failures. Signed-off-by: Chris Morgan --- drivers/power/pmic/rk8xx.c | 50 +------------------------------------- 1 file changed, 1 insertion(+), 49 deletions(-) diff --git a/drivers/power/pmic/rk8xx.c b/drivers/power/pmic/rk8xx.c index 25ef621f8d..8d703112c3 100644 --- a/drivers/power/pmic/rk8xx.c +++ b/drivers/power/pmic/rk8xx.c @@ -6,50 +6,10 @@ #include #include -#include #include #include #include #include -#include - -static int rk8xx_sysreset_request(struct udevice *dev, enum sysreset_t type) -{ - struct rk8xx_priv *priv = dev_get_priv(dev->parent); - - if (type != SYSRESET_POWER_OFF) - return -EPROTONOSUPPORT; - - switch (priv->variant) { - case RK805_ID: - case RK808_ID: - case RK816_ID: - case RK818_ID: - pmic_clrsetbits(dev->parent, REG_DEVCTRL, 0, BIT(0)); - break; - case RK809_ID: - case RK817_ID: - pmic_clrsetbits(dev->parent, RK817_REG_SYS_CFG3, 0, - BIT(0)); - break; - default: - printf("Unknown PMIC RK%x: Cannot shutdown\n", - priv->variant); - return -EPROTONOSUPPORT; - }; - - return -EINPROGRESS; -} - -static struct sysreset_ops rk8xx_sysreset_ops = { - .request = rk8xx_sysreset_request, -}; - -U_BOOT_DRIVER(rk8xx_sysreset) = { - .name = "rk8xx_sysreset", - .id = UCLASS_SYSRESET, - .ops = &rk8xx_sysreset_ops, -}; /* In the event of a plug-in and the appropriate option has been * selected, we simply shutdown instead of continue the normal boot @@ -133,7 +93,7 @@ static int rk8xx_read(struct udevice *dev, uint reg, uint8_t *buff, int len) static int rk8xx_bind(struct udevice *dev) { ofnode regulators_node; - int children, ret; + int children; regulators_node = dev_read_subnode(dev, "regulators"); if (!ofnode_valid(regulators_node)) { @@ -144,14 +104,6 @@ static int rk8xx_bind(struct udevice *dev) debug("%s: '%s' - found regulators subnode\n", __func__, dev->name); - if (CONFIG_IS_ENABLED(SYSRESET)) { - ret = device_bind_driver_to_node(dev, "rk8xx_sysreset", - "rk8xx_sysreset", - dev_ofnode(dev), NULL); - if (ret) - return ret; - } - children = pmic_bind_children(dev, regulators_node, pmic_children_info); if (!children) debug("%s: %s - no child found\n", __func__, dev->name); -- 2.25.1