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

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

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

Our usual round of DT patches for the 5.17 merge window, with:
  - Introduction of the chassis-type property
  - I2C, SPDIF support for the Tanix TX6
  - Memory frequency scaling for the A64 and H5
  - Hantro G2 support for the H6
  - New Board: Tanix TX6 Mini

* tag 'sunxi-dt-for-5.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  arm64: dts: allwinner: h6: Add Hantro G2 node
  arm64: dts: allwinner: h6: tanix-tx6: Enable bluetooth
  arm64: dts: allwinner: h6: tanix: Add MMC1 node
  arm64: dts: allwinner: h6: Add Tanix TX6 mini dts
  dt-bindings: arm: sunxi: Add Tanix TX6 mini
  arm64: dts: allwinner: h6: tanix-tx6: Split to DT and DTSI
  ARM: dts: sun8i: Adjust power key nodes
  arm64: dts: allwinner: a64: Update MBUS node
  ARM: dts: sunxi: h3/h5: Update MBUS node
  dt-bindings: arm: sunxi: Add H5 MBUS compatible
  dt-bindings: arm: sunxi: Expand MBUS binding
  dt-bindings: clock: sunxi: Export CLK_DRAM for devfreq
  dt-bindings: crypto: Add optional dma properties
  ARM: dts: sun8i: h3: beelink-x2: Add GPIO CEC node
  ARM: dts: sunxi: Add CEC clock to DW-HDMI
  arm64: dts: allwinner: a64: Add CEC clock to HDMI
  ARM: dts: sun8i: h3: beelink-x2: Sort nodes
  arm64: dts: allwinner: h6: tanix-tx6: Add I2C node
  arm64: dts: allwinner: h6: tanix-tx6: Add SPDIF
  arm64: dts: allwinner: add 'chassis-type' property

Link: https://lore.kernel.org/r/ef385139-6fd4-42d2-9bfe-a4dda7ac76c9.lettre@localhost


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 365ee803 0baddea6

Documentation/devicetree/bindings/arm/sunxi.yaml

+5 −0
Original line number Diff line number Diff line
@@ -808,6 +808,11 @@ properties: 
          - const: oranth,tanix-tx6

          - const: allwinner,sun50i-h6



      - description: Tanix TX6 mini

        items:

          - const: oranth,tanix-tx6-mini

          - const: allwinner,sun50i-h6



      - description: TBS A711 Tablet

        items:

          - const: tbs-biometrics,a711

Documentation/devicetree/bindings/arm/sunxi/allwinner,sun4i-a10-mbus.yaml

+88 −3
Original line number Diff line number Diff line
@@ -32,12 +32,38 @@ properties: 
      - allwinner,sun8i-h3-mbus

      - allwinner,sun8i-r40-mbus

      - allwinner,sun50i-a64-mbus

      - allwinner,sun50i-h5-mbus



  reg:

    maxItems: 1

    minItems: 1

    items:

      - description: MBUS interconnect/bandwidth limit/PMU registers

      - description: DRAM controller/PHY registers



  reg-names:

    minItems: 1

    items:

      - const: mbus

      - const: dram



  clocks:

    minItems: 1

    items:

      - description: MBUS interconnect module clock

      - description: DRAM controller/PHY module clock

      - description: Register bus clock, shared by MBUS and DRAM



  clock-names:

    minItems: 1

    items:

      - const: mbus

      - const: dram

      - const: bus



  interrupts:

    maxItems: 1

    description:

      MBUS PMU activity interrupt.



  dma-ranges:

    description:
@@ -54,13 +80,55 @@ required: 
  - clocks

  - dma-ranges



if:

  properties:

    compatible:

      contains:

        enum:

          - allwinner,sun8i-h3-mbus

          - allwinner,sun50i-a64-mbus

          - allwinner,sun50i-h5-mbus



then:

  properties:

    reg:

      minItems: 2



    reg-names:

      minItems: 2



    clocks:

      minItems: 3



    clock-names:

      minItems: 3



  required:

    - reg-names

    - clock-names



else:

  properties:

    reg:

      maxItems: 1



    reg-names:

      maxItems: 1



    clocks:

      maxItems: 1



    clock-names:

      maxItems: 1



additionalProperties: false



examples:

  - |

    #include <dt-bindings/clock/sun5i-ccu.h>

    #include <dt-bindings/clock/sun50i-a64-ccu.h>

    #include <dt-bindings/interrupt-controller/arm-gic.h>



    mbus: dram-controller@1c01000 {

    dram-controller@1c01000 {

        compatible = "allwinner,sun5i-a13-mbus";

        reg = <0x01c01000 0x1000>;

        clocks = <&ccu CLK_MBUS>;
@@ -70,4 +138,21 @@ examples: 
        #interconnect-cells = <1>;

    };



  - |

    dram-controller@1c62000 {

        compatible = "allwinner,sun50i-a64-mbus";

        reg = <0x01c62000 0x1000>,

              <0x01c63000 0x1000>;

        reg-names = "mbus", "dram";

        clocks = <&ccu CLK_MBUS>,

                 <&ccu CLK_DRAM>,

                 <&ccu CLK_BUS_DRAM>;

        clock-names = "mbus", "dram", "bus";

        interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;

        #address-cells = <1>;

        #size-cells = <1>;

        dma-ranges = <0x00000000 0x40000000 0xc0000000>;

        #interconnect-cells = <1>;

    };



...

Documentation/devicetree/bindings/crypto/allwinner,sun4i-a10-crypto.yaml

+10 −0
Original line number Diff line number Diff line
@@ -44,6 +44,16 @@ properties: 
      - const: ahb

      - const: mod



  dmas:

    items:

      - description: RX DMA Channel

      - description: TX DMA Channel



  dma-names:

    items:

      - const: rx

      - const: tx



  resets:

    maxItems: 1

arch/arm/boot/dts/sun8i-h2-plus-bananapi-m2-zero.dts

+2 −1
Original line number Diff line number Diff line
@@ -52,8 +52,9 @@ gpio_keys { 


		sw4 {

			label = "power";

			linux,code = <BTN_0>;

			linux,code = <KEY_POWER>;

			gpios = <&r_pio 0 3 GPIO_ACTIVE_LOW>;

			wakeup-source;

		};

	};

arch/arm/boot/dts/sun8i-h3-beelink-x2.dts

+20 −14
Original line number Diff line number Diff line
@@ -57,6 +57,12 @@ aliases { 
		ethernet1 = &sdiowifi;

	};



	cec-gpio {

		compatible = "cec-gpio";

		cec-gpios = <&pio 0 14 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>; /* PA14 */

		hdmi-phandle = <&hdmi>;

	};



	chosen {

		stdout-path = "serial0:115200n8";

	};
@@ -87,11 +93,15 @@ led-1 { 
		};

	};



	wifi_pwrseq: wifi_pwrseq {

		compatible = "mmc-pwrseq-simple";

		reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 */

		clocks = <&rtc 1>;

		clock-names = "ext_clock";

	r-gpio-keys {

		compatible = "gpio-keys";



		power {

			label = "power";

			linux,code = <KEY_POWER>;

			gpios = <&r_pio 0 3 GPIO_ACTIVE_LOW>;

			wakeup-source;

		};

	};



	sound_spdif {
@@ -112,15 +122,11 @@ spdif_out: spdif-out { 
		compatible = "linux,spdif-dit";

	};



	r-gpio-keys {

		compatible = "gpio-keys";



		power {

			label = "power";

			linux,code = <KEY_POWER>;

			gpios = <&r_pio 0 3 GPIO_ACTIVE_LOW>;

			wakeup-source;

		};

	wifi_pwrseq: wifi_pwrseq {

		compatible = "mmc-pwrseq-simple";

		reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 */

		clocks = <&rtc 1>;

		clock-names = "ext_clock";

	};

};