Unverified Commit bb138ad9 authored by Florian Fainelli's avatar Florian Fainelli
Browse files

Merge tag 'tags/bcm2835-dt-next-2018-09-09' into devicetree/next 



This pull request brings in a board DT for the Raspberry Pi Compute
Module 3, its I/O board and enables the Ethernet LEDs for the RPi 3B+.

Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
parents ccf8b4e4 6ef5bd6c

Documentation/devicetree/bindings/arm/bcm/brcm,bcm2835.txt

+8 −0
Original line number Diff line number Diff line
@@ -42,6 +42,14 @@ Raspberry Pi Compute Module 
Required root node properties:

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



Raspberry Pi Compute Module 3

Required root node properties:

compatible = "raspberrypi,3-compute-module", "brcm,bcm2837";



Raspberry Pi Compute Module 3 Lite

Required root node properties:

compatible = "raspberrypi,3-compute-module-lite", "brcm,bcm2837";



Raspberry Pi Zero

Required root node properties:

compatible = "raspberrypi,model-zero", "brcm,bcm2835";

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ dtb-$(CONFIG_ARCH_BCM2835) += \ 
	bcm2836-rpi-2-b.dtb \

	bcm2837-rpi-3-b.dtb \

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

	bcm2837-rpi-cm3-io3.dtb \

	bcm2835-rpi-zero.dtb \

	bcm2835-rpi-zero-w.dtb

dtb-$(CONFIG_ARCH_BCM_5301X) += \

arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts

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

/dts-v1/;

#include "bcm2837-rpi-cm3.dtsi"

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



/ {

	compatible = "raspberrypi,3-compute-module", "brcm,bcm2837";

	model = "Raspberry Pi Compute Module 3 IO board V3.0";

};



&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",

			  "GPIO46",

			  "GPIO47",

			  /* 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 = <&expgpio 1 GPIO_ACTIVE_LOW>;

};



&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_gpio14>;

	status = "okay";

};

arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi

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

/dts-v1/;

#include "bcm2837.dtsi"

#include "bcm2835-rpi.dtsi"



/ {

	memory {

		reg = <0 0x40000000>;

	};



	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;

	};

};



&firmware {

	expgpio: gpio {

		compatible = "raspberrypi,firmware-gpio";

		gpio-controller;

		#gpio-cells = <2>;

		gpio-line-names = "HDMI_HPD_N",

				  "EMMC_EN_N",

				  "NC",

				  "NC",

				  "NC",

				  "NC",

				  "NC",

				  "NC";

		status = "okay";

	};

};



&sdhost {

	pinctrl-names = "default";

	pinctrl-0 = <&sdhost_gpio48>;

	bus-width = <4>;

	vmmc-supply = <&reg_3v3>;

	vqmmc-supply = <&reg_1v8>;

	status = "okay";

};

arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi

+14 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#include <dt-bindings/net/microchip-lan78xx.h>



/ {

	aliases {

		ethernet0 = &ethernet;
@@ -21,6 +23,18 @@ usb-port@1 { 
			ethernet: ethernet@1 {

				compatible = "usb424,7800";

				reg = <1>;



				mdio {

					#address-cells = <0x1>;

					#size-cells = <0x0>;

					eth_phy: ethernet-phy@1 {

						reg = <1>;

						microchip,led-modes = <

							LAN78XX_LINK_1000_ACTIVITY

							LAN78XX_LINK_10_100_ACTIVITY

						>;

					};

				};

			};

		};

	};