Merge tag 'tags/bcm2835-dt-next-2020-03-09' into devicetree/next (381171d9) · Commits · 戴 / test

arch/arm/boot/dts/bcm2711-rpi-4-b.dts

+74 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@
		};

		aliases {
		emmc2bus = &emmc2bus;
		ethernet0 = &genet;
		};

		@@ -71,6 +72,79 @@
		};
		};

		&gpio {
		/*
		* Parts taken from rpi_SCH_4b_4p0_reduced.pdf and
		* the official GPU firmware DT blob.
		*
		* Legend:
		* "FOO" = GPIO line named "FOO" on the schematic
		* "FOO_N" = GPIO line named "FOO" on schematic, active low
		*/
		gpio-line-names = "ID_SDA",
		"ID_SCL",
		"SDA1",
		"SCL1",
		"GPIO_GCLK",
		"GPIO5",
		"GPIO6",
		"SPI_CE1_N",
		"SPI_CE0_N",
		"SPI_MISO",
		"SPI_MOSI",
		"SPI_SCLK",
		"GPIO12",
		"GPIO13",
		/* Serial port */
		"TXD1",
		"RXD1",
		"GPIO16",
		"GPIO17",
		"GPIO18",
		"GPIO19",
		"GPIO20",
		"GPIO21",
		"GPIO22",
		"GPIO23",
		"GPIO24",
		"GPIO25",
		"GPIO26",
		"GPIO27",
		"RGMII_MDIO",
		"RGMIO_MDC",
		/* Used by BT module */
		"CTS0",
		"RTS0",
		"TXD0",
		"RXD0",
		/* Used by Wifi */
		"SD1_CLK",
		"SD1_CMD",
		"SD1_DATA0",
		"SD1_DATA1",
		"SD1_DATA2",
		"SD1_DATA3",
		/* Shared with SPI flash */
		"PWM0_MISO",
		"PWM1_MOSI",
		"STATUS_LED_G_CLK",
		"SPIFLASH_CE_N",
		"SDA0",
		"SCL0",
		"RGMII_RXCLK",
		"RGMII_RXCTL",
		"RGMII_RXD0",
		"RGMII_RXD1",
		"RGMII_RXD2",
		"RGMII_RXD3",
		"RGMII_TXCLK",
		"RGMII_TXCTL",
		"RGMII_TXD0",
		"RGMII_TXD1",
		"RGMII_TXD2",
		"RGMII_TXD3";
		};

		&pwm1 {
		pinctrl-names = "default";
		pinctrl-0 = <&pwm1_0_gpio40 &pwm1_1_gpio41>;

+20 −5

Original line number	Diff line number	Diff line
		@@ -241,17 +241,32 @@
		status = "disabled";
		};

		hvs@7e400000 {
		interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
		};
		};

		/*
		* emmc2 has different DMA constraints based on SoC revisions. It was
		* moved into its own bus, so as for RPi4's firmware to update them.
		* The firmware will find whether the emmc2bus alias is defined, and if
		* so, it'll edit the dma-ranges property below accordingly.
		*/
		emmc2bus: emmc2bus {
		compatible = "simple-bus";
		#address-cells = <2>;
		#size-cells = <1>;

		ranges = <0x0 0x7e000000 0x0 0xfe000000 0x01800000>;
		dma-ranges = <0x0 0xc0000000 0x0 0x00000000 0x40000000>;

		emmc2: emmc2@7e340000 {
		compatible = "brcm,bcm2711-emmc2";
		reg = <0x7e340000 0x100>;
		reg = <0x0 0x7e340000 0x100>;
		interrupts = <GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>;
		clocks = <&clocks BCM2711_CLOCK_EMMC2>;
		status = "disabled";
		};

		hvs@7e400000 {
		interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
		};
		};

		arm-pmu {