From: Marc Gonzalez <mgonzalez@freebox.fr>
To: Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
Neil Armstrong <neil.armstrong@linaro.org>,
Kevin Hilman <khilman@baylibre.com>,
Jerome Brunet <jbrunet@baylibre.com>,
Martin Blumenstingl <martin.blumenstingl@googlemail.com>,
Jiucheng Xu <jiucheng.xu@amlogic.com>
Cc: Marc Gonzalez <marc.w.gonzalez@free.fr>,
Pierre-Hugues Husson <phh@phh.me>,
linux-amlogic@lists.infradead.org,
linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v2 2/3] perf/amlogic: resolve conflict between canvas & pmu
Date: Mon, 27 Mar 2023 14:09:31 +0200 [thread overview]
Message-ID: <20230327120932.2158389-3-mgonzalez@freebox.fr> (raw)
In-Reply-To: <20230327120932.2158389-1-mgonzalez@freebox.fr>
According to S905X2 Datasheet - Revision 07:
DMC_MON area spans 0xff638080-0xff6380c0
DDR_PLL area spans 0xff638c00-0xff638c34
Round DDR_PLL area size up to 0x40
Fixes: 90cf8e21016fa3 ("arm64: dts: meson: Add DDR PMU node")
Signed-off-by: Marc Gonzalez <mgonzalez@freebox.fr>
---
arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
index a5653ab1f0b43..1aab65bb5f578 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
@@ -1585,6 +1585,12 @@ canvas: video-lut@48 {
compatible = "amlogic,canvas";
reg = <0x0 0x48 0x0 0x14>;
};
+
+ pmu: pmu@80 {
+ reg = <0x0 0x80 0x0 0x40>,
+ <0x0 0xc00 0x0 0x40>;
+ interrupts = <GIC_SPI 52 IRQ_TYPE_EDGE_RISING>;
+ };
};
usb2_phy1: phy@3a000 {
@@ -1710,12 +1716,6 @@ internal_ephy: ethernet-phy@8 {
};
};
- pmu: pmu@ff638000 {
- reg = <0x0 0xff638000 0x0 0x100>,
- <0x0 0xff638c00 0x0 0x100>;
- interrupts = <GIC_SPI 52 IRQ_TYPE_EDGE_RISING>;
- };
-
aobus: bus@ff800000 {
compatible = "simple-bus";
reg = <0x0 0xff800000 0x0 0x100000>;
--
2.25.1
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
next prev parent reply other threads:[~2023-03-27 12:18 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-27 12:09 [PATCH v2 0/3] Fix G12 PMU conflict Marc Gonzalez
2023-03-27 12:09 ` [PATCH v2 1/3] arm64: dts: meson-g12-common: specify full DMC range Marc Gonzalez
2023-03-27 12:09 ` Marc Gonzalez [this message]
2023-03-27 12:44 ` [PATCH v2 2/3] perf/amlogic: resolve conflict between canvas & pmu Marc Gonzalez
2023-03-27 14:12 ` Neil Armstrong
2023-03-28 11:56 ` Marc Gonzalez
2023-03-27 12:09 ` [PATCH v2 3/3] perf/amlogic: adjust register offsets Marc Gonzalez
2023-03-27 14:17 ` Neil Armstrong
2023-03-27 15:12 ` Will Deacon
2023-03-27 15:27 ` Neil Armstrong
2023-03-27 14:15 ` (subset) [PATCH v2 0/3] Fix G12 PMU conflict Neil Armstrong
2023-03-27 15:25 ` Marc Gonzalez
2023-03-27 15:36 ` Marc Gonzalez
2023-03-27 15:52 ` Marc Gonzalez
2023-03-29 0:01 ` Marc Gonzalez
2023-03-27 15:31 ` (subset) " Neil Armstrong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230327120932.2158389-3-mgonzalez@freebox.fr \
--to=mgonzalez@freebox.fr \
--cc=devicetree@vger.kernel.org \
--cc=jbrunet@baylibre.com \
--cc=jiucheng.xu@amlogic.com \
--cc=khilman@baylibre.com \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=linux-amlogic@lists.infradead.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=marc.w.gonzalez@free.fr \
--cc=martin.blumenstingl@googlemail.com \
--cc=neil.armstrong@linaro.org \
--cc=phh@phh.me \
--cc=robh+dt@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox