Commit 42a5718b authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

Our usual bunch of DT patches, with this time mostly:
 - Mali GPU support for the H6
 - Two new crypto drivers enablement
 - A few fixes to our DTs, fixed through the validation effort
 - New boards: NanoPi Duo2

* tag 'sunxi-dt-for-5.5-1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: (22 commits)
  dt-bindings: arm: sunxi: add FriendlyARM NanoPi Duo2
  ARM: dts: sun8i: add FriendlyARM NanoPi Duo2
  arm64: allwinner: h6: Enable GPU node for Tanix TX6
  arm64: dts: allwinner: bluetooth for Emlid Neutis N5
  ARM: dts: sunxi: h3/h5: add missing uart2 rts/cts pins
  ARM: dts: sun9i: a80: Add Security System node
  ARM: dts: sun8i: a83t: Add Security System node
  arm64: dts: allwinner: sun50i: Add Crypto Engine node on H6
  arm64: dts: allwinner: sun50i: Add crypto engine node on H5
  arm64: dts: allwinner: sun50i: Add Crypto Engine node on A64
  ARM: dts: sun8i: H3: Add Crypto Engine node
  ARM: dts: sun8i: R40: add crypto engine node
  dt-bindings: crypto: Add DT bindings documentation for sun8i-ce Crypto Engine
  arm64: dts: allwinner: Add mali GPU supply for H6 boards
  arm64: dts: allwinner: Add ARM Mali GPU node for H6
  ARM: dts: sun8i: a83t: a711: Add touchscreen node
  ARM: dts: sun5i: olinuxino micro: Fix AT24 node name
  ARM: dts: sun9i: Add missing watchdog clocks
  arm64: dts: sun50i: sopine-baseboard: Expose serial1, serial2 and serial3
  arm64: dts: allwinner: orange-pi-3: Enable UART1 / Bluetooth
  ...

Link: https://lore.kernel.org/r/1bf18c83-f41d-4353-9ca2-9585b8693df2.lettre@localhost


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents f638b287 d79ccef0

Documentation/devicetree/bindings/arm/sunxi.yaml

+5 −0
Original line number Diff line number Diff line
@@ -211,6 +211,11 @@ properties: 
          - const: friendlyarm,nanopi-a64

          - const: allwinner,sun50i-a64



      - description: FriendlyARM NanoPi Duo2

        items:

          - const: friendlyarm,nanopi-duo2

          - const: allwinner,sun8i-h3



      - description: FriendlyARM NanoPi M1

        items:

          - const: friendlyarm,nanopi-m1

Documentation/devicetree/bindings/crypto/allwinner,sun8i-ce.yaml

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

%YAML 1.2

---

$id: http://devicetree.org/schemas/crypto/allwinner,sun8i-ce.yaml#

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



title: Allwinner Crypto Engine driver



maintainers:

  - Corentin Labbe <clabbe.montjoie@gmail.com>



properties:

  compatible:

    enum:

      - allwinner,sun8i-h3-crypto

      - allwinner,sun8i-r40-crypto

      - allwinner,sun50i-a64-crypto

      - allwinner,sun50i-h5-crypto

      - allwinner,sun50i-h6-crypto



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  clocks:

    items:

      - description: Bus clock

      - description: Module clock

      - description: MBus clock

    minItems: 2

    maxItems: 3



  clock-names:

    items:

      - const: bus

      - const: mod

      - const: ram

    minItems: 2

    maxItems: 3



  resets:

    maxItems: 1



if:

  properties:

    compatible:

      items:

        const: allwinner,sun50i-h6-crypto

then:

  properties:

      clocks:

        minItems: 3

      clock-names:

        minItems: 3

else:

  properties:

      clocks:

        maxItems: 2

      clock-names:

        maxItems: 2



required:

  - compatible

  - reg

  - interrupts

  - clocks

  - clock-names

  - resets



additionalProperties: false



examples:

  - |

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

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

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



    crypto: crypto@1c15000 {

      compatible = "allwinner,sun8i-h3-crypto";

      reg = <0x01c15000 0x1000>;

      interrupts = <GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH>;

      clocks = <&ccu CLK_BUS_CE>, <&ccu CLK_CE>;

      clock-names = "bus", "mod";

      resets = <&ccu RST_BUS_CE>;

    };

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -1112,6 +1112,7 @@ dtb-$(CONFIG_MACH_SUN8I) += \ 
	sun8i-h3-beelink-x2.dtb \

	sun8i-h3-libretech-all-h3-cc.dtb \

	sun8i-h3-mapleboard-mp130.dtb \

	sun8i-h3-nanopi-duo2.dtb \

	sun8i-h3-nanopi-m1.dtb	\

	sun8i-h3-nanopi-m1-plus.dtb \

	sun8i-h3-nanopi-neo.dtb \

arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ 
&i2c1 {

	status = "okay";



	at24@50 {

	eeprom@50 {

		compatible = "atmel,24c16";

		pagesize = <16>;

		reg = <0x50>;

arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts

+16 −0
Original line number Diff line number Diff line
@@ -164,6 +164,22 @@ 
	status = "okay";

};



&i2c0 {

	clock-frequency = <400000>;

	status = "okay";



	touchscreen@38 {

		compatible = "edt,edt-ft5x06";

		reg = <0x38>;

		interrupt-parent = <&r_pio>;

		interrupts = <0 7 IRQ_TYPE_EDGE_FALLING>; /* PL7 */

		reset-gpios = <&pio 3 5 GPIO_ACTIVE_LOW>; /* PD5 */

		vcc-supply = <&reg_ldo_io0>;

		touchscreen-size-x = <1024>;

		touchscreen-size-y = <600>;

	};

};



&i2c1 {

	clock-frequency = <400000>;

	status = "okay";

CRA Git | Maintained and supported by SUSTech CRA and CCSE