Commit 09a01817 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull more ARM SoC updates from Arnd Bergmann:
 "This is the second part of the general SoC updates, containing
  everything that did not make it in the initial pull request, or that
  came in as a bugfix later.

   - Devicetree updates for SoCFPGA, ASPEED, AT91 and Rockchip,
     including a new machine using an ASPEED BMC.

   - More DT fixes from Krzysztof Kozlowski across platforms

   - A new SoC platform for the GXP baseboard management controller,
     used in current server products from HPE"

* tag 'arm-late-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (56 commits)
  ARM: configs: Enable more audio support for i.MX
  tee: optee: Pass a pointer to virt_addr_valid()
  arm64: dts: rockchip: rename Quartz64-A bluetooth gpios
  arm64: dts: rockchip: add clocks property to cru node rk3368
  arm64: dts: rockchip: add clocks property to cru node rk3308
  arm64: dts: rockchip: add clocks to rk356x cru
  ARM: dts: rockchip: add clocks property to cru node rk3228
  ARM: dts: rockchip: add clocks property to cru node rk3036
  ARM: dts: rockchip: add clocks property to cru node rk3066a/rk3188
  ARM: dts: rockchip: add clocks property to cru node rk3288
  ARM: dts: rockchip: Remove "amba" bus nodes from rv1108
  ARM: dts: rockchip: add clocks property to cru node rv1108
  arm64: dts: sprd: use new 'dma-channels' property
  ARM: dts: da850: use new 'dma-channels' property
  ARM: dts: pxa: use new 'dma-channels/requests' properties
  soc: ixp4xx/qmgr: Fix unused match warning
  ARM: ep93xx: Make ts72xx_register_flash() static
  ARM: configs: enable support for Kontron KSwitch D10
  ep93xx: clock: Do not return the address of the freed memory
  arm64: dts: intel: add device tree for n6000
  ...
parents 96479c09 9c76d723

Documentation/devicetree/bindings/arm/hpe,gxp.yaml

0 → 100644
+27 −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/arm/hpe,gxp.yaml#

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



title: HPE BMC GXP platforms



maintainers:

  - Nick Hawkins <nick.hawkins@hpe.com>

  - Jean-Marie Verdun <verdun@hpe.com>



properties:

  compatible:

    oneOf:

      - description: GXP Based Boards

        items:

          - enum:

              - hpe,gxp-dl360gen10

          - const: hpe,gxp



required:

  - compatible



additionalProperties: true



...

Documentation/devicetree/bindings/arm/intel,socfpga.yaml

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ properties: 
        items:

          - enum:

              - intel,n5x-socdk

              - intel,socfpga-agilex-n6000

              - intel,socfpga-agilex-socdk

          - const: intel,socfpga-agilex

Documentation/devicetree/bindings/gpio/gpio-altera.txt

+3 −2
Original line number Diff line number Diff line
@@ -9,8 +9,9 @@ Required properties: 
  - The second cell is reserved and is currently unused.

- gpio-controller : Marks the device node as a GPIO controller.

- interrupt-controller: Mark the device node as an interrupt controller

- #interrupt-cells : Should be 1. The interrupt type is fixed in the hardware.

- #interrupt-cells : Should be 2. The interrupt type is fixed in the hardware.

  - The first cell is the GPIO offset number within the GPIO controller.

  - The second cell is the interrupt trigger type and level flags.

- interrupts: Specify the interrupt.

- altr,interrupt-type: Specifies the interrupt trigger type the GPIO

  hardware is synthesized. This field is required if the Altera GPIO controller
@@ -38,6 +39,6 @@ gpio_altr: gpio@ff200000 { 
	altr,interrupt-type = <IRQ_TYPE_EDGE_RISING>;

	#gpio-cells = <2>;

	gpio-controller;

	#interrupt-cells = <1>;

	#interrupt-cells = <2>;

	interrupt-controller;

};

Documentation/devicetree/bindings/soc/intel/intel,hps-copy-engine.yaml

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

# Copyright (C) 2022, Intel Corporation

%YAML 1.2

---

$id: "http://devicetree.org/schemas/soc/intel/intel,hps-copy-engine.yaml#"

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



title: Intel HPS Copy Engine



maintainers:

  - Matthew Gerlach <matthew.gerlach@linux.intel.com>



description: |

  The Intel Hard Processor System (HPS) Copy Engine is an IP block used to copy

  a bootable image from host memory to HPS DDR.  Additionally, there is a

  register the HPS can use to indicate the state of booting the copied image as

  well as a keep-a-live indication to the host.



properties:

  compatible:

    const: intel,hps-copy-engine



  '#dma-cells':

    const: 1



  reg:

    maxItems: 1



required:

  - compatible

  - reg



additionalProperties: false



examples:

  - |

    bus@80000000 {

        compatible = "simple-bus";

        reg = <0x80000000 0x60000000>,

              <0xf9000000 0x00100000>;

        reg-names = "axi_h2f", "axi_h2f_lw";

        #address-cells = <2>;

        #size-cells = <1>;

        ranges = <0x00000000 0x00000000 0xf9000000 0x00001000>;



        dma-controller@0 {

            compatible = "intel,hps-copy-engine";

            reg = <0x00000000 0x00000000 0x00001000>;

            #dma-cells = <1>;

        };

    };

Documentation/devicetree/bindings/timer/hpe,gxp-timer.yaml

0 → 100644
+47 −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/timer/hpe,gxp-timer.yaml#

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



title: HPE GXP Timer



maintainers:

  - Nick Hawkins <nick.hawkins@hpe.com>

  - Jean-Marie Verdun <verdun@hpe.com>



properties:

  compatible:

    const: hpe,gxp-timer



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  clocks:

    maxItems: 1



  clock-names:

    const: iop



required:

  - compatible

  - reg

  - interrupts

  - clocks

  - clock-names



additionalProperties: false



examples:

  - |

    timer@c0000000 {

        compatible = "hpe,gxp-timer";

        reg = <0x80 0x16>;

        interrupts = <0>;

        interrupt-parent = <&vic0>;

        clocks = <&iopclk>;

        clock-names = "iop";

    };