From patchwork Mon Oct 30 19:41:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artur Weber X-Patchwork-Id: 13440848 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 04B04C4332F for ; Mon, 30 Oct 2023 19:42:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=aVqCG5XXj4wxnRjUT5pXtkYSKq9h5zQu896WdgmdEQo=; b=VwPnfThX38wZhQ cQUxXs3UbKi//qO39pQ54ku6TQHeedqoBX1isUcEFOs+FxAhdCs3zA36NQuDgS9XKYG21tpz7NGRY 4b7fQ5k84t/CTU9+eGbKub536y7IL8TVWT8o8TxJyXkGWX/ZrmrM9N3NJU/Ek/8kutxHUyU1byv3r 7UZtdeo6zuKNn5TCvSfZVbbM8f6CigyES4gDyEstddciVwUMkv88caH+Fz1OPVb5PbMf/LMiRrTXN vmm4XGemY40sEG3oo1XZmtJZib/MBYA3QFlYY+7w42ggjkHaEyYlsCJYvMsCzxwCljv056/MRaGqr tU/gvug4TLIfQBZP01/w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qxY9C-003xKR-1F; Mon, 30 Oct 2023 19:42:02 +0000 Received: from mail-lf1-x12f.google.com ([2a00:1450:4864:20::12f]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qxY93-003xGT-1M for linux-arm-kernel@lists.infradead.org; Mon, 30 Oct 2023 19:41:54 +0000 Received: by mail-lf1-x12f.google.com with SMTP id 2adb3069b0e04-507adc3381cso6998550e87.3 for ; Mon, 30 Oct 2023 12:41:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698694912; x=1699299712; darn=lists.infradead.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=3545GZ4rTilRPlMK6OENQjdsYfS2hQ9SURsOYUBvQmk=; b=IIiw3bnukGdQA32TQMQBdU1RtVL8uLC7xvC00uCIcHqN+NUR9pD6o9W7UDRL71szgl 6HKxU1RV2HpjvP2IMIv1wKV63ox+SmUK4oxzwECrPV6vUDUsrmGFdUCWxQKIj892ET7X 5JIDYdSTBFgi7hLP2YsLuL6hOEmkir4TNDXbRuKpFBP9TeTyjKm9ha8CI39OIJiSv98s fLqUVHi4XYb/d+hVC+TBb/1s+nY2OpRRl1dC/j2wxtUOHBfEg1Lf5MzKPChMfiLG8kbr QdMY25PHYCG9qsrE6AAxefjy5c4dk9PuiN65KoGTVcp+7NSs4UnJIw/EsYv/fZ+PpuC6 qwbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698694912; x=1699299712; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3545GZ4rTilRPlMK6OENQjdsYfS2hQ9SURsOYUBvQmk=; b=mMZJ8qK51mZtye8y79ii7gdVLy8ul4KvAtKvcL1rlF4f1J2YbZy4l0Yvw2n5c/FuWc tnyx0WTAOCe7DSrWFQl7XLxbEf8WLuPM27o3Evyy833mmx2ags1arZnuszvLHnzXDVGn c1ifUjwlQDUodyeAHMXidH71nBcPmjcGgiRhm4E6xMnsYCsZGPM7ZOQaQD1gjcEdyjKC rAFK6g2unHn2/lOwmAUzVmCNWcQ+Ytm3lQIyuEQysahzUC8+f/bxKvrSyo/N8MYfqEro 10Mql8W3inSxsK6sXKmFkfSeU7Aeh7/3Ev3q0qFRbHrPmEgUkX8bNVyoADk5jmJhP4/I T6+g== X-Gm-Message-State: AOJu0YwV+7Js7cWNCZ9ntXXLFQtdhBiFtLfYICj1DGnlCb3hUfDaBvHt KVK04shiVs0yIeDvsBI5jUM= X-Google-Smtp-Source: AGHT+IGWswxESjDHXYLTl5Cpnzaj8IEwQ99AVQmntdpTDHIAk6Pqzn4ikpab+YANcim3rmmp2FIGqA== X-Received: by 2002:a19:f80e:0:b0:500:7f71:e46b with SMTP id a14-20020a19f80e000000b005007f71e46bmr8209208lff.1.1698694911772; Mon, 30 Oct 2023 12:41:51 -0700 (PDT) Received: from hex.my.domain (83.11.208.51.ipv4.supernova.orange.pl. [83.11.208.51]) by smtp.gmail.com with ESMTPSA id m10-20020ac2428a000000b005057184ae62sm1527802lfh.96.2023.10.30.12.41.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Oct 2023 12:41:51 -0700 (PDT) From: Artur Weber Date: Mon, 30 Oct 2023 20:41:45 +0100 Subject: [PATCH v2 3/6] ARM: dts: Drop DTS for BCM59056 PMIC MIME-Version: 1.0 Message-Id: <20231030-bcm59054-v2-3-5fa4011aa5ba@gmail.com> References: <20231030-bcm59054-v2-0-5fa4011aa5ba@gmail.com> In-Reply-To: <20231030-bcm59054-v2-0-5fa4011aa5ba@gmail.com> To: Lee Jones , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Florian Fainelli , Ray Jui , Scott Branden , Broadcom internal kernel review list , Liam Girdwood , Mark Brown Cc: Stanislav Jakubek , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Artur Weber X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=ed25519-sha256; t=1698694906; l=3995; i=aweber.kernel@gmail.com; s=20231030; h=from:subject:message-id; bh=DBtpuYO/zr95rgnLU/rQbbV2xjIrUTq43L7BHBrPA9U=; b=HDu0zf8GfviM5rEV5zkbcvF2LUTvgWofykCLZFC+mAUEKB0AesBtIFkSJQRg/3R/1a1/uY2vW 2Lnqvief9jhAomuborD/4Csi+k8a/E1A0MHcWibrdbGm9siphhSAZMh X-Developer-Key: i=aweber.kernel@gmail.com; a=ed25519; pk=RhDBfWbJEHqDibXbhNEBAnc9FMkyznGxX/hwfhL8bv8= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231030_124153_456974_7F576E42 X-CRM114-Status: GOOD ( 13.72 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The BCM59056 PMIC has its own separate DTSI, meant to be included in a DTS file after defining the pmu node on some I2C bus. I'm not aware of many other devices that do this, and it seems very unintuitive. Drop the DTS in favor of adding the BCM59056 PMIC node directly into the device DTS files. Signed-off-by: Artur Weber --- arch/arm/boot/dts/broadcom/bcm28155-ap.dts | 68 +++++++++++----------- arch/arm/boot/dts/broadcom/bcm59056.dtsi | 91 ------------------------------ 2 files changed, 32 insertions(+), 127 deletions(-) diff --git a/arch/arm/boot/dts/broadcom/bcm28155-ap.dts b/arch/arm/boot/dts/broadcom/bcm28155-ap.dts index 2f3634545e64..cefaa9a3c45c 100644 --- a/arch/arm/boot/dts/broadcom/bcm28155-ap.dts +++ b/arch/arm/boot/dts/broadcom/bcm28155-ap.dts @@ -37,7 +37,39 @@ &pmu_bsc { status = "okay"; pmu: pmu@8 { + compatible = "brcm,bcm59056"; + interrupts = ; reg = <0x08>; + + regulators { + camldo1_reg: camldo1 { + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + sdldo_reg: sdldo { + regulator-min-microvolt = <3000000>; + regulator-max-microvolt = <3000000>; + }; + + sdxldo_reg: sdxldo { + regulator-min-microvolt = <2700000>; + regulator-max-microvolt = <3300000>; + }; + + usbldo_reg: usbldo { + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + iosr1_reg: iosr1 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-always-on; + }; + }; }; }; @@ -74,39 +106,3 @@ &usbotg { &usbphy { status = "okay"; }; - -#include "bcm59056.dtsi" - -&pmu { - compatible = "brcm,bcm59056"; - interrupts = ; - regulators { - camldo1_reg: camldo1 { - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - regulator-always-on; - }; - - sdldo_reg: sdldo { - regulator-min-microvolt = <3000000>; - regulator-max-microvolt = <3000000>; - }; - - sdxldo_reg: sdxldo { - regulator-min-microvolt = <2700000>; - regulator-max-microvolt = <3300000>; - }; - - usbldo_reg: usbldo { - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - regulator-always-on; - }; - - iosr1_reg: iosr1 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - regulator-always-on; - }; - }; -}; diff --git a/arch/arm/boot/dts/broadcom/bcm59056.dtsi b/arch/arm/boot/dts/broadcom/bcm59056.dtsi deleted file mode 100644 index a9bb7ad81378..000000000000 --- a/arch/arm/boot/dts/broadcom/bcm59056.dtsi +++ /dev/null @@ -1,91 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later -/* -* Copyright 2014 Linaro Limited -* Author: Matt Porter -*/ - -&pmu { - compatible = "brcm,bcm59056"; - regulators { - rfldo_reg: rfldo { - }; - - camldo1_reg: camldo1 { - }; - - camldo2_reg: camldo2 { - }; - - simldo1_reg: simldo1 { - }; - - simldo2_reg: simldo2 { - }; - - sdldo_reg: sdldo { - }; - - sdxldo_reg: sdxldo { - }; - - mmcldo1_reg: mmcldo1 { - }; - - mmcldo2_reg: mmcldo2 { - }; - - audldo_reg: audldo { - }; - - micldo_reg: micldo { - }; - - usbldo_reg: usbldo { - }; - - vibldo_reg: vibldo { - }; - - csr_reg: csr { - }; - - iosr1_reg: iosr1 { - }; - - iosr2_reg: iosr2 { - }; - - msr_reg: msr { - }; - - sdsr1_reg: sdsr1 { - }; - - sdsr2_reg: sdsr2 { - }; - - vsr_reg: vsr { - }; - - gpldo1_reg: gpldo1 { - }; - - gpldo2_reg: gpldo2 { - }; - - gpldo3_reg: gpldo3 { - }; - - gpldo4_reg: gpldo4 { - }; - - gpldo5_reg: gpldo5 { - }; - - gpldo6_reg: gpldo6 { - }; - - vbus_reg: vbus { - }; - }; -};