Unverified Commit ceaf23fe authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Usual round of DT patches for the 5.18 merge window, with:
- DT fixes
- ethernet0 alias for Nanopi NEO
- r_uart node for H3/H5
- eMMC and bluetooth nodes for Nanopi NEO air
- updated maintainers for Allwinner SoCs
- new board: A20-Marsboard

* tag 'sunxi-dt-for-5.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  MAINTAINERS: Update Allwinner SoCs maintainers
  ARM: dts: sun8i-h3: Drop args in 'thermal-sensors'
  ARM: dts: sun8i: v3s: Move the csi1 block to follow address order
  ARM: dts: sun8i: Add ethernet0 alias in Nanopi NEO's device tree
  dt-bindings: arm: sunxi: add haoyu,a20-marsboard
  ARM: dts: sun7i: Add A20-Marsboard
  ARM: dts: sunxi: h3/h5: add r_uart node
  ARM: dts: nanopi-neo-air: Add eMMC and bluetooth

Link: https://lore.kernel.org/r/YhgMJ0AqaHopzaW3@kista.localdomain


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents e03e97d5 ebdfc289

Documentation/devicetree/bindings/arm/sunxi.yaml

+5 −0
Original line number Diff line number Diff line
@@ -444,6 +444,11 @@ properties: 
          - const: haoyu,a10-marsboard

          - const: allwinner,sun4i-a10



      - description: HAOYU Electronics Marsboard A20

        items:

          - const: haoyu,a20-marsboard

          - const: allwinner,sun7i-a20



      - description: MapleBoard MP130

        items:

          - const: mapleboard,mp130

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -1685,9 +1685,9 @@ S: Maintained 
F:	drivers/clk/sunxi/









ARM/Allwinner sunXi SoC support









M:	Maxime Ripard <mripard@kernel.org>









M:	Chen-Yu Tsai <wens@csie.org>









R:	Jernej Skrabec <jernej.skrabec@gmail.com>









M:	Jernej Skrabec <jernej.skrabec@gmail.com>









M:	Samuel Holland <samuel@sholland.org>









L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)









S:	Maintained









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git
































arch/arm/boot/dts/Makefile



+1
−0






























Original line number
Diff line number
Diff line







@@ -1231,6 +1231,7 @@ dtb-$(CONFIG_MACH_SUN7I) += \







	sun7i-a20-bananapro.dtb \









	sun7i-a20-cubieboard2.dtb \









	sun7i-a20-cubietruck.dtb \









	sun7i-a20-haoyu-marsboard.dtb \









	sun7i-a20-hummingbird.dtb \









	sun7i-a20-itead-ibox.dtb \









	sun7i-a20-i12-tvbox.dtb \
































arch/arm/boot/dts/sun7i-a20-haoyu-marsboard.dts
0 → 100644



+182
−0






























Original line number
Diff line number
Diff line









// SPDX-License-Identifier: (GPL-2.0+ OR MIT)









/*









 * Copyright 2021 Conley Lee









 * Conley Lee <conleylee@foxmail.com>









 */



















/dts-v1/;









#include "sun7i-a20.dtsi"









#include "sunxi-common-regulators.dtsi"



















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









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



















/ {









	model = "HAOYU Electronics Marsboard A20";









	compatible = "haoyu,a20-marsboard", "allwinner,sun7i-a20";



















	aliases {









		serial0 = &uart0;









	};



















	chosen {









		stdout-path = "serial0:115200n8";









	};



















	hdmi-connector {









		compatible = "hdmi-connector";









		type = "a";



















		port {









			hdmi_con_in: endpoint {









				remote-endpoint = <&hdmi_out_con>;









			};









		};









	};









};



















&ahci {









	target-supply = <&reg_ahci_5v>;









	status = "okay";









};



















&codec {









	status = "okay";









};



















&cpu0 {









	cpu-supply = <&reg_dcdc2>;









};



















&de {









	status = "okay";









};



















&ehci0 {









	status = "okay";









};



















&ehci1 {









	status = "okay";









};



















&gmac {









	pinctrl-names = "default";









	pinctrl-0 = <&gmac_mii_pins>, <&gmac_txerr>;









	phy-handle = <&phy0>;









	phy-mode = "mii";









	status = "okay";









};



















&hdmi {









	status = "okay";









};



















&hdmi_out {









	hdmi_out_con: endpoint {









		remote-endpoint = <&hdmi_con_in>;









	};









};



















&i2c0 {









	status = "okay";



















	axp209: pmic@34 {









		reg = <0x34>;









		interrupt-parent = <&nmi_intc>;









		interrupts = <0 IRQ_TYPE_LEVEL_LOW>;









	};









};



















&mmc0 {









	vmmc-supply = <&reg_vcc3v3>;









	bus-width = <4>;









	cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */









	status = "okay";









};



















&gmac_mdio {









	phy0: ethernet-phy@0 {









		reg = <0>;









	};









};



















&ohci0 {









	status = "okay";









};



















&ohci1 {









	status = "okay";









};



















&otg_sram {









	status = "okay";









};



















&pio {









	gmac_txerr: gmac-txerr-pin {









		pins = "PA17";









		function = "gmac";









	};









};



















&reg_ahci_5v {









	status = "okay";









};



















#include "axp209.dtsi"



















&ac_power_supply {









	status = "okay";









};



















&reg_dcdc2 {









	regulator-always-on;









	regulator-min-microvolt = <1000000>;









	regulator-max-microvolt = <1450000>;









	regulator-name = "vdd-cpu";









};



















&reg_dcdc3 {









	regulator-always-on;









	regulator-min-microvolt = <1000000>;









	regulator-max-microvolt = <1400000>;









	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_usb1_vbus {









	status = "okay";









};



















&reg_usb2_vbus {









	status = "okay";









};



















&uart0 {









	pinctrl-names = "default";









	pinctrl-0 = <&uart0_pb_pins>;









	status = "okay";









};



















&usb_otg {









	dr_mode = "otg";









	status = "okay";









};



















&usbphy {









	usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */









	usb1_vbus-supply = <&reg_usb1_vbus>;









	usb2_vbus-supply = <&reg_usb2_vbus>;









	status = "okay";









};
























arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts



+28
−0






























Original line number
Diff line number
Diff line







@@ -103,12 +103,40 @@ brcmf: bcrmf@1 {







	};









};



















&mmc2 {









	pinctrl-names = "default";









	pinctrl-0 = <&mmc2_8bit_pins>;









	vmmc-supply = <&reg_vcc3v3>;









	vqmmc-supply = <&reg_vcc3v3>;









	bus-width = <8>;









	non-removable;









	status = "okay";









};



















&uart0 {









	pinctrl-names = "default";









	pinctrl-0 = <&uart0_pa_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 */









	};









};



















&usbphy {









	/* USB VBUS is always on */









	status = "okay";