Attachment #223826 for bug #254786

Line 0 Link Here

(-)sysutils/u-boot-rock-pi-e/Makefile (+11 lines)
	1	# $FreeBSD$
	2
	3	MASTERDIR= ${.CURDIR}/../u-boot-master
	4
	5	MODEL= rock-pi-e
	6	BOARD_CONFIG= rock-pi-e-rk3328_defconfig
	7	FAMILY= rk3328
	8
	9	EXTRA_PATCHES= ${.CURDIR}/files/
	10
	11	.include "${MASTERDIR}/Makefile"




--- arch/arm/dts/rk3328-rock-pi-e.dts.orig	2020-07-06 22:22:53.000000000 +0300
+++ arch/arm/dts/rk3328-rock-pi-e.dts	2020-07-09 15:12:51.906797000 +0300
@@ -1,260 +1,438 @@
-// SPDX-License-Identifier: GPL-2.0+
 /*
- * (C) Copyright 2020 Radxa
+ * SPDX-License-Identifier: (GPL-2.0+ or MIT)
+ * Copyright (c) 2016 Fuzhou Rockchip Electronics Co., Ltd
  */
 
 /dts-v1/;
 #include "rk3328.dtsi"
+#include <dt-bindings/input/input.h>
 
 / {
-	model = "Radxa Rockpi E";
-	compatible = "radxa,rock-pi-e", "rockchip,rk3328";
+	model = "Radxa ROCK Pi E";
+	compatible = "radxa,rockpie", "rockchip,rk3328";
 
 	chosen {
-	stdout-path = "serial2:1500000n8";
+		stdout-path = "serial2:1500000n8";
 	};
 
+	fiq_debugger: fiq-debugger {
+		compatible = "rockchip,fiq-debugger";
+		rockchip,serial-id = <2>;
+		rockchip,signal-irq = <159>;
+		rockchip,wake-irq = <0>;
+		/* If enable uart uses irq instead of fiq */
+		rockchip,irq-mode-enable = <0>;
+		rockchip,baudrate = <1500000>;  /* Only 115200 and 1500000 */
+		interrupts = <GIC_SPI 127 IRQ_TYPE_LEVEL_LOW>;
+		status = "disabled";
+	};
+
 	gmac_clkin: external-gmac-clock {
-	compatible = "fixed-clock";
-	clock-frequency = <125000000>;
-	clock-output-names = "gmac_clkin";
-	#clock-cells = <0>;
+		compatible = "fixed-clock";
+		clock-frequency = <125000000>;
+		clock-output-names = "gmac_clkin";
+		#clock-cells = <0>;
 	};
 
+	sound {
+		compatible = "simple-audio-card";
+		simple-audio-card,format = "i2s";
+		simple-audio-card,mclk-fs = <256>;
+		simple-audio-card,name = "rockchip,rk3328";
+		simple-audio-card,cpu {
+			sound-dai = <&i2s1>;
+		};
+		simple-audio-card,codec {
+			sound-dai = <&codec>;
+		};
+	};
+
+	hdmi-sound {
+		compatible = "simple-audio-card";
+		simple-audio-card,format = "i2s";
+		simple-audio-card,mclk-fs = <128>;
+		simple-audio-card,name = "rockchip,hdmi";
+		simple-audio-card,cpu {
+			sound-dai = <&i2s0>;
+		};
+		simple-audio-card,codec {
+			sound-dai = <&hdmi>;
+		};
+	};
+
+	vcc_host_vbus: host-vbus-regulator {
+		compatible = "regulator-fixed";
+		gpio = <&gpio3 RK_PA7 GPIO_ACTIVE_HIGH>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&host_vbus_drv>;
+		regulator-always-on;
+		regulator-boot-on;
+		regulator-name = "vcc_host_vbus";
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		enable-active-high;
+	};
+
+	vcc_phy: vcc-phy-regulator {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc_phy";
+		regulator-always-on;
+		regulator-boot-on;
+	};
+
 	vcc_sd: sdmmc-regulator {
-	compatible = "regulator-fixed";
-	gpio = <&gpio0 RK_PD6 GPIO_ACTIVE_LOW>;
-	pinctrl-names = "default";
-	pinctrl-0 = <&sdmmc0m1_gpio>;
-	regulator-name = "vcc_sd";
-	regulator-always-on;
-	regulator-boot-on;
-	regulator-min-microvolt = <3300000>;
-	regulator-max-microvolt = <3300000>;
-	vin-supply = <&vcc_io>;
+		compatible = "regulator-fixed";
+		gpio = <&gpio0 30 GPIO_ACTIVE_LOW>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&sdmmc0m1_gpio>;
+		regulator-name = "vcc_sd";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		vin-supply = <&vcc_io>;
 	};
 
+	vcc_sys: vcc-sys {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc_sys";
+		regulator-always-on;
+		regulator-boot-on;
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+	};
+
 	vcc5v0_host_xhci: vcc5v0-host-xhci-drv {
-	compatible = "regulator-fixed";
-	enable-active-high;
-	regulator-name = "vcc5v0_host_xhci";
-	gpio = <&gpio3 RK_PA7 GPIO_ACTIVE_HIGH>;
-	regulator-min-microvolt = <5000000>;
-	regulator-max-microvolt = <5000000>;
+		compatible = "regulator-fixed";
+		enable-active-high;
+		regulator-name = "vcc5v0_host_xhci";
+		gpio = <&gpio3 RK_PA7 GPIO_ACTIVE_HIGH>;
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
 	};
 
-	vcc_sys: vcc-sys {
-	compatible = "regulator-fixed";
-	regulator-name = "vcc_sys";
-	regulator-always-on;
-	regulator-boot-on;
-	regulator-min-microvolt = <5000000>;
-	regulator-max-microvolt = <5000000>;
+	xin32k: xin32k {
+		compatible = "fixed-clock";
+		clock-frequency = <32768>;
+		clock-output-names = "xin32k";
+		#clock-cells = <0>;
 	};
-};
 
-&cpu0 {
-	cpu-supply = <&vdd_arm>;
+	gpio-leds {
+		compatible = "gpio-leds";
+		status = "okay";
+
+		user-led {
+			label = "rockpie:user";
+			gpios = <&gpio3 5 GPIO_ACTIVE_LOW>;
+			linux,default-trigger = "heartbeat";
+			default-state = "on";
+		};
+	};
 };
 
-&cpu1 {
-	cpu-supply = <&vdd_arm>;
+&io_domains {
+	status = "okay";
+
+	vccio1-supply = <&vcc_io>;
+	vccio2-supply = <&vcc_18emmc>;
+	vccio3-supply = <&vcc_io>;
+	vccio4-supply = <&vcc_io>;
+	vccio5-supply = <&vcc_io>;
+	vccio6-supply = <&vcc_io>;
+	pmuio-supply = <&vcc_io>;
 };
 
-&cpu2 {
+&cpu0 {
 	cpu-supply = <&vdd_arm>;
 };
 
-&cpu3 {
-	cpu-supply = <&vdd_arm>;
+&gpu {
+	status = "okay";
+	mali-supply = <&vdd_logic>;
 };
 
-&emmc {
-	bus-width = <8>;
-	cap-mmc-highspeed;
-	mmc-hs200-1_8v;
-	supports-emmc;
-	disable-wp;
-	non-removable;
-	num-slots = <1>;
-	pinctrl-names = "default";
-	pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_bus8>;
-	vmmc-supply = <&vcc_io>;
-	vqmmc-supply = <&vcc18_emmc>;
+&gmac2phy {
+	phy-supply = <&vcc_phy>;
+	clock_in_out = "output";
+	assigned-clocks = <&cru SCLK_MAC2PHY>, <&cru SCLK_MAC2PHY_SRC>;
+	assigned-clock-rate = <0>, <50000000>;
+	assigned-clock-parents = <&cru SCLK_MAC2PHY_SRC>, <&cru PLL_GPLL>;
 	status = "okay";
 };

 &gmac2io {
-	assigned-clocks = <&cru SCLK_MAC2IO>, <&cru SCLK_MAC2IO_EXT>;
-	assigned-clock-parents = <&gmac_clkin>, <&gmac_clkin>;
-	clock_in_out = "input";
 	phy-supply = <&vcc_io>;
 	phy-mode = "rgmii";
-	pinctrl-names = "default";
-	pinctrl-0 = <&rgmiim1_pins>;
-	snps,force_thresh_dma_mode;
+	clock_in_out = "input";
 	snps,reset-gpio = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>;
 	snps,reset-active-low;
 	snps,reset-delays-us = <0 10000 50000>;
+	assigned-clocks = <&cru SCLK_MAC2IO>, <&cru SCLK_MAC2IO_EXT>;
+	assigned-clock-parents = <&gmac_clkin>, <&gmac_clkin>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&rgmiim1_pins>;
+	snps,aal;
+	snps,rxpbl = <0x4>;
+	snps,txpbl = <0x4>;
 	tx_delay = <0x26>;
 	rx_delay = <0x11>;
 	status = "okay";
 };
 
-&i2c1 {
+&display_subsystem {
 	status = "okay";
+};
 
-	rk805: rk805@18 {
-	compatible = "rockchip,rk805";
+&hdmi {
+	#sound-dai-cells = <0>;
+	ddc-i2c-scl-high-time-ns = <9625>;
+	ddc-i2c-scl-low-time-ns = <10000>;
 	status = "okay";
-	reg = <0x18>;
-	interrupt-parent = <&gpio2>;
-	interrupts = <6 IRQ_TYPE_LEVEL_LOW>;
-	#clock-cells = <1>;
-	clock-output-names = "xin32k", "rk805-clkout2";
-	pinctrl-names = "default";
-	pinctrl-0 = <&pmic_int_l>;
-	rockchip,system-power-controller;
-	wakeup-source;
+};
 
-	vcc1-supply = <&vcc_sys>;
-	vcc2-supply = <&vcc_sys>;
-	vcc3-supply = <&vcc_sys>;
-	vcc4-supply = <&vcc_sys>;
-	vcc5-supply = <&vcc_io>;
-	vcc6-supply = <&vcc_sys>;
+&hdmiphy {
+	status = "okay";
+};
 
-	regulators {
-	vdd_logic: DCDC_REG1 {
-	regulator-name = "vdd_logic";
-	regulator-min-microvolt = <712500>;
-	regulator-max-microvolt = <1450000>;
-	regulator-ramp-delay = <12500>;
-	regulator-always-on;
-	regulator-boot-on;
-	regulator-state-mem {
-	regulator-on-in-suspend;
-	regulator-suspend-microvolt = <1000000>;
-	};
-	};
+/*&h265e {
+	status = "okay";
+};
 
-	vdd_arm: DCDC_REG2 {
-	regulator-name = "vdd_arm";
-	regulator-min-microvolt = <712500>;
-	regulator-max-microvolt = <1450000>;
-	regulator-ramp-delay = <12500>;
-	regulator-always-on;
-	regulator-boot-on;
-	regulator-state-mem {
-	regulator-on-in-suspend;
-	regulator-suspend-microvolt = <950000>;
-	};
-	};
+&rkvdec {
+	status = "okay";
+};
 
-	vcc_ddr: DCDC_REG3 {
-	regulator-name = "vcc_ddr";
-	regulator-always-on;
-	regulator-boot-on;
-	regulator-state-mem {
-	regulator-on-in-suspend;
-	};
-	};
+&vepu {
+	status = "okay";
+};*/
 
-	vcc_io: DCDC_REG4 {
-	regulator-name = "vcc_io";
-	regulator-min-microvolt = <3300000>;
-	regulator-max-microvolt = <3300000>;
-	regulator-always-on;
-	regulator-boot-on;
-	regulator-state-mem {
-	regulator-on-in-suspend;
-	regulator-suspend-microvolt = <3300000>;
-	};
-	};
+&vop {
+	status = "okay";
+};
 
-	vcc_18: LDO_REG1 {
-	regulator-name = "vcc_18";
-	regulator-min-microvolt = <1800000>;
-	regulator-max-microvolt = <1800000>;
-	regulator-always-on;
-	regulator-boot-on;
-	regulator-state-mem {
-	regulator-on-in-suspend;
-	regulator-suspend-microvolt = <1800000>;
-	};
-	};
+&vop_mmu {
+	status = "okay";
+};
 
-	vcc18_emmc: LDO_REG2 {
-	regulator-name = "vcc18_emmc";
-	regulator-min-microvolt = <1800000>;
-	regulator-max-microvolt = <1800000>;
-	regulator-always-on;
-	regulator-boot-on;
-	regulator-state-mem {
-	regulator-on-in-suspend;
-	regulator-suspend-microvolt = <1800000>;
-	};
-	};
+/*&vpu_service {
+	status = "okay";
+};*/
 
-	vdd_10: LDO_REG3 {
-	regulator-name = "vdd_10";
-	regulator-min-microvolt = <1000000>;
-	regulator-max-microvolt = <1000000>;
-	regulator-always-on;
-	regulator-boot-on;
-	regulator-state-mem {
-	regulator-on-in-suspend;
-	regulator-suspend-microvolt = <1000000>;
-	};
-	};
-	};
-	};
+&i2s0 {
+	#sound-dai-cells = <0>;
+	rockchip,bclk-fs = <128>;
+	status = "okay";
 };
 
-&io_domains {
+&i2s1 {
+	#sound-dai-cells = <0>;
 	status = "okay";
+};
 
-	vccio1-supply = <&vcc_io>;
-	vccio2-supply = <&vcc18_emmc>;
-	vccio3-supply = <&vcc_io>;
-	vccio4-supply = <&vcc_io>;
-	vccio5-supply = <&vcc_io>;
-	vccio6-supply = <&vcc_io>;
-	pmuio-supply = <&vcc_io>;
+&codec {
+	#sound-dai-cells = <0>;
+	status = "okay";
 };
 
-&pinctrl {
-	pmic {
-	pmic_int_l: pmic-int-l {
-	rockchip,pins = <2 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>;
-	};
-	};
+&emmc {
+	bus-width = <8>;
+	cap-mmc-highspeed;
+	mmc-hs200-1_8v;
+	supports-emmc;
+	disable-wp;
+	non-removable;
+	num-slots = <1>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_bus8>;
+	status = "okay";
 };
 
 &sdmmc {
 	bus-width = <4>;
 	cap-mmc-highspeed;
 	cap-sd-highspeed;
-	card-detect-delay = <200>;
 	disable-wp;
 	max-frequency = <150000000>;
 	num-slots = <1>;
 	pinctrl-names = "default";
 	pinctrl-0 = <&sdmmc0_clk &sdmmc0_cmd &sdmmc0_dectn &sdmmc0_bus4>;
 	supports-sd;
+	status = "okay";
 	vmmc-supply = <&vcc_sd>;
+};
+
+&i2c1 {
 	status = "okay";
+
+	rk805: rk805@18 {
+		compatible = "rockchip,rk805";
+		status = "okay";
+		reg = <0x18>;
+		interrupt-parent = <&gpio2>;
+		interrupts = <6 IRQ_TYPE_LEVEL_LOW>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&pmic_int_l>;
+		rockchip,system-power-controller;
+		wakeup-source;
+		gpio-controller;
+		#gpio-cells = <2>;
+		#clock-cells = <1>;
+		clock-output-names = "rk805-clkout1", "rk805-clkout2";
+
+		vcc1-supply = <&vcc_sys>;
+		vcc2-supply = <&vcc_sys>;
+		vcc3-supply = <&vcc_sys>;
+		vcc4-supply = <&vcc_sys>;
+		vcc5-supply = <&vcc_io>;
+		vcc6-supply = <&vcc_io>;
+
+		rtc {
+			status = "okay";
+		};
+
+		pwrkey {
+			status = "disabled";
+		};
+
+		gpio {
+			status = "okay";
+		};
+
+		regulators {
+			compatible = "rk805-regulator";
+			status = "okay";
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			vdd_logic: DCDC_REG1 {
+				regulator-name = "vdd_logic";
+				regulator-min-microvolt = <712500>;
+				regulator-max-microvolt = <1450000>;
+				regulator-ramp-delay = <12500>;
+				regulator-boot-on;
+				regulator-always-on;
+				regulator-state-mem {
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <1000000>;
+				};
+			};
+
+			vdd_arm: DCDC_REG2 {
+				regulator-name = "vdd_arm";
+				regulator-min-microvolt = <712500>;
+				regulator-max-microvolt = <1450000>;
+				regulator-ramp-delay = <12500>;
+				regulator-boot-on;
+				regulator-always-on;
+				regulator-state-mem {
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <950000>;
+				};
+			};
+
+			vcc_ddr: DCDC_REG3 {
+				regulator-name = "vcc_ddr";
+				regulator-boot-on;
+				regulator-always-on;
+				regulator-state-mem {
+					regulator-on-in-suspend;
+				};
+			};
+
+			vcc_io: DCDC_REG4 {
+				regulator-name = "vcc_io";
+				regulator-min-microvolt = <3300000>;
+				regulator-max-microvolt = <3300000>;
+				regulator-boot-on;
+				regulator-always-on;
+				regulator-state-mem {
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <3300000>;
+				};
+			};
+
+			vdd_18: LDO_REG1 {
+				regulator-name = "vdd_18";
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <1800000>;
+				regulator-boot-on;
+				regulator-always-on;
+				regulator-state-mem {
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <1800000>;
+				};
+			};
+
+			vcc_18emmc: LDO_REG2 {
+				regulator-name = "vcc_18emmc";
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <1800000>;
+				regulator-boot-on;
+				regulator-always-on;
+				regulator-state-mem {
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <1800000>;
+				};
+			};
+
+			vdd_11: LDO_REG3 {
+				regulator-name = "vdd_11";
+				regulator-min-microvolt = <1100000>;
+				regulator-max-microvolt = <1100000>;
+				regulator-boot-on;
+				regulator-always-on;
+				regulator-state-mem {
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <1100000>;
+				};
+			};
+		};
+	};
 };
 
-&saradc {
+&pinctrl {
+	pinctrl-names = "default";
+	pinctrl-0 = <&wifi_enable>;
+
+	wifi {
+		wifi_enable: wifi-enable {
+			rockchip,pins =
+				<0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_down>;
+		};
+	};
+
+	pmic {
+		pmic_int_l: pmic-int-l {
+			rockchip,pins =
+				<2 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>;	/* gpio2_a6 */
+		};
+	};
+
+	usb {
+		host_vbus_drv: host-vbus-drv {
+			rockchip,pins =
+				<3 RK_PA7 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+	};
+};
+
+&u2phy {
 	status = "okay";
 };
 
+&u2phy_host {
+	status = "okay";
+};
+
+&u2phy_otg {
+	status = "okay";
+};
+
 &uart2 {
 	status = "okay";
 };
 
 &usb20_otg {
+	dr_mode = "host";
 	status = "okay";
 };
 
@@ -264,4 +443,19 @@
 
 &usb_host0_ohci {
 	status = "okay";
+};
+
+&wdt {
+	status = "okay";
+};
+
+&saradc {
+	status = "okay";
+	vref-supply = <&vdd_18>;
+};
+
+&tsadc {
+	status = "okay";
+	rockchip,hw-tshut-mode = <1>; /* tshut mode 0:CRU 1:GPIO */
+	rockchip,hw-tshut-polarity = <1>; /* tshut polarity 0:LOW 1:HIGH */
 };




--- arch/arm/mach-rockchip/misc.c.orig
+++ arch/arm/mach-rockchip/misc.c
@@ -50,6 +50,11 @@ int rockchip_setup_macaddr(void)
 	mac_addr[0] &= 0xfe;  /* clear multicast bit */
 	mac_addr[0] |= 0x02;  /* set local assignment bit (IEEE802) */
 	eth_env_set_enetaddr("ethaddr", mac_addr);
+
+	/* Make a valid MAC address for eth1 too */
+	mac_addr[5] += 0x20;
+	mac_addr[5] &= 0xff;
+	eth_env_set_enetaddr("eth1addr", mac_addr);
 #endif
 	return 0;
 }




--- include/configs/rockchip-common.h.orig	2020-07-16 13:55:46.148082000 +0300
+++ include/configs/rockchip-common.h	2020-07-16 13:56:54.959523000 +0300
@@ -17,8 +17,8 @@
 /* First try to boot from SD (index 0), then eMMC (index 1) */
 #if CONFIG_IS_ENABLED(CMD_MMC)
 	#define BOOT_TARGET_MMC(func) \
-		func(MMC, mmc, 0) \
-		func(MMC, mmc, 1)
+		func(MMC, mmc, 1) \
+		func(MMC, mmc, 0)
 #else
 	#define BOOT_TARGET_MMC(func)
 #endif

Line 0 Link Here

(-)sysutils/u-boot-rock-pi-e/pkg-descr (+7 lines)
	1	U-Boot loader and related files for the Radxa Rock Pi E.
	2
	3	To install this bootloader on an sdcard just do:
	4	dd if=/usr/local/share/u-boot/u-boot-rock-pi-e/idbloader.img of=/path/to/sdcarddevice seek=64 bs=512 conv=sync
	5	dd if=/usr/local/share/u-boot/u-boot-rock-pi-e/u-boot.itb of=/path/to/sdcarddevice seek=16384 bs=512 conv=sync
	6
	7	WWW: https://www.denx.de/wiki/U-Boot

Return to bug 254786

Line 0 Link Here

(-)sysutils/u-boot-rock-pi-e/files/patch-arch_arm_dts_rk3328-rock-pi-e.dts (+632 lines)
		1	--- arch/arm/dts/rk3328-rock-pi-e.dts.orig 2020-07-06 22:22:53.000000000 +0300
		2	+++ arch/arm/dts/rk3328-rock-pi-e.dts 2020-07-09 15:12:51.906797000 +0300
		3	@@ -1,260 +1,438 @@
		4	-// SPDX-License-Identifier: GPL-2.0+
		5	/*
		6	- * (C) Copyright 2020 Radxa
		7	+ * SPDX-License-Identifier: (GPL-2.0+ or MIT)
		8	+ * Copyright (c) 2016 Fuzhou Rockchip Electronics Co., Ltd
		9	*/
		10
		11	/dts-v1/;
		12	#include "rk3328.dtsi"
		13	+#include <dt-bindings/input/input.h>
		14
		15	/ {
		16	- model = "Radxa Rockpi E";
		17	- compatible = "radxa,rock-pi-e", "rockchip,rk3328";
		18	+ model = "Radxa ROCK Pi E";
		19	+ compatible = "radxa,rockpie", "rockchip,rk3328";
		20
		21	chosen {
		22	- stdout-path = "serial2:1500000n8";
		23	+ stdout-path = "serial2:1500000n8";
		24	};
		25
		26	+ fiq_debugger: fiq-debugger {
		27	+ compatible = "rockchip,fiq-debugger";
		28	+ rockchip,serial-id = <2>;
		29	+ rockchip,signal-irq = <159>;
		30	+ rockchip,wake-irq = <0>;
		31	+ /* If enable uart uses irq instead of fiq */
		32	+ rockchip,irq-mode-enable = <0>;
		33	+ rockchip,baudrate = <1500000>; /* Only 115200 and 1500000 */
		34	+ interrupts = <GIC_SPI 127 IRQ_TYPE_LEVEL_LOW>;
		35	+ status = "disabled";
		36	+ };
		37	+
		38	gmac_clkin: external-gmac-clock {
		39	- compatible = "fixed-clock";
		40	- clock-frequency = <125000000>;
		41	- clock-output-names = "gmac_clkin";
		42	- #clock-cells = <0>;
		43	+ compatible = "fixed-clock";
		44	+ clock-frequency = <125000000>;
		45	+ clock-output-names = "gmac_clkin";
		46	+ #clock-cells = <0>;
		47	};
		48
		49	+ sound {
		50	+ compatible = "simple-audio-card";
		51	+ simple-audio-card,format = "i2s";
		52	+ simple-audio-card,mclk-fs = <256>;
		53	+ simple-audio-card,name = "rockchip,rk3328";
		54	+ simple-audio-card,cpu {
		55	+ sound-dai = <&i2s1>;
		56	+ };
		57	+ simple-audio-card,codec {
		58	+ sound-dai = <&codec>;
		59	+ };
		60	+ };
		61	+
		62	+ hdmi-sound {
		63	+ compatible = "simple-audio-card";
		64	+ simple-audio-card,format = "i2s";
65	+ simple-audio-card,mclk-fs = <128>;
66	+ simple-audio-card,name = "rockchip,hdmi";
67	+ simple-audio-card,cpu {
68	+ sound-dai = <&i2s0>;
69	+ };
70	+ simple-audio-card,codec {
71	+ sound-dai = <&hdmi>;
72	+ };
73	+ };
74	+
75	+ vcc_host_vbus: host-vbus-regulator {
76	+ compatible = "regulator-fixed";
77	+ gpio = <&gpio3 RK_PA7 GPIO_ACTIVE_HIGH>;
78	+ pinctrl-names = "default";
79	+ pinctrl-0 = <&host_vbus_drv>;
80	+ regulator-always-on;
81	+ regulator-boot-on;
82	+ regulator-name = "vcc_host_vbus";
83	+ regulator-min-microvolt = <5000000>;
84	+ regulator-max-microvolt = <5000000>;
85	+ enable-active-high;
86	+ };
87	+
88	+ vcc_phy: vcc-phy-regulator {
89	+ compatible = "regulator-fixed";
90	+ regulator-name = "vcc_phy";
91	+ regulator-always-on;
92	+ regulator-boot-on;
93	+ };
94	+
95	vcc_sd: sdmmc-regulator {
96	- compatible = "regulator-fixed";
97	- gpio = <&gpio0 RK_PD6 GPIO_ACTIVE_LOW>;
98	- pinctrl-names = "default";
99	- pinctrl-0 = <&sdmmc0m1_gpio>;
100	- regulator-name = "vcc_sd";
101	- regulator-always-on;
102	- regulator-boot-on;
103	- regulator-min-microvolt = <3300000>;
104	- regulator-max-microvolt = <3300000>;
105	- vin-supply = <&vcc_io>;
106	+ compatible = "regulator-fixed";
107	+ gpio = <&gpio0 30 GPIO_ACTIVE_LOW>;
108	+ pinctrl-names = "default";
109	+ pinctrl-0 = <&sdmmc0m1_gpio>;
110	+ regulator-name = "vcc_sd";
111	+ regulator-min-microvolt = <3300000>;
112	+ regulator-max-microvolt = <3300000>;
113	+ vin-supply = <&vcc_io>;
114	};
115
116	+ vcc_sys: vcc-sys {
117	+ compatible = "regulator-fixed";
118	+ regulator-name = "vcc_sys";
119	+ regulator-always-on;
120	+ regulator-boot-on;
121	+ regulator-min-microvolt = <5000000>;
122	+ regulator-max-microvolt = <5000000>;
123	+ };
124	+
125	vcc5v0_host_xhci: vcc5v0-host-xhci-drv {
126	- compatible = "regulator-fixed";
127	- enable-active-high;
128	- regulator-name = "vcc5v0_host_xhci";
129	- gpio = <&gpio3 RK_PA7 GPIO_ACTIVE_HIGH>;
130	- regulator-min-microvolt = <5000000>;
131	- regulator-max-microvolt = <5000000>;
132	+ compatible = "regulator-fixed";
133	+ enable-active-high;
134	+ regulator-name = "vcc5v0_host_xhci";
135	+ gpio = <&gpio3 RK_PA7 GPIO_ACTIVE_HIGH>;
136	+ regulator-min-microvolt = <5000000>;
137	+ regulator-max-microvolt = <5000000>;
138	};
139
140	- vcc_sys: vcc-sys {
141	- compatible = "regulator-fixed";
142	- regulator-name = "vcc_sys";
143	- regulator-always-on;
144	- regulator-boot-on;
145	- regulator-min-microvolt = <5000000>;
146	- regulator-max-microvolt = <5000000>;
147	+ xin32k: xin32k {
148	+ compatible = "fixed-clock";
149	+ clock-frequency = <32768>;
150	+ clock-output-names = "xin32k";
151	+ #clock-cells = <0>;
152	};
153	-};
154
155	-&cpu0 {
156	- cpu-supply = <&vdd_arm>;
157	+ gpio-leds {
158	+ compatible = "gpio-leds";
159	+ status = "okay";
160	+
161	+ user-led {
162	+ label = "rockpie:user";
163	+ gpios = <&gpio3 5 GPIO_ACTIVE_LOW>;
164	+ linux,default-trigger = "heartbeat";
165	+ default-state = "on";
166	+ };
167	+ };
168	};
169
170	-&cpu1 {
171	- cpu-supply = <&vdd_arm>;
172	+&io_domains {
173	+ status = "okay";
174	+
175	+ vccio1-supply = <&vcc_io>;
176	+ vccio2-supply = <&vcc_18emmc>;
177	+ vccio3-supply = <&vcc_io>;
178	+ vccio4-supply = <&vcc_io>;
179	+ vccio5-supply = <&vcc_io>;
180	+ vccio6-supply = <&vcc_io>;
181	+ pmuio-supply = <&vcc_io>;
182	};
183
184	-&cpu2 {
185	+&cpu0 {
186	cpu-supply = <&vdd_arm>;
187	};
188
189	-&cpu3 {
190	- cpu-supply = <&vdd_arm>;
191	+&gpu {
192	+ status = "okay";
193	+ mali-supply = <&vdd_logic>;
194	};
195
196	-&emmc {
197	- bus-width = <8>;
198	- cap-mmc-highspeed;
199	- mmc-hs200-1_8v;
200	- supports-emmc;
201	- disable-wp;
202	- non-removable;
203	- num-slots = <1>;
204	- pinctrl-names = "default";
205	- pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_bus8>;
206	- vmmc-supply = <&vcc_io>;
207	- vqmmc-supply = <&vcc18_emmc>;
208	+&gmac2phy {
209	+ phy-supply = <&vcc_phy>;
210	+ clock_in_out = "output";
211	+ assigned-clocks = <&cru SCLK_MAC2PHY>, <&cru SCLK_MAC2PHY_SRC>;
212	+ assigned-clock-rate = <0>, <50000000>;
213	+ assigned-clock-parents = <&cru SCLK_MAC2PHY_SRC>, <&cru PLL_GPLL>;
214	status = "okay";
215	};
216
217	&gmac2io {
218	- assigned-clocks = <&cru SCLK_MAC2IO>, <&cru SCLK_MAC2IO_EXT>;
219	- assigned-clock-parents = <&gmac_clkin>, <&gmac_clkin>;
220	- clock_in_out = "input";
221	phy-supply = <&vcc_io>;
222	phy-mode = "rgmii";
223	- pinctrl-names = "default";
224	- pinctrl-0 = <&rgmiim1_pins>;
225	- snps,force_thresh_dma_mode;
226	+ clock_in_out = "input";
227	snps,reset-gpio = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>;
228	snps,reset-active-low;
229	snps,reset-delays-us = <0 10000 50000>;
230	+ assigned-clocks = <&cru SCLK_MAC2IO>, <&cru SCLK_MAC2IO_EXT>;
231	+ assigned-clock-parents = <&gmac_clkin>, <&gmac_clkin>;
232	+ pinctrl-names = "default";
233	+ pinctrl-0 = <&rgmiim1_pins>;
234	+ snps,aal;
235	+ snps,rxpbl = <0x4>;
236	+ snps,txpbl = <0x4>;
237	tx_delay = <0x26>;
238	rx_delay = <0x11>;
239	status = "okay";
240	};
241
242	-&i2c1 {
243	+&display_subsystem {
244	status = "okay";
245	+};
246
247	- rk805: rk805@18 {
248	- compatible = "rockchip,rk805";
249	+&hdmi {
250	+ #sound-dai-cells = <0>;
251	+ ddc-i2c-scl-high-time-ns = <9625>;
252	+ ddc-i2c-scl-low-time-ns = <10000>;
253	status = "okay";
254	- reg = <0x18>;
255	- interrupt-parent = <&gpio2>;
256	- interrupts = <6 IRQ_TYPE_LEVEL_LOW>;
257	- #clock-cells = <1>;
258	- clock-output-names = "xin32k", "rk805-clkout2";
259	- pinctrl-names = "default";
260	- pinctrl-0 = <&pmic_int_l>;
261	- rockchip,system-power-controller;
262	- wakeup-source;
263	+};
264
265	- vcc1-supply = <&vcc_sys>;
266	- vcc2-supply = <&vcc_sys>;
267	- vcc3-supply = <&vcc_sys>;
268	- vcc4-supply = <&vcc_sys>;
269	- vcc5-supply = <&vcc_io>;
270	- vcc6-supply = <&vcc_sys>;
271	+&hdmiphy {
272	+ status = "okay";
273	+};
274
275	- regulators {
276	- vdd_logic: DCDC_REG1 {
277	- regulator-name = "vdd_logic";
278	- regulator-min-microvolt = <712500>;
279	- regulator-max-microvolt = <1450000>;
280	- regulator-ramp-delay = <12500>;
281	- regulator-always-on;
282	- regulator-boot-on;
283	- regulator-state-mem {
284	- regulator-on-in-suspend;
285	- regulator-suspend-microvolt = <1000000>;
286	- };
287	- };
288	+/*&h265e {
289	+ status = "okay";
290	+};
291
292	- vdd_arm: DCDC_REG2 {
293	- regulator-name = "vdd_arm";
294	- regulator-min-microvolt = <712500>;
295	- regulator-max-microvolt = <1450000>;
296	- regulator-ramp-delay = <12500>;
297	- regulator-always-on;
298	- regulator-boot-on;
299	- regulator-state-mem {
300	- regulator-on-in-suspend;
301	- regulator-suspend-microvolt = <950000>;
302	- };
303	- };
304	+&rkvdec {
305	+ status = "okay";
306	+};
307
308	- vcc_ddr: DCDC_REG3 {
309	- regulator-name = "vcc_ddr";
310	- regulator-always-on;
311	- regulator-boot-on;
312	- regulator-state-mem {
313	- regulator-on-in-suspend;
314	- };
315	- };
316	+&vepu {
317	+ status = "okay";
318	+};*/
319
320	- vcc_io: DCDC_REG4 {
321	- regulator-name = "vcc_io";
322	- regulator-min-microvolt = <3300000>;
323	- regulator-max-microvolt = <3300000>;
324	- regulator-always-on;
325	- regulator-boot-on;
326	- regulator-state-mem {
327	- regulator-on-in-suspend;
328	- regulator-suspend-microvolt = <3300000>;
329	- };
330	- };
331	+&vop {
332	+ status = "okay";
333	+};
334
335	- vcc_18: LDO_REG1 {
336	- regulator-name = "vcc_18";
337	- regulator-min-microvolt = <1800000>;
338	- regulator-max-microvolt = <1800000>;
339	- regulator-always-on;
340	- regulator-boot-on;
341	- regulator-state-mem {
342	- regulator-on-in-suspend;
343	- regulator-suspend-microvolt = <1800000>;
344	- };
345	- };
346	+&vop_mmu {
347	+ status = "okay";
348	+};
349
350	- vcc18_emmc: LDO_REG2 {
351	- regulator-name = "vcc18_emmc";
352	- regulator-min-microvolt = <1800000>;
353	- regulator-max-microvolt = <1800000>;
354	- regulator-always-on;
355	- regulator-boot-on;
356	- regulator-state-mem {
357	- regulator-on-in-suspend;
358	- regulator-suspend-microvolt = <1800000>;
359	- };
360	- };
361	+/*&vpu_service {
362	+ status = "okay";
363	+};*/
364
365	- vdd_10: LDO_REG3 {
366	- regulator-name = "vdd_10";
367	- regulator-min-microvolt = <1000000>;
368	- regulator-max-microvolt = <1000000>;
369	- regulator-always-on;
370	- regulator-boot-on;
371	- regulator-state-mem {
372	- regulator-on-in-suspend;
373	- regulator-suspend-microvolt = <1000000>;
374	- };
375	- };
376	- };
377	- };
378	+&i2s0 {
379	+ #sound-dai-cells = <0>;
380	+ rockchip,bclk-fs = <128>;
381	+ status = "okay";
382	};
383
384	-&io_domains {
385	+&i2s1 {
386	+ #sound-dai-cells = <0>;
387	status = "okay";
388	+};
389
390	- vccio1-supply = <&vcc_io>;
391	- vccio2-supply = <&vcc18_emmc>;
392	- vccio3-supply = <&vcc_io>;
393	- vccio4-supply = <&vcc_io>;
394	- vccio5-supply = <&vcc_io>;
395	- vccio6-supply = <&vcc_io>;
396	- pmuio-supply = <&vcc_io>;
397	+&codec {
398	+ #sound-dai-cells = <0>;
399	+ status = "okay";
400	};
401
402	-&pinctrl {
403	- pmic {
404	- pmic_int_l: pmic-int-l {
405	- rockchip,pins = <2 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>;
406	- };
407	- };
408	+&emmc {
409	+ bus-width = <8>;
410	+ cap-mmc-highspeed;
411	+ mmc-hs200-1_8v;
412	+ supports-emmc;
413	+ disable-wp;
414	+ non-removable;
415	+ num-slots = <1>;
416	+ pinctrl-names = "default";
417	+ pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_bus8>;
418	+ status = "okay";
419	};
420
421	&sdmmc {
422	bus-width = <4>;
423	cap-mmc-highspeed;
424	cap-sd-highspeed;
425	- card-detect-delay = <200>;
426	disable-wp;
427	max-frequency = <150000000>;
428	num-slots = <1>;
429	pinctrl-names = "default";
430	pinctrl-0 = <&sdmmc0_clk &sdmmc0_cmd &sdmmc0_dectn &sdmmc0_bus4>;
431	supports-sd;
432	+ status = "okay";
433	vmmc-supply = <&vcc_sd>;
434	+};
435	+
436	+&i2c1 {
437	status = "okay";
438	+
439	+ rk805: rk805@18 {
440	+ compatible = "rockchip,rk805";
441	+ status = "okay";
442	+ reg = <0x18>;
443	+ interrupt-parent = <&gpio2>;
444	+ interrupts = <6 IRQ_TYPE_LEVEL_LOW>;
445	+ pinctrl-names = "default";
446	+ pinctrl-0 = <&pmic_int_l>;
447	+ rockchip,system-power-controller;
448	+ wakeup-source;
449	+ gpio-controller;
450	+ #gpio-cells = <2>;
451	+ #clock-cells = <1>;
452	+ clock-output-names = "rk805-clkout1", "rk805-clkout2";
453	+
454	+ vcc1-supply = <&vcc_sys>;
455	+ vcc2-supply = <&vcc_sys>;
456	+ vcc3-supply = <&vcc_sys>;
457	+ vcc4-supply = <&vcc_sys>;
458	+ vcc5-supply = <&vcc_io>;
459	+ vcc6-supply = <&vcc_io>;
460	+
461	+ rtc {
462	+ status = "okay";
463	+ };
464	+
465	+ pwrkey {
466	+ status = "disabled";
467	+ };
468	+
469	+ gpio {
470	+ status = "okay";
471	+ };
472	+
473	+ regulators {
474	+ compatible = "rk805-regulator";
475	+ status = "okay";
476	+ #address-cells = <1>;
477	+ #size-cells = <0>;
478	+
479	+ vdd_logic: DCDC_REG1 {
480	+ regulator-name = "vdd_logic";
481	+ regulator-min-microvolt = <712500>;
482	+ regulator-max-microvolt = <1450000>;
483	+ regulator-ramp-delay = <12500>;
484	+ regulator-boot-on;
485	+ regulator-always-on;
486	+ regulator-state-mem {
487	+ regulator-on-in-suspend;
488	+ regulator-suspend-microvolt = <1000000>;
489	+ };
490	+ };
491	+
492	+ vdd_arm: DCDC_REG2 {
493	+ regulator-name = "vdd_arm";
494	+ regulator-min-microvolt = <712500>;
495	+ regulator-max-microvolt = <1450000>;
496	+ regulator-ramp-delay = <12500>;
497	+ regulator-boot-on;
498	+ regulator-always-on;
499	+ regulator-state-mem {
500	+ regulator-on-in-suspend;
501	+ regulator-suspend-microvolt = <950000>;
502	+ };
503	+ };
504	+
505	+ vcc_ddr: DCDC_REG3 {
506	+ regulator-name = "vcc_ddr";
507	+ regulator-boot-on;
508	+ regulator-always-on;
509	+ regulator-state-mem {
510	+ regulator-on-in-suspend;
511	+ };
512	+ };
513	+
514	+ vcc_io: DCDC_REG4 {
515	+ regulator-name = "vcc_io";
516	+ regulator-min-microvolt = <3300000>;
517	+ regulator-max-microvolt = <3300000>;
518	+ regulator-boot-on;
519	+ regulator-always-on;
520	+ regulator-state-mem {
521	+ regulator-on-in-suspend;
522	+ regulator-suspend-microvolt = <3300000>;
523	+ };
524	+ };
525	+
526	+ vdd_18: LDO_REG1 {
527	+ regulator-name = "vdd_18";
528	+ regulator-min-microvolt = <1800000>;
529	+ regulator-max-microvolt = <1800000>;
530	+ regulator-boot-on;
531	+ regulator-always-on;
532	+ regulator-state-mem {
533	+ regulator-on-in-suspend;
534	+ regulator-suspend-microvolt = <1800000>;
535	+ };
536	+ };
537	+
538	+ vcc_18emmc: LDO_REG2 {
539	+ regulator-name = "vcc_18emmc";
540	+ regulator-min-microvolt = <1800000>;
541	+ regulator-max-microvolt = <1800000>;
542	+ regulator-boot-on;
543	+ regulator-always-on;
544	+ regulator-state-mem {
545	+ regulator-on-in-suspend;
546	+ regulator-suspend-microvolt = <1800000>;
547	+ };
548	+ };
549	+
550	+ vdd_11: LDO_REG3 {
551	+ regulator-name = "vdd_11";
552	+ regulator-min-microvolt = <1100000>;
553	+ regulator-max-microvolt = <1100000>;
554	+ regulator-boot-on;
555	+ regulator-always-on;
556	+ regulator-state-mem {
557	+ regulator-on-in-suspend;
558	+ regulator-suspend-microvolt = <1100000>;
559	+ };
560	+ };
561	+ };
562	+ };
563	};
564
565	-&saradc {
566	+&pinctrl {
567	+ pinctrl-names = "default";
568	+ pinctrl-0 = <&wifi_enable>;
569	+
570	+ wifi {
571	+ wifi_enable: wifi-enable {
572	+ rockchip,pins =
573	+ <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_down>;
574	+ };
575	+ };
576	+
577	+ pmic {
578	+ pmic_int_l: pmic-int-l {
579	+ rockchip,pins =
580	+ <2 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>; /* gpio2_a6 */
581	+ };
582	+ };
583	+
584	+ usb {
585	+ host_vbus_drv: host-vbus-drv {
586	+ rockchip,pins =
587	+ <3 RK_PA7 RK_FUNC_GPIO &pcfg_pull_none>;
588	+ };
589	+ };
590	+};
591	+
592	+&u2phy {
593	status = "okay";
594	};
595
596	+&u2phy_host {
597	+ status = "okay";
598	+};
599	+
600	+&u2phy_otg {
601	+ status = "okay";
602	+};
603	+
604	&uart2 {
605	status = "okay";
606	};
607
608	&usb20_otg {
609	+ dr_mode = "host";
610	status = "okay";
611	};
612
613	@@ -264,4 +443,19 @@
614
615	&usb_host0_ohci {
616	status = "okay";
617	+};
618	+
619	+&wdt {
620	+ status = "okay";
621	+};
622	+
623	+&saradc {
624	+ status = "okay";
625	+ vref-supply = <&vdd_18>;
626	+};
627	+
628	+&tsadc {
629	+ status = "okay";
630	+ rockchip,hw-tshut-mode = <1>; /* tshut mode 0:CRU 1:GPIO */
631	+ rockchip,hw-tshut-polarity = <1>; /* tshut polarity 0:LOW 1:HIGH */
632	};

Line 0 Link Here

(-)sysutils/u-boot-rock-pi-e/files/patch-arch_arm_mach-rockchip_misc.c (+14 lines)
	1	--- arch/arm/mach-rockchip/misc.c.orig
	2	+++ arch/arm/mach-rockchip/misc.c
	3	@@ -50,6 +50,11 @@ int rockchip_setup_macaddr(void)
	4	mac_addr[0] &= 0xfe; /* clear multicast bit */
	5	mac_addr[0] \|= 0x02; /* set local assignment bit (IEEE802) */
	6	eth_env_set_enetaddr("ethaddr", mac_addr);
	7	+
	8	+ /* Make a valid MAC address for eth1 too */
	9	+ mac_addr[5] += 0x20;
	10	+ mac_addr[5] &= 0xff;
	11	+ eth_env_set_enetaddr("eth1addr", mac_addr);
	12	#endif
	13	return 0;
	14	}

Line 0 Link Here

(-)sysutils/u-boot-rock-pi-e/files/patch-include_configs_rockchip-common.h (+13 lines)
	1	--- include/configs/rockchip-common.h.orig 2020-07-16 13:55:46.148082000 +0300
	2	+++ include/configs/rockchip-common.h 2020-07-16 13:56:54.959523000 +0300
	3	@@ -17,8 +17,8 @@
	4	/* First try to boot from SD (index 0), then eMMC (index 1) */
	5	#if CONFIG_IS_ENABLED(CMD_MMC)
	6	#define BOOT_TARGET_MMC(func) \
	7	- func(MMC, mmc, 0) \
	8	- func(MMC, mmc, 1)
	9	+ func(MMC, mmc, 1) \
	10	+ func(MMC, mmc, 0)
	11	#else
	12	#define BOOT_TARGET_MMC(func)
	13	#endif