Unverified Commit 2ef36366 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'socfpga_dts_update_for_v5.18_part2' of... 

Merge tag 'socfpga_dts_update_for_v5.18_part2' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into arm/dt

SoCFPGA dts updates for v5.18, part 2
- More dt-bindings cleanup, this time, USB DWC2 properties
- Add SDR EDAC dts entry for the N5X platform

* tag 'socfpga_dts_update_for_v5.18_part2' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
  arm64: dts: n5x: add sdr edac support
  arm64: dts: agilex/stratix10: add clock-names to USB DWC2 node
  dt-bindings: usb: dwc2: add disable-over-current
  dt-bindings: usb: dwc2: add iommus
  dt-bindings: usb: dwc2: fix compatible of Intel Agilex

Link: https://lore.kernel.org/r/20220310195740.151250-1-dinguyen@kernel.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 634f0f26 ef82c9be

Documentation/devicetree/bindings/usb/dwc2.yaml

+8 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ properties: 
              - amlogic,meson8b-usb

              - amlogic,meson-gxbb-usb

              - amlogic,meson-g12a-usb

              - intel,socfpga-agilex-hsotg

          - const: snps,dwc2

      - const: amcc,dwc-otg

      - const: apm,apm82181-dwc-otg
@@ -67,6 +68,13 @@ properties: 
    items:

      - const: otg



  disable-over-current:

    type: boolean

    description: whether to disable detection of over-current condition.



  iommus:

    maxItems: 1



  resets:

    items:

      - description: common reset

arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -485,6 +485,7 @@ 
			resets = <&rst USB0_RESET>, <&rst USB0_OCP_RESET>;

			reset-names = "dwc2", "dwc2-ecc";

			clocks = <&clkmgr STRATIX10_USB_CLK>;

			clock-names = "otg";

			iommus = <&smmu 6>;

			status = "disabled";

		};

arch/arm64/boot/dts/intel/socfpga_agilex.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -510,6 +510,7 @@ 
			resets = <&rst USB0_RESET>, <&rst USB0_OCP_RESET>;

			reset-names = "dwc2", "dwc2-ecc";

			clocks = <&clkmgr AGILEX_USB_CLK>;

			clock-names = "otg";

			iommus = <&smmu 6>;

			status = "disabled";

		};

arch/arm64/boot/dts/intel/socfpga_n5x_socdk.dts

+10 −0
Original line number Diff line number Diff line
@@ -24,6 +24,16 @@ 
		/* We expect the bootloader to fill in the reg */

		reg = <0 0 0 0>;

	};



	soc {

		sdram_edac: sdr_edac@f87f8000 {

			compatible = "snps,ddrc-3.80a";

			reg = <0xf87f8000 0x400>;

			interrupts = <0 175 4>;

			intel,sysmgr-syscon = <&sysmgr 0xb8>;

			status = "okay";

		};

	};

};



&clkmgr {