Unverified Commit 0100f76d authored by Florian Fainelli's avatar Florian Fainelli
Browse files

Merge tag 'tags/bcm2835-dt-next-2020-01-07' into devicetree/next 



Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
parents 030cc6cb 530735df

arch/arm/boot/dts/bcm2711.dtsi

+2 −4
Original line number Diff line number Diff line
@@ -112,10 +112,8 @@ 
		};



		rng@7e104000 {

			interrupts = <GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>;



			/* RNG is incompatible with brcm,bcm2835-rng */

			status = "disabled";

			compatible = "brcm,bcm2711-rng200";

			reg = <0x7e104000 0x28>;

		};



		uart2: serial@7e201400 {

arch/arm/boot/dts/bcm2835-common.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -70,6 +70,12 @@ 
			system-power-controller;

		};



		rng@7e104000 {

			compatible = "brcm,bcm2835-rng";

			reg = <0x7e104000 0x10>;

			interrupts = <2 29>;

		};



		pixelvalve@7e206000 {

			compatible = "brcm,bcm2835-pixelvalve0";

			reg = <0x7e206000 0x100>;

arch/arm/boot/dts/bcm283x.dtsi

+0 −6
Original line number Diff line number Diff line
@@ -84,12 +84,6 @@ 
				<&dsi1 0>, <&dsi1 1>, <&dsi1 2>;

		};



		rng@7e104000 {

			compatible = "brcm,bcm2835-rng";

			reg = <0x7e104000 0x10>;

			interrupts = <2 29>;

		};



		mailbox: mailbox@7e00b880 {

			compatible = "brcm,bcm2835-mbox";

			reg = <0x7e00b880 0x40>;