Unverified Commit 9423c823 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

Samsung DTS ARM changes for v5.19

1. Several DT schema related changes to make DTBs passing schema checks:
   EHCI/OHCI/DMA/Ethernet node names, DMA channels order, USB-like
   compatibles.
2. Add specific compatibles to Multi Core Timer to allow stricter DT
   schema matching.
3. Cleanup from deprecated bindings:
   - Remove deprecated unit-address workaround for Exynos5422 Odroid XU3
     LPDDR3 memory timings.
   - Do not use unit-address (and SFR region) in Exynos5250 MIPI phy in
     favor of syscon node (unit-address deprecated in 2016).
   - Use standard generic PHYs for EHCI/OHCI device in S5PV210.
4. Fix inverted SPI CS (thus blank panel) on S5PV210 Aries boards.
5. Correct Bluetooth interupt name on S5PV210 Aries boards.

* tag 'samsung-dt-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: dts: s5pv210: align DMA channels with dtschema
  ARM: dts: s5pv210: Adjust DMA node names to match spec
  ARM: dts: s5pv210: Adjust memory reg entries to match spec
  ARM: dts: s5pv210: Correct interrupt name for bluetooth in Aries
  ARM: dts: s5pv210: Remove spi-cs-high on panel in Aries
  ARM: dts: s5pv210: Use standard arrays of generic PHYs for EHCI/OHCI device
  ARM: dts: s5pv210: align EHCI/OHCI nodes with dtschema
  ARM: dts: exynos: align EHCI/OHCI nodes with dtschema on Exynos4
  ARM: dts: exynos: drop deprecated SFR region from MIPI phy
  ARM: dts: exynos: add a specific compatible to MCT
  ARM: dts: exynos: remove deprecated unit address for LPDDR3 timings on Odroid
  ARM: dts: exynos: fix compatible strings for Ethernet USB devices
  ARM: dts: exynos: fix ethernet node name for different odroid boards

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 75e64de8 9e916fb9

arch/arm/boot/dts/exynos3250.dtsi

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



		timer@10050000 {

			compatible = "samsung,exynos4210-mct";

			compatible = "samsung,exynos3250-mct",

				     "samsung,exynos4210-mct";

			reg = <0x10050000 0x800>;

			interrupts = <GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH>,

arch/arm/boot/dts/exynos4.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -373,7 +373,7 @@ 
			status = "disabled";

		};



		ehci: ehci@12580000 {

		ehci: usb@12580000 {

			compatible = "samsung,exynos4210-ehci";

			reg = <0x12580000 0x100>;

			interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>;
@@ -384,7 +384,7 @@ 
			phy-names = "host", "hsic0", "hsic1";

		};



		ohci: ohci@12590000 {

		ohci: usb@12590000 {

			compatible = "samsung,exynos4210-ohci";

			reg = <0x12590000 0x100>;

			interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>;

arch/arm/boot/dts/exynos4412-odroidu3.dts

+2 −2
Original line number Diff line number Diff line
@@ -119,8 +119,8 @@ 
	phys = <&exynos_usbphy 2>, <&exynos_usbphy 3>;

	phy-names = "hsic0", "hsic1";



	ethernet: usbether@2 {

		compatible = "usb0424,9730";

	ethernet: ethernet@2 {

		compatible = "usb424,9730";

		reg = <2>;

		local-mac-address = [00 00 00 00 00 00]; /* Filled in by a bootloader */

	};

arch/arm/boot/dts/exynos4412-odroidx.dts

+4 −4
Original line number Diff line number Diff line
@@ -70,19 +70,19 @@ 
	phy-names = "hsic0";



	hub@2 {

		compatible = "usb0424,3503";

		compatible = "usb424,3503";

		reg = <2>;

		#address-cells = <1>;

		#size-cells = <0>;



		hub@1 {

			compatible = "usb0424,9514";

			compatible = "usb424,9514";

			reg = <1>;

			#address-cells = <1>;

			#size-cells = <0>;



			ethernet: usbether@1 {

				compatible = "usb0424,ec00";

			ethernet: ethernet@1 {

				compatible = "usb424,ec00";

				reg = <1>;

				/* Filled in by a bootloader */

				local-mac-address = [00 00 00 00 00 00];

arch/arm/boot/dts/exynos5250.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -245,7 +245,8 @@ 
		};



		timer@101c0000 {

			compatible = "samsung,exynos4210-mct";

			compatible = "samsung,exynos5250-mct",

				     "samsung,exynos4210-mct";

			reg = <0x101C0000 0x800>;

			clocks = <&clock CLK_FIN_PLL>, <&clock CLK_MCT>;

			clock-names = "fin_pll", "mct";
@@ -817,15 +818,14 @@ 
			status = "disabled";

		};



		dp_phy: video-phy {

		dp_phy: video-phy-0 {

			compatible = "samsung,exynos5250-dp-video-phy";

			samsung,pmu-syscon = <&pmu_system_controller>;

			#phy-cells = <0>;

		};



		mipi_phy: video-phy@10040710 {

		mipi_phy: video-phy-1 {

			compatible = "samsung,s5pv210-mipi-video-phy";

			reg = <0x10040710 0x100>;

			#phy-cells = <1>;

			syscon = <&pmu_system_controller>;

		};