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

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

Merge tag 'sunxi-dt-for-5.16-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.16 merge window, with:
  - DT schema fixes
  - I2S support for the R40
  - HDMI support for the pinetab
  - devfreq support for the A64 GPU

* tag 'sunxi-dt-for-5.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: (21 commits)
  dt-bindings: interconnect: sunxi: Add R40 MBUS compatible
  arm64: dts: allwinner: NanoPi R1S H5: Add generic compatible string for I2C EEPROM
  arm64: dts: allwinner: pinetab: Add HDMI support
  arm64: dts: allwinner: a64: Add GPU opp table
  ARM: dts: sun8i: r40: Add I2S nodes
  dt-bindings: sound: sun4i-i2s: add Allwinner R40 I2S compatible
  arm64: dts: allwinner: teres-i: Remove wakekup-source from the PMIC
  arm64: dts: allwinner: teres-i: Add missing reg
  arm64: dts: allwinner: pinetab: Change regulator node name to avoid warning
  arm64: dts: allwinner: a100: Fix thermal zone node name
  arm64: dts: allwinner: h6: Fix de3 parent clocks ordering
  arm64: dts: allwinner: h5: Fix GPU thermal zone node name
  ARM: dts: cubieboard4: Remove the dumb-vga-dac compatible
  ARM: dts: tbs711: Fix touchscreen compatible
  ARM: dts: sunxi: Fix the SPI NOR node names
  ARM: dts: sunxi: Fix OPPs node name
  ARM: dts: sunxi: Fix OPP arrays
  ARM: dts: sunxi: Rename gpio pinctrl names
  ARM: dts: sunxi: Rename power-supply names
  dt-bindings: sunxi: Add Allwinner A80 PRCM Binding
  ...

Link: https://lore.kernel.org/r/5cad5ac6-187d-4d36-9437-5821c6e8242d.lettre@localhost


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 8d2214d3 d7b101a3

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

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ properties: 
    enum:

      - allwinner,sun5i-a13-mbus

      - allwinner,sun8i-h3-mbus

      - allwinner,sun8i-r40-mbus

      - allwinner,sun50i-a64-mbus



  reg:

Documentation/devicetree/bindings/arm/sunxi/allwinner,sun6i-a31-cpuconfig.yaml

0 → 100644
+38 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/arm/sunxi/allwinner,sun6i-a31-cpuconfig.yaml#

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



title: Allwinner CPU Configuration Controller Device Tree Bindings



maintainers:

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

  - Maxime Ripard <mripard@kernel.org>



properties:

  compatible:

    enum:

      - allwinner,sun6i-a31-cpuconfig

      - allwinner,sun8i-a23-cpuconfig

      - allwinner,sun8i-a83t-cpucfg

      - allwinner,sun8i-a83t-r-cpucfg

      - allwinner,sun9i-a80-cpucfg



  reg:

    maxItems: 1



required:

  - compatible

  - reg



additionalProperties: false



examples:

  - |

      cpucfg@1f01c00 {

          compatible = "allwinner,sun6i-a31-cpuconfig";

          reg = <0x01f01c00 0x300>;

      };



...

Documentation/devicetree/bindings/arm/sunxi/allwinner,sun9i-a80-prcm.yaml

0 → 100644
+33 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/arm/sunxi/allwinner,sun9i-a80-prcm.yaml#

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



title: Allwinner A80 PRCM Device Tree Bindings



maintainers:

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

  - Maxime Ripard <mripard@kernel.org>



properties:

  compatible:

    const: allwinner,sun9i-a80-prcm



  reg:

    maxItems: 1



required:

  - compatible

  - reg



additionalProperties: false



examples:

  - |

      prcm@8001400 {

          compatible = "allwinner,sun9i-a80-prcm";

          reg = <0x08001400 0x200>;

      };



...

Documentation/devicetree/bindings/sound/allwinner,sun4i-a10-i2s.yaml

+3 −0
Original line number Diff line number Diff line
@@ -20,6 +20,9 @@ properties: 
      - const: allwinner,sun6i-a31-i2s

      - const: allwinner,sun8i-a83t-i2s

      - const: allwinner,sun8i-h3-i2s

      - items:

          - const: allwinner,sun8i-r40-i2s

          - const: allwinner,sun8i-h3-i2s

      - items:

          - const: allwinner,sun8i-v3-i2s

          - const: allwinner,sun8i-h3-i2s

arch/arm/boot/dts/axp209.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ &axp209 { 
	interrupt-controller;

	#interrupt-cells = <1>;



	ac_power_supply: ac-power-supply {

	ac_power_supply: ac-power {

		compatible = "x-powers,axp202-ac-power-supply";

		status = "disabled";

	};
@@ -69,7 +69,7 @@ axp_gpio: gpio { 
		#gpio-cells = <2>;

	};



	battery_power_supply: battery-power-supply {

	battery_power_supply: battery-power {

		compatible = "x-powers,axp209-battery-power-supply";

		status = "disabled";

	};
@@ -112,7 +112,7 @@ reg_ldo5: ldo5 { 
		};

	};



	usb_power_supply: usb-power-supply {

	usb_power_supply: usb-power {

		compatible = "x-powers,axp202-usb-power-supply";

		status = "disabled";

	};