Unverified Commit 8f09b5ec authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

- added D1 crypto node
- enabled DVFS on OrangePi PC2 board
- added GPIO line names on Nezha D1 board
- added suniv USB nodes and enabled on licheepi-nano
- new suniv boards: PopStick v1.1 and Lctech Pi
- added Allwinner T113-s DTSI
- added MangoPi MQ-R T113-s board variant
- swapped DMA names for A23, A31, A33, D1, H3, H5, V3s

* tag 'sunxi-dt-for-6.4-1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  riscv: dts: allwinner: d1: Switch dma-names order for snps,dw-apb-uart nodes
  ARM: dts: sunxi: h3/h5: Switch dma-names order for snps,dw-apb-uart nodes
  ARM: dts: sun8i: v3s: Switch dma-names order for snps,dw-apb-uart nodes
  ARM: dts: sun8i: a23/a33: Switch dma-names order for snps,dw-apb-uart nodes
  ARM: dts: sun6i: a31: Switch dma-names order for snps,dw-apb-uart nodes
  ARM: dts: sunxi: add MangoPi MQ-R-T113 board
  dt-bindings: arm: sunxi: document MangoPi MQ-R board names
  ARM: dts: sunxi: add Allwinner T113-s SoC .dtsi
  dts: add riscv include prefix link
  ARM: dts: suniv: Add Lctech Pi F1C200s devicetree
  ARM: dts: suniv: add device tree for PopStick v1.1
  dt-binding: arm: sunxi: add two board compatible strings
  dt-bindings: vendor-prefixes: add Source Parts and Lctech names
  ARM: dts: suniv: licheepi-nano: enable USB
  ARM: dts: suniv: add USB-related device nodes
  riscv: dts: nezha-d1: add gpio-line-names
  arm64: dts: allwinner: h5: OrangePi PC2: add OPP table to enable DVFS
  riscv: dts: allwinner: d1: Add crypto engine node

Link: https://lore.kernel.org/r/20230408125156.GA17050@jernej-laptop


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 58982e1d a140b18f

Documentation/devicetree/bindings/arm/sunxi.yaml

+18 −0
Original line number Diff line number Diff line
@@ -366,6 +366,12 @@ properties: 
          - const: lamobo,lamobo-r1

          - const: allwinner,sun7i-a20



      - description: Lctech Pi F1C200s

        items:

          - const: lctech,pi-f1c200s

          - const: allwinner,suniv-f1c200s

          - const: allwinner,suniv-f1c100s



      - description: Libre Computer Board ALL-H3-CC H2+

        items:

          - const: libretech,all-h3-cc-h2-plus
@@ -807,6 +813,13 @@ properties: 
          - const: sinlinx,sina33

          - const: allwinner,sun8i-a33



      - description: SourceParts PopStick v1.1

        items:

          - const: sourceparts,popstick-v1.1

          - const: sourceparts,popstick

          - const: allwinner,suniv-f1c200s

          - const: allwinner,suniv-f1c100s



      - description: SL631 Action Camera with IMX179

        items:

          - const: allwinner,sl631-imx179
@@ -843,6 +856,11 @@ properties: 
          - const: wexler,tab7200

          - const: allwinner,sun7i-a20



      - description: MangoPi MQ-R board

        items:

          - const: widora,mangopi-mq-r-t113

          - const: allwinner,sun8i-t113s



      - description: WITS A31 Colombus Evaluation Board

        items:

          - const: wits,colombus

Documentation/devicetree/bindings/riscv/sunxi.yaml

+5 −0
Original line number Diff line number Diff line
@@ -64,6 +64,11 @@ properties: 
          - const: widora,mangopi-mq-pro

          - const: allwinner,sun20i-d1



      - description: MangoPi MQ-R board

        items:

          - const: widora,mangopi-mq-r-f133

          - const: allwinner,sun20i-d1s



additionalProperties: true



...

Documentation/devicetree/bindings/vendor-prefixes.yaml

+4 −0
Original line number Diff line number Diff line
@@ -725,6 +725,8 @@ patternProperties: 
    description: Lantiq Semiconductor

  "^lattice,.*":

    description: Lattice Semiconductor

  "^lctech,.*":

    description: Shenzen LC Technology Co., Ltd.

  "^leadtek,.*":

    description: Shenzhen Leadtek Technology Co., Ltd.

  "^leez,.*":
@@ -1249,6 +1251,8 @@ patternProperties: 
    description: Solomon Systech Limited

  "^sony,.*":

    description: Sony Corporation

  "^sourceparts,.*":

    description: Source Parts Inc.

  "^spansion,.*":

    description: Spansion Inc.

  "^sparkfun,.*":

arch/arm/boot/dts/Makefile

+4 −1
Original line number Diff line number Diff line
@@ -1411,6 +1411,7 @@ dtb-$(CONFIG_MACH_SUN8I) += \ 
	sun8i-s3-elimo-initium.dtb \

	sun8i-s3-lichee-zero-plus.dtb \

	sun8i-s3-pinecube.dtb \

	sun8i-t113s-mangopi-mq-r-t113.dtb \

	sun8i-t3-cqa3t-bv3.dtb \

	sun8i-v3-sl631-imx179.dtb \

	sun8i-v3s-licheepi-zero.dtb \
@@ -1420,7 +1421,9 @@ dtb-$(CONFIG_MACH_SUN9I) += \ 
	sun9i-a80-optimus.dtb \

	sun9i-a80-cubieboard4.dtb

dtb-$(CONFIG_MACH_SUNIV) += \

	suniv-f1c100s-licheepi-nano.dtb

	suniv-f1c100s-licheepi-nano.dtb \

	suniv-f1c200s-lctech-pi.dtb \

	suniv-f1c200s-popstick-v1.1.dtb

dtb-$(CONFIG_ARCH_TEGRA_2x_SOC) += \

	tegra20-acer-a500-picasso.dtb \

	tegra20-asus-tf101.dtb \

arch/arm/boot/dts/sun6i-a31.dtsi

+6 −6
Original line number Diff line number Diff line
@@ -822,7 +822,7 @@ uart0: serial@1c28000 { 
			clocks = <&ccu CLK_APB2_UART0>;

			resets = <&ccu RST_APB2_UART0>;

			dmas = <&dma 6>, <&dma 6>;

			dma-names = "rx", "tx";

			dma-names = "tx", "rx";

			status = "disabled";

		};
@@ -835,7 +835,7 @@ uart1: serial@1c28400 { 
			clocks = <&ccu CLK_APB2_UART1>;

			resets = <&ccu RST_APB2_UART1>;

			dmas = <&dma 7>, <&dma 7>;

			dma-names = "rx", "tx";

			dma-names = "tx", "rx";

			status = "disabled";

		};
@@ -848,7 +848,7 @@ uart2: serial@1c28800 { 
			clocks = <&ccu CLK_APB2_UART2>;

			resets = <&ccu RST_APB2_UART2>;

			dmas = <&dma 8>, <&dma 8>;

			dma-names = "rx", "tx";

			dma-names = "tx", "rx";

			status = "disabled";

		};
@@ -861,7 +861,7 @@ uart3: serial@1c28c00 { 
			clocks = <&ccu CLK_APB2_UART3>;

			resets = <&ccu RST_APB2_UART3>;

			dmas = <&dma 9>, <&dma 9>;

			dma-names = "rx", "tx";

			dma-names = "tx", "rx";

			status = "disabled";

		};
@@ -874,7 +874,7 @@ uart4: serial@1c29000 { 
			clocks = <&ccu CLK_APB2_UART4>;

			resets = <&ccu RST_APB2_UART4>;

			dmas = <&dma 10>, <&dma 10>;

			dma-names = "rx", "tx";

			dma-names = "tx", "rx";

			status = "disabled";

		};
@@ -887,7 +887,7 @@ uart5: serial@1c29400 { 
			clocks = <&ccu CLK_APB2_UART5>;

			resets = <&ccu RST_APB2_UART5>;

			dmas = <&dma 22>, <&dma 22>;

			dma-names = "rx", "tx";

			dma-names = "tx", "rx";

			status = "disabled";

		};