Unverified Commit ffe4bd3d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'sunxi-dt-for-6.3-1' of... 

Merge tag 'sunxi-dt-for-6.3-1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into arm/dt

- introduce Allwinner D1 DTSI
- add boards: Dongshan Nezha STU, MangoPi MQ (Pro), Sipeed Lichee RV,
  Nezha
- add D1 power controller node
- Add SATA regulator to Bananapi M3
- fix regulator reference for nanopi-duo2
- fix GPIO node names
- align HDMI CEC node name for h3-beelink-x2
- add DPHY interrupt to A64 and A33

* tag 'sunxi-dt-for-6.3-1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux

:
  riscv: dts: allwinner: d1: Add power controller node
  riscv: Add the Allwinner SoC family Kconfig option
  riscv: dts: allwinner: Add Dongshan Nezha STU devicetree
  riscv: dts: allwinner: Add MangoPi MQ Pro devicetree
  riscv: dts: allwinner: Add Sipeed Lichee RV devicetrees
  riscv: dts: allwinner: Add Allwinner D1 Nezha devicetree
  riscv: dts: allwinner: Add MangoPi MQ devicetree
  riscv: dts: allwinner: Add the D1/D1s SoC devicetree
  dt-bindings: riscv: Add Allwinner D1/D1s board compatibles
  dt-bindings: vendor-prefixes: Add Allwinner D1/D1s board vendors
  MAINTAINERS: Match the sun20i family of Allwinner SoCs
  ARM: dts: sun8i: a83t: bananapi-m3: describe SATA disk regulator
  ARM: dts: sun8i: nanopi-duo2: Fix regulator GPIO reference
  ARM: dts: sunxi: Fix GPIO LED node names
  ARM: dts: sun8i: h3-beelink-x2: align HDMI CEC node names with dtschema
  arm64: dts: allwinner: a64: Add DPHY interrupt
  ARM: dts: sun8i: a33: Add DPHY interrupt

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 248c07f9 dca36f7b

Documentation/devicetree/bindings/riscv/sunxi.yaml

0 → 100644
+69 −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/riscv/sunxi.yaml#

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



title: Allwinner RISC-V SoC-based boards



maintainers:

  - Chen-Yu Tsai <wens@csie.org>

  - Jernej Skrabec <jernej.skrabec@gmail.com>

  - Samuel Holland <samuel@sholland.org>



description:

  Allwinner RISC-V SoC-based boards



properties:

  $nodename:

    const: '/'

  compatible:

    oneOf:

      - description: Dongshan Nezha STU SoM

        items:

          - const: 100ask,dongshan-nezha-stu

          - const: allwinner,sun20i-d1



      - description: D1 Nezha board

        items:

          - const: allwinner,d1-nezha

          - const: allwinner,sun20i-d1



      - description: ClockworkPi R-01 SoM and v3.14 board

        items:

          - const: clockwork,r-01-clockworkpi-v3.14

          - const: allwinner,sun20i-d1



      - description: ClockworkPi R-01 SoM, v3.14 board, and DevTerm expansion

        items:

          - const: clockwork,r-01-devterm-v3.14

          - const: clockwork,r-01-clockworkpi-v3.14

          - const: allwinner,sun20i-d1



      - description: Lichee RV SoM

        items:

          - const: sipeed,lichee-rv

          - const: allwinner,sun20i-d1



      - description: Carrier boards for the Lichee RV SoM

        items:

          - enum:

              - sipeed,lichee-rv-86-panel-480p

              - sipeed,lichee-rv-86-panel-720p

              - sipeed,lichee-rv-dock

          - const: sipeed,lichee-rv

          - const: allwinner,sun20i-d1



      - description: MangoPi MQ board

        items:

          - const: widora,mangopi-mq

          - const: allwinner,sun20i-d1s



      - description: MangoPi MQ Pro board

        items:

          - const: widora,mangopi-mq-pro

          - const: allwinner,sun20i-d1



additionalProperties: true



...

Documentation/devicetree/bindings/vendor-prefixes.yaml

+4 −0
Original line number Diff line number Diff line
@@ -266,6 +266,8 @@ patternProperties: 
    description: Cirrus Logic, Inc.

  "^cisco,.*":

    description: Cisco Systems, Inc.

  "^clockwork,.*":

    description: Clockwork Tech LLC

  "^cloos,.*":

    description: Carl Cloos Schweisstechnik GmbH.

  "^cloudengines,.*":
@@ -1448,6 +1450,8 @@ patternProperties: 
    description: Shenzhen whwave Electronics, Inc.

  "^wi2wi,.*":

    description: Wi2Wi, Inc.

  "^widora,.*":

    description: Beijing Widora Technology Co., Ltd.

  "^wiligear,.*":

    description: Wiligear, Ltd.

  "^willsemi,.*":

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -1888,7 +1888,7 @@ F: drivers/pinctrl/sunxi/ 
F:	drivers/soc/sunxi/

N:	allwinner

N:	sun[x456789]i

N:	sun50i

N:	sun[25]0i









ARM/Amlogic Meson SoC CLOCK FRAMEWORK









M:	Neil Armstrong <neil.armstrong@linaro.org>


































arch/arm/boot/dts/sun5i-gr8-chip-pro.dts



+1
−1






























Original line number
Diff line number
Diff line







@@ -70,7 +70,7 @@ chosen {







	leds {









		compatible = "gpio-leds";



















		status {









		led-0 {









			label = "chip-pro:white:status";









			gpios = <&axp_gpio 2 GPIO_ACTIVE_HIGH>;









			default-state = "on";


































arch/arm/boot/dts/sun5i-r8-chip.dts



+1
−1






























Original line number
Diff line number
Diff line







@@ -70,7 +70,7 @@ chosen {







	leds {









		compatible = "gpio-leds";



















		status {









		led-0 {









			label = "chip:white:status";









			gpios = <&axp_gpio 2 GPIO_ACTIVE_HIGH>;









			default-state = "on";