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

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



Maxime Ripard introduces two new clock providers into RPi4's device tree:

- The first one based on the enhancements made to clk-raspberrypi, which
  is now registered trough DT and provides control over the whole range
  of firmware based clocks.

- The second one based on the new clk-bcm2711-dvp driver, which gates
  the clocks and reset signals that feed into RPi4's HDMI0/1 blocks.

Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
parents c4f294fd 25c6f396

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

+5 −0
Original line number Diff line number Diff line
@@ -69,6 +69,11 @@ sd_vcc_reg: sd_vcc_reg { 
};



&firmware {

	firmware_clocks: clocks {

		compatible = "raspberrypi,firmware-clocks";

		#clock-cells = <1>;

	};



	expgpio: gpio {

		compatible = "raspberrypi,firmware-gpio";

		gpio-controller;

arch/arm/boot/dts/bcm2711.dtsi

+15 −0
Original line number Diff line number Diff line
@@ -12,6 +12,13 @@ / { 


	interrupt-parent = <&gicv2>;



	clk_108MHz: clk-108M {

		#clock-cells = <0>;

		compatible = "fixed-clock";

		clock-frequency = <108000000>;

		clock-output-names = "108MHz-clock";

	};



	soc {

		/*

		 * Defined ranges:
@@ -244,6 +251,14 @@ pwm1: pwm@7e20c800 { 
		hvs@7e400000 {

			interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;

		};



		dvp: clock@7ef00000 {

			compatible = "brcm,brcm2711-dvp";

			reg = <0x7ef00000 0x10>;

			clocks = <&clk_108MHz>;

			#clock-cells = <1>;

			#reset-cells = <1>;

		};

	};



	/*