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

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

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

Our usual bunch of patches to support the Allwinner SoCs, this time
adding:
  - New secondary interrupt controller binding to support the wake-up
  - Use the RSB bus instead of I2C for the PMIC on the H6
  - HDMI support for the BananaPi M2-Zero
  - New board: Topwise A721

* tag 'sunxi-dt-for-5.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  ARM: dts: sun8i: h3: beelink-x2: Add power button
  arm64: dts: allwinner: h6: Use RSB for AXP805 PMIC connection
  ARM: dts: sunxi: h2-plus-bananapi-m2-zero: Add HDMI out
  ARM: dts: sun4i: Add support for Topwise A721 tablet
  dt-bindings: arm: Add Topwise A721
  arm64: dts: allwinner: Move wakeup-capable IRQs to r_intc
  arm64: dts: allwinner: Use the new r_intc binding
  ARM: dts: sunxi: Move wakeup-capable IRQs to r_intc
  ARM: dts: sunxi: h3/h5: Add r_intc node
  ARM: dts: sunxi: Use the new r_intc binding

Link: https://lore.kernel.org/r/8a3e3271-bebe-4d27-a9e7-7b7a6311a38d.lettre@localhost


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 85af259b d580e6f0

Documentation/devicetree/bindings/arm/sunxi.yaml

+5 −0
Original line number Diff line number Diff line
@@ -802,6 +802,11 @@ properties: 
          - const: tbs-biometrics,a711

          - const: allwinner,sun8i-a83t



      - description: Topwise A721 Tablet

        items:

          - const: topwise,a721

          - const: allwinner,sun4i-a10



      - description: Utoo P66

        items:

          - const: utoo,p66

arch/arm/boot/dts/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -1111,7 +1111,8 @@ dtb-$(CONFIG_MACH_SUN4I) += \ 
	sun4i-a10-olinuxino-lime.dtb \

	sun4i-a10-pcduino.dtb \

	sun4i-a10-pcduino2.dtb \

	sun4i-a10-pov-protab2-ips9.dtb

	sun4i-a10-pov-protab2-ips9.dtb \

	sun4i-a10-topwise-a721.dtb

dtb-$(CONFIG_MACH_SUN5I) += \

	sun5i-a10s-auxtek-t003.dtb \

	sun5i-a10s-auxtek-t004.dtb \

arch/arm/boot/dts/sun4i-a10-topwise-a721.dts

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

/*

 * Copyright 2020 Pascal Roeleven <dev@pascalroeleven.nl>

 */



/dts-v1/;

#include "sun4i-a10.dtsi"

#include "sunxi-common-regulators.dtsi"



#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/input/input.h>

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

#include <dt-bindings/pwm/pwm.h>



/ {

	model = "Topwise A721";

	compatible = "topwise,a721", "allwinner,sun4i-a10";



	aliases {

		serial0 = &uart0;

	};



	backlight: backlight {

		compatible = "pwm-backlight";

		pwms = <&pwm 0 100000 PWM_POLARITY_INVERTED>;

		power-supply = <&reg_vbat>;

		enable-gpios = <&pio 7 7 GPIO_ACTIVE_HIGH>; /* PH7 */

		brightness-levels = <0 30 40 50 60 70 80 90 100>;

		default-brightness-level = <8>;

	};



	chosen {

		stdout-path = "serial0:115200n8";

	};



	panel {

		compatible = "starry,kr070pe2t";

		backlight = <&backlight>;

		power-supply = <&reg_lcd_power>;



		port {

			panel_input: endpoint {

				remote-endpoint = <&tcon0_out_panel>;

			};

		};

	};



	reg_lcd_power: reg-lcd-power {

		compatible = "regulator-fixed";

		regulator-name = "reg-lcd-power";

		gpio = <&pio 7 8 GPIO_ACTIVE_HIGH>; /* PH8 */

		enable-active-high;

	};



	reg_vbat: reg-vbat {

		compatible = "regulator-fixed";

		regulator-name = "vbat";

		regulator-min-microvolt = <3700000>;

		regulator-max-microvolt = <3700000>;

	};



};



&codec {

	status = "okay";

};



&cpu0 {

	cpu-supply = <&reg_dcdc2>;

};



&de {

	status = "okay";

};



&ehci0 {

	status = "okay";

};



&ehci1 {

	status = "okay";

};



&i2c0 {

	status = "okay";



	axp209: pmic@34 {

		reg = <0x34>;

		interrupts = <0>;

	};

};



#include "axp209.dtsi"



&ac_power_supply {

	status = "okay";

};



&battery_power_supply {

	status = "okay";

};



&i2c1 {

	status = "okay";



	accelerometer@4c {

		compatible = "fsl,mma7660";

		reg = <0x4c>;

	};

};



&i2c2 {

	status = "okay";



	touchscreen@38 {

		compatible = "edt,edt-ft5406";

		reg = <0x38>;

		interrupt-parent = <&pio>;

		interrupts = <7 21 IRQ_TYPE_EDGE_FALLING>;

		touchscreen-size-x = <800>;

		touchscreen-size-y = <480>;

		vcc-supply = <&reg_vcc3v3>;

	};

};



&lradc {

	vref-supply = <&reg_ldo2>;

	status = "okay";



	button-571 {

		label = "Volume Up";

		linux,code = <KEY_VOLUMEUP>;

		channel = <0>;

		voltage = <571428>;

	};



	button-761 {

		label = "Volume Down";

		linux,code = <KEY_VOLUMEDOWN>;

		channel = <0>;

		voltage = <761904>;

	};

};



&mmc0 {

	vmmc-supply = <&reg_vcc3v3>;

	bus-width = <4>;

	cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH01 */

	status = "okay";

};



&ohci0 {

	status = "okay";

};



&ohci1 {

	status = "okay";

};



&otg_sram {

	status = "okay";

};



&pio {

	vcc-pb-supply = <&reg_vcc3v3>;

	vcc-pf-supply = <&reg_vcc3v3>;

	vcc-ph-supply = <&reg_vcc3v3>;

};



&pwm {

	pinctrl-names = "default";

	pinctrl-0 = <&pwm0_pin>;

	status = "okay";

};



&reg_dcdc2 {

	regulator-always-on;

	regulator-min-microvolt = <1000000>;

	regulator-max-microvolt = <1400000>;

	regulator-name = "vdd-cpu";

};



&reg_dcdc3 {

	regulator-always-on;

	regulator-min-microvolt = <1250000>;

	regulator-max-microvolt = <1250000>;

	regulator-name = "vdd-int-dll";

};



&reg_ldo1 {

	regulator-name = "vdd-rtc";

};



&reg_ldo2 {

	regulator-always-on;

	regulator-min-microvolt = <3000000>;

	regulator-max-microvolt = <3000000>;

	regulator-name = "avcc";

};



&reg_usb0_vbus {

	status = "okay";

};



&reg_usb1_vbus {

	status = "okay";

};



&reg_usb2_vbus {

	status = "okay";

};



&tcon0_out {

	tcon0_out_panel: endpoint@0 {

		reg = <0>;

		remote-endpoint = <&panel_input>;

	};

};



&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_pb_pins>;

	status = "okay";

};



&usb_otg {

	dr_mode = "otg";

	status = "okay";

};



&usb_power_supply {

	status = "okay";

};



&usbphy {

	usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */

	usb0_vbus_det-gpios = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */

	usb0_vbus-supply = <&reg_usb0_vbus>;

	usb1_vbus-supply = <&reg_usb1_vbus>;

	usb2_vbus-supply = <&reg_usb2_vbus>;

	status = "okay";

};

arch/arm/boot/dts/sun6i-a31-hummingbird.dts

+1 −1
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ 
		compatible = "x-powers,axp221";

		reg = <0x68>;

		interrupt-parent = <&r_intc>;

		interrupts = <0 IRQ_TYPE_LEVEL_LOW>;

		interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;

		x-powers,drive-vbus-en;

	};

};

arch/arm/boot/dts/sun6i-a31-m9.dts

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ 
		compatible = "x-powers,axp221";

		reg = <0x68>;

		interrupt-parent = <&r_intc>;

		interrupts = <0 IRQ_TYPE_LEVEL_LOW>;

		interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;

	};

};