Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db2f7fe5 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Allwinner DT changes for 5.4

Our usual pile of patches for the next release, which include mostly:
  - More fixes thanks to the DT validation using the YAML bindings
  - IR receiver support on the H6
  - SPDIF support on the H6
  - I2C Support on the H6
  - CSI support on the A20
  - RTC support on the H6
  - New Boards: Lichee Zero Plus, Tanix TX6, A64-Olinuxino-eMMC

* tag 'sunxi-dt-for-5.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: (40 commits)
  arm64: dts: allwinner: orange-pi-3: Enable WiFi
  ARM: dts: sunxi: Add missing watchdog clocks
  ARM: dts: sunxi: Add missing watchdog interrupts
  arm64: dts: allwinner: h6: Add support for RTC and fix the clock tree
  ARM: dts: sun7i: Add CSI0 controller
  arm64: dts: allwinner: a64: Add A64 OlinuXino board (with eMMC)
  dt-bindings: arm: sunxi: Add compatible for A64 OlinuXino with eMMC
  ARM: dts: v3s: Change the timers compatible
  ARM: dts: h3: Change the timers compatible
  ARM: dts: a83t: Change the timers compatible
  ARM: dts: a23/a33: Change the timers compatible
  ARM: dts: sun6i: Add missing timers interrupts
  ARM: dts: sun5i: Add missing timers interrupts
  ARM: dts: sun4i: Add missing timers interrupts
  dt-bindings: mfd: Convert Allwinner GPADC bindings to a schema
  arm64: dts: allwinner: h6: Introduce Tanix TX6 board
  dt-bindings: arm: sunxi: Add compatible for Tanix TX6 board
  arm64: allwinner: h6: add I2C nodes
  dt-bindings: i2c: mv64xxx: Add compatible for the H6 i2c node.
  ARM: dts: sunxi: Add mdio bus sub-node to GMAC
  ...

Link: https://lore.kernel.org/r/d97e6252-9dd7-4cf5-a3cf-56f78b0ca455.lettre@localhost


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 34a6e228 15ede970

Documentation/devicetree/bindings/arm/sunxi.yaml

+16 −0
Original line number Diff line number Diff line
@@ -353,6 +353,12 @@ properties: 
          - const: licheepi,licheepi-zero

          - const: allwinner,sun8i-v3s



      - description: Lichee Zero Plus (with S3, without eMMC/SPI Flash)

        items:

          - const: sipeed,lichee-zero-plus

          - const: sochip,s3

          - const: allwinner,sun8i-v3



      - description: Linksprite PCDuino

        items:

          - const: linksprite,a10-pcduino
@@ -568,6 +574,11 @@ properties: 
          - const: olimex,a64-olinuxino

          - const: allwinner,sun50i-a64



      - description: Olimex A64-OlinuXino (with eMMC)

        items:

          - const: olimex,a64-olinuxino-emmc

          - const: allwinner,sun50i-a64



      - description: Olimex A64 Teres-I

        items:

          - const: olimex,a64-teres-i
@@ -671,6 +682,11 @@ properties: 
          - const: sinlinx,sina33

          - const: allwinner,sun8i-a33



      - description: Tanix TX6

        items:

          - const: oranth,tanix-tx6

          - const: allwinner,sun50i-h6



      - description: TBS A711 Tablet

        items:

          - const: tbs-biometrics,a711

Documentation/devicetree/bindings/i2c/marvell,mv64xxx-i2c.yaml

+3 −0
Original line number Diff line number Diff line
@@ -26,6 +26,9 @@ properties: 
      - items:

          - const: allwinner,sun50i-a64-i2c

          - const: allwinner,sun6i-a31-i2c

      - items:

          - const: allwinner,sun50i-h6-i2c

          - const: allwinner,sun6i-a31-i2c



      - const: marvell,mv64xxx-i2c

      - const: marvell,mv78230-i2c

Documentation/devicetree/bindings/iio/adc/allwinner,sun8i-a33-ths.yaml

0 → 100644
+43 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

%YAML 1.2

---

$id: http://devicetree.org/schemas/iio/adc/allwinner,sun8i-a33-ths.yaml#

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



title: Allwinner A33 Thermal Sensor Device Tree Bindings



maintainers:

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

  - Maxime Ripard <maxime.ripard@bootlin.com>



properties:

  "#io-channel-cells":

    const: 0



  "#thermal-sensor-cells":

    const: 0



  compatible:

    const: allwinner,sun8i-a33-ths



  reg:

    maxItems: 1



required:

  - "#io-channel-cells"

  - "#thermal-sensor-cells"

  - compatible

  - reg



additionalProperties: false



examples:

  - |

    ths: ths@1c25000 {

        compatible = "allwinner,sun8i-a33-ths";

        reg = <0x01c25000 0x100>;

        #thermal-sensor-cells = <0>;

        #io-channel-cells = <0>;

    };



...

Documentation/devicetree/bindings/mfd/allwinner,sun4i-a10-ts.yaml

0 → 100644
+76 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

%YAML 1.2

---

$id: http://devicetree.org/schemas/mfd/allwinner,sun4i-a10-ts.yaml#

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



title: Allwinner A10 Resistive Touchscreen Controller Device Tree Bindings



maintainers:

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

  - Maxime Ripard <maxime.ripard@bootlin.com>



properties:

  "#thermal-sensor-cells":

    const: 0



  compatible:

    enum:

      - allwinner,sun4i-a10-ts

      - allwinner,sun5i-a13-ts

      - allwinner,sun6i-a31-ts



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  allwinner,ts-attached:

    $ref: /schemas/types.yaml#/definitions/flag

    description: A touchscreen is attached to the controller



  allwinner,tp-sensitive-adjust:

    allOf:

      - $ref: /schemas/types.yaml#/definitions/uint32

      - minimum: 0

        maximum: 15

        default: 15

    description: Sensitivity of pen down detection



  allwinner,filter-type:

    allOf:

      - $ref: /schemas/types.yaml#/definitions/uint32

      - minimum: 0

        maximum: 3

        default: 1

    description: |

      Select median and averaging filter. Sample used for median /

      averaging filter:

        0: 4/2

        1: 5/3

        2: 8/4

        3: 16/8



required:

  - "#thermal-sensor-cells"

  - compatible

  - reg

  - interrupts



additionalProperties: false



examples:

  - |

    rtp: rtp@1c25000 {

        compatible = "allwinner,sun4i-a10-ts";

        reg = <0x01c25000 0x100>;

        interrupts = <29>;

        allwinner,ts-attached;

        #thermal-sensor-cells = <0>;

        /* sensitive/noisy touch panel */

        allwinner,tp-sensitive-adjust = <0>;

        allwinner,filter-type = <3>;

    };



...

Documentation/devicetree/bindings/mfd/sun4i-gpadc.txt

deleted100644 → 0
+0 −59
Original line number Diff line number Diff line 
Allwinner SoCs' GPADC Device Tree bindings

------------------------------------------

The Allwinner SoCs all have an ADC that can also act as a thermal sensor

and sometimes as a touchscreen controller.



Required properties:

  - compatible: "allwinner,sun8i-a33-ths",

  - reg: mmio address range of the chip,

  - #thermal-sensor-cells: shall be 0,

  - #io-channel-cells: shall be 0,



Example:

	ths: ths@1c25000 {

		compatible = "allwinner,sun8i-a33-ths";

		reg = <0x01c25000 0x100>;

		#thermal-sensor-cells = <0>;

		#io-channel-cells = <0>;

	};



sun4i, sun5i and sun6i SoCs are also supported via the older binding:



sun4i resistive touchscreen controller

--------------------------------------



Required properties:

 - compatible: "allwinner,sun4i-a10-ts", "allwinner,sun5i-a13-ts" or

   "allwinner,sun6i-a31-ts"

 - reg: mmio address range of the chip

 - interrupts: interrupt to which the chip is connected

 - #thermal-sensor-cells: shall be 0



Optional properties:

 - allwinner,ts-attached	 : boolean indicating that an actual touchscreen

				   is attached to the controller

 - allwinner,tp-sensitive-adjust : integer (4 bits)

				   adjust sensitivity of pen down detection

				   between 0 (least sensitive) and 15

				   (defaults to 15)

 - allwinner,filter-type	 : integer (2 bits)

				   select median and averaging filter

				   samples used for median / averaging filter

				   0: 4/2

				   1: 5/3

				   2: 8/4

				   3: 16/8

				   (defaults to 1)



Example:



	rtp: rtp@1c25000 {

		compatible = "allwinner,sun4i-a10-ts";

		reg = <0x01c25000 0x100>;

		interrupts = <29>;

		allwinner,ts-attached;

		#thermal-sensor-cells = <0>;

		/* sensitive/noisy touch panel */

		allwinner,tp-sensitive-adjust = <0>;

		allwinner,filter-type = <3>;

	};