korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2025-01-11 16:24:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2015-04-03 11:23:19 -07:00
commit ceca038a35
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arch/arm/boot/dts/bcm7445.dtsi
View File

@ -76,7 +76,7 @@
reg-shift = <2>; reg-shift = <2>;
reg-io-width = <4>; reg-io-width = <4>;
interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>;
clock-frequency = <0x4d3f640>; clock-frequency = <81000000>;
}; };
sun_top_ctrl: syscon@404000 { sun_top_ctrl: syscon@404000 {
@ -96,6 +96,18 @@
"syscon"; "syscon";
reg = <0x452000 0x100>; 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 { smpboot {