From patchwork Sat Feb 15 09:39:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artur Weber X-Patchwork-Id: 13975996 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 E3FA6C021A0 for ; Sat, 15 Feb 2025 09:45:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type: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=97ERf3V/Bpk7MgoHGPJsnvkiQqZJeJp/kSKmJml6+us=; b=AwLcnCtNd7RqEUwfxwkO01F4bC J+1KR8sMHGhjOmhbG5ILOd1oAeVxcw0U1qrGjm7eiA17bQ9I8/IN06i82gbLTp82vR+RAJPE9YhDC MHtPZBlR4ckYhbXg5VvMqdDqIeLG0nj2v61h1R8c79Gf9EYPwbCq78reOZ0MVM80fKwwVNQc6QZ99 dSci2BbdsGwkXGTuQL0PKn0bvkKNg0kNciPMeN26mgQu2xxj3pgKU8+b4xLWTnGqNp/mseECVrK/h 5nrbaAhEhkpW5BK8LaVqYyGdZJxq/wYUafUclK9DJkbZzHmBbKoH5mWDEJ9AXAposOfFUkupH++ft Z9wH1Yug==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tjEk1-0000000HMiV-0GvW; Sat, 15 Feb 2025 09:45:41 +0000 Received: from mail-ej1-x630.google.com ([2a00:1450:4864:20::630]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tjEeO-0000000HLbJ-2dn3 for linux-arm-kernel@lists.infradead.org; Sat, 15 Feb 2025 09:39:53 +0000 Received: by mail-ej1-x630.google.com with SMTP id a640c23a62f3a-abb8045c3f3so14593666b.2 for ; Sat, 15 Feb 2025 01:39:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739612391; x=1740217191; 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=97ERf3V/Bpk7MgoHGPJsnvkiQqZJeJp/kSKmJml6+us=; b=GwCnTsotXkAwyAa0aM1LqQEtn71rK8b8UiJnSgOXeZNakT7VFIMt0ED6leisRKOU5p QL6CBQLyTwi3kYCuM26DrsVWlLbEvrDL4zBuL4tpgBky/pcJy5zKIqzRcO+TzE2KnyZX +/JpLbRIgJj+mjUXwaSGsBHsPtb+ZA2WIN3O7SwMd4ju9wzJVZk5MiP/91RTh934x64B 5QcgsvfL79kNOCfIByson7eg9N5kc5d5SmQnuYGaovcogCmwF7Dw0xvxbbmhZeSLHTKL Iisbb7xSRjotki6E78TRYaTVpwMwKeoV5FY/1T+5K1zWQgUcyaKjo4fW60/Zc6B/7hup 4axQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739612391; x=1740217191; 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=97ERf3V/Bpk7MgoHGPJsnvkiQqZJeJp/kSKmJml6+us=; b=YAM4pUWVzXCdBRyxo7DK+et4DGGpqh7Z7vZYd3R1uJ03lBvQCz6G9AUOFU2TSmZJaB A9L88Z0y8I89Yxur/+Q8dHIlQ0z6r3aLywL/8O+51HrgbWLWU4G5lfAkqnWxPUD/YJEL Xg/0X/o/BB3+NWpDVAqoACkeMXWqlBgG9JbQkATBPu7qD98pGgf4k+YKceNFjM0fB9qr VhRaT2rRwfN250oHACzB9aSrczY5qW4nmEqg+ocHdqsG9i+iHCKKeDIZX/WH2oTTD7cK n9vcWr1xcAgb/aG9+nwP8K2SLUtHdZPb7ANI/U1efdVWXHJoCioieARoTAm9ojWoCz1E FsXw== X-Forwarded-Encrypted: i=1; AJvYcCWZar4e3sviLL23UFXSIwcE7Rh20zycyEebYc9EiZ7t8wKdJ6mt998OFiyjH/5dEGAp2+480IQni7kkKMvTmb7V@lists.infradead.org X-Gm-Message-State: AOJu0Yy+8lxXAKKmjBbIBOTeu2y1rjEkF66jsFzYJCq5cApcLyQ1vy8G K4rxgKiDvq3bXHUrNK8dKci5X8pTcStGA57pqoxfQmcHARbw0/Um X-Gm-Gg: ASbGncuh4JyLSTQ29oWe1G10ok2QbmXfjvkDAEOFRxQe10HoOXVuoV7hqle6dD3PTto 5drYyEXRJEdND0wtm0v1jXBMxVrrgrijXLGEB4GZ9oOr7g9v+ccZuozTw44RvR1Me3VKtwroJDx Fzt1rI82MVW4q7CzZVywftvG8dlP47XMFR3KJAEsLDfWeqk+erZB829J//Oo1r9hAe6J8NQOzwZ jJAFE/i9r64EQjY4GETnURP8k6Omtbz3Pgt9rh6JsdYeNo7gqGzLtEs0CpF7S7eHpUmkXjlI86J 2aGW50ht+yitF6oBdHJ8UbzUOM+YO8Wx8LHDrdAjW6VpT01DOt8xsMaPRFw7cg== X-Google-Smtp-Source: AGHT+IEmnfJdkVs52L6LtS2eYqiXXVArGWoGY9+5/Wydc6pEP0Nw9yS668U0eiqIjzSLV5V8VEZv8w== X-Received: by 2002:a17:907:9494:b0:ab7:d537:91cb with SMTP id a640c23a62f3a-abb70aa6217mr212329266b.7.1739612391125; Sat, 15 Feb 2025 01:39:51 -0800 (PST) Received: from hex.my.domain (83.8.115.239.ipv4.supernova.orange.pl. [83.8.115.239]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-abb7aecd3d5sm69698966b.148.2025.02.15.01.39.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Feb 2025 01:39:49 -0800 (PST) From: Artur Weber Date: Sat, 15 Feb 2025 10:39:38 +0100 Subject: [PATCH v4 3/9] ARM: dts: Drop DTS for BCM59056 PMU MIME-Version: 1.0 Message-Id: <20250215-bcm59054-v4-3-dbfb2d76a855@gmail.com> References: <20250215-bcm59054-v4-0-dbfb2d76a855@gmail.com> In-Reply-To: <20250215-bcm59054-v4-0-dbfb2d76a855@gmail.com> To: Lee Jones , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Liam Girdwood , Mark Brown , Florian Fainelli , Ray Jui , Scott Branden , Broadcom internal kernel review list Cc: Stanislav Jakubek , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, ~postmarketos/upstreaming@lists.sr.ht, Artur Weber X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1739612381; l=4265; i=aweber.kernel@gmail.com; s=20231030; h=from:subject:message-id; bh=oSsgHxWm93UX4Dr0gTfLMbljoK+SAeJiEhBDHrh1GCg=; b=fjXL2zGg8ujsZq9zIspXdWAZocT7+/ynnRoq3vtY6cN/EMAPNNhRAykXbVwC4fTyzU6uFjpD4 67PUnbgruY4BbzW1zdF7UlNGtCMUNBC60UObuTumMaUNHHAh3s4tyGn 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-20250215_013952_690847_17F037E6 X-CRM114-Status: GOOD ( 14.14 ) 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 PMU has its own separate DTSI, meant to be included in a DTS file after defining the pmu node on some I2C bus. This seems rather unintuitive; drop the DTS in favor of adding the BCM59056 PMU node directly into the device DTS files. If the amount of subdevices supported by the BCM590xx grows, and a common device tree turns out to be beneficial, it can be reintroduced in the future. Signed-off-by: Artur Weber --- Changes in v4: - PMIC -> PMU in commit message --- 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 2f3634545e64978888cd0b47fd5647a5e2eb8e07..cefaa9a3c45c9c90bffc08f739161d8ea21d98dd 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 a9bb7ad81378d88811c4473763c579d3d2c006a1..0000000000000000000000000000000000000000 --- 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 { - }; - }; -};