Skip to contentSkip to conversation

sunxi: Add support for OrangePi 3

PATCH New Jernej Skrabec 4 participants 9 messages Jan 10, 2021 – Jan 12, 2021

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

v6 cover sunxi: Add support for OrangePi 3

This series introduces OrangePi 3 support.

Previous cover letter:
This is just refreshed v4 from here:
https://patchwork.ozlabs.org/project/uboot/list/?series=156657&state=*

Patches are only rebased, DT updated and defconfig regenerated, so I kept old tags. Only difference with old version is that this one does not sync H6 DT files. Becasue of that, this series should be applied on top of:
https://patchwork.ozlabs.org/project/uboot/list/?series=222516

Please take a look.

Best regards,
Jernej

Changes from v5:
- Added tags
- Renamed FIXUP_BDADDR -> BLUETOOTH_DT_DEVICE_FIXUP
- Renamed fixup_bd_address() -> bluetooth_dt_fixup()
- Removed CONFIG_PSCI_RESET from defconfig

Andre Heider (3):
sunxi: board: extract creating a unique sid into a helper function
arm: sunxi: add a config option to fixup a Bluetooth address
arm64: dts: sun50i: Add support for Orange Pi 3

 arch/arm/dts/Makefile                 |   1 +
 arch/arm/dts/sun50i-h6-orangepi-3.dts | 345 ++++++++++++++++++++++++++
 arch/arm/mach-sunxi/Kconfig           |  11 +
 board/sunxi/MAINTAINERS               |   5 +
 board/sunxi/board.c                   | 155 ++++++++----
 configs/orangepi_3_defconfig          |  12 +
 6 files changed, 474 insertions(+), 55 deletions(-)
 create mode 100644 arch/arm/dts/sun50i-h6-orangepi-3.dts
 create mode 100644 configs/orangepi_3_defconfig
Signature · 1 line
2.30.0
#1 lore raw

PATCH v6 1/3 sunxi: board: extract creating a unique sid into a helper function

From: Andre Heider <[email protected]>

Refactor setup_environment() so we can use the created sid for a Bluetooth address too.

---
 board/sunxi/board.c | 121 ++++++++++++++++++++++++--------------------
 1 file changed, 66 insertions(+), 55 deletions(-)
board/sunxi/board.c +66 -55
index 708a27ed78e9..4a29e351141b 100644
@@ -789,6 +789,38 @@ static void parse_spl_header(const uint32_t spl_addr)
 	env_set_hex("fel_scriptaddr", spl->fel_script_address);
 }
 
+static bool get_unique_sid(unsigned int *sid)
+{
+	if (sunxi_get_sid(sid) != 0)
+		return false;
+
+	if (!sid[0])
+		return false;
+
+	/*
+	 * The single words 1 - 3 of the SID have quite a few bits
+	 * which are the same on many models, so we take a crc32
+	 * of all 3 words, to get a more unique value.
+	 *
+	 * Note we only do this on newer SoCs as we cannot change
+	 * the algorithm on older SoCs since those have been using
+	 * fixed mac-addresses based on only using word 3 for a
+	 * long time and changing a fixed mac-address with an
+	 * u-boot update is not good.
+	 */
+#if !defined(CONFIG_MACH_SUN4I) && !defined(CONFIG_MACH_SUN5I) && \
+    !defined(CONFIG_MACH_SUN6I) && !defined(CONFIG_MACH_SUN7I) && \
+    !defined(CONFIG_MACH_SUN8I_A23) && !defined(CONFIG_MACH_SUN8I_A33)
+	sid[3] = crc32(0, (unsigned char *)&sid[1], 12);
+#endif
+
+	/* Ensure the NIC specific bytes of the mac are not all 0 */
+	if ((sid[3] & 0xffffff) == 0)
+		sid[3] |= 0x800000;
+
+	return true;
+}
+
 /*
  * Note this function gets called multiple times.
  * It must not make any changes to env variables which already exist.
@@ -799,61 +831,40 @@ static void setup_environment(const void *fdt)
 	unsigned int sid[4];
 	uint8_t mac_addr[6];
 	char ethaddr[16];
-	int i, ret;
-
-	ret = sunxi_get_sid(sid);
-	if (ret == 0 && sid[0] != 0) {
-		/*
-		 * The single words 1 - 3 of the SID have quite a few bits
-		 * which are the same on many models, so we take a crc32
-		 * of all 3 words, to get a more unique value.
-		 *
-		 * Note we only do this on newer SoCs as we cannot change
-		 * the algorithm on older SoCs since those have been using
-		 * fixed mac-addresses based on only using word 3 for a
-		 * long time and changing a fixed mac-address with an
-		 * u-boot update is not good.
-		 */
-#if !defined(CONFIG_MACH_SUN4I) && !defined(CONFIG_MACH_SUN5I) && \
-    !defined(CONFIG_MACH_SUN6I) && !defined(CONFIG_MACH_SUN7I) && \
-    !defined(CONFIG_MACH_SUN8I_A23) && !defined(CONFIG_MACH_SUN8I_A33)
-		sid[3] = crc32(0, (unsigned char *)&sid[1], 12);
-#endif
-
-		/* Ensure the NIC specific bytes of the mac are not all 0 */
-		if ((sid[3] & 0xffffff) == 0)
-			sid[3] |= 0x800000;
-
-		for (i = 0; i < 4; i++) {
-			sprintf(ethaddr, "ethernet%d", i);
-			if (!fdt_get_alias(fdt, ethaddr))
-				continue;
-
-			if (i == 0)
-				strcpy(ethaddr, "ethaddr");
-			else
-				sprintf(ethaddr, "eth%daddr", i);
-
-			if (env_get(ethaddr))
-				continue;
-
-			/* Non OUI / registered MAC address */
-			mac_addr[0] = (i << 4) | 0x02;
-			mac_addr[1] = (sid[0] >>  0) & 0xff;
-			mac_addr[2] = (sid[3] >> 24) & 0xff;
-			mac_addr[3] = (sid[3] >> 16) & 0xff;
-			mac_addr[4] = (sid[3] >>  8) & 0xff;
-			mac_addr[5] = (sid[3] >>  0) & 0xff;
-
-			eth_env_set_enetaddr(ethaddr, mac_addr);
-		}
-
-		if (!env_get("serial#")) {
-			snprintf(serial_string, sizeof(serial_string),
-				"%08x%08x", sid[0], sid[3]);
-
-			env_set("serial#", serial_string);
-		}
+	int i;
+
+	if (!get_unique_sid(sid))
+		return;
+
+	for (i = 0; i < 4; i++) {
+		sprintf(ethaddr, "ethernet%d", i);
+		if (!fdt_get_alias(fdt, ethaddr))
+			continue;
+
+		if (i == 0)
+			strcpy(ethaddr, "ethaddr");
+		else
+			sprintf(ethaddr, "eth%daddr", i);
+
+		if (env_get(ethaddr))
+			continue;
+
+		/* Non OUI / registered MAC address */
+		mac_addr[0] = (i << 4) | 0x02;
+		mac_addr[1] = (sid[0] >>  0) & 0xff;
+		mac_addr[2] = (sid[3] >> 24) & 0xff;
+		mac_addr[3] = (sid[3] >> 16) & 0xff;
+		mac_addr[4] = (sid[3] >>  8) & 0xff;
+		mac_addr[5] = (sid[3] >>  0) & 0xff;
+
+		eth_env_set_enetaddr(ethaddr, mac_addr);
+	}
+
+	if (!env_get("serial#")) {
+		snprintf(serial_string, sizeof(serial_string),
+			"%08x%08x", sid[0], sid[3]);
+
+		env_set("serial#", serial_string);
 	}
 }
 
Signature · 1 line
2.30.0
#2 lore raw

PATCH v6 2/3 arm: sunxi: add a config option to fixup a Bluetooth address

In reply to Jernej Skrabec

From: Andre Heider <[email protected]>

Some Bluetooth controllers, like the BCM4345C5 of the Orange Pi 3, ship with the controller default address.

Add a config option to fix it up so it can function properly.

---
 arch/arm/mach-sunxi/Kconfig | 11 +++++++++++
 board/sunxi/board.c         | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+)
arch/arm/mach-sunxi/Kconfig +11 -0
index 49ef217f08c0..11e644519271 100644
@@ -1016,4 +1016,15 @@ config PINEPHONE_DT_SELECTION
 	  Enable this option to automatically select the device tree for the
 	  correct PinePhone hardware revision during boot.
 
+config BLUETOOTH_DT_DEVICE_FIXUP
+	string "Fixup the Bluetooth controller address"
+	default ""
+	help
+	  This option specifies the DT compatible name of the Bluetooth
+	  controller for which to set the "local-bd-address" property.
+	  Set this option if your device ships with the Bluetooth controller
+	  default address.
+	  The used address is "bdaddr" if set, and "ethaddr" with the LSB
+	  flipped elsewise.
+
 endif
board/sunxi/board.c +34 -0
index 4a29e351141b..ed658fced3c7 100644
@@ -908,6 +908,38 @@ int misc_init_r(void)
 	return 0;
 }
 
+static void bluetooth_dt_fixup(void *blob)
+{
+	/* Some devices ship with a Bluetooth controller default address.
+	 * Set a valid address through the device tree.
+	 */
+	uchar tmp[ETH_ALEN], bdaddr[ETH_ALEN];
+	unsigned int sid[4];
+	int i;
+
+	if (!CONFIG_BLUETOOTH_DT_DEVICE_FIXUP[0])
+		return;
+
+	if (eth_env_get_enetaddr("bdaddr", tmp)) {
+		/* Convert between the binary formats of the corresponding stacks */
+		for (i = 0; i < ETH_ALEN; ++i)
+			bdaddr[i] = tmp[ETH_ALEN - i - 1];
+	} else {
+		if (!get_unique_sid(sid))
+			return;
+
+		bdaddr[0] = ((sid[3] >>  0) & 0xff) ^ 1;
+		bdaddr[1] = (sid[3] >>  8) & 0xff;
+		bdaddr[2] = (sid[3] >> 16) & 0xff;
+		bdaddr[3] = (sid[3] >> 24) & 0xff;
+		bdaddr[4] = (sid[0] >>  0) & 0xff;
+		bdaddr[5] = 0x02;
+	}
+
+	do_fixup_by_compat(blob, CONFIG_BLUETOOTH_DT_DEVICE_FIXUP,
+			   "local-bd-address", bdaddr, ETH_ALEN, 1);
+}
+
 int ft_board_setup(void *blob, struct bd_info *bd)
 {
 	int __maybe_unused r;
@@ -918,6 +950,8 @@ int ft_board_setup(void *blob, struct bd_info *bd)
 	 */
 	setup_environment(blob);
 
+	bluetooth_dt_fixup(blob);
+
 #ifdef CONFIG_VIDEO_DT_SIMPLEFB
 	r = sunxi_simplefb_setup(blob);
 	if (r)
Signature · 1 line
2.30.0
#3 lore raw

PATCH v6 3/3 arm64: dts: sun50i: Add support for Orange Pi 3

In reply to Jernej Skrabec

From: Andre Heider <[email protected]>

dts file is taken from Linux 5.11-rc1 tag.

The Bluetooth controller of this device ships with a default address, use the new CONFIG_FIXUP_BDADDR option to fix it up.

akonadi:?collection=30&name=INBOX

[Updated OrangePi 3 DT, rebase and config update]
---
 arch/arm/dts/Makefile                 |   1 +
 arch/arm/dts/sun50i-h6-orangepi-3.dts | 345 ++++++++++++++++++++++++++
 board/sunxi/MAINTAINERS               |   5 +
 configs/orangepi_3_defconfig          |  12 +
 4 files changed, 363 insertions(+)
 create mode 100644 arch/arm/dts/sun50i-h6-orangepi-3.dts
 create mode 100644 configs/orangepi_3_defconfig
arch/arm/dts/Makefile +1 -0
index e00aed1ec207..607571d04b25 100644
@@ -605,6 +605,7 @@ dtb-$(CONFIG_MACH_SUN50I_H5) += \
 	sun50i-h5-orangepi-zero-plus2.dtb
 dtb-$(CONFIG_MACH_SUN50I_H6) += \
 	sun50i-h6-beelink-gs1.dtb \
+	sun50i-h6-orangepi-3.dtb \
 	sun50i-h6-orangepi-lite2.dtb \
 	sun50i-h6-orangepi-one-plus.dtb \
 	sun50i-h6-pine-h64.dtb \
arch/arm/dts/sun50i-h6-orangepi-3.dts new file +345 -0

345 lines not on this page · raw message

board/sunxi/MAINTAINERS +5 -0
index 1b37a9899edd..95b4df83e0a9 100644
@@ -385,6 +385,11 @@ M:	Icenowy Zheng <[email protected]>
 S:	Maintained
 F:	configs/teres_i_defconfig
 
+ORANGEPI 3 BOARD
+M:	Andre Heider <[email protected]>
+S:	Maintained
+F:	configs/orangepi_3_defconfig
+
 ORANGEPI LITE2 BOARD
 M:	Jagan Teki <[email protected]>
 S:	Maintained
configs/orangepi_3_defconfig new file +12 -0
new file mode 100644
index 000000000000..82b9815205ef
@@ -0,0 +1,12 @@
+CONFIG_ARM=y
+CONFIG_ARCH_SUNXI=y
+CONFIG_SPL=y
+CONFIG_MACH_SUN50I_H6=y
+CONFIG_SUNXI_DRAM_H6_LPDDR3=y
+CONFIG_MMC0_CD_PIN="PF6"
+CONFIG_MMC_SUNXI_SLOT_EXTRA=2
+CONFIG_BLUETOOTH_DT_DEVICE_FIXUP="brcm,bcm4345c5"
+CONFIG_DEFAULT_DEVICE_TREE="sun50i-h6-orangepi-3"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_OHCI_HCD=y
Signature · 1 line
2.30.0
#4 lore raw

PATCH v6 3/3 arm64: dts: sun50i: Add support for Orange Pi 3

Dne nedelja, 10. januar 2021 ob 20:29:39 CET je Jernej Skrabec napisal(a):

Quoted 8 lines

From: Andre Heider <[email protected]>

dts file is taken from Linux 5.11-rc1 tag.

The Bluetooth controller of this device ships with a default address, use the new CONFIG_FIXUP_BDADDR option to fix it up.

akonadi:?collection=30&name=INBOX

Andre,

This ^ should be your tag. Can you fix it at committing?

Best regard,
Jernej

arch/arm/dts/sun50i-h6-

Quoted 26 lines
[Updated OrangePi 3 DT, rebase and config update]
---
 arch/arm/dts/Makefile                 |   1 +
 arch/arm/dts/sun50i-h6-orangepi-3.dts | 345 ++++++++++++++++++++++++++
 board/sunxi/MAINTAINERS               |   5 +
 configs/orangepi_3_defconfig          |  12 +
 4 files changed, 363 insertions(+)
 create mode 100644 arch/arm/dts/sun50i-h6-orangepi-3.dts
 create mode 100644 configs/orangepi_3_defconfig
arch/arm/dts/Makefile +1 -0
index e00aed1ec207..607571d04b25 100644
@@ -605,6 +605,7 @@ dtb-$(CONFIG_MACH_SUN50I_H5) += \
 	sun50i-h5-orangepi-zero-plus2.dtb
 dtb-$(CONFIG_MACH_SUN50I_H6) += \
 	sun50i-h6-beelink-gs1.dtb \
+	sun50i-h6-orangepi-3.dtb \
 	sun50i-h6-orangepi-lite2.dtb \
 	sun50i-h6-orangepi-one-plus.dtb \
 	sun50i-h6-pine-h64.dtb \
arch/arm/dts/sun50i-h6- renamed from arch/arm/dts/sun50i-h6-orangepi-3.dts +0 -0

orangepi-3.dts

Quoted 43 lines

new file mode 100644
index 000000000000..15c9dd8c4479

arch/arm/dts/sun50i-h6-orangepi-3.dts new file +38 -0
@@ -0,0 +1,345 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+// Copyright (C) 2019 Ond?ej Jirman <[email protected]>
+
+/dts-v1/;
+
+#include "sun50i-h6.dtsi"
+#include "sun50i-h6-cpu-opp.dtsi"
+
+#include <dt-bindings/gpio/gpio.h>
+
+/ {
+	model = "OrangePi 3";
+	compatible = "xunlong,orangepi-3", "allwinner,sun50i-h6";
+
+	aliases {
+		serial0 = &uart0;
+		serial1 = &uart1;
+	};
+
+	chosen {
+		stdout-path = "serial0:115200n8";
+	};
+
+	connector {
+		compatible = "hdmi-connector";
+		ddc-en-gpios = <&pio 7 2 GPIO_ACTIVE_HIGH>; /* PH2 */
+		type = "a";
+
+		port {
+			hdmi_con_in: endpoint {
+				remote-endpoint = <&hdmi_out_con>;
+			};
+		};
+	};
+
+	ext_osc32k: ext_osc32k_clk {
+		#clock-cells = <0>;
+		compatible = "fixed-clock";

arch/arm/dts/sun50i-h6-orangepi-3.dts line 48

Quoted 10 lines
arch/arm/dts/sun50i-h6-orangepi-3.dts new file +10 -0
+		clock-frequency = <32768>;
+		clock-output-names = "ext_osc32k";
+	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		power {
+			label = "orangepi:red:power";
+			gpios = <&r_pio 0 4 GPIO_ACTIVE_HIGH>; /* PL4 

*/

arch/arm/dts/sun50i-h6-orangepi-3.dts

Quoted 6 lines
arch/arm/dts/sun50i-h6-orangepi-3.dts new file +6 -0
+			default-state = "on";
+		};
+
+		status {
+			label = "orangepi:green:status";
+			gpios = <&r_pio 0 7 GPIO_ACTIVE_HIGH>; /* PL7 

*/

Quoted 137 lines
arch/arm/dts/sun50i-h6-orangepi-3.dts new file +137 -0
+		};
+	};
+
+	reg_vcc5v: vcc5v {
+		/* board wide 5V supply directly from the DC jack */
+		compatible = "regulator-fixed";
+		regulator-name = "vcc-5v";
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		regulator-always-on;
+	};
+
+	reg_vcc33_wifi: vcc33-wifi {
+		/* Always on 3.3V regulator for WiFi and BT */
+		compatible = "regulator-fixed";
+		regulator-name = "vcc33-wifi";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		regulator-always-on;
+		vin-supply = <&reg_vcc5v>;
+	};
+
+	reg_vcc_wifi_io: vcc-wifi-io {
+		/* Always on 1.8V/300mA regulator for WiFi and BT IO */
+		compatible = "regulator-fixed";
+		regulator-name = "vcc-wifi-io";
+		regulator-min-microvolt = <1800000>;
+		regulator-max-microvolt = <1800000>;
+		regulator-always-on;
+		vin-supply = <&reg_vcc33_wifi>;
+	};
+
+	wifi_pwrseq: wifi-pwrseq {
+		compatible = "mmc-pwrseq-simple";
+		clocks = <&rtc 1>;
+		clock-names = "ext_clock";
+		reset-gpios = <&r_pio 1 3 GPIO_ACTIVE_LOW>; /* PM3 */
+		post-power-on-delay-ms = <200>;
+	};
+};
+
+&cpu0 {
+	cpu-supply = <&reg_dcdca>;
+};
+
+&de {
+	status = "okay";
+};
+
+&dwc3 {
+	status = "okay";
+};
+
+&ehci0 {
+	status = "okay";
+};
+
+&ehci3 {
+	status = "okay";
+};
+
+&gpu {
+	mali-supply = <&reg_dcdcc>;
+	status = "okay";
+};
+
+&hdmi {
+	status = "okay";
+};
+
+&hdmi_out {
+	hdmi_out_con: endpoint {
+		remote-endpoint = <&hdmi_con_in>;
+	};
+};
+
+&mmc0 {
+	vmmc-supply = <&reg_cldo1>;
+	cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */
+	bus-width = <4>;
+	status = "okay";
+};
+
+&mmc1 {
+	vmmc-supply = <&reg_vcc33_wifi>;
+	vqmmc-supply = <&reg_vcc_wifi_io>;
+	mmc-pwrseq = <&wifi_pwrseq>;
+	bus-width = <4>;
+	non-removable;
+	status = "okay";
+
+	brcm: sdio-wifi at 1 {
+		reg = <1>;
+		compatible = "brcm,bcm4329-fmac";
+		interrupt-parent = <&r_pio>;
+		interrupts = <1 0 IRQ_TYPE_LEVEL_LOW>; /* PM0 */
+		interrupt-names = "host-wake";
+	};
+};
+
+&mmc2 {
+	vmmc-supply = <&reg_cldo1>;
+	vqmmc-supply = <&reg_bldo2>;
+	cap-mmc-hw-reset;
+	non-removable;
+	bus-width = <8>;
+	status = "okay";
+};
+
+&ohci0 {
+	status = "okay";
+};
+
+&ohci3 {
+	status = "okay";
+};
+
+&pio {
+	vcc-pc-supply = <&reg_bldo2>;
+	vcc-pd-supply = <&reg_cldo1>;
+	vcc-pg-supply = <&reg_vcc_wifi_io>;
+};
+
+&r_i2c {
+	status = "okay";
+
+	axp805: pmic at 36 {
+		compatible = "x-powers,axp805", "x-powers,axp806";
+		reg = <0x36>;
+		interrupt-parent = <&r_intc>;
+		interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+		interrupt-controller;
+		#interrupt-cells = <1>;
+		x-powers,self-working-mode;
+		vina-supply = <&reg_vcc5v>;
+		vinb-supply = <&reg_vcc5v>;
+		vinc-supply = <&reg_vcc5v>;

arch/arm/dts/sun50i-h6-orangepi-3.dts

Quoted 10 lines
arch/arm/dts/sun50i-h6-orangepi-3.dts new file +10 -0
+		vind-supply = <&reg_vcc5v>;
+		vine-supply = <&reg_vcc5v>;
+		aldoin-supply = <&reg_vcc5v>;
+		bldoin-supply = <&reg_vcc5v>;
+		cldoin-supply = <&reg_vcc5v>;
+
+		regulators {
+			reg_aldo1: aldo1 {
+				regulator-always-on;
+				regulator-min-microvolt = 

<3300000>;

arch/arm/dts/sun50i-h6-orangepi-3.dts line 202

Quoted 1 line
arch/arm/dts/sun50i-h6-orangepi-3.dts new file +1 -0
+				regulator-max-microvolt = 

<3300000>;

arch/arm/dts/sun50i-h6-orangepi-3.dts

Quoted 5 lines
arch/arm/dts/sun50i-h6-orangepi-3.dts new file +5 -0
+				regulator-name = "vcc-pl-led-ir";
+			};
+
+			reg_aldo2: aldo2 {
+				regulator-min-microvolt = 

<3300000>;

arch/arm/dts/sun50i-h6-orangepi-3.dts line 208

Quoted 1 line
arch/arm/dts/sun50i-h6-orangepi-3.dts new file +1 -0
+				regulator-max-microvolt = 

<3300000>;

arch/arm/dts/sun50i-h6-orangepi-3.dts line 209

Quoted 1 line
arch/arm/dts/sun50i-h6-orangepi-3.dts new file +1 -0
+				regulator-name = "vcc33-audio-tv-

ephy-mac";

arch/arm/dts/sun50i-h6-orangepi-3.dts

Quoted 6 lines
arch/arm/dts/sun50i-h6-orangepi-3.dts new file +6 -0
+			};
+
+			/* ALDO3 is shorted to CLDO1 */
+			reg_aldo3: aldo3 {
+				regulator-always-on;
+				regulator-min-microvolt = 

<3300000>;

arch/arm/dts/sun50i-h6-orangepi-3.dts line 216

Quoted 1 line
arch/arm/dts/sun50i-h6-orangepi-3.dts new file +1 -0
+				regulator-max-microvolt = 

<3300000>;

arch/arm/dts/sun50i-h6-orangepi-3.dts line 217

Quoted 1 line
arch/arm/dts/sun50i-h6-orangepi-3.dts new file +1 -0
+				regulator-name = "vcc33-io-pd-

emmc-sd-usb-uart-1";

arch/arm/dts/sun50i-h6-orangepi-3.dts

Quoted 5 lines
arch/arm/dts/sun50i-h6-orangepi-3.dts new file +5 -0
+			};
+
+			reg_bldo1: bldo1 {
+				regulator-always-on;
+				regulator-min-microvolt = 

<1800000>;

arch/arm/dts/sun50i-h6-orangepi-3.dts line 223

Quoted 1 line
arch/arm/dts/sun50i-h6-orangepi-3.dts new file +1 -0
+				regulator-max-microvolt = 

<1800000>;

arch/arm/dts/sun50i-h6-orangepi-3.dts line 224

Quoted 1 line
arch/arm/dts/sun50i-h6-orangepi-3.dts new file +1 -0
+				regulator-name = "vcc18-dram-bias-

pll";

arch/arm/dts/sun50i-h6-orangepi-3.dts

Quoted 5 lines
arch/arm/dts/sun50i-h6-orangepi-3.dts new file +5 -0
+			};
+
+			reg_bldo2: bldo2 {
+				regulator-always-on;
+				regulator-min-microvolt = 

<1800000>;

arch/arm/dts/sun50i-h6-orangepi-3.dts line 230

Quoted 1 line
arch/arm/dts/sun50i-h6-orangepi-3.dts new file +1 -0
+				regulator-max-microvolt = 

<1800000>;

arch/arm/dts/sun50i-h6-orangepi-3.dts line 231

Quoted 1 line
arch/arm/dts/sun50i-h6-orangepi-3.dts new file +1 -0
+				regulator-name = "vcc-efuse-pcie-

hdmi-pc";

arch/arm/dts/sun50i-h6-orangepi-3.dts

Quoted 13 lines
arch/arm/dts/sun50i-h6-orangepi-3.dts new file +13 -0
+			};
+
+			bldo3 {
+				/* unused */
+			};
+
+			bldo4 {
+				/* unused */
+			};
+
+			reg_cldo1: cldo1 {
+				regulator-always-on;
+				regulator-min-microvolt = 

<3300000>;

arch/arm/dts/sun50i-h6-orangepi-3.dts line 245

Quoted 1 line
arch/arm/dts/sun50i-h6-orangepi-3.dts new file +1 -0
+				regulator-max-microvolt = 

<3300000>;

arch/arm/dts/sun50i-h6-orangepi-3.dts line 246

Quoted 1 line
arch/arm/dts/sun50i-h6-orangepi-3.dts new file +1 -0
+				regulator-name = "vcc33-io-pd-

emmc-sd-usb-uart-2";

arch/arm/dts/sun50i-h6-orangepi-3.dts

Quoted 13 lines
arch/arm/dts/sun50i-h6-orangepi-3.dts new file +13 -0
+			};
+
+			cldo2 {
+				/* unused */
+			};
+
+			cldo3 {
+				/* unused */
+			};
+
+			reg_dcdca: dcdca {
+				regulator-always-on;
+				regulator-min-microvolt = 

<800000>;

arch/arm/dts/sun50i-h6-orangepi-3.dts line 260

Quoted 1 line
arch/arm/dts/sun50i-h6-orangepi-3.dts new file +1 -0
+				regulator-max-microvolt = 

<1160000>;

arch/arm/dts/sun50i-h6-orangepi-3.dts

Quoted 6 lines
arch/arm/dts/sun50i-h6-orangepi-3.dts new file +6 -0
+				regulator-ramp-delay = <2500>;
+				regulator-name = "vdd-cpu";
+			};
+
+			reg_dcdcc: dcdcc {
+				regulator-enable-ramp-delay = 

<32000>;

arch/arm/dts/sun50i-h6-orangepi-3.dts line 267

Quoted 1 line
arch/arm/dts/sun50i-h6-orangepi-3.dts new file +1 -0
+				regulator-min-microvolt = 

<810000>;

arch/arm/dts/sun50i-h6-orangepi-3.dts line 268

Quoted 1 line
arch/arm/dts/sun50i-h6-orangepi-3.dts new file +1 -0
+				regulator-max-microvolt = 

<1080000>;

arch/arm/dts/sun50i-h6-orangepi-3.dts

Quoted 7 lines
arch/arm/dts/sun50i-h6-orangepi-3.dts new file +7 -0
+				regulator-ramp-delay = <2500>;
+				regulator-name = "vdd-gpu";
+			};
+
+			reg_dcdcd: dcdcd {
+				regulator-always-on;
+				regulator-min-microvolt = 

<960000>;

arch/arm/dts/sun50i-h6-orangepi-3.dts line 276

Quoted 1 line
arch/arm/dts/sun50i-h6-orangepi-3.dts new file +1 -0
+				regulator-max-microvolt = 

<960000>;

arch/arm/dts/sun50i-h6-orangepi-3.dts

Quoted 6 lines
arch/arm/dts/sun50i-h6-orangepi-3.dts new file +6 -0
+				regulator-name = "vdd-sys";
+			};
+
+			reg_dcdce: dcdce {
+				regulator-always-on;
+				regulator-min-microvolt = 

<1200000>;

arch/arm/dts/sun50i-h6-orangepi-3.dts line 283

Quoted 1 line
arch/arm/dts/sun50i-h6-orangepi-3.dts new file +1 -0
+				regulator-max-microvolt = 

<1200000>;

Quoted 26 lines
arch/arm/dts/sun50i-h6-orangepi-3.dts new file +26 -0
+				regulator-name = "vcc-dram";
+			};
+
+			sw {
+				/* unused */
+			};
+		};
+	};
+};
+
+&r_ir {
+	status = "okay";
+};
+
+&rtc {
+	clocks = <&ext_osc32k>;
+};
+
+&uart0 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&uart0_ph_pins>;
+	status = "okay";
+};
+
+/* There's the BT part of the AP6256 connected to that UART */
+&uart1 {

arch/arm/dts/sun50i-h6-orangepi-3.dts

Quoted 10 lines
arch/arm/dts/sun50i-h6-orangepi-3.dts new file +10 -0
+	pinctrl-names = "default";
+	pinctrl-0 = <&uart1_pins>, <&uart1_rts_cts_pins>;
+	uart-has-rtscts;
+	status = "okay";
+
+	bluetooth {
+		compatible = "brcm,bcm4345c5";
+		clocks = <&rtc 1>;
+		clock-names = "lpo";
+		device-wakeup-gpios = <&r_pio 1 2 GPIO_ACTIVE_HIGH>; /* 

PM2 */

arch/arm/dts/sun50i-h6-orangepi-3.dts line 320

Quoted 1 line
arch/arm/dts/sun50i-h6-orangepi-3.dts new file +1 -0
+		host-wakeup-gpios = <&r_pio 1 1 GPIO_ACTIVE_HIGH>; /* 

PM1 */

arch/arm/dts/sun50i-h6-orangepi-3.dts line 321

Quoted 1 line
arch/arm/dts/sun50i-h6-orangepi-3.dts new file +1 -0
+		shutdown-gpios = <&r_pio 1 4 GPIO_ACTIVE_HIGH>; /* PM4 

*/

Quoted 62 lines
arch/arm/dts/sun50i-h6-orangepi-3.dts new file +24 -0
+		max-speed = <1500000>;
+	};
+};
+
+&usb2otg {
+	/*
+	 * This board doesn't have a controllable VBUS even though it
+	 * does have an ID pin. Using it as anything but a USB host is
+	 * unsafe.
+	 */
+	dr_mode = "host";
+	status = "okay";
+};
+
+&usb2phy {
+	usb0_id_det-gpios = <&pio 2 15 GPIO_ACTIVE_HIGH>; /* PC15 */
+	usb0_vbus-supply = <&reg_vcc5v>;
+	usb3_vbus-supply = <&reg_vcc5v>;
+	status = "okay";
+};
+
+&usb3phy {
+	status = "okay";
+};
board/sunxi/MAINTAINERS +5 -0
index 1b37a9899edd..95b4df83e0a9 100644
@@ -385,6 +385,11 @@ M:	Icenowy Zheng <[email protected]>
 S:	Maintained
 F:	configs/teres_i_defconfig
 
+ORANGEPI 3 BOARD
+M:	Andre Heider <[email protected]>
+S:	Maintained
+F:	configs/orangepi_3_defconfig
+
 ORANGEPI LITE2 BOARD
 M:	Jagan Teki <[email protected]>
 S:	Maintained
configs/orangepi_3_defconfig new file +12 -0
new file mode 100644
index 000000000000..82b9815205ef
@@ -0,0 +1,12 @@
+CONFIG_ARM=y
+CONFIG_ARCH_SUNXI=y
+CONFIG_SPL=y
+CONFIG_MACH_SUN50I_H6=y
+CONFIG_SUNXI_DRAM_H6_LPDDR3=y
+CONFIG_MMC0_CD_PIN="PF6"
+CONFIG_MMC_SUNXI_SLOT_EXTRA=2
+CONFIG_BLUETOOTH_DT_DEVICE_FIXUP="brcm,bcm4345c5"
+CONFIG_DEFAULT_DEVICE_TREE="sun50i-h6-orangepi-3"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_OHCI_HCD=y
Signature · 1 line
2.30.0
maintainer
#5 lore raw

PATCH v6 3/3 arm64: dts: sun50i: Add support for Orange Pi 3

In reply to Jernej Skrabec
Quoted 6 lines · Jernej Skrabec

From: Andre Heider <[email protected]>

dts file is taken from Linux 5.11-rc1 tag.

The Bluetooth controller of this device ships with a default address, use the new CONFIG_FIXUP_BDADDR option to fix it up.

This still references the old config name. It should be CONFIG_BLUETOOTH_DT_DEVICE_FIXUP.

Cheers,
Samuel

Quoted 5 lines

akonadi:?collection=30&name=INBOX

[Updated OrangePi 3 DT, rebase and config update]
#6 lore raw

PATCH v6 3/3 arm64: dts: sun50i: Add support for Orange Pi 3

Quoted 10 lines · Samuel Holland
Quoted 6 lines · Jernej Skrabec

From: Andre Heider <[email protected]>

dts file is taken from Linux 5.11-rc1 tag.

The Bluetooth controller of this device ships with a default address, use the new CONFIG_FIXUP_BDADDR option to fix it up.

This still references the old config name. It should be CONFIG_BLUETOOTH_DT_DEVICE_FIXUP.

Ah, thanks for pointing this out. I checked the usage in the code, but missed the commit message.
Will fix it up in my branch.

Cheers,
Andre

#7 lore raw

v6 cover sunxi: Add support for OrangePi 3

In reply to Jernej Skrabec
Quoted 11 lines · Jernej Skrabec

This series introduces OrangePi 3 support.

Previous cover letter:
This is just refreshed v4 from here:
https://patchwork.ozlabs.org/project/uboot/list/?series=156657&state=*

Patches are only rebased, DT updated and defconfig regenerated, so I kept old tags. Only difference with old version is that this one does not sync H6 DT files. Becasue of that, this series should be applied on top of:
https://patchwork.ozlabs.org/project/uboot/list/?series=222516

I applied and pushed 1/3 and 2/3.

Put 3/3 on my next branch, behind the H6 DT update, to be pushed as soon as we get the RGMII PHY mode patch in.

Thanks!
Andre

Quoted 26 lines

Please take a look.

Best regards,
Jernej

Changes from v5:
- Added tags
- Renamed FIXUP_BDADDR -> BLUETOOTH_DT_DEVICE_FIXUP
- Renamed fixup_bd_address() -> bluetooth_dt_fixup()
- Removed CONFIG_PSCI_RESET from defconfig

Andre Heider (3):
sunxi: board: extract creating a unique sid into a helper function
arm: sunxi: add a config option to fixup a Bluetooth address
arm64: dts: sun50i: Add support for Orange Pi 3

 arch/arm/dts/Makefile                 |   1 +
 arch/arm/dts/sun50i-h6-orangepi-3.dts | 345 ++++++++++++++++++++++++++
 arch/arm/mach-sunxi/Kconfig           |  11 +
 board/sunxi/MAINTAINERS               |   5 +
 board/sunxi/board.c                   | 155 ++++++++----
 configs/orangepi_3_defconfig          |  12 +
 6 files changed, 474 insertions(+), 55 deletions(-)
 create mode 100644 arch/arm/dts/sun50i-h6-orangepi-3.dts
 create mode 100644 configs/orangepi_3_defconfig
#8 lore raw

v6 cover sunxi: Add support for OrangePi 3

Quoted 13 lines · Andr? Przywara
Quoted 11 lines · Jernej Skrabec

This series introduces OrangePi 3 support.

Previous cover letter:
This is just refreshed v4 from here:
https://patchwork.ozlabs.org/project/uboot/list/?series=156657&state=*

Patches are only rebased, DT updated and defconfig regenerated, so I kept old tags. Only difference with old version is that this one does not sync H6 DT files. Becasue of that, this series should be applied on top of:
https://patchwork.ozlabs.org/project/uboot/list/?series=222516

Quoted 7 lines

I applied and pushed 1/3 and 2/3.

Put 3/3 on my next branch, behind the H6 DT update, to be pushed as soon as we get the RGMII PHY mode patch in.

Thanks!
Andre

Nice, thanks!

And thank you Jernej for picking this up and getting it over the line!

Andre

Quoted 28 lines
Quoted 27 lines

Please take a look.

Best regards,
Jernej

Changes from v5:
- Added tags
- Renamed FIXUP_BDADDR -> BLUETOOTH_DT_DEVICE_FIXUP
- Renamed fixup_bd_address() -> bluetooth_dt_fixup()
- Removed CONFIG_PSCI_RESET from defconfig

Andre Heider (3):
sunxi: board: extract creating a unique sid into a helper function
arm: sunxi: add a config option to fixup a Bluetooth address
arm64: dts: sun50i: Add support for Orange Pi 3

  arch/arm/dts/Makefile                 |   1 +
  arch/arm/dts/sun50i-h6-orangepi-3.dts | 345 ++++++++++++++++++++++++++
  arch/arm/mach-sunxi/Kconfig           |  11 +
  board/sunxi/MAINTAINERS               |   5 +
  board/sunxi/board.c                   | 155 ++++++++----
  configs/orangepi_3_defconfig          |  12 +
  6 files changed, 474 insertions(+), 55 deletions(-)

create mode 100644 arch/arm/dts/sun50i-h6-orangepi-3.dts create mode 100644 configs/orangepi_3_defconfig