Commit 358b5f73 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'v4.19-next-fixes' of... 

Merge tag 'v4.19-next-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux into fixes

DT mt7622:
- Kernelci awaits a working stdout-path.
  Fix the path for reference board and bananapi-r64
- General propouse timer has issues with clocks that didn't
  get probed early. Delete the DT node as the timer isn't
  need, a ARM arch timer exists on the system.

* tag 'v4.19-next-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux

:
  arm64: dts: mt7622: Drop the general purpose timer node
  arm64: dts: mt7622: fix no more console output on BPI-R64 board
  arm64: dts: mt7622: fix no more console output on rfb1

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

arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts

+6 −1
Original line number Diff line number Diff line
@@ -16,8 +16,13 @@ 
	model = "Bananapi BPI-R64";

	compatible = "bananapi,bpi-r64", "mediatek,mt7622";



	aliases {

		serial0 = &uart0;

	};



	chosen {

		bootargs = "earlycon=uart8250,mmio32,0x11002000 console=ttyS0,115200n1 swiotlb=512";

		stdout-path = "serial0:115200n8";

		bootargs = "earlycon=uart8250,mmio32,0x11002000 swiotlb=512";

	};



	cpus {

arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts

+6 −1
Original line number Diff line number Diff line
@@ -17,8 +17,13 @@ 
	model = "MediaTek MT7622 RFB1 board";

	compatible = "mediatek,mt7622-rfb1", "mediatek,mt7622";



	aliases {

		serial0 = &uart0;

	};



	chosen {

		bootargs = "earlycon=uart8250,mmio32,0x11002000 console=ttyS0,115200n1 swiotlb=512";

		stdout-path = "serial0:115200n8";

		bootargs = "earlycon=uart8250,mmio32,0x11002000 swiotlb=512";

	};



	cpus {

arch/arm64/boot/dts/mediatek/mt7622.dtsi

+0 −10
Original line number Diff line number Diff line
@@ -227,16 +227,6 @@ 
		#reset-cells = <1>;

	};



	timer: timer@10004000 {

		compatible = "mediatek,mt7622-timer",

			     "mediatek,mt6577-timer";

		reg = <0 0x10004000 0 0x80>;

		interrupts = <GIC_SPI 152 IRQ_TYPE_LEVEL_LOW>;

		clocks = <&infracfg CLK_INFRA_APXGPT_PD>,

			 <&topckgen CLK_TOP_RTC>;

		clock-names = "system-clk", "rtc-clk";

	};



	scpsys: scpsys@10006000 {

		compatible = "mediatek,mt7622-scpsys",

			     "syscon";

CRA Git | Maintained and supported by SUSTech CRA and CCSE