From patchwork Wed Sep 13 08:44:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen-Yu Tsai X-Patchwork-Id: 138742 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp989949vqx; Wed, 13 Sep 2023 03:40:47 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGrg5KnyY8yab9B9cHYdX4gQw3rzDHhIJpJnYsfAdsW75y9yl/ulFBnr0hmwfv0y81jmpsv X-Received: by 2002:a17:90a:8684:b0:268:798:a28b with SMTP id p4-20020a17090a868400b002680798a28bmr7128062pjn.23.1694601646659; Wed, 13 Sep 2023 03:40:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694601646; cv=none; d=google.com; s=arc-20160816; b=HCCU+anfe1Od+nwHfkPfdUheFH8NrhOHRTzvI7Q5Pcnd+2O8b0ROKL6Huxu/fAXtYO sS3lqTG5V4gq+a2Ua0jvFNf892odhZHqjW9kUOxIz+0+jwkKbIluI8dB2ueFndURsrHb ZIxmQPnyDZqrfRUa41rIiaZ9JGSV3Lvys6OoBpTtnqLokA5K7DbeFefyCP9z2b/0AIQv h6GLA14DCNkNmha+LmEZvKX9r3TAIwDQy4uIW2NFVknvVKZe2c9D1OUfnTaSRj3HfKro 9cz63lr2RhdGzeidLfTMoBU7HlDzKv++bqfnPDFsC1/8lLYMYzLhbta3eOpdww8uESET BVKw== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=Fmv+Vq9O4hXwTu7w7+aDs70zSlTsq1mhjzn706AuHTQ=; fh=07bTE8bs/+7NuM8BwMhOsc9ajNYUYKWgUOFo00FKlFM=; b=isEfzfnQGPRuaOzyN1Bhm5cA0fJZM12hHJ9F+346h86DMlD98kFDosdzsz8/8jH5GL U7DocCPHfqMQXGL8t1Ve6jNY6f+3wirbzZA7cONb7nM6IyN1Inas/5MAtGlgASmFTyiR ZYawslYYLOGdtnqqCxpLNEUgHO5cwB0taPoaILpTkDwHIl2pfSNDKJYBs2lpkRfEmHS7 s9wTxcQh9sRjEhMflCGw+srFjgR6Hasi79BpIQKBbMhY9aNKBHG2bsoulDwA6FbYupiK wl2B7vbfSQAmmY3W5jFkiAMSN5Pf93ImULHMTHKV/pUnYFfsvIn6e6hf/bSvZeVD5VfZ eeSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=QCIu2r1s; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id e30-20020a63545e000000b00574092cdfedsi9676384pgm.808.2023.09.13.03.40.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 03:40:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=QCIu2r1s; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id E60B680B79CA; Wed, 13 Sep 2023 01:45:20 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238919AbjIMIpL (ORCPT + 36 others); Wed, 13 Sep 2023 04:45:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40818 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239043AbjIMIpK (ORCPT ); Wed, 13 Sep 2023 04:45:10 -0400 Received: from mail-pl1-x629.google.com (mail-pl1-x629.google.com [IPv6:2607:f8b0:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 466301996 for ; Wed, 13 Sep 2023 01:45:06 -0700 (PDT) Received: by mail-pl1-x629.google.com with SMTP id d9443c01a7336-1bf57366ccdso5173285ad.1 for ; Wed, 13 Sep 2023 01:45:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1694594706; x=1695199506; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Fmv+Vq9O4hXwTu7w7+aDs70zSlTsq1mhjzn706AuHTQ=; b=QCIu2r1souu0AYvTviONV5pbNEMpx1sBK2Kjgx9HIvjr0TZpVty4NhPcJpYSQ8nf/y l46dEyQ/j4aoxsw0EIVFbYCVzKEgJt/emQEp2auZdL8jXUgE+7DIeIa2xO0LzJiub/rm hxnzQKv6khzyUhBof1TwqLCLMqfeqSspsAK/0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694594706; x=1695199506; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Fmv+Vq9O4hXwTu7w7+aDs70zSlTsq1mhjzn706AuHTQ=; b=kAVke6bFvu1fBf/Rr/2nQwvQBcGn+z8ww0FsHGnjs6+ucTphKBp+EnrgsBtAvZsJHz nH8aCxfM8D2kZEbbdh6nNKdvOyCBpoKh1eeRZ2rnwz0S3WCcl4CqbXzAodR6yRYhyZ+n X/qgQzHvaht8Cw3EpTgInlahjMVaIeG98JM+nXFS9bxCQxM+FoG+1N7XA/rKuA7tINz5 B1//B0BxCxx9FyxIfDL5mz+c/zRmV2HPPRPE1mfO8h/5e/ZbpciPHhkQPAixOHOKAFDP OM1CvhUzmJ+s1tBiPTM0TYPX9FFYsU5xJ8okuuRtLY2stLh0T62ou27BXnFau7mGNLYR kWlA== X-Gm-Message-State: AOJu0YxzxcFFxWMI5OrKSSRylDiSmpYQdz0d77KyuZhoifAOYfCtzbCs dwcXikSI0B6MtXhuCLFxvAZlnF9GVQpKolGPaec= X-Received: by 2002:a17:90b:1e10:b0:26f:6f2a:a11 with SMTP id pg16-20020a17090b1e1000b0026f6f2a0a11mr3049931pjb.12.1694594705782; Wed, 13 Sep 2023 01:45:05 -0700 (PDT) Received: from wenstp920.tpe.corp.google.com ([2401:fa00:1:10:b24c:3be4:d952:d3b1]) by smtp.gmail.com with ESMTPSA id p8-20020a17090a74c800b0027360359b70sm937099pjl.48.2023.09.13.01.45.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 01:45:05 -0700 (PDT) From: Chen-Yu Tsai To: Matthias Brugger Cc: Chen-Yu Tsai , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, AngeloGioacchino Del Regno Subject: [PATCH v3] arm64: dts: mediatek: mt6358: Merge ldo_vcn33_* regulators Date: Wed, 13 Sep 2023 16:44:56 +0800 Message-ID: <20230913084457.1638690-1-wenst@chromium.org> X-Mailer: git-send-email 2.42.0.283.g2d96d420d3-goog MIME-Version: 1.0 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 (groat.vger.email [0.0.0.0]); Wed, 13 Sep 2023 01:45:21 -0700 (PDT) X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776918616365264893 X-GMAIL-MSGID: 1776918616365264893 The ldo_vcn33_bt and ldo_vcn33_wifi regulators are actually the same regulator, having the same voltage setting and output pin. There are simply two enable bits that are ORed together to enable the regulator. Having two regulators representing the same output pin is misleading from a design matching standpoint, and also error-prone in driver implementations. Now that the bindings have these two merged, merge them in the device tree as well. Neither vcn33 regulators are referenced in upstream device trees. As far as hardware designs go, none of the Chromebooks using MT8183 w/ MT6358 use this output. Signed-off-by: Chen-Yu Tsai Reviewed-by: AngeloGioacchino Del Regno --- This was part of the series "regulator: mt6358: Remove bogus regulators and improvements". Since the driver parts related to this patch have all been picked up, so I'm sending this separately. arch/arm64/boot/dts/mediatek/mt6358.dtsi | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/arch/arm64/boot/dts/mediatek/mt6358.dtsi b/arch/arm64/boot/dts/mediatek/mt6358.dtsi index 96ba8490b629..ad5e4022e06d 100644 --- a/arch/arm64/boot/dts/mediatek/mt6358.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt6358.dtsi @@ -292,15 +292,8 @@ mt6358_vrf18_reg: ldo_vrf18 { regulator-enable-ramp-delay = <120>; }; - mt6358_vcn33_bt_reg: ldo_vcn33_bt { - regulator-name = "vcn33_bt"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3500000>; - regulator-enable-ramp-delay = <270>; - }; - - mt6358_vcn33_wifi_reg: ldo_vcn33_wifi { - regulator-name = "vcn33_wifi"; + mt6358_vcn33_reg: ldo_vcn33 { + regulator-name = "vcn33"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3500000>; regulator-enable-ramp-delay = <270>;