Unverified Commit 594579e4 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

- Add D1 GPADC node
- Introduce support for OrangePi Zero 3 SBC
- Enable DT overlay support for Allwinner H3 boards

* tag 'sunxi-dt-for-6.6-1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  arm: dts: Enable device-tree overlay support for sun8i-h3 pi devices
  arm64: dts: allwinner: h616: Add OrangePi Zero 3 board support
  dt-bindings: arm: sunxi: document Orange Pi Zero 3 board name
  arm64: dts: allwinner: h616: Split Orange Pi Zero 2 DT
  riscv: dts: allwinner: d1: Add GPADC node

Link: https://lore.kernel.org/r/20230806180546.GA127039@jernej-laptop


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents c718f36c 0801a3a9

Documentation/devicetree/bindings/arm/sunxi.yaml

+5 −0
Original line number Diff line number Diff line
@@ -997,4 +997,9 @@ properties: 
          - const: xunlong,orangepi-zero2

          - const: allwinner,sun50i-h616



      - description: Xunlong OrangePi Zero 3

        items:

          - const: xunlong,orangepi-zero3

          - const: allwinner,sun50i-h618



additionalProperties: true

arch/arm/boot/dts/allwinner/Makefile

+19 −0
Original line number Diff line number Diff line
@@ -179,6 +179,25 @@ dtb-$(CONFIG_MACH_SUN7I) += \ 
	sun7i-a20-pcduino3-nano.dtb \

	sun7i-a20-wexler-tab7200.dtb \

	sun7i-a20-wits-pro-a20-dkt.dtb



# Enables support for device-tree overlays for all pis

DTC_FLAGS_sun8i-h3-orangepi-lite := -@

DTC_FLAGS_sun8i-h3-bananapi-m2-plus := -@

DTC_FLAGS_sun8i-h3-nanopi-m1-plus := -@

DTC_FLAGS_sun8i-h3-nanopi-m1 := -@

DTC_FLAGS_sun8i-h3-nanopi-duo2 := -@

DTC_FLAGS_sun8i-h3-orangepi-plus2e := -@

DTC_FLAGS_sun8i-h3-orangepi-one := -@

DTC_FLAGS_sun8i-h3-orangepi-plus := -@

DTC_FLAGS_sun8i-h3-orangepi-2 := -@

DTC_FLAGS_sun8i-h3-orangepi-zero-plus2 := -@

DTC_FLAGS_sun8i-h3-nanopi-neo-air := -@

DTC_FLAGS_sun8i-h3-zeropi := -@

DTC_FLAGS_sun8i-h3-nanopi-neo := -@

DTC_FLAGS_sun8i-h3-nanopi-r1 := -@

DTC_FLAGS_sun8i-h3-orangepi-pc := -@

DTC_FLAGS_sun8i-h3-bananapi-m2-plus-v1.2 := -@

DTC_FLAGS_sun8i-h3-orangepi-pc-plus := -@

dtb-$(CONFIG_MACH_SUN8I) += \

	sun8i-a23-evb.dtb \

	sun8i-a23-gt90h-v4.dtb \

arch/arm64/boot/dts/allwinner/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -40,3 +40,4 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-tanix-tx6.dtb 
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-tanix-tx6-mini.dtb

dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h616-orangepi-zero2.dtb

dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h616-x96-mate.dtb

dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h618-orangepi-zero3.dtb

arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero.dtsi

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

/*

 * Copyright (C) 2020 Arm Ltd.

 *

 * DT nodes common between Orange Pi Zero 2 and Orange Pi Zero 3.

 * Excludes PMIC nodes and properties, since they are different between the two.

 */



#include "sun50i-h616.dtsi"



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

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

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



/ {

	aliases {

		ethernet0 = &emac0;

		serial0 = &uart0;

	};



	chosen {

		stdout-path = "serial0:115200n8";

	};



	leds {

		compatible = "gpio-leds";



		led-0 {

			function = LED_FUNCTION_POWER;

			color = <LED_COLOR_ID_RED>;

			gpios = <&pio 2 12 GPIO_ACTIVE_HIGH>; /* PC12 */

			default-state = "on";

		};



		led-1 {

			function = LED_FUNCTION_STATUS;

			color = <LED_COLOR_ID_GREEN>;

			gpios = <&pio 2 13 GPIO_ACTIVE_HIGH>; /* PC13 */

		};

	};



	reg_vcc5v: vcc5v {

		/* board wide 5V supply directly from the USB-C socket */

		compatible = "regulator-fixed";

		regulator-name = "vcc-5v";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		regulator-always-on;

	};



	reg_usb1_vbus: regulator-usb1-vbus {

		compatible = "regulator-fixed";

		regulator-name = "usb1-vbus";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		vin-supply = <&reg_vcc5v>;

		enable-active-high;

		gpio = <&pio 2 16 GPIO_ACTIVE_HIGH>; /* PC16 */

	};

};



&ehci1 {

	status = "okay";

};



/* USB 2 & 3 are on headers only. */



&emac0 {

	pinctrl-names = "default";

	pinctrl-0 = <&ext_rgmii_pins>;

	phy-mode = "rgmii";

	phy-handle = <&ext_rgmii_phy>;

	allwinner,rx-delay-ps = <3100>;

	allwinner,tx-delay-ps = <700>;

	status = "okay";

};



&mdio0 {

	ext_rgmii_phy: ethernet-phy@1 {

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

		reg = <1>;

	};

};



&mmc0 {

	cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>;	/* PF6 */

	bus-width = <4>;

	status = "okay";

};



&ohci1 {

	status = "okay";

};



&spi0  {

	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&spi0_pins>, <&spi0_cs0_pin>;



	flash@0 {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "jedec,spi-nor";

		reg = <0>;

		spi-max-frequency = <40000000>;

	};

};



&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_ph_pins>;

	status = "okay";

};



&usbotg {

	/*

	 * PHY0 pins are connected to a USB-C socket, but a role switch

	 * is not implemented: both CC pins are pulled to GND.

	 * The VBUS pins power the device, so a fixed peripheral mode

	 * is the best choice.

	 * The board can be powered via GPIOs, in this case port0 *can*

	 * act as a host (with a cable/adapter ignoring CC), as VBUS is

	 * then provided by the GPIOs. Any user of this setup would

	 * need to adjust the DT accordingly: dr_mode set to "host",

	 * enabling OHCI0 and EHCI0.

	 */

	dr_mode = "peripheral";

	status = "okay";

};



&usbphy {

	usb1_vbus-supply = <&reg_usb1_vbus>;

	status = "okay";

};

arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts

+1 −118
Original line number Diff line number Diff line
@@ -5,95 +5,19 @@ 


/dts-v1/;



#include "sun50i-h616.dtsi"



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

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

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

#include "sun50i-h616-orangepi-zero.dtsi"



/ {

	model = "OrangePi Zero2";

	compatible = "xunlong,orangepi-zero2", "allwinner,sun50i-h616";



	aliases {

		ethernet0 = &emac0;

		serial0 = &uart0;

	};



	chosen {

		stdout-path = "serial0:115200n8";

	};



	leds {

		compatible = "gpio-leds";



		led-0 {

			function = LED_FUNCTION_POWER;

			color = <LED_COLOR_ID_RED>;

			gpios = <&pio 2 12 GPIO_ACTIVE_HIGH>; /* PC12 */

			default-state = "on";

		};



		led-1 {

			function = LED_FUNCTION_STATUS;

			color = <LED_COLOR_ID_GREEN>;

			gpios = <&pio 2 13 GPIO_ACTIVE_HIGH>; /* PC13 */

		};

	};



	reg_vcc5v: vcc5v {

		/* board wide 5V supply directly from the USB-C socket */

		compatible = "regulator-fixed";

		regulator-name = "vcc-5v";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		regulator-always-on;

	};



	reg_usb1_vbus: regulator-usb1-vbus {

		compatible = "regulator-fixed";

		regulator-name = "usb1-vbus";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		vin-supply = <&reg_vcc5v>;

		enable-active-high;

		gpio = <&pio 2 16 GPIO_ACTIVE_HIGH>; /* PC16 */

	};

};



&ehci1 {

	status = "okay";

};



/* USB 2 & 3 are on headers only. */



&emac0 {

	pinctrl-names = "default";

	pinctrl-0 = <&ext_rgmii_pins>;

	phy-mode = "rgmii";

	phy-handle = <&ext_rgmii_phy>;

	phy-supply = <&reg_dcdce>;

	allwinner,rx-delay-ps = <3100>;

	allwinner,tx-delay-ps = <700>;

	status = "okay";

};



&mdio0 {

	ext_rgmii_phy: ethernet-phy@1 {

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

		reg = <1>;

	};

};



&mmc0 {

	vmmc-supply = <&reg_dcdce>;

	cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>;	/* PF6 */

	bus-width = <4>;

	status = "okay";

};



&ohci1 {

	status = "okay";

};



&r_rsb {
@@ -211,44 +135,3 @@ &pio { 
	vcc-ph-supply = <&reg_aldo1>;

	vcc-pi-supply = <&reg_aldo1>;

};
 


&spi0  {

	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&spi0_pins>, <&spi0_cs0_pin>;



	flash@0 {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "jedec,spi-nor";

		reg = <0>;

		spi-max-frequency = <40000000>;

	};

};



&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_ph_pins>;

	status = "okay";

};



&usbotg {

	/*

	 * PHY0 pins are connected to a USB-C socket, but a role switch

	 * is not implemented: both CC pins are pulled to GND.

	 * The VBUS pins power the device, so a fixed peripheral mode

	 * is the best choice.

	 * The board can be powered via GPIOs, in this case port0 *can*

	 * act as a host (with a cable/adapter ignoring CC), as VBUS is

	 * then provided by the GPIOs. Any user of this setup would

	 * need to adjust the DT accordingly: dr_mode set to "host",

	 * enabling OHCI0 and EHCI0.

	 */

	dr_mode = "peripheral";

	status = "okay";

};



&usbphy {

	usb1_vbus-supply = <&reg_usb1_vbus>;

	status = "okay";

};