Commit c79306d5 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'arm-soc/for-4.19/devicetree' of https://github.com/Broadcom/stblinux into next/dt 

This pull request contains Broadcom ARM-based SoCs Device Tree changes
for 4.19, please pull the following:

- Clement adds ethernet aliases to the Cygnus DTS include file such that
  a DT aware bootloader such as u-boot can properly insert MAC addresses

- Mohamed adds a Device Tree node for the HWRNG found on Cygnus SoCs

- Vivek migrates all the BCM5301x (Northstar) Device Tree sources to use
  the proper USB 3.0 PHY representation using its parent MDIO bus.
  Vivek also completes the Linksys EA9500 Device Tree by adding support
  for LEDs, internal and external switches.

- Rafal adds the ARM architected timer to the BCM53573 Device Tree
  include file.

- Eric adds the Performance Monitoring Unit to the BCM2837 DTS include
  file since it was absent before

- Boris adds the BCM283x transposer block to the Device Tree

- Stefan adds the Raspberry Pi Compute Module (CM1) Device Tree include
  and sources.

* tag 'arm-soc/for-4.19/devicetree' of https://github.com/Broadcom/stblinux

:
  ARM: dts: BCM5301X: Add support for Linksys EA9500
  ARM: dts: BCM53573: Add architected timer
  ARM: dts: BCM5301X: Make USB 3.0 PHY use MDIO PHY driver
  ARM: dts: cygnus: enable iproc-hwrng
  ARM: dts: cygnus: add ethernet0 alias
  ARM: dts: bcm283x: Add Transposer block
  ARM: dts: bcm283x: Add the PMU to the devicetree.
  ARM: dts: add Raspberry Pi Compute Module and IO board

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 5665ab3a 3be77fe8

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ dtb-$(CONFIG_ARCH_BCM2835) += \ 
	bcm2835-rpi-b-rev2.dtb \

	bcm2835-rpi-b-plus.dtb \

	bcm2835-rpi-a-plus.dtb \

	bcm2835-rpi-cm1-io1.dtb \

	bcm2836-rpi-2-b.dtb \

	bcm2837-rpi-3-b.dtb \

	bcm2837-rpi-3-b-plus.dtb \

arch/arm/boot/dts/bcm-cygnus.dtsi

+9 −0
Original line number Diff line number Diff line
@@ -41,6 +41,10 @@ / { 
	model = "Broadcom Cygnus SoC";

	interrupt-parent = <&gic>;



	aliases {

		ethernet0 = &eth0;

	};



	cpus {

		#address-cells = <1>;

		#size-cells = <0>;
@@ -417,6 +421,11 @@ spi2: spi@1802a000 { 
			status = "disabled";

		};



		rng: rng@18032000 {

			compatible = "brcm,iproc-rng200";

			reg = <0x18032000 0x28>;

		};



		sdhci0: sdhci@18041000 {

			compatible = "brcm,sdhci-iproc-cygnus";

			reg = <0x18041000 0x100>;

arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts

0 → 100644
+88 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/dts-v1/;

#include "bcm2835-rpi-cm1.dtsi"

#include "bcm283x-rpi-usb-host.dtsi"



/ {

	compatible = "raspberrypi,compute-module", "brcm,bcm2835";

	model = "Raspberry Pi Compute Module IO board rev1";

};



&gpio {

	/*

	 * This is based on the official GPU firmware DT blob.

	 *

	 * Legend:

	 * "NC" = not connected (no rail from the SoC)

	 * "FOO" = GPIO line named "FOO" on the schematic

	 * "FOO_N" = GPIO line named "FOO" on schematic, active low

	 */

	gpio-line-names = "GPIO0",

			  "GPIO1",

			  "GPIO2",

			  "GPIO3",

			  "GPIO4",

			  "GPIO5",

			  "GPIO6",

			  "GPIO7",

			  "GPIO8",

			  "GPIO9",

			  "GPIO10",

			  "GPIO11",

			  "GPIO12",

			  "GPIO13",

			  "GPIO14",

			  "GPIO15",

			  "GPIO16",

			  "GPIO17",

			  "GPIO18",

			  "GPIO19",

			  "GPIO20",

			  "GPIO21",

			  "GPIO22",

			  "GPIO23",

			  "GPIO24",

			  "GPIO25",

			  "GPIO26",

			  "GPIO27",

			  "GPIO28",

			  "GPIO29",

			  "GPIO30",

			  "GPIO31",

			  "GPIO32",

			  "GPIO33",

			  "GPIO34",

			  "GPIO35",

			  "GPIO36",

			  "GPIO37",

			  "GPIO38",

			  "GPIO39",

			  "GPIO40",

			  "GPIO41",

			  "GPIO42",

			  "GPIO43",

			  "GPIO44",

			  "GPIO45",

			  "HDMI_HPD_N",

			  /* Also used as ACT LED */

			  "EMMC_EN_N",

			  /* Used by eMMC */

			  "SD_CLK_R",

			  "SD_CMD_R",

			  "SD_DATA0_R",

			  "SD_DATA1_R",

			  "SD_DATA2_R",

			  "SD_DATA3_R";



	pinctrl-0 = <&gpioout &alt0>;

};



&hdmi {

	hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;

};



&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_gpio14>;

	status = "okay";

};

arch/arm/boot/dts/bcm2835-rpi-cm1.dtsi

0 → 100644
+34 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/dts-v1/;

#include "bcm2835.dtsi"

#include "bcm2835-rpi.dtsi"



/ {

	leds {

		act {

			gpios = <&gpio 47 GPIO_ACTIVE_LOW>;

		};

	};



	reg_3v3: fixed-regulator {

		compatible = "regulator-fixed";

		regulator-name = "3V3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		regulator-always-on;

	};



	reg_1v8: fixed-regulator {

		compatible = "regulator-fixed";

		regulator-name = "1V8";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

		regulator-always-on;

	};

};



&sdhost {

	non-removable;

	vmmc-supply = <&reg_3v3>;

	vqmmc-supply = <&reg_1v8>;

};

arch/arm/boot/dts/bcm2837.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -17,6 +17,12 @@ local_intc: local_intc@40000000 { 
		};

	};



	arm-pmu {

		compatible = "arm,cortex-a53-pmu";

		interrupt-parent = <&local_intc>;

		interrupts = <9 IRQ_TYPE_LEVEL_HIGH>;

	};



	timer {

		compatible = "arm,armv7-timer";

		interrupt-parent = <&local_intc>;