Commit 915a3919 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'sunxi-dt-for-5.11' of... 

Merge tag 'sunxi-dt-for-5.11' 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:
  - Some nice pinephone additions
  - I2S support for the A64, H3, H5 and H6
  - New boards: Elimo Impetus, Elimo Initium, FriendlyArm ZeroPi, NanoPi R1

* tag 'sunxi-dt-for-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: (21 commits)
  ARM: dts: sun8i-h2-plus-bananapi-m2-zero: add gpio-line-names
  ARM: dts: sun8i: h3: Add initial NanoPi R1 support
  arm64: dts: allwinner: pinephone: Use generic sensor node names
  ARM: dts: sun8i: s3: Add dts for the Elimo Initium SBC
  dt-bindings: arm: sunxi: add Elimo bindings
  ARM: dts: sun8i: s3: Add dtsi for the Elimo Impetus SoM
  arm64: dts: allwinner: pinephone: Add Bluetooth support
  arm64: dts: allwinner: pinephone: Add WiFi support
  arm64: dts: allwinner: pinephone: Add light/proximity sensor
  arm64: dts: allwinner: pinephone: Add LED flash
  arm64: dts: allwinner: pinephone: Set ALDO3 to exactly 3v0
  arm64: dts: allwinner: pinephone: Remove AC power supply
  arm: dts: sunxi: h3/h5: Add I2S2 node
  arm64: dts: allwinner: a64: Add I2S2 node
  arm64: dts: allwinner: h6: Add I2S1 node
  arm64: dts: allwinner: h6: PineH64 model B: Add wifi
  ARM: dts: sun8i-v3s: Add I2C1 PB pins description
  ARM: dts: sun8i: V3/S3: Add UART1 pin definitions to the V3/S3 dtsi
  dt-bindings: vendors: add Elimo Engineering vendor prefix
  ARM: dts: sun8i: add FriendlyArm ZeroPi support
  ...

Link: https://lore.kernel.org/r/551fdf4f-8a0b-4a22-ba49-b4f61520a9ab.lettre@localhost


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents ab8d302c 036b7334

Documentation/devicetree/bindings/arm/sunxi.yaml

+23 −0
Original line number Diff line number Diff line
@@ -201,6 +201,19 @@ properties: 
          - const: dserve,dsrv9703c

          - const: allwinner,sun4i-a10



      - description: Elimo Engineering Impetus SoM

        items:

          - const: elimo,impetus

          - const: sochip,s3

          - const: allwinner,sun8i-v3



      - description: Elimo Engineering Initium

        items:

          - const: elimo,initium

          - const: elimo,impetus

          - const: sochip,s3

          - const: allwinner,sun8i-v3



      - description: Empire Electronix D709 Tablet

        items:

          - const: empire-electronix,d709
@@ -251,6 +264,16 @@ properties: 
          - const: friendlyarm,nanopi-neo-plus2

          - const: allwinner,sun50i-h5



      - description: FriendlyARM NanoPi R1

        items:

          - const: friendlyarm,nanopi-r1

          - const: allwinner,sun8i-h3



      - description: FriendlyARM ZeroPi

        items:

          - const: friendlyarm,zeropi

          - const: allwinner,sun8i-h3



      - description: Gemei G9 Tablet

        items:

          - const: gemei,g9

Documentation/devicetree/bindings/vendor-prefixes.yaml

+2 −0
Original line number Diff line number Diff line
@@ -319,6 +319,8 @@ patternProperties: 
    description: Elgin S/A.

  "^elida,.*":

    description: Shenzhen Elida Technology Co., Ltd.

  "^elimo,.*":

    description: Elimo Engineering Ltd.

  "^embest,.*":

    description: Shenzhen Embest Technology Co., Ltd.

  "^emlid,.*":

arch/arm/boot/dts/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -1193,6 +1193,7 @@ dtb-$(CONFIG_MACH_SUN8I) += \ 
	sun8i-h3-nanopi-m1-plus.dtb \

	sun8i-h3-nanopi-neo.dtb \

	sun8i-h3-nanopi-neo-air.dtb \

	sun8i-h3-nanopi-r1.dtb \

	sun8i-h3-orangepi-2.dtb \

	sun8i-h3-orangepi-lite.dtb \

	sun8i-h3-orangepi-one.dtb \
@@ -1202,12 +1203,14 @@ dtb-$(CONFIG_MACH_SUN8I) += \ 
	sun8i-h3-orangepi-plus2e.dtb \

	sun8i-h3-orangepi-zero-plus2.dtb \

	sun8i-h3-rervision-dvk.dtb \

	sun8i-h3-zeropi.dtb \

	sun8i-h3-emlid-neutis-n5h3-devboard.dtb \

	sun8i-r16-bananapi-m2m.dtb \

	sun8i-r16-nintendo-nes-classic.dtb \

	sun8i-r16-nintendo-super-nes-classic.dtb \

	sun8i-r16-parrot.dtb \

	sun8i-r40-bananapi-m2-ultra.dtb \

	sun8i-s3-elimo-initium.dtb \

	sun8i-s3-lichee-zero-plus.dtb \

	sun8i-s3-pinecube.dtb \

	sun8i-t3-cqa3t-bv3.dtb \

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

+64 −0
Original line number Diff line number Diff line
@@ -136,6 +136,70 @@ bluetooth { 


};



&pio {

	gpio-line-names =

		/* PA */

		"CON2-P13", "CON2-P11", "CON2-P22", "CON2-P15",

			"CON3-P03", "CON3-P02", "CON2-P07", "CON2-P29",

		"CON2-P31", "CON2-P33", "CON2-P35", "CON2-P05",

			"CON2-P03", "CON2-P08", "CON2-P10", "CON2-P16",

		"CON2-P12", "CON2-P37", "CON2-P28", "CON2-P27",

			"CON2-P40", "CON2-P38", "", "",

		"", "", "", "", "", "", "", "",



		/* PB */

		"", "", "", "", "", "", "", "",

		"", "", "", "", "", "", "", "",

		"", "", "", "", "", "", "", "",

		"", "", "", "", "", "", "", "",



		/* PC */

		"CON2-P19", "CON2-P21", "CON2-P23", "CON2-P24",

			"CON2-P18", "", "", "CON2-P26",

		"", "", "", "", "", "", "", "",

		"", "", "", "", "", "", "", "",

		"", "", "", "", "", "", "", "",



		/* PD */

		"", "", "", "", "", "", "", "",

		"", "", "", "", "", "", "CSI-PWR-EN", "",

		"", "", "", "", "", "", "", "",

		"", "", "", "", "", "", "", "",



		/* PE */

		"CN3-P17", "CN3-P13", "CN3-P09", "CN3-P07",

			"CN3-P19", "CN3-P21", "CN3-P22", "CN3-P20",

		"CN3-P18", "CN3-P16", "CN3-P14", "CN3-P12",

			"CN3-P05", "CN3-P03", "CN3-P06", "CN3-P08",

		"", "", "", "", "", "", "", "",

		"", "", "", "", "", "", "", "",



		/* PF */

		"SDC0-D1", "SDC0-D0", "SDC0-CLK", "SDC0-CMD", "SDC0-D3",

			"SDC0-D2", "SDC0-DET", "",

		"", "", "", "", "", "", "", "",

		"", "", "", "", "", "", "", "",

		"", "", "", "", "", "", "", "",



		/* PG */

		"WL-SDIO-CLK", "WL-SDIO-CMD", "WL-SDIO-D0", "WL-SDIO-D1",

			"WL-SDIO-D2", "WL-SDIO-D3", "BT-UART-TX", "BT-UART-RX",

		"BT-UART-RTS", "BT-UART-CTS", "WL-WAKE-AP", "BT-WAKE-AP",

			"BT-RST-N", "AP-WAKE-BT", "", "",

		"", "", "", "", "", "", "", "",

		"", "", "", "", "", "", "", "";

};



&r_pio {

	gpio-line-names =

		/* PL */

		"", "CPUX-SET", "CON2-P32", "POWER-KEY", "CON2-P36",

			"VCC-IO-EN", "USB0-ID", "WL-PWR-EN",

		"PWR-STB", "PWR-DRAM", "PWR-LED", "IR-RX", "", "", "", "",

		"", "", "", "", "", "", "", "",

		"", "", "", "", "", "", "", "";

};



&usb_otg {

	dr_mode = "otg";

	status = "okay";

arch/arm/boot/dts/sun8i-h3-nanopi-r1.dts

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

/*

 * Copyright (C) 2019 Igor Pecovnik <igor@armbian.com>

 * Copyright (C) 2020 Jayantajit Gogoi <jayanta.gogoi525@gmail.com>

 * Copyright (C) 2020 Yu-Tung Chang <mtwget@gmail.com>

*/



#include "sun8i-h3-nanopi.dtsi"

#include <dt-bindings/leds/common.h>



/ {

	model = "FriendlyARM NanoPi R1";

	compatible = "friendlyarm,nanopi-r1", "allwinner,sun8i-h3";



	aliases {

		serial1 = &uart1;

		ethernet0 = &emac;

		ethernet1 = &wifi;

	};



	reg_gmac_3v3: gmac-3v3 {

		compatible = "regulator-fixed";

		regulator-name = "gmac-3v3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		startup-delay-us = <100000>;

		enable-active-high;

		gpio = <&pio 3 6 GPIO_ACTIVE_HIGH>; /* PD6 */

	};



	reg_vdd_cpux: gpio-regulator {

		compatible = "regulator-gpio";

		regulator-name = "vdd-cpux";

		regulator-type = "voltage";

		regulator-boot-on;

		regulator-always-on;

		regulator-min-microvolt = <1100000>;

		regulator-max-microvolt = <1300000>;

		regulator-ramp-delay = <50>;

		gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>; /* PL6 */

		gpios-states = <0x1>;

		states = <1100000 0x0

			  1300000 0x1>;

	};



	wifi_pwrseq: wifi_pwrseq {

		compatible = "mmc-pwrseq-simple";

		reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 */

		clocks = <&rtc 1>;

		clock-names = "ext_clock";

	};



	leds {

		led-2 {

			function = LED_FUNCTION_WAN;

			color = <LED_COLOR_ID_GREEN>;

			gpios = <&pio 6 11 GPIO_ACTIVE_HIGH>; /* PG11 */

		};



		led-3 {

			function = LED_FUNCTION_LAN;

			color = <LED_COLOR_ID_GREEN>;

			gpios = <&pio 0 9 GPIO_ACTIVE_HIGH>; /* PA9 */

		};

	};

};



&cpu0 {

	cpu-supply = <&reg_vdd_cpux>;

};



&ehci1 {

	status = "okay";

};



&ehci2 {

	status = "okay";

};



&emac {

	pinctrl-names = "default";

	pinctrl-0 = <&emac_rgmii_pins>;

	phy-supply = <&reg_gmac_3v3>;

	phy-handle = <&ext_rgmii_phy>;

	phy-mode = "rgmii-id";

	status = "okay";

};



&external_mdio {

	ext_rgmii_phy: ethernet-phy@7 {

		compatible = "ethernet-phy-ieee802.3-c22";

		reg = <7>;

	};

};



&mmc1 {

	vmmc-supply = <&reg_vcc3v3>;

	vqmmc-supply = <&reg_vcc3v3>;

	mmc-pwrseq = <&wifi_pwrseq>;

	bus-width = <4>;

	non-removable;

	status = "okay";



	wifi: wifi@1 {

		reg = <1>;

		compatible = "brcm,bcm4329-fmac";

		interrupt-parent = <&pio>;

		interrupts = <6 10 IRQ_TYPE_LEVEL_LOW>; /* PG10 / EINT10 */

		interrupt-names = "host-wake";

	};

};



&mmc2 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc2_8bit_pins>;

	vmmc-supply = <&reg_vcc3v3>;

	vqmmc-supply = <&reg_vcc3v3>;

	bus-width = <8>;

	non-removable;

	status = "okay";

};



&ohci1 {

	status = "okay";

};



&ohci2 {

	status = "okay";

};



&reg_usb0_vbus {

	gpio = <&r_pio 0 2 GPIO_ACTIVE_HIGH>; /* PL2 */

	status = "okay";

};



&uart1 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart1_pins>;

	status = "okay";

};



&uart3 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart3_pins>, <&uart3_rts_cts_pins>;

	uart-has-rtscts;

	status = "okay";



	bluetooth {

		compatible = "brcm,bcm43438-bt";

		clocks = <&rtc 1>;

		clock-names = "lpo";

		vbat-supply = <&reg_vcc3v3>;

		vddio-supply = <&reg_vcc3v3>;

		device-wakeup-gpios = <&pio 0 8 GPIO_ACTIVE_HIGH>; /* PA8 */

		host-wakeup-gpios = <&pio 0 7 GPIO_ACTIVE_HIGH>; /* PA7 */

		shutdown-gpios = <&pio 6 13 GPIO_ACTIVE_HIGH>; /* PG13 */

	};

};



&usb_otg {

	status = "okay";

	dr_mode = "otg";

};



&usbphy {

	usb0_id_det-gpios = <&pio 6 12 GPIO_ACTIVE_HIGH>; /* PG12 */

	usb0_vbus-supply = <&reg_usb0_vbus>;

	status = "okay";

};