ARM: BCM5301X: add Meraki MR32 series

mark the Meraki MR32 and its SoC (BCM53016) as supported in the bindings documentation file.

A quick look on Broadcom BCM5301x series umbrella website reveals:

<https://www.broadcom.com/products/embedded-and-networking-processors/communications/bcm5301x>

"BCM53012 and BCM53016 with dual-core Cortex-A9 CPU at 1 GHz, 256KB L2 cache,
16-bit DDR2 interface, USB3 integrated switch, GPHYs and packet accelerator".

As far as I can tell, Broadcom considers the SoC to be a version of the BCM53012.

Signed-off-by Christian Lamparter <[email protected]>

Acked-by Scott Branden <[email protected]>

---

The BCM53016 in the Meraki MR32 uses the on-chip PWM controller to drive a tri-color RGB LED. Since I plan to use the PWM, I made a label for the pwm's pinmux node. This way, it can be easily referenced.... And Also included a label for the i2c since I'm going to need it in the future too.

Signed-off-by Christian Lamparter <[email protected]>

Acked-by Scott Branden <[email protected]>

---

The BCM53016 in the Meraki MR32 utilizes the third "uart2" to connect to a on-board Bluetooth-LE 4.0 BCM20732 chip.

Signed-off-by Christian Lamparter <[email protected]>

Reviewed-by Scott Branden <[email protected]>

---

The SoC supports three pcie ports. Currently, only pcie0 and pcie1 are enabled. This patch adds the pcie2 port as well.

Signed-off-by Christian Lamparter <[email protected]>

Reviewed-by Scott Branden <[email protected]>

---

This patch extends the existing entry for the "BROADCOM BCM5301X ARM ARCHITECTURE" to include files belonging to the BCM5301X.

Signed-off-by Christian Lamparter <[email protected]>

Acked-by Scott Branden <[email protected]>

---

add support for the Cisco Meraki MR32.
This is a dual-band enterprise class 802.11ac access point. The unit was donated by Chris Blake. Thank you!

SoC:    Broadcom BCM53016A1 (1 GHz, 2 cores)
RAM:    128 MiB
NAND:   128 MiB Spansion S34ML01G2 (~114 MiB useable)
ETH:    1GBit Ethernet Port - PoE
WIFI1:  Broadcom BCM43520 an+ac (2x2:2 - id: 0x4352)
WIFI2:  Broadcom BCM43520 bgn (2x2:2 - id: 0x4352)
WIFI3:  Broadcom BCM43428 abgn (1x1:1 - id: 43428)

BLE:    Broadcom BCM20732 (ttyS1)
LEDS:   1 x Programmable RGB Status LED (driven by a PWM)
        1 x White LED (GPIO)
        1 x Orange LED Fault Indicator (GPIO)
        2 x LAN Activity / Speed LEDs (On the RJ45 Port)
BUTTON: one Reset button
MISC:   AT24C64 8KiB EEPROM (i2c - stores Ethernet MAC)

ina219 hardware monitor (i2c)
Kensington Lock

SERIAL:
WARNING: The serial port needs a TTL/RS-232 3V3 level converter! The Serial setting is 115200-8-N-1. The board has a populated right angle 1x4 0.1" pinheader.
The pinout is: VCC, RX, TX, GND.

Odd stuff:
- uart0 clock frequency is 62.5 MHz.
- The LEDs are labeled as SYS-LED1 through SYS-LED3 because of the silkscreen on the PCB.
- the original u-boot has been compiled with most functions and commands disabled. The u-boot env isn't setup properly either and as a result, the bcm47xxpart probing is not working. Hence, the nand partitions are specified through a "fixed-partition" binding.
- The "WICED SMART(TM)" Bluetooth LE 4.0 BCM20732 chip is connected to uart2 of the SoC. The BCM20732 does not provide a HCI. So the linux' bluetooth stack is useless. The mock-up node with the compatible binding and enable-gpios property is provided solely as documentation.

Signed-off-by Christian Lamparter <[email protected]>

---

add support for the Cisco Meraki MR32.
This is a dual-band enterprise class 802.11ac access point. The unit was donated by Chris Blake. Thank you!

SoC:    Broadcom BCM53016A1 (1 GHz, 2 cores)
RAM:    128 MiB
NAND:   128 MiB Spansion S34ML01G2 (~114 MiB useable)
ETH:    1GBit Ethernet Port - PoE
WIFI1:  Broadcom BCM43520 an+ac (2x2:2 - id: 0x4352)
WIFI2:  Broadcom BCM43520 bgn (2x2:2 - id: 0x4352)
WIFI3:  Broadcom BCM43428 abgn (1x1:1 - id: 43428)

BLE:    Broadcom BCM20732 (ttyS1)
LEDS:   1 x Programmable RGB Status LED (driven by a PWM)
         1 x White LED (GPIO)
         1 x Orange LED Fault Indicator (GPIO)
         2 x LAN Activity / Speed LEDs (On the RJ45 Port)
BUTTON: one Reset button
MISC:   AT24C64 8KiB EEPROM (i2c - stores Ethernet MAC)

ina219 hardware monitor (i2c)
Kensington Lock

SERIAL:
WARNING: The serial port needs a TTL/RS-232 3V3 level converter!
The Serial setting is 115200-8-N-1. The board has a populated right angle 1x4 0.1" pinheader.
The pinout is: VCC, RX, TX, GND.

Odd stuff:
- uart0 clock frequency is 62.5 MHz.
- The LEDs are labeled as SYS-LED1 through SYS-LED3 because of the silkscreen on the PCB.
- the original u-boot has been compiled with most functions and commands disabled. The u-boot env isn't setup properly either and as a result, the bcm47xxpart probing is not working. Hence, the nand partitions are specified through a "fixed-partition" binding.
- The "WICED SMART(TM)" Bluetooth LE 4.0 BCM20732 chip is connected to uart2 of the SoC. The BCM20732 does not provide a HCI. So the linux' bluetooth stack is useless. The mock-up node with the compatible binding and enable-gpios property is provided solely as documentation.

Signed-off-by Christian Lamparter <[email protected]>

---

v1 -> v2:
- fixed order of boards in Makefile. (Scott Branden)
- added device_type to memory node. (Florian Fainelli)
- added hw i2c, although doesn't work. (Florian Fainelli)
- renamed gpio-keys to just keys.
- included pinmux configurations for i2c and pwm.

---
  arch/arm/boot/dts/Makefile                 |   1 +
  arch/arm/boot/dts/bcm53016-meraki-mr32.dts | 219 +++++++++++++++++++++
  2 files changed, 220 insertions(+)

create mode 100644 arch/arm/boot/dts/bcm53016-meraki-mr32.dts

arch/arm/boot/dts/Makefile +1 -0

index 4572db3fa5ae..d254ca2a942d 100644
@@ -127,6 +127,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \
  	bcm47094-luxul-xwr-3150-v1.dtb \
  	bcm47094-netgear-r8500.dtb \
  	bcm47094-phicomm-k3.dtb \
+	bcm53016-meraki-mr32.dtb \
  	bcm94708.dtb \
  	bcm94709.dtb \
  	bcm953012er.dtb \

arch/arm/boot/dts/bcm53016-meraki-mr32.dts new file +126 -0

new file mode 100644
index 000000000000..7306df7ff704
@@ -0,0 +1,219 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+/*
+ * Broadcom BCM470X / BCM5301X ARM platform code.
+ * DTS for Meraki MR32 / Codename: Espresso
+ *
+ * Copyright (C) 2018-2020 Christian Lamparter <[email protected]>
+ */
+
+/dts-v1/;
+
+#include "bcm4708.dtsi"
+#include "bcm5301x-nand-cs0-bch8.dtsi"
+#include <dt-bindings/leds/common.h>
+
+/ {
+	compatible = "meraki,mr32", "brcm,brcm53016", "brcm,bcm4708";
+	model = "Meraki MR32";
+
+	chosen {
+		bootargs = " console=ttyS0,115200n8 earlycon";
+	};
+
+	memory {
+		reg = <0x00000000 0x08000000>;
+		device_type = "memory";
+	};
+
+	aliases {
+		serial1 = &uart2;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		sysled3 {
+			function = LED_FUNCTION_FAULT;
+			color = <LED_COLOR_ID_AMBER>;
+			gpios = <&chipcommon 18 GPIO_ACTIVE_LOW>;
+			panic-indicator;
+		};
+		sysled2 {
+			function = LED_FUNCTION_INDICATOR;
+			color = <LED_COLOR_ID_WHITE>;
+			gpios = <&chipcommon 19 GPIO_ACTIVE_HIGH>;
+		};
+	};
+
+	keys {
+		compatible = "gpio-keys";
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		restart {
+			label = "Reset";
+			linux,code = <KEY_RESTART>;
+			gpios = <&chipcommon 21 GPIO_ACTIVE_LOW>;
+		};
+	};
+
+	pwm-leds {
+		compatible = "pwm-leds";
+
+		red {
+			/* SYS-LED 1 - Tricolor */
+			function = LED_FUNCTION_INDICATOR;
+			color = <LED_COLOR_ID_RED>;
+			pwms = <&pwm 0 50000 0>;
+			max-brightness = <255>;
+		};
+
+		green {
+			/* SYS-LED 1 - Tricolor */
+			function = LED_FUNCTION_POWER;
+			color = <LED_COLOR_ID_GREEN>;
+			pwms = <&pwm 1 50000 0>;
+			max-brightness = <255>;
+		};
+
+		blue {
+			/* SYS-LED 1 - Tricolor */
+			function = LED_FUNCTION_INDICATOR;
+			color = <LED_COLOR_ID_BLUE>;
+			pwms = <&pwm 2 50000 0>;
+			max-brightness = <255>;
+		};
+	};
+
+	i2c {
+		/*
+		 * The platform provided I2C does not budge.
+		 * This is a replacement until I can figure
+		 * out what are the missing bits...
+		 */
+
+		compatible = "i2c-gpio";
+		sda-gpios = <&chipcommon 5 GPIO_ACTIVE_HIGH>;
+		scl-gpios = <&chipcommon 4 GPIO_ACTIVE_HIGH>;
+		i2c-gpio,delay-us = <10>; /* close to 100 kHz */
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		current_sense: ina219@45 {
+			compatible = "ti,ina219";
+			reg = <0x45>;
+			shunt-resistor = <60000>; /* = 60 mOhms */
+		};
+
+		eeprom: eeprom@50 {
+			compatible = "atmel,24c64";
+			reg = <0x50>;
+			pagesize = <32>;
+			read-only;
+		};
+	};
+};
+
+&i2c0 {
+	/* status = "okay"; - can be enabled once it works. */
+
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinmux_i2c>;
+
+	clock-frequency = <100000>;
+
+	current_sense: ina219@45 {
+		compatible = "ti,ina219";

Quoted 4 lines · Christian Lamparter

add support for the Cisco Meraki MR32.
This is a dual-band enterprise class 802.11ac access point. The unit was donated by Chris Blake. Thank you!

Quoted 40 lines

(quoted diff) +40 -0

+
+    i2c {
+        /*
+         * The platform provided I2C does not budge.
+         * This is a replacement until I can figure
+         * out what are the missing bits...
+         */
+
+        compatible = "i2c-gpio";
+        sda-gpios = <&chipcommon 5 GPIO_ACTIVE_HIGH>;
+        scl-gpios = <&chipcommon 4 GPIO_ACTIVE_HIGH>;
+        i2c-gpio,delay-us = <10>; /* close to 100 kHz */
+        #address-cells = <1>;
+        #size-cells = <0>;
+
+        current_sense: ina219@45 {
+            compatible = "ti,ina219";
+            reg = <0x45>;
+            shunt-resistor = <60000>; /* = 60 mOhms */
+        };
+
+        eeprom: eeprom@50 {
+            compatible = "atmel,24c64";
+            reg = <0x50>;
+            pagesize = <32>;
+            read-only;
+        };
+    };
+};
+
+&i2c0 {
+    /* status = "okay"; - can be enabled once it works. */
+
+    pinctrl-names = "default";
+    pinctrl-0 = <&pinmux_i2c>;
+
+    clock-frequency = <100000>;
+
+    current_sense: ina219@45 {
+        compatible = "ti,ina219";

Review

Quoted 10 lines

(quoted diff) +10 -0

+        reg = <0x45>;
+        shunt-resistor = <60000>; /* = 60 mOhms */
+    };
+
+    eeprom: eeprom@50 {
+        compatible = "atmel,24c64";
+        reg = <0x50>;
+        pagesize = <32>;
+        read-only;
+    };

These would create duplicate labels which are hard errors per DTC,
so I took out the entire &i2c0 override here into what I merged into devicetree/next.

This cannot have built for you unless you run dtc with the force flag, is that how OpenWrt does it?

Hello,

Quoted 7 lines · Florian Fainelli

Quoted 4 lines · Christian Lamparter

add support for the Cisco Meraki MR32.
This is a dual-band enterprise class 802.11ac access point. The unit was donated by Chris Blake. Thank you!

[...]

Quoted 54 lines

Quoted 40 lines

(quoted diff) +40 -0

+
+    i2c {
+        /*
+         * The platform provided I2C does not budge.
+         * This is a replacement until I can figure
+         * out what are the missing bits...
+         */
+
+        compatible = "i2c-gpio";
+        sda-gpios = <&chipcommon 5 GPIO_ACTIVE_HIGH>;
+        scl-gpios = <&chipcommon 4 GPIO_ACTIVE_HIGH>;
+        i2c-gpio,delay-us = <10>; /* close to 100 kHz */
+        #address-cells = <1>;
+        #size-cells = <0>;
+
+        current_sense: ina219@45 {
+            compatible = "ti,ina219";
+            reg = <0x45>;
+            shunt-resistor = <60000>; /* = 60 mOhms */
+        };
+
+        eeprom: eeprom@50 {
+            compatible = "atmel,24c64";
+            reg = <0x50>;
+            pagesize = <32>;
+            read-only;
+        };
+    };
+};
+
+&i2c0 {
+    /* status = "okay"; - can be enabled once it works. */
+
+    pinctrl-names = "default";
+    pinctrl-0 = <&pinmux_i2c>;
+
+    clock-frequency = <100000>;
+
+    current_sense: ina219@45 {
+        compatible = "ti,ina219";

Review

Quoted 10 lines

(quoted diff) +10 -0

+        reg = <0x45>;
+        shunt-resistor = <60000>; /* = 60 mOhms */
+    };
+
+    eeprom: eeprom@50 {
+        compatible = "atmel,24c64";
+        reg = <0x50>;
+        pagesize = <32>;
+        read-only;
+    };

These would create duplicate labels which are hard errors per DTC,
so I took out the entire &i2c0 override here into what I merged into devicetree/next.

Quoted 1 line

This cannot have built for you unless you run dtc with the force flag, is that how OpenWrt does it?

I'm sorry for my mistake. Yes, I looked at this now again and my tree had this uncommited change :(.

---

$ git diff

arch/arm/boot/dts/bcm53016-meraki-mr32.dts +2 -3

index 7306df7ff704..35e733b0db62 100644
@@ -122,13 +122,13 @@ &i2c0 {
 
         clock-frequency = <100000>;
 
-       current_sense: ina219@45 {
+       /* current_sense: */ ina219@45 {
                 compatible = "ti,ina219";
                 reg = <0x45>;
                 shunt-resistor = <60000>; /* = 60 mOhms */
         };
 
-       eeprom: eeprom@50 {
+       /* eeprom: */ eeprom@50 {
                 compatible = "atmel,24c64";
                 reg = <0x50>;
                 pagesize = <32>;
---

Didn't show up when running make.

In the OpenWrt version (As OpenWrt is currently using a patched 5.4) the labels on the non-functioning i2c node are commented-out.

<https://patchwork.ozlabs.org/project/openwrt/patch/c647ad56b4adb449cd448a2bc56d58058fd06e6f.1599346205.git.chunkeey@gmail.com/>

|++&i2c0 {
|[...] (Cut)
|++
|++    /* current_sense: */ ina219@45 {
|++        compatible = "ti,ina219";
|++        reg = <0x45>;
|++        shunt-resistor = <60000>; /* = 60 mOhms */
|++    };
|++
|++    /* eeprom: */ eeprom@50 {
|++        compatible = "atmel,24c64";
|++        reg = <0x50>;
|++        pagesize = <32>;
|++        read-only;
|++    };
|++};

Ok, I'll drop the &i2c node as well in my MR32 OpenWrt series. But I'll keep a patch with the i2c node in my openwrt staging tree.

(I can't find devicetree/next on https://git.kernel.org/ . Can you please tell me the link to it?)

Hello,

I've been holding on to this devices dts' for a while now. But since the HW has been running with versions of these patches for more than a year, I do think I should make it available in upstream in order to move on.

Hardware-Info of the Meraki MR32:

This is a dual-band enterprise class 802.11ac access point. The unit was donated by Chris Blake. Thank you!

SoC:    Broadcom BCM53016A1 (1 GHz, 2 cores)
RAM:    128 MiB
NAND:   128 MiB Spansion S34ML01G2 (~114 MiB useable)
ETH:    1GBit Ethernet Port - PoE
WIFI1:  Broadcom BCM43520 an+ac (2x2:2 - id: 0x4352)
WIFI2:  Broadcom BCM43520 bgn (2x2:2 - id: 0x4352)
WIFI3:  Broadcom BCM43428 abgn (1x1:1 - id: 43428)

So far, the remaining TODOs center around the pinctrl, i2c and WIFI. The I2C is implemented with the bit-banged i2c-gpio driver as the SoC's I2C didn't budge after many hours of trying.

A patch that included the "meraki" vendor-prefix has been broken out of the series as recommended by Florian Fainelli. Here's the link:
<https://lists.ozlabs.org/pipermail/linuxppc-dev/2020-August/216949.html>