Unverified Commit e69f2736 authored by Georgii Staroselskii's avatar Georgii Staroselskii Committed by Maxime Ripard
Browse files

ARM: dts: allwinner: Split out non-SoC specific parts of Neutis N5 



A new variant of Emlid Neutis has been inroduced. This one uses H3
instead of H5. The boards are essentially the same. This commit moves
non-SoC-specific parts out so that the common parts could be reused with
ease.

Signed-off-by: default avatarGeorgii Staroselskii <georgii.staroselskii@emlid.com>
Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
parent 59f3f4dc

arch/arm/boot/dts/sunxi-h3-h5-emlid-neutis.dtsi

0 → 100644
+170 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT

/*

 * DTSI for Emlid Neutis SoMs.

 *

 * Copyright (C) 2019 Georgii Staroselskii <georgii.staroselskii@emlid.com>

 */



#include "sunxi-common-regulators.dtsi"



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



/ {

	aliases {

		serial0 = &uart0;

	};



	chosen {

		stdout-path = "serial0:115200n8";

	};



	wifi_pwrseq: wifi_pwrseq {

		compatible = "mmc-pwrseq-simple";

		reset-gpios = <&pio 2 7 GPIO_ACTIVE_LOW>; /* PC7 */

		post-power-on-delay-ms = <200>;

		clocks = <&rtc 1>;

		clock-names = "ext_clock";

	};

};



&cpu0 {

	cpu-supply = <&vdd_cpux>;

};



&reg_usb0_vbus {

	gpio = <&r_pio 0 9 GPIO_ACTIVE_HIGH>;   /* PL9 */

	status = "okay";

};





&de {

	status = "okay";

};



&ohci0 {

	status = "okay";

};



&ohci1 {

	status = "okay";

};



&ohci2 {

	status = "okay";

};



&ohci3 {

	status = "okay";

};





&ehci0 {

	status = "okay";

};



&ehci1 {

	status = "okay";

};



&ehci2 {

	status = "okay";

};



&ehci3 {

	status = "okay";

};



&mmc0 {

	vmmc-supply = <&reg_vcc3v3>;

	bus-width = <4>;

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

	status = "okay";

};





&mmc1 {

	vmmc-supply = <&reg_vcc3v3>;

	vqmmc-supply = <&reg_vcc3v3>;

	mmc-pwrseq = <&wifi_pwrseq>;

	bus-width = <4>;

	non-removable;

	status = "okay";



	brcmf: wifi@1 {

		reg = <1>;

		compatible = "brcm,bcm4329-fmac";

		interrupt-parent = <&r_pio>;

		interrupts = <0 5 IRQ_TYPE_LEVEL_LOW>;	/* PL5 */

		interrupt-names = "host-wake";

	};

};



&mmc2 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc2_8bit_pins>;

	vmmc-supply = <&reg_vcc3v3>;

	bus-width = <8>;

	non-removable;

	cap-mmc-hw-reset;

	status = "okay";

};



&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_pa_pins>;

	status = "okay";

};





&uart1 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart1_pins>, <&uart1_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>;

		shutdown-gpios = <&pio 2 4 GPIO_ACTIVE_HIGH>; /* PC4 */

		device-wakeup-gpios = <&r_pio 0 7 GPIO_ACTIVE_HIGH>; /* PL7 */

	};

};



&uart2 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart2_pins>;

	status = "okay";

};



&uart3 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart3_pins>;

	status = "okay";

};



&usbphy {

	usb0_id_det-gpios = <&r_pio 0 8 GPIO_ACTIVE_HIGH>; /* PL8 */

	usb0_vbus-supply = <&reg_usb0_vbus>;

	status = "okay";

};



&usb_otg {

	dr_mode = "otg";

	status = "okay";

};



&codec {

	allwinner,audio-routing =

		"Line Out", "LINEOUT",

		"LINEIN", "Line In",

		"MIC1", "Mic",

		"MIC2", "Mic",

		"Mic",  "MBIAS";

};



&i2c0 {

	status = "okay";

};

arch/arm64/boot/dts/allwinner/sun50i-h5-emlid-neutis-n5-devboard.dts

+4 −80
Original line number Diff line number Diff line
@@ -15,14 +15,6 @@ / { 
		     "emlid,neutis-n5",

		     "allwinner,sun50i-h5";



	aliases {

		serial0 = &uart0;

	};



	chosen {

		stdout-path = "serial0:115200n8";

	};



	connector {

		compatible = "hdmi-connector";

		type = "a";
@@ -34,16 +26,6 @@ hdmi_con_in: endpoint { 
		};

	};



	reg_usb0_vbus: usb0-vbus {

		compatible = "regulator-fixed";

		regulator-name = "usb0-vbus";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		enable-active-high;

		gpio = <&r_pio 0 9 GPIO_ACTIVE_HIGH>;   /* PL9 */

		status = "okay";

	};



	vdd_cpux: gpio-regulator {

		compatible = "regulator-gpio";

		regulator-name = "vdd-cpux";
@@ -59,33 +41,11 @@ vdd_cpux: gpio-regulator { 
	};

};



&codec {

	allwinner,audio-routing =

		"Line Out", "LINEOUT",

		"LINEIN", "Line In",

		"MIC1", "Mic",

		"MIC2", "Mic",

		"Mic",  "MBIAS";

	status = "okay";

};



&de {

	status = "okay";

};



&ehci0 {

	status = "okay";

&cpu0 {

	cpu-supply = <&vdd_cpux>;

};



&ehci1 {

	status = "okay";

};



&ehci2 {

	status = "okay";

};



&ehci3 {

&codec {

	status = "okay";

};
@@ -106,42 +66,6 @@ hdmi_out_con: endpoint { 
	};

};



&mmc0 {

	vmmc-supply = <&reg_vcc3v3>;

	bus-width = <4>;

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

	status = "okay";

};



&ohci0 {

	status = "okay";

};



&ohci1 {

	status = "okay";

};



&ohci2 {

	status = "okay";

};



&ohci3 {

	status = "okay";

};



&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_pa_pins>;

	status = "okay";

};



&usb_otg {

	dr_mode = "otg";

	status = "okay";

};



&usbphy {

	usb0_id_det-gpios = <&r_pio 0 8 GPIO_ACTIVE_HIGH>; /* PL8 */

	usb0_vbus-supply = <&reg_usb0_vbus>;

&i2c1 {

	status = "okay";

};

arch/arm64/boot/dts/allwinner/sun50i-h5-emlid-neutis-n5.dtsi

+1 −63
Original line number Diff line number Diff line
@@ -8,66 +8,4 @@ 
/dts-v1/;



#include "sun50i-h5.dtsi"



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



/ {

	reg_vcc3v3: vcc3v3 {

		compatible = "regulator-fixed";

		regulator-name = "vcc3v3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

	};



	wifi_pwrseq: wifi_pwrseq {

		compatible = "mmc-pwrseq-simple";

		reset-gpios = <&pio 2 7 GPIO_ACTIVE_LOW>; /* PC7 */

		post-power-on-delay-ms = <200>;

		clocks = <&rtc 1>;

		clock-names = "ext_clock";

	};

};



&mmc1 {

	vmmc-supply = <&reg_vcc3v3>;

	vqmmc-supply = <&reg_vcc3v3>;

	mmc-pwrseq = <&wifi_pwrseq>;

	bus-width = <4>;

	non-removable;

	status = "okay";



	brcmf: wifi@1 {

		reg = <1>;

		compatible = "brcm,bcm4329-fmac";

		interrupt-parent = <&r_pio>;

		interrupts = <0 5 IRQ_TYPE_LEVEL_LOW>;	/* PL5 */

		interrupt-names = "host-wake";

	};

};



&mmc2 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc2_8bit_pins>;

	vmmc-supply = <&reg_vcc3v3>;

	bus-width = <8>;

	non-removable;

	cap-mmc-hw-reset;

	status = "okay";

};



&uart1 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart1_pins>, <&uart1_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>;

		shutdown-gpios = <&pio 2 4 GPIO_ACTIVE_HIGH>; /* PC4 */

		device-wakeup-gpios = <&r_pio 0 7 GPIO_ACTIVE_HIGH>; /* PL7 */

	};

};
 
#include <arm/sunxi-h3-h5-emlid-neutis.dtsi>