Commit 0e909f18 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Our usual number of patches to improve the Allwinner Device Tree
support, including:
  - Support for the IOMMU on the H6
  - Support for cpufreq / thermal throttling on the H6
  - Support for the mailbox on the A64, A83t, H3, H5 and H6
  - New boards: A20-OLinuXino-LIME-eMMC

* tag 'sunxi-dt-for-5.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: (23 commits)
  arm64: dts: allwinner: h6: Add IOMMU
  arm64: dts: allwinner: h6: Enable CPU opp tables for Tanix TX6
  arm64: dts: allwinner: h6: add voltage range to OPP table
  arm64: dts: allwinner: sun50i-a64: Add missing address/size-cells
  arm64: dts: allwinner: h6: Enable CPU opp tables for Pine H64
  arm64: dts: allwinner: Sort Pine H64 device-tree nodes
  arm64: dts: allwinner: h6: Enable CPU opp tables for Orange Pi 3
  arm64: dts: allwinner: h6: Enable CPU opp tables for Beelink GS1
  arm64: dts: allwinner: h6: Add CPU Operating Performance Points table
  arm64: dts: allwinner: h6: Add thermal trip points/cooling map
  arm64: dts: allwinner: h6: Add clock to CPU cores
  arm64: allwinner: h6: orangepi-lite2: Support BT+WIFI combo module
  arm64: dts: allwinner: h6: orangepi: Disable OTG mode
  arm64: dts: allwinner: h6: orangepi: Add gpio power supply
  ARM: dts: sun8i-h2-plus-bananapi-m2-zero: Fix led polarity
  arm64: dts: allwinner: h6: Add msgbox node
  arm64: dts: allwinner: a64: Add msgbox node
  ARM: dts: sunxi: h3/h5: Add msgbox node
  ARM: dts: sunxi: a83t: Add msgbox node
  ARM: dts: sun8i-h3: add opp table for mali gpu
  ...

Link: https://lore.kernel.org/r/cfa66bd9-f74c-4614-9ea5-9ef8546cc571.lettre@localhost


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 9c1acf51 b3a0a2f9

Documentation/devicetree/bindings/arm/sunxi.yaml

+5 −0
Original line number Diff line number Diff line
@@ -561,6 +561,11 @@ properties: 
          - const: olimex,a20-olinuxino-lime

          - const: allwinner,sun7i-a20



      - description: Olimex A20-OlinuXino LIME (with eMMC)

        items:

          - const: olimex,a20-olinuxino-lime-emmc

          - const: allwinner,sun7i-a20



      - description: Olimex A20-OlinuXino LIME2

        items:

          - const: olimex,a20-olinuxino-lime2

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -1121,6 +1121,7 @@ dtb-$(CONFIG_MACH_SUN7I) += \ 
	sun7i-a20-olimex-som204-evb.dtb \

	sun7i-a20-olimex-som204-evb-emmc.dtb \

	sun7i-a20-olinuxino-lime.dtb \

	sun7i-a20-olinuxino-lime-emmc.dtb \

	sun7i-a20-olinuxino-lime2.dtb \

	sun7i-a20-olinuxino-lime2-emmc.dtb \

	sun7i-a20-olinuxino-micro.dtb \

arch/arm/boot/dts/sun7i-a20-olinuxino-lime-emmc.dts

0 → 100644
+32 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)

/*

 * Copyright (C) 2020 Olimex Ltd.

 *   Author: Stefan Mavrodiev <stefan@olimex.com>

 */



#include "sun7i-a20-olinuxino-lime.dts"



/ {

	model = "Olimex A20-OLinuXino-LIME-eMMC";

	compatible = "olimex,a20-olinuxino-lime-emmc", "allwinner,sun7i-a20";



	mmc2_pwrseq: pwrseq {

		compatible = "mmc-pwrseq-emmc";

		reset-gpios = <&pio 2 16 GPIO_ACTIVE_LOW>;

	};

};



&mmc2 {

	vmmc-supply = <&reg_vcc3v3>;

	vqmmc-supply = <&reg_vcc3v3>;

	bus-width = <4>;

	non-removable;

	mmc-pwrseq = <&mmc2_pwrseq>;

	status = "okay";



	emmc: emmc@0 {

		reg = <0>;

		compatible = "mmc-card";

		broken-hpi;

	};

};

arch/arm/boot/dts/sun8i-a83t.dtsi

+10 −0
Original line number Diff line number Diff line
@@ -610,6 +610,16 @@ 
			clock-names = "bus", "mod";

		};



		msgbox: mailbox@1c17000 {

			compatible = "allwinner,sun8i-a83t-msgbox",

				     "allwinner,sun6i-a31-msgbox";

			reg = <0x01c17000 0x1000>;

			clocks = <&ccu CLK_BUS_MSGBOX>;

			resets = <&ccu RST_BUS_MSGBOX>;

			interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>;

			#mbox-cells = <1>;

		};



		usb_otg: usb@1c19000 {

			compatible = "allwinner,sun8i-a83t-musb",

				     "allwinner,sun8i-a33-musb";

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

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 


		pwr_led {

			label = "bananapi-m2-zero:red:pwr";

			gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>; /* PL10 */

			gpios = <&r_pio 0 10 GPIO_ACTIVE_LOW>; /* PL10 */

			default-state = "on";

		};

	};

CRA Git | Maintained and supported by SUSTech CRA and CCSE