Commit fad235ed authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arm-late-6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc 

Pull more ARM SoC updates from Arnd Bergmann:
 "These updates came in after I had already tagged the branches, but
  they still seem appropriate for 6.0 and most of them were part of
  linux-next through other trees.

   - The reset controller tree adds one new driver for the TI TPS380x
     power management chip and a few minor changes in other drivers

   - Apple M1 now has a DT entry for the NVMe controller after the
     driver was merged, and has a new mailing list in the MAINTAINERS
     file.

   - Fixes for USB on the Socionext Uniphier platforms and the network
     controller on Intel Cyclone5"

* tag 'arm-late-6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  arm64: dts: uniphier: Fix USB interrupts for PXs3 SoC
  ARM: dts: uniphier: Fix USB interrupts for PXs2 SoC
  arm64: dts: apple: t8103: Add ANS2 NVMe nodes
  reset: tps380x: Fix spelling mistake "Voltags" -> "Voltage"
  reset: tps380x: Add TPS380x device driver supprt
  dt-bindings: reset: Add TPS380x documentation
  dt-bindings: reset: renesas,rzg2l-usbphy-ctrl: Document RZ/G2UL USBPHY Control bindings
  ARM: dts: add EMAC AXI settings for Cyclone5
  reset: reset-simple should depends on HAS_IOMEM
  Revert "reset: microchip-sparx5: allow building as a module"
  reset: a10sr: allow building under COMPILE_TEST
  reset: allow building of reset simple driver if expert config selected
  reset: microchip-sparx5: allow building as a module
  arm64: dts: apple: Re-parent ANS2 power domains
  MAINTAINERS: add ARM/APPLE MACHINE mailing list
parents 8db4a029 1630eee2

Documentation/devicetree/bindings/reset/renesas,rzg2l-usbphy-ctrl.yaml

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ properties: 
  compatible:

    items:

      - enum:

          - renesas,r9a07g043-usbphy-ctrl # RZ/G2UL

          - renesas,r9a07g044-usbphy-ctrl # RZ/G2{L,LC}

          - renesas,r9a07g054-usbphy-ctrl # RZ/V2L

      - const: renesas,rzg2l-usbphy-ctrl

Documentation/devicetree/bindings/reset/ti,tps380x-reset.yaml

0 → 100644
+49 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only or BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/reset/ti,tps380x-reset.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: TI TPS380x reset controller node bindings



maintainers:

  - Marco Felsch <kernel@pengutronix.de>



description: |

  The TPS380x family [1] of supervisory circuits monitor supply voltages to

  provide circuit initialization and timing supervision. The devices assert a

  RESET signal if the voltage drops below a preset threshold or upon a manual

  reset input (MR). The RESET output remains asserted for the factory

  programmed delay after the voltage return above its threshold or after the

  manual reset input is released.



  [1] https://www.ti.com/product/TPS3801



properties:

  compatible:

    enum:

      - ti,tps3801



  reset-gpios:

    maxItems: 1

    description: Reference to the GPIO connected to the MR pin.



  "#reset-cells":

    const: 0



required:

  - compatible

  - reset-gpios

  - "#reset-cells"



additionalProperties: false



examples:

  - |

    #include <dt-bindings/gpio/gpio.h>

    reset: reset-controller {

        compatible = "ti,tps3801";

        #reset-cells = <0>;

        reset-gpios = <&gpio3 2 GPIO_ACTIVE_LOW>;

    };

...

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -1850,6 +1850,7 @@ ARM/APPLE MACHINE SUPPORT 
M:	Hector Martin <marcan@marcan.st>

M:	Sven Peter <sven@svenpeter.dev>

R:	Alyssa Rosenzweig <alyssa@rosenzweig.io>

L:	asahi@lists.linux.dev

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

W:	https://asahilinux.org

arch/arm/boot/dts/socfpga.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -561,6 +561,12 @@ 
			interrupts = <0 175 4>;

		};



		socfpga_axi_setup: stmmac-axi-config {

			snps,wr_osr_lmt = <0xf>;

			snps,rd_osr_lmt = <0xf>;

			snps,blen = <0 0 0 0 16 0 0>;

		};



		gmac0: ethernet@ff700000 {

			compatible = "altr,socfpga-stmmac", "snps,dwmac-3.70a", "snps,dwmac";

			altr,sysmgr-syscon = <&sysmgr 0x60 0>;
@@ -576,6 +582,7 @@ 
			snps,perfect-filter-entries = <128>;

			tx-fifo-depth = <4096>;

			rx-fifo-depth = <4096>;

			snps,axi-config = <&socfpga_axi_setup>;

			status = "disabled";

		};
@@ -594,6 +601,7 @@ 
			snps,perfect-filter-entries = <128>;

			tx-fifo-depth = <4096>;

			rx-fifo-depth = <4096>;

			snps,axi-config = <&socfpga_axi_setup>;

			status = "disabled";

		};

arch/arm/boot/dts/uniphier-pxs2.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -597,8 +597,8 @@ 
			compatible = "socionext,uniphier-dwc3", "snps,dwc3";

			status = "disabled";

			reg = <0x65a00000 0xcd00>;

			interrupt-names = "host", "peripheral";

			interrupts = <0 134 4>, <0 135 4>;

			interrupt-names = "dwc_usb3";

			interrupts = <0 134 4>;

			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_usb0>, <&pinctrl_usb2>;

			clock-names = "ref", "bus_early", "suspend";
@@ -693,8 +693,8 @@ 
			compatible = "socionext,uniphier-dwc3", "snps,dwc3";

			status = "disabled";

			reg = <0x65c00000 0xcd00>;

			interrupt-names = "host", "peripheral";

			interrupts = <0 137 4>, <0 138 4>;

			interrupt-names = "dwc_usb3";

			interrupts = <0 137 4>;

			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_usb1>, <&pinctrl_usb3>;

			clock-names = "ref", "bus_early", "suspend";