Received: by 2002:a05:7412:f690:b0:e2:908c:2ebd with SMTP id ej16csp491121rdb; Thu, 19 Oct 2023 09:57:56 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG+41FsrMqP5Wl5cXxrhC5v9QqJo4rV2uLG9x+mXuSGypwPSDSdBFzE4ULwB+9bakngt7jD X-Received: by 2002:a05:6a21:398e:b0:159:fe1d:2f32 with SMTP id ad14-20020a056a21398e00b00159fe1d2f32mr2718644pzc.42.1697734676357; Thu, 19 Oct 2023 09:57:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697734676; cv=none; d=google.com; s=arc-20160816; b=QyoUkuFCpPpHQTG1C/hjnuDY3Bcw8er3F66J/UZpyPCKr0CZhCrQmbXl+3/NsylJw0 qfgLXH+Q8pxnaPq9HAbpnbvAdtPn5NhwbW5jGG6XGGrgKNIWvHO27t2ihn2ij4aYAq/L 0vRM83VBunDkYpjJ5I4c4WIMkIJS0g51Wt8DTM7iqto/fgwD41aazQxByT/lENktOnIJ nXUuUvRwNzQ25pUDbWoUboHPjdg/pgh7Q0zQoQYLVgWagxnZSM4A+5bFkZ1l1n9HhT+0 D/+Tc1D6s6H6raCpeTYYwpaIO+Q2C4VFr8OUad7sjoqravSBmN1neqJgRoCcaelu4gSI IyMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Go9JA7+JYNYhv0MGq8Mjb1Z/TrugjGIiQDvRmzn+bx8=; fh=d6XH3dt5H0c+4wnwIk/8KA2kgFbVz8WdE7bZpO88hdM=; b=v89NwY6SnQp/ZrP6t+e+TYzw84XdI/QtAscJ/8VqxwrtYsOTYTw5xas6dTNNO9BhUR M2k7WAIMBTxNYpSpgJvhWW5z0QwFgvHcK61vqeCQw4ShNPw8aKTyWCm0kTx1ALPGIADm oMjloXjbJdxKm76I7vXMh94hfg228YprzoFFZTlH7QfTJUWvNWAv0eQKGpJldo0184of EjpuOPow1KoYJK+VVjrg1V2mkfNlJf/V163RNCyLPOyt7o4R2bqFi5JpmPSac9cVLgjP qUWUBBcLj1hORGK+Vr/my+cWjl3V8va0ueqEP7ZSIsG5qljAQWBdOT7fjMolmNTBihdI qd6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@xff.cz header.s=mail header.b=ADncXZsE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=xff.cz Return-Path: Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id m130-20020a633f88000000b005adfebb193esi4220008pga.420.2023.10.19.09.57.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Oct 2023 09:57:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@xff.cz header.s=mail header.b=ADncXZsE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=xff.cz Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 6A0E5826C0F0; Thu, 19 Oct 2023 09:57:55 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233147AbjJSQ5t (ORCPT + 99 others); Thu, 19 Oct 2023 12:57:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56934 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235465AbjJSQ5k (ORCPT ); Thu, 19 Oct 2023 12:57:40 -0400 Received: from vps.xff.cz (vps.xff.cz [195.181.215.36]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C837C134; Thu, 19 Oct 2023 09:57:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=xff.cz; s=mail; t=1697734656; bh=dULVbDj/GEZVo4kyTOnn5meTP4EtkE4Vt4bfDheFTd4=; h=From:To:Cc:Subject:Date:References:From; b=ADncXZsEaHZz3EY+QYv7iW6WzGUERPLtjKvyMT31bvA1ntrCrRdm9aVfgwZJ1CIXz J8SN3AjM2utj+y/lvmJSM4+243PZ/tRX20vxCWOuqr8KWaUUQNhQq/bP7UH5dJEo7h 6ohN0aJOq/paq10vB0FL+ajydzNLg6CkZzzBVPh0= From: =?UTF-8?q?Ond=C5=99ej=20Jirman?= To: Lee Jones , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner Cc: Ondrej Jirman , Sebastian Reichel , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [RESEND PATCH v3 3/4] mfd: rk8xx: Add support for standard system-power-controller property Date: Thu, 19 Oct 2023 18:57:25 +0200 Message-ID: <20231019165732.3818789-4-megi@xff.cz> In-Reply-To: <20231019165732.3818789-1-megi@xff.cz> References: <20231019165732.3818789-1-megi@xff.cz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Thu, 19 Oct 2023 09:57:55 -0700 (PDT) From: Ondrej Jirman DT property rockchip,system-power-controller is now deprecated. Signed-off-by: Ondrej Jirman Reviewed-by: Sebastian Reichel --- drivers/mfd/rk8xx-core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/mfd/rk8xx-core.c b/drivers/mfd/rk8xx-core.c index 11a831e92da8..a50a181b18e9 100644 --- a/drivers/mfd/rk8xx-core.c +++ b/drivers/mfd/rk8xx-core.c @@ -685,7 +685,8 @@ int rk8xx_probe(struct device *dev, int variant, unsigned int irq, struct regmap if (ret) return dev_err_probe(dev, ret, "failed to add MFD devices\n"); - if (device_property_read_bool(dev, "rockchip,system-power-controller")) { + if (device_property_read_bool(dev, "rockchip,system-power-controller") || + device_property_read_bool(dev, "system-power-controller")) { ret = devm_register_sys_off_handler(dev, SYS_OFF_MODE_POWER_OFF_PREPARE, SYS_OFF_PRIO_HIGH, &rk808_power_off, rk808); -- 2.42.0