Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ceca038a authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'arm-soc/for-4.1/devicetree-part-3' of http://github.com/broadcom/stblinux into next/dt 

Merge "Broadcom Device Tree changes for 4.1 #3" from Brian Norris:

This pull request contains changes to the BCM7445 reference DTS files from
Brian:

- making a clock-frequency property decimal instead of hexadecimal

- adding the irq0 interrupt controller node to make the reference DTS bootable
  again

* tag 'arm-soc/for-4.1/devicetree-part-3' of http://github.com/broadcom/stblinux

:
  ARM: dts: brcmstb: add IRQ0 controller
  ARM: dts: brcmstb: un-hexify clock frequency

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents e0199d98 0c02acec

arch/arm/boot/dts/bcm7445.dtsi

+13 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ 
			reg-shift = <2>;

			reg-io-width = <4>;

			interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>;

			clock-frequency = <0x4d3f640>;

			clock-frequency = <81000000>;

		};



		sun_top_ctrl: syscon@404000 {
@@ -96,6 +96,18 @@ 
				     "syscon";

			reg = <0x452000 0x100>;

		};



		irq0_intc: interrupt-controller@f040a780 {

			compatible = "brcm,bcm7120-l2-intc";

			interrupt-parent = <&gic>;

			#interrupt-cells = <1>;

			reg = <0x40a780 0x8>;

			interrupt-controller;

			interrupts = <GIC_SPI 0x45 0x0>,

				     <GIC_SPI 0x43 0x0>;

			brcm,int-map-mask = <0x25c>, <0x7000000>;

			brcm,int-fwd-mask = <0x70000>;

		};

	};



	smpboot {