Commit 6b0fbc54 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM Nuvoton WPCM450 platform support from Arnd Bergmann:
 "The Nuvoton WPCM450 BMC is an older chip based on the ARM926 CPU core
  that remains in use on Supermicro X9 server boards among others.

  Support gets added for a particular server board using this SoC along
  with the basic platform bringup.

  As the platform is a predecessor to the npcm7xx platform we already
  support, it is added to the same directory, despite using a different
  name. It also seems to be related to the older w90x900/nuc9xx platform
  that was removed last year"

* tag 'arm-newsoc-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  ARM: config: Add WPCM to multi v5
  MAINTAINERS: Add entry for Nuvoton WPCM450
  ARM: dts: Add devicetree for Supermicro X9SCi-LN4F based on WPCM450
  ARM: dts: Add devicetree for Nuvoton WPCM450 BMC chip
  watchdog: npcm: Add support for WPCM450
  ARM: npcm: Introduce Nuvoton WPCM450 SoC
  dt-bindings: watchdog: npcm: Add nuvoton,wpcm450-wdt
  dt-bindings: arm: npcm: Add nuvoton,wpcm450 compatible string
  dt-bindings: vendor-prefixes: Add Supermicro
  ARM: dts: Add board-specific compatible string to npcm750-evb devicetree
  dt-bindings: arm: Convert nuvoton,npcm750 binding to YAML
parents f7857bf3 39b95079

Documentation/devicetree/bindings/arm/npcm/npcm.txt

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
NPCM Platforms Device Tree Bindings

-----------------------------------

NPCM750 SoC

Required root node properties:

	- compatible = "nuvoton,npcm750";

Documentation/devicetree/bindings/arm/npcm/npcm.yaml

0 → 100644
+29 −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/npcm/npcm.yaml#

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



title: NPCM Platforms Device Tree Bindings



maintainers:

  - Jonathan Neuschäfer <j.neuschaefer@gmx.net>



properties:

  $nodename:

    const: '/'

  compatible:

    oneOf:

      - description: WPCM450 based boards

        items:

          - enum:

              - supermicro,x9sci-ln4f-bmc   # Supermicro X9SCI-LN4F server's BMC

          - const: nuvoton,wpcm450



      - description: NPCM750 based boards

        items:

          - enum:

              - nuvoton,npcm750-evb         # NPCM750 evaluation board

          - const: nuvoton,npcm750



additionalProperties: true

Documentation/devicetree/bindings/vendor-prefixes.yaml

+2 −0
Original line number Diff line number Diff line
@@ -1091,6 +1091,8 @@ patternProperties: 
    description: Shenzhen Sunchip Technology Co., Ltd

  "^SUNW,.*":

    description: Sun Microsystems, Inc

  "^supermicro,.*":

    description: Super Micro Computer, Inc.

  "^silvaco,.*":

    description: Silvaco, Inc.

  "^swir,.*":

Documentation/devicetree/bindings/watchdog/nuvoton,npcm-wdt.txt

+2 −1
Original line number Diff line number Diff line
@@ -5,7 +5,8 @@ The watchdog supports a pre-timeout interrupt that fires 10ms before the 
expiry.



Required properties:

- compatible      : "nuvoton,npcm750-wdt" for NPCM750 (Poleg).

- compatible      : "nuvoton,npcm750-wdt" for NPCM750 (Poleg), or

                    "nuvoton,wpcm450-wdt" for WPCM450 (Hermon).

- reg             : Offset and length of the register set for the device.

- interrupts      : Contain the timer interrupt with flags for

                    falling edge.

MAINTAINERS

+9 −0
Original line number Diff line number Diff line
@@ -2214,6 +2214,15 @@ F: drivers/*/*npcm* 
F:	drivers/*/*/*npcm*

F:	include/dt-bindings/clock/nuvoton,npcm7xx-clock.h









ARM/NUVOTON WPCM450 ARCHITECTURE









M:	Jonathan Neuschäfer <j.neuschaefer@gmx.net>









L:	openbmc@lists.ozlabs.org (moderated for non-subscribers)









S:	Maintained









F:	Documentation/devicetree/bindings/*/*wpcm*









F:	arch/arm/boot/dts/nuvoton-wpcm450*









F:	arch/arm/mach-npcm/wpcm450.c









F:	drivers/*/*wpcm*

















ARM/OPENMOKO NEO FREERUNNER (GTA02) MACHINE SUPPORT









L:	openmoko-kernel@lists.openmoko.org (subscribers-only)









S:	Orphan