This pull request contains Broadcom ARM-based SoC Device Tree fixes for 4.11,

please pull the following:
 
 - Jon fixes the UART output on the Broadcom bcm953012k reference board by
   using the proper clock reference instead of hard-coding the baud rate
 
 - Jon also fixes the memory map on the bcm953012k reference board by using
   the appropriate physical RAM start address
 
 - Jon finally fixes the interrupt type for the Cortex A9 global and local
   timers found in the BCM5301X SoC (Norsthar).
 -----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCAAGBQJYvLojAAoJEIfQlpxEBwcE8hEP/R82D7fGMnkTKB5QkqpzEo7O
 cd/v64fMJQ3ShFlKpr+mEpsaC8Bw4lXcavzqc2lRdoRU/3Qm4MpHMT3iq2nehHxF
 afOz/1f/NRZntAYDtWvBGYMzbktIM4NQ6wIIxVG5uhNLWNVIRpqeuOQ3ct1LyEEL
 Tpw3icgm8wjcLyVB1Gf7bPz+DQCcEz/yemsiKw1IXNpcSso57WdScbl+fjFNatXT
 EhyIbC0oo72st0NBDIfODBIMC0CCEkV32f1WHwIkqc7KUsmGZbdMatUrf9uJu9Aw
 YoWKLpkMQgtH0Oe0bo7rL0yauEy+cfYg5CFDidg3buQsHLe8REYpA2oep/eqqVj1
 8LZZOT6D6no53lya8BO9nl6HsMZg+tne7jloE1Pvyx/adBvJ/LteYV0GzkbcLT9Q
 a3nNK0exfs2Y/FIhWRqDdPszPlRSxmG2QJUMpJ9aKar3SWxPHWySFMSvn5rox0up
 eYql1MRiUVWVzpE8XtRBPcxbGX6tRoEhbsIWUysA7MxcsQeTGtpHJR9tqaEuRLhM
 68MjQNvNqB/qwUgzFc7w7b5hrFN5FLEdUomfeYGUVeLfxmK2D/mic/AlMaRlkmay
 l7LElyfZE3UWlxQHiV4Mj4tDzS2Rn+7aBQDlSX+IS1vHWj+SfYeamZqLwPF5l0O1
 TrJ0r2mxWpja5lAdM4M4
 =0Qzy
 -----END PGP SIGNATURE-----

Merge tag 'arm-soc/for-4.11/devicetree-fixes' of http://github.com/Broadcom/stblinux into fixes

This pull request contains Broadcom ARM-based SoC Device Tree fixes for 4.11,
please pull the following:

- Jon fixes the UART output on the Broadcom bcm953012k reference board by
  using the proper clock reference instead of hard-coding the baud rate

- Jon also fixes the memory map on the bcm953012k reference board by using
  the appropriate physical RAM start address

- Jon finally fixes the interrupt type for the Cortex A9 global and local
  timers found in the BCM5301X SoC (Norsthar).

* tag 'arm-soc/for-4.11/devicetree-fixes' of http://github.com/Broadcom/stblinux:
  ARM: dts: BCM5301X: Correct GIC_PPI interrupt flags
  ARM: dts: BCM5301X: Fix memory start address
  ARM: dts: BCM5301X: Fix UARTs on bcm953012k

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2017-03-13 15:12:01 -07:00
commit f40624e85b
2 changed files with 4 additions and 5 deletions

View File

@ -66,14 +66,14 @@ scu@20000 {
timer@20200 {
compatible = "arm,cortex-a9-global-timer";
reg = <0x20200 0x100>;
interrupts = <GIC_PPI 11 IRQ_TYPE_LEVEL_HIGH>;
interrupts = <GIC_PPI 11 IRQ_TYPE_EDGE_RISING>;
clocks = <&periph_clk>;
};
local-timer@20600 {
compatible = "arm,cortex-a9-twd-timer";
reg = <0x20600 0x100>;
interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_HIGH>;
interrupts = <GIC_PPI 13 IRQ_TYPE_EDGE_RISING>;
clocks = <&periph_clk>;
};

View File

@ -48,15 +48,14 @@ chosen {
};
memory {
reg = <0x00000000 0x10000000>;
reg = <0x80000000 0x10000000>;
};
};
&uart0 {
clock-frequency = <62499840>;
status = "okay";
};
&uart1 {
clock-frequency = <62499840>;
status = "okay";
};