Unverified Commit 37d01395 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

- Added V3s nodes for PWM pinctrl, EHCI and OHCI
- RISC-V DT cleanups
- Added new ISA property and PMU node to Allwinner D1
- Added interconnect to R40 video codec node
- New boards: Anbernic RG-Nano, BigTreeTech Pi, BigTreeTech CB1 SOM

* tag 'sunxi-dt-for-6.7-1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  riscv: dts: allwinner: convert isa detection to new properties
  ARM: dts: sun8i-r40: Add interconnect to video-codec
  ARM: dts: sunxi: add support for Anbernic RG-Nano
  dt-bindings: arm: sunxi: add Anbernic RG-Nano
  ARM: dts: sun8i: v3s: add EHCI and OHCI to v3s dts
  arm: dts: sun8i: V3s: Add pinctrl for pwm
  riscv: dts: allwinner: d1: Add PMU event node
  arm64: dts: allwinner: h616: Add BigTreeTech Pi support
  arm64: dts: allwinner: h616: Add BigTreeTech CB1 SoM & boards support
  dt-bindings: arm: sunxi: Add BigTreeTech boards
  dt-bindings: vendor-prefixes: Add BigTreeTech
  arm64: dts: allwinner: h616: Add SID controller node
  dt-bindings: nvmem: SID: Add binding for H616 SID controller
  riscv: dts: allwinner: remove address-cells from intc node
  riscv: dts: use capital "OR" for multiple licenses in SPDX

Link: https://lore.kernel.org/r/20231013194203.GA2155816@jernej-laptop


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents d4f23fdf c3f7c148

Documentation/devicetree/bindings/arm/sunxi.yaml

+16 −0
Original line number Diff line number Diff line
@@ -51,6 +51,11 @@ properties: 
          - const: allwinner,parrot

          - const: allwinner,sun8i-a33



      - description: Anbernic RG-Nano

        items:

          - const: anbernic,rg-nano

          - const: allwinner,sun8i-v3s



      - description: Amarula A64 Relic

        items:

          - const: amarula,a64-relic
@@ -151,6 +156,17 @@ properties: 
          - const: roofull,beelink-x2

          - const: allwinner,sun8i-h3



      - description: BigTreeTech Manta M4/8P

        items:

          - const: bigtreetech,cb1-manta

          - const: bigtreetech,cb1

          - const: allwinner,sun50i-h616



      - description: BigTreeTech Pi

        items:

          - const: bigtreetech,pi

          - const: allwinner,sun50i-h616



      - description: Chuwi V7 CW0825

        items:

          - const: chuwi,v7-cw0825

Documentation/devicetree/bindings/nvmem/allwinner,sun4i-a10-sid.yaml

+3 −1
Original line number Diff line number Diff line
@@ -23,7 +23,9 @@ properties: 
      - const: allwinner,sun20i-d1-sid

      - const: allwinner,sun50i-a64-sid

      - items:

          - const: allwinner,sun50i-a100-sid

          - enum:

              - allwinner,sun50i-a100-sid

              - allwinner,sun50i-h616-sid

          - const: allwinner,sun50i-a64-sid

      - const: allwinner,sun50i-h5-sid

      - const: allwinner,sun50i-h6-sid

Documentation/devicetree/bindings/vendor-prefixes.yaml

+2 −0
Original line number Diff line number Diff line
@@ -198,6 +198,8 @@ patternProperties: 
    description: Shanghai Belling Co., Ltd.

  "^bhf,.*":

    description: Beckhoff Automation GmbH & Co. KG

  "^bigtreetech,.*":

    description: Shenzhen BigTree Tech Co., LTD

  "^bitmain,.*":

    description: Bitmain Technologies

  "^blutek,.*":

arch/arm/boot/dts/allwinner/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -256,6 +256,7 @@ dtb-$(CONFIG_MACH_SUN8I) += \ 
	sun8i-t113s-mangopi-mq-r-t113.dtb \

	sun8i-t3-cqa3t-bv3.dtb \

	sun8i-v3-sl631-imx179.dtb \

	sun8i-v3s-anbernic-rg-nano.dtb \

	sun8i-v3s-licheepi-zero.dtb \

	sun8i-v3s-licheepi-zero-dock.dtb \

	sun8i-v40-bananapi-m2-berry.dtb

arch/arm/boot/dts/allwinner/sun8i-r40.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -338,6 +338,8 @@ video-codec@1c0e000 { 
			resets = <&ccu RST_BUS_VE>;

			interrupts = <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>;

			allwinner,sram = <&ve_sram 1>;

			interconnects = <&mbus 4>;

			interconnect-names = "dma-mem";

		};



		mmc0: mmc@1c0f000 {