Commit 3f5099f0 authored by Arnd Bergmann's avatar Arnd Bergmann

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

There was a little conflict between the v4.11 bugfixes and the new changes for 4.12,
this merges the fixes into the 4.12 branch to avoid having to resolve it again.

* Broadcom fixes in mainline
  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: default avatarArnd Bergmann <arnd@arndb.de>
parents 944d01c5 0c2bf9f9
...@@ -44,7 +44,7 @@ aliases { ...@@ -44,7 +44,7 @@ aliases {
}; };
memory { memory {
reg = <0x00000000 0x10000000>; reg = <0x80000000 0x10000000>;
}; };
}; };
...@@ -107,10 +107,9 @@ partition@700000 { ...@@ -107,10 +107,9 @@ partition@700000 {
}; };
&uart0 { &uart0 {
clock-frequency = <62499840>; status = "okay";
}; };
&uart1 { &uart1 {
clock-frequency = <62499840>;
status = "okay"; status = "okay";
}; };
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment