Commit 6a346cf9 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

- Stephan adds support for the HWRNG on 2711 (Raspberry Pi 4) which is
  different than the previous Pi chips

- Florian switches the BCM956265HR board to use the hardware I2C
  controllers for interfacing with the SFPs

* tag 'arm-soc/for-5.6/devicetree' of https://github.com/Broadcom/stblinux:
  ARM: dts: bcm2711: Enable HWRNG support
  ARM: dts: bcm2835: Move rng definition to common location
  ARM: dts: NSP: Use hardware I2C for BCM958625HR

Link: https://lore.kernel.org/r/20200108191114.15987-1-f.fainelli@gmail.com


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents e052860d 0100f76d

arch/arm/boot/dts/bcm2711.dtsi

+2 −4
Original line number Diff line number Diff line
@@ -112,10 +112,8 @@ pm: watchdog@7e100000 { 
		};



		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 @@ pm: watchdog@7e100000 { 
			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 @@ clocks: cprman@7e101000 { 
				<&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>;

arch/arm/boot/dts/bcm958625hr.dts

+5 −10
Original line number Diff line number Diff line
@@ -55,18 +55,9 @@ gpio-restart { 
		priority = <200>;

	};



	/* Hardware I2C block cannot do more than 63 bytes per transfer,

	 * which would prevent reading from a SFP's EEPROM (256 byte).

	 */

	i2c1: i2c {

		compatible = "i2c-gpio";

		sda-gpios = <&gpioa 5 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;

		scl-gpios = <&gpioa 4 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;

	};



	sfp: sfp {

		compatible = "sff,sfp";

		i2c-bus = <&i2c1>;

		i2c-bus = <&i2c0>;

		mod-def0-gpios = <&gpioa 28 GPIO_ACTIVE_LOW>;

		los-gpios = <&gpioa 24 GPIO_ACTIVE_HIGH>;

		tx-fault-gpios = <&gpioa 30 GPIO_ACTIVE_HIGH>;
@@ -74,6 +65,10 @@ sfp: sfp { 
	};

};



&i2c0 {

	status = "okay";

};



&amac0 {

	status = "okay";

};