devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] ARM: dts: BCM5301X: Fix pin controller node
@ 2020-08-19  4:23 Florian Fainelli
  2020-08-19 15:27 ` Ray Jui
                   ` (3 more replies)
  0 siblings, 4 replies; 9+ messages in thread
From: Florian Fainelli @ 2020-08-19  4:23 UTC (permalink / raw)
  To: linux-arm-kernel
  Cc: Christian Lamparter, Florian Fainelli, Hauke Mehrtens,
	Rafał Miłecki,
	maintainer:BROADCOM BCM5301X ARM ARCHITECTURE, Rob Herring,
	open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
	open list

The pin controller resources start at 0xc0 from the CRU base which is at
0x100 from th DMU base, for a final address of 0x1800_c1c0, whereas we
are currently off by 0x100. The resource size of the CRU is also
incorrect and should end at 0x248 bytes from 0x100 which is the start
address. Finally, the compatibility strings defined for the
pin-controller node should reflect the SoC being used.

Fixes: 9994241ac97c ("ARM: dts: BCM5301X: Describe Northstar pins mux controller")
Reported-by: Christian Lamparter <chunkeey@gmail.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
Christian, can you test this as a preliminary patch for your Cisco
Meraki MR32 series? Thanks!

 arch/arm/boot/dts/bcm4708.dtsi  | 4 ++++
 arch/arm/boot/dts/bcm4709.dtsi  | 4 ++++
 arch/arm/boot/dts/bcm5301x.dtsi | 8 ++++----
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/arch/arm/boot/dts/bcm4708.dtsi b/arch/arm/boot/dts/bcm4708.dtsi
index 1a19e97a987d..5064fe51e402 100644
--- a/arch/arm/boot/dts/bcm4708.dtsi
+++ b/arch/arm/boot/dts/bcm4708.dtsi
@@ -43,6 +43,10 @@ cpu@1 {
 
 };
 
+&pinctrl {
+	compatible = "brcm,bcm4708-pinmux";
+};
+
 &uart0 {
 	status = "okay";
 };
diff --git a/arch/arm/boot/dts/bcm4709.dtsi b/arch/arm/boot/dts/bcm4709.dtsi
index e1bb8661955f..7417c275ea9d 100644
--- a/arch/arm/boot/dts/bcm4709.dtsi
+++ b/arch/arm/boot/dts/bcm4709.dtsi
@@ -5,6 +5,10 @@
 
 #include "bcm4708.dtsi"
 
+&pinctrl {
+	compatible = "brcm,bcm4709-pinmux";
+};
+
 &uart0 {
 	clock-frequency = <125000000>;
 	status = "okay";
diff --git a/arch/arm/boot/dts/bcm5301x.dtsi b/arch/arm/boot/dts/bcm5301x.dtsi
index 2d9b4dd05830..bf49943f504a 100644
--- a/arch/arm/boot/dts/bcm5301x.dtsi
+++ b/arch/arm/boot/dts/bcm5301x.dtsi
@@ -402,14 +402,14 @@ dmu@1800c000 {
 
 		cru@100 {
 			compatible = "simple-bus";
-			reg = <0x100 0x1a4>;
+			reg = <0x100 0x248>;
 			ranges;
 			#address-cells = <1>;
 			#size-cells = <1>;
 
-			pin-controller@1c0 {
-				compatible = "brcm,bcm4708-pinmux";
-				reg = <0x1c0 0x24>;
+			pinctrl: pin-controller@c0 {
+				compatible = "brcm,bcm53012-pinmux";
+				reg = <0xc0 0x24>;
 				reg-names = "cru_gpio_control";
 
 				spi-pins {
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2020-08-20 12:20 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-08-19  4:23 [PATCH] ARM: dts: BCM5301X: Fix pin controller node Florian Fainelli
2020-08-19 15:27 ` Ray Jui
2020-08-19 15:36 ` Rafał Miłecki
2020-08-19 18:28   ` Florian Fainelli
2020-08-19 20:48 ` Christian Lamparter
2020-08-19 20:49   ` Florian Fainelli
2020-08-19 21:14     ` Ray Jui
2020-08-19 21:29       ` Florian Fainelli
2020-08-20 12:20 ` Rafał Miłecki

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).