Unverified Commit c86071e8 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'samsung-dt-5.19-2' of... 

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

Samsung DTS ARM changes for v5.19, part two

1. Cleanups: unused and undocumented dma-channels and dma-requests.
2. Correct compatible of Samsung EEPROM on S5PV210.

* tag 'samsung-dt-5.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: dts: exynos: drop useless 'dma-channels/requests' properties
  ARM: dts: s5pv210: drop useless 'dma-channels/requests' properties
  ARM: dts: exynos: add atmel,24c128 fallback to Samsung EEPROM

Link: https://lore.kernel.org/r/20220506081438.149192-4-krzysztof.kozlowski@linaro.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 6e4c9b1f d414b7a3

arch/arm/boot/dts/exynos3250.dtsi

+0 −4
Original line number Diff line number Diff line
@@ -429,8 +429,6 @@ 
			clocks = <&cmu CLK_PDMA0>;

			clock-names = "apb_pclk";

			#dma-cells = <1>;

			#dma-channels = <8>;

			#dma-requests = <32>;

		};



		pdma1: dma-controller@12690000 {
@@ -440,8 +438,6 @@ 
			clocks = <&cmu CLK_PDMA1>;

			clock-names = "apb_pclk";

			#dma-cells = <1>;

			#dma-channels = <8>;

			#dma-requests = <32>;

		};



		adc: adc@126c0000 {

arch/arm/boot/dts/exynos4.dtsi

+0 −6
Original line number Diff line number Diff line
@@ -676,8 +676,6 @@ 
			clocks = <&clock CLK_PDMA0>;

			clock-names = "apb_pclk";

			#dma-cells = <1>;

			#dma-channels = <8>;

			#dma-requests = <32>;

		};



		pdma1: dma-controller@12690000 {
@@ -687,8 +685,6 @@ 
			clocks = <&clock CLK_PDMA1>;

			clock-names = "apb_pclk";

			#dma-cells = <1>;

			#dma-channels = <8>;

			#dma-requests = <32>;

		};



		mdma1: dma-controller@12850000 {
@@ -698,8 +694,6 @@ 
			clocks = <&clock CLK_MDMA>;

			clock-names = "apb_pclk";

			#dma-cells = <1>;

			#dma-channels = <8>;

			#dma-requests = <1>;

		};



		fimd: fimd@11c00000 {

arch/arm/boot/dts/exynos4210-universal_c210.dts

+0 −2
Original line number Diff line number Diff line
@@ -666,8 +666,6 @@ 
		clocks = <&clock CLK_MDMA>;

		clock-names = "apb_pclk";

		#dma-cells = <1>;

		#dma-channels = <8>;

		#dma-requests = <1>;

		power-domains = <&pd_lcd0>;

	};

};

arch/arm/boot/dts/exynos5250-smdk5250.dts

+2 −2
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ 
	samsung,i2c-max-bus-freq = <20000>;



	eeprom@50 {

		compatible = "samsung,s524ad0xd1";

		compatible = "samsung,s524ad0xd1", "atmel,24c128";

		reg = <0x50>;

	};
@@ -289,7 +289,7 @@ 
	samsung,i2c-max-bus-freq = <20000>;



	eeprom@51 {

		compatible = "samsung,s524ad0xd1";

		compatible = "samsung,s524ad0xd1", "atmel,24c128";

		reg = <0x51>;

	};

arch/arm/boot/dts/exynos5250.dtsi

+0 −8
Original line number Diff line number Diff line
@@ -700,8 +700,6 @@ 
			clocks = <&clock CLK_PDMA0>;

			clock-names = "apb_pclk";

			#dma-cells = <1>;

			#dma-channels = <8>;

			#dma-requests = <32>;

		};



		pdma1: dma-controller@121b0000 {
@@ -711,8 +709,6 @@ 
			clocks = <&clock CLK_PDMA1>;

			clock-names = "apb_pclk";

			#dma-cells = <1>;

			#dma-channels = <8>;

			#dma-requests = <32>;

		};



		mdma0: dma-controller@10800000 {
@@ -722,8 +718,6 @@ 
			clocks = <&clock CLK_MDMA0>;

			clock-names = "apb_pclk";

			#dma-cells = <1>;

			#dma-channels = <8>;

			#dma-requests = <1>;

		};



		mdma1: dma-controller@11c10000 {
@@ -733,8 +727,6 @@ 
			clocks = <&clock CLK_MDMA1>;

			clock-names = "apb_pclk";

			#dma-cells = <1>;

			#dma-channels = <8>;

			#dma-requests = <1>;

		};



		gsc_0: gsc@13e00000 {