Unverified Commit 9c099a37 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'samsung-dt64-5.19' of... 

Merge tag 'samsung-dt64-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/dt

Samsung DTS ARM64 changes for v5.19

1. Cleanup: move aliases of board-related features to board in
   Exynos850.
2. Add specific compatibles to Multi Core Timer to allow stricter DT
   schema matching.

* tag 'samsung-dt64-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  arm64: dts: tesla: add a specific compatible to MCT on FSD
  arm64: dts: exynos: add a specific compatible to MCT
  arm64: dts: exynos: move aliases to board in Exynos850

Link: https://lore.kernel.org/r/20220420072152.11696-3-krzysztof.kozlowski@linaro.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 9423c823 22cbcb8f

arch/arm64/boot/dts/exynos/exynos5433.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -806,7 +806,8 @@ 
		};



		timer@101c0000 {

			compatible = "samsung,exynos4210-mct";

			compatible = "samsung,exynos5433-mct",

				     "samsung,exynos4210-mct";

			reg = <0x101c0000 0x800>;

			interrupts = <GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>,

				<GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>,

arch/arm64/boot/dts/exynos/exynos850-e850-96.dts

+5 −0
Original line number Diff line number Diff line
@@ -20,6 +20,11 @@ 
	model = "WinLink E850-96 board";

	compatible = "winlink,e850-96", "samsung,exynos850";



	aliases {

		mmc0 = &mmc_0;

		serial0 = &serial_0;

	};



	chosen {

		stdout-path = &serial_0;

	};

arch/arm64/boot/dts/exynos/exynos850.dtsi

+2 −17
Original line number Diff line number Diff line
@@ -29,22 +29,6 @@ 
		pinctrl3 = &pinctrl_hsi;

		pinctrl4 = &pinctrl_core;

		pinctrl5 = &pinctrl_peri;

		mmc0 = &mmc_0;

		serial0 = &serial_0;

		serial1 = &serial_1;

		serial2 = &serial_2;

		i2c0 = &i2c_0;

		i2c1 = &i2c_1;

		i2c2 = &i2c_2;

		i2c3 = &i2c_3;

		i2c4 = &i2c_4;

		i2c5 = &i2c_5;

		i2c6 = &i2c_6;

		i2c7 = &hsi2c_0;

		i2c8 = &hsi2c_1;

		i2c9 = &hsi2c_2;

		i2c10 = &hsi2c_3;

		i2c11 = &hsi2c_4;

	};



	arm-pmu {
@@ -181,7 +165,8 @@ 
		};



		timer@10040000 {

			compatible = "samsung,exynos4210-mct";

			compatible = "samsung,exynos850-mct",

				     "samsung,exynos4210-mct";

			reg = <0x10040000 0x800>;

			interrupts = <GIC_SPI 203 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 204 IRQ_TYPE_LEVEL_HIGH>,

arch/arm64/boot/dts/tesla/fsd.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -727,7 +727,7 @@ 
		};



		timer@10040000 {

			compatible = "samsung,exynos4210-mct";

			compatible = "tesla,fsd-mct", "samsung,exynos4210-mct";

			reg = <0x0 0x10040000 0x0 0x800>;

			interrupts = <GIC_SPI 455 IRQ_TYPE_LEVEL_HIGH>,

				<GIC_SPI 456 IRQ_TYPE_LEVEL_HIGH>,