Commit 4c433276 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'amlogic-dt' of... 

Merge tag 'amlogic-dt' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into next/dt

Amlogic 32-bit DT updates for v4.21
- support more timers on meson8
- add the stdout-path property on several boards

* tag 'amlogic-dt' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic

:
  ARM: dts: meson: add the clock inputs for the Meson timer
  ARM: dts: meson: add the TIMER B/C/D interrupts
  ARM: dts: meson: consistently disable pin bias
  ARM: dts: meson8b: mxq: add the /chosen/stdout-path property
  ARM: dts: meson8: minix-neo-x8: add the /chosen/stdout-path property
  ARM: dts: meson6: atv1200: add the /chosen/stdout-path property
  dt-bindings: timer: meson6_timer: document the clock inputs
  dt-bindings: timer: meson6_timer: document all interrupts

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents e14a6df9 7b141abe

Documentation/devicetree/bindings/timer/amlogic,meson6-timer.txt

+9 −2
Original line number Diff line number Diff line
@@ -4,12 +4,19 @@ Required properties: 


- compatible : should be "amlogic,meson6-timer"

- reg : Specifies base physical address and size of the registers.

- interrupts : The interrupt of the first timer

- interrupts : The four interrupts, one for each timer event

- clocks : phandles to the pclk (system clock) and XTAL clocks

- clock-names : must contain "pclk" and "xtal"



Example:



timer@c1109940 {

	compatible = "amlogic,meson6-timer";

	reg = <0xc1109940 0x14>;

	interrupts = <0 10 1>;

	interrupts = <GIC_SPI 10 IRQ_TYPE_EDGE_RISING>,

		     <GIC_SPI 11 IRQ_TYPE_EDGE_RISING>,

		     <GIC_SPI 6 IRQ_TYPE_EDGE_RISING>,

		     <GIC_SPI 29 IRQ_TYPE_EDGE_RISING>;

	clocks = <&xtal>, <&clk81>;

	clock-names = "xtal", "pclk";

};

arch/arm/boot/dts/meson.dtsi

+5 −2
Original line number Diff line number Diff line
@@ -197,10 +197,13 @@ 
				interrupts = <GIC_SPI 0 IRQ_TYPE_EDGE_RISING>;

			};



			timer@9940 {

			timer_abcde: timer@9940 {

				compatible = "amlogic,meson6-timer";

				reg = <0x9940 0x18>;

				interrupts = <GIC_SPI 10 IRQ_TYPE_EDGE_RISING>;

				interrupts = <GIC_SPI 10 IRQ_TYPE_EDGE_RISING>,

					     <GIC_SPI 11 IRQ_TYPE_EDGE_RISING>,

					     <GIC_SPI 6 IRQ_TYPE_EDGE_RISING>,

					     <GIC_SPI 29 IRQ_TYPE_EDGE_RISING>;

			};

		};

arch/arm/boot/dts/meson6-atv1200.dts

+4 −0
Original line number Diff line number Diff line
@@ -56,6 +56,10 @@ 
		serial0 = &uart_AO;

	};



	chosen {

		stdout-path = "serial0:115200n8";

	};



	memory {

		reg = <0x40000000 0x80000000>;

	};

arch/arm/boot/dts/meson6.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -88,6 +88,11 @@ 
	status = "disabled";

};



&timer_abcde {

	clocks = <&xtal>, <&clk81>;

	clock-names = "xtal", "pclk";

};



&uart_AO {

	clocks = <&xtal>, <&clk81>, <&clk81>;

	clock-names = "xtal", "pclk", "baud";

arch/arm/boot/dts/meson8-minix-neo-x8.dts

+4 −0
Original line number Diff line number Diff line
@@ -52,6 +52,10 @@ 
		serial0 = &uart_AO;

	};



	chosen {

		stdout-path = "serial0:115200n8";

	};



	memory {

		reg = <0x40000000 0x80000000>;

	};

CRA Git | Maintained and supported by SUSTech CRA and CCSE