From patchwork Sun Jun 4 14:56:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 103023 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2185333vqr; Sun, 4 Jun 2023 08:10:20 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ762QonranVaIQFB3eaxHUhSx7pzZB6EXDhRnuCWDwGhIsTg4lMLe5JzVVtzXVDkHw76OJ5 X-Received: by 2002:a05:6a20:918f:b0:111:1bc4:cf0a with SMTP id v15-20020a056a20918f00b001111bc4cf0amr2316453pzd.52.1685891420124; Sun, 04 Jun 2023 08:10:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685891420; cv=none; d=google.com; s=arc-20160816; b=PNVmCqze+pPG16mSodcfQ/Z/98IHjUayOq6bJscuQV/Qxhcc/4NRdg4Soa/ikRlccY Ye7ZFH9nGhMBKbWSQslejY3k+2F+GQdtYQhKts093MCyD9me+BoIcuwekFwArkNh+EIU feMHoseUkP/b3xuDDenkHNMG1R6FqMVmwHxqt5wECsD3cTrUlsYGH9hEdSJIGx88mcGW wichxJqtSCKJLJFkHTSmq1oCRnFoqJAKWaf3Lq8Igl7hPmemcVV1/H7iCnnoXfPjcjbZ U0D6X37+st7q2zjKy7TbqCY89zN9d0eZj38kjn+3GNZulK6UBNIGrvF97IA1+B44Dscf m0Xg== 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=bLUXA4878g/UvHVxmBNWXjGexK/P7B7yeTnDxDXg25A=; b=icAytFqCFqfGem7nH7ZrYZ79EeUNhe9bqMcB6tVVsTDV1AP9ASDrH7/nFlIOKZCZeh MbSgy+p+aDMekUIAliYb/oYkoPawuwvs9Cu+MnDh4UHadv9crxbkSuVydJg469vQ8YP5 YYCw6tLgL1zzF4d7AsDxvmyKTb4UsO3el/NEszsmPfoGEaPu89iVWpx8ejkfMuvjqI// 3FqBmpTnNxLFGqijL9dQ+Vs36uCS1uCd5F4s5PjP5VoBvEIeJYLhuePy1eAvjQI+zSuc VgQU+h0waMPD/WEaR9jJCwDQuq6a9Rafs6HA+Cft72ZQWpMUGEGLFH+zn1wE5B5F01++ EzBA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=Qb9FfZl3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=crapouillou.net Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s190-20020a625ec7000000b0063b1fbbb8c5si3926919pfb.131.2023.06.04.08.10.05; Sun, 04 Jun 2023 08:10:20 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=Qb9FfZl3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=crapouillou.net Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231725AbjFDO5V (ORCPT + 99 others); Sun, 4 Jun 2023 10:57:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33442 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232390AbjFDO5O (ORCPT ); Sun, 4 Jun 2023 10:57:14 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6AFCF13A; Sun, 4 Jun 2023 07:57:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1685890612; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bLUXA4878g/UvHVxmBNWXjGexK/P7B7yeTnDxDXg25A=; b=Qb9FfZl3AuPSaZOXRVqRm58S2lAknvCcydsyRNW9As6fkwTqqcnQ/I6+tmKFPmjEUGh/bo N6gtrqRr4mYjbXAEAnnRaope/woG5vjsNxyZZumWEHybiKPqZ0bqYMH1wMfawf8TKZ/BgC DBS8wXDhVAmc8uAUptU5H0Euw3E4NUY= From: Paul Cercueil To: Thomas Bogendoerfer , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: "H . Nikolaus Schaller" , linux-mips@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, list@opendingux.net, Paul Cercueil Subject: [PATCH 2/9] MIPS: DTS: CI20: Fix ACT8600 regulator node names Date: Sun, 4 Jun 2023 16:56:35 +0200 Message-Id: <20230604145642.200577-3-paul@crapouillou.net> In-Reply-To: <20230604145642.200577-1-paul@crapouillou.net> References: <20230604145642.200577-1-paul@crapouillou.net> MIME-Version: 1.0 X-Spam: Yes X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767785281498179392?= X-GMAIL-MSGID: =?utf-8?q?1767785281498179392?= The Device Tree was using invalid node names for the ACT8600 regulators. To be fair, it is not the original committer's fault, as the documentation did gives invalid names as well. In theory, the fix should have been to modify the driver to accept the alternative names. However, even though the act8865 driver spits warnings, the kernel seemed to work fine with what is currently supported upstream. For that reason, I think it is okay to just update the DTS. I removed the "regulator-name" too, since they really didn't bring any information. The node names are enough. Fixes: 73f2b940474d ("MIPS: CI20: DTS: Add I2C nodes") Signed-off-by: Paul Cercueil --- arch/mips/boot/dts/ingenic/ci20.dts | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/arch/mips/boot/dts/ingenic/ci20.dts b/arch/mips/boot/dts/ingenic/ci20.dts index e76953dce2e7..5361606c5e13 100644 --- a/arch/mips/boot/dts/ingenic/ci20.dts +++ b/arch/mips/boot/dts/ingenic/ci20.dts @@ -237,59 +237,49 @@ &i2c0 { act8600: act8600@5a { compatible = "active-semi,act8600"; reg = <0x5a>; - status = "okay"; regulators { - vddcore: SUDCDC1 { - regulator-name = "DCDC_REG1"; + vddcore: DCDC1 { regulator-min-microvolt = <1100000>; regulator-max-microvolt = <1100000>; regulator-always-on; }; - vddmem: SUDCDC2 { - regulator-name = "DCDC_REG2"; + vddmem: DCDC2 { regulator-min-microvolt = <1500000>; regulator-max-microvolt = <1500000>; regulator-always-on; }; - vcc_33: SUDCDC3 { - regulator-name = "DCDC_REG3"; + vcc_33: DCDC3 { regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; regulator-always-on; }; - vcc_50: SUDCDC4 { - regulator-name = "SUDCDC_REG4"; + vcc_50: SUDCDC_REG4 { regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; regulator-always-on; }; - vcc_25: LDO_REG5 { - regulator-name = "LDO_REG5"; + vcc_25: LDO5 { regulator-min-microvolt = <2500000>; regulator-max-microvolt = <2500000>; regulator-always-on; }; - wifi_io: LDO_REG6 { - regulator-name = "LDO_REG6"; + wifi_io: LDO6 { regulator-min-microvolt = <2500000>; regulator-max-microvolt = <2500000>; regulator-always-on; }; - vcc_28: LDO_REG7 { - regulator-name = "LDO_REG7"; + cim_io_28: LDO7 { regulator-min-microvolt = <2800000>; regulator-max-microvolt = <2800000>; regulator-always-on; }; - vcc_15: LDO_REG8 { - regulator-name = "LDO_REG8"; + cim_io_15: LDO8 { regulator-min-microvolt = <1500000>; regulator-max-microvolt = <1500000>; regulator-always-on; }; vrtc_18: LDO_REG9 { - regulator-name = "LDO_REG9"; /* Despite the datasheet stating 3.3V * for REG9 and the driver expecting that, * REG9 outputs 1.8V. @@ -303,7 +293,6 @@ vrtc_18: LDO_REG9 { regulator-always-on; }; vcc_11: LDO_REG10 { - regulator-name = "LDO_REG10"; regulator-min-microvolt = <1200000>; regulator-max-microvolt = <1200000>; regulator-always-on;