Commit f40624e8 authored Mar 13, 2017 by Olof Johansson

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>

parents 9aea151f 0c2bf9f9

arch/arm/boot/dts/bcm5301x.dtsi

+2 −2

Original line number	Diff line number	Diff line
		@@ -66,14 +66,14 @@
		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>;
		};

arch/arm/boot/dts/bcm953012k.dts

+2 −3

Original line number	Diff line number	Diff line
		@@ -48,15 +48,14 @@
		};

		memory {
		reg = <0x00000000 0x10000000>;
		reg = <0x80000000 0x10000000>;
		};
		};

		&uart0 {
		clock-frequency = <62499840>;
		status = "okay";
		};

		&uart1 {
		clock-frequency = <62499840>;
		status = "okay";
		};