Commit 4828f457 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

Merge tag 'sunxi-dt-for-5.9-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:
  - CPUFreq / Thermal throttling support for the H5
  - Touchscreen support for the Pinephone
  - New boards: PinePhone v1.2

* tag 'sunxi-dt-for-5.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  arm64: dts: allwinner: h5: bananapi-m2-plus-v1.2: Tie in CPU OPPs
  arm64: dts: allwinner: h5: libretech-all-h3-cc: Tie in CPU OPPs
  arm64: dts: allwinner: h5: Add CPU Operating Performance Points table
  arm64: dts: allwinner: h5: Add trip and cooling maps to CPU thermal zones
  arm64: dts: allwinner: h5: Add clock to CPU cores
  ARM: dts: sunxi: bananapi-m2-plus-v1.2: Fix CPU supply voltages
  ARM: dts: sunxi: bananapi-m2-plus-v1.2: Add regulator supply to all CPU cores
  ARM: dts: sunxi: libretech-all-h3-cc: Add regulator supply to all CPU cores
  arm64: dts: sun50i-pinephone: dldo4 must not be >= 1.8V
  arm64: dts: allwinner: Add support for PinePhone revision 1.2
  dt-bindings: arm: sunxi: Add PinePhone 1.2 bindings
  arm64: dts: sun50i-a64-pinephone: Add touchscreen support
  arm64: dts: sun50i-a64-pinephone: Enable LCD support on PinePhone
  ARM: dts: orange-pi-zero-plus2: add leds configuration
  ARM: dts: orange-pi-zero-plus2: enable USB OTG port

Link: https://lore.kernel.org/r/fa48ffcb-3404-41bb-b065-a16717cf5688.lettre@localhost


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 262fc784 bc6b31c5

Documentation/devicetree/bindings/arm/sunxi.yaml

+5 −0
Original line number Diff line number Diff line
@@ -657,6 +657,11 @@ properties: 
          - const: pine64,pinephone-1.1

          - const: allwinner,sun50i-a64



      - description: Pine64 PinePhone (1.2)

        items:

          - const: pine64,pinephone-1.2

          - const: allwinner,sun50i-a64



      - description: Pine64 PineTab

        items:

          - const: pine64,pinetab

arch/arm/boot/dts/sun8i-h3-orangepi-zero-plus2.dts

+38 −0
Original line number Diff line number Diff line
@@ -70,6 +70,21 @@ 
		};

	};



	leds {

		compatible = "gpio-leds";



		pwr {

			label = "orangepi:green:pwr";

			gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>;

			default-state = "on";

		};



		status {

			label = "orangepi:red:status";

			gpios = <&pio 0 17 GPIO_ACTIVE_HIGH>;

		};

	};



	reg_vcc3v3: vcc3v3 {

		compatible = "regulator-fixed";

		regulator-name = "vcc3v3";
@@ -88,6 +103,10 @@ 
	status = "okay";

};



&ehci0 {

	status = "okay";

};



&hdmi {

	status = "okay";

};
@@ -132,8 +151,27 @@ 
	status = "okay";

};



&ohci0 {

	status = "okay";

};



&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_pa_pins>;

	status = "okay";

};



&usb_otg {

	/*

	 * According to schematics CN1 MicroUSB port can be used to take

	 * external 5V to power up the board VBUS. On the contrary CN1 MicroUSB

	 * port cannot provide power externally even if the board is powered

	 * via GPIO pins. It thus makes sense to force peripheral mode.

	 */

	dr_mode = "peripheral";

	status = "okay";

};



&usbphy {

	status = "okay";

};

arch/arm/boot/dts/sunxi-bananapi-m2-plus-v1.2.dtsi

+15 −3
Original line number Diff line number Diff line
@@ -16,15 +16,27 @@ 
		regulator-type = "voltage";

		regulator-boot-on;

		regulator-always-on;

		regulator-min-microvolt = <1100000>;

		regulator-max-microvolt = <1300000>;

		regulator-min-microvolt = <1108475>;

		regulator-max-microvolt = <1308475>;

		regulator-ramp-delay = <50>; /* 4ms */

		gpios = <&r_pio 0 1 GPIO_ACTIVE_HIGH>; /* PL1 */

		gpios-states = <0x1>;

		states = <1100000 0>, <1300000 1>;

		states = <1108475 0>, <1308475 1>;

	};

};



&cpu0 {

	cpu-supply = <&reg_vdd_cpux>;

};



&cpu1 {

	cpu-supply = <&reg_vdd_cpux>;

};



&cpu2 {

	cpu-supply = <&reg_vdd_cpux>;

};



&cpu3 {

	cpu-supply = <&reg_vdd_cpux>;

};

arch/arm/boot/dts/sunxi-libretech-all-h3-cc.dtsi

+12 −0
Original line number Diff line number Diff line
@@ -128,6 +128,18 @@ 
	cpu-supply = <&reg_vdd_cpux>;

};



&cpu1 {

	cpu-supply = <&reg_vdd_cpux>;

};



&cpu2 {

	cpu-supply = <&reg_vdd_cpux>;

};



&cpu3 {

	cpu-supply = <&reg_vdd_cpux>;

};



&de {

	status = "okay";

};

arch/arm64/boot/dts/allwinner/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-pine64-plus.dtb sun50i-a64-pine64.dtb 
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-pinebook.dtb

dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-pinephone-1.0.dtb

dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-pinephone-1.1.dtb

dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-pinephone-1.2.dtb

dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-pinetab.dtb

dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-sopine-baseboard.dtb

dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-teres-i.dtb

CRA Git | Maintained and supported by SUSTech CRA and CCSE