Commit 3be77fe8 authored by Florian Fainelli's avatar Florian Fainelli
Browse files

Merge tag 'bcm2835-dt-next-2018-07-03' into devicetree/next 



This pull request brings in a board DT for the Raspberry Pi Compute
Module and its I/O board, the Pi3's PMU node, and the display's
transposer block.

Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
parents 2bebdfcd b7dd29b4

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/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>;

arch/arm/boot/dts/bcm283x.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -66,6 +66,12 @@ timer@7e003000 { 
			clock-frequency = <1000000>;

		};



		txp@7e004000 {

			compatible = "brcm,bcm2835-txp";

			reg = <0x7e004000 0x20>;

			interrupts = <1 11>;

		};



		dma: dma@7e007000 {

			compatible = "brcm,bcm2835-dma";

			reg = <0x7e007000 0xf00>;