From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Sat, 20 Jun 2020 22:39:57 +0200 Subject: [ARCHEOLOGY] Initial ROCK Pi E support (as WIP) (#2042) note: rpardini: rebased on top of v6.3.1. this patch used to overwrite a file, and is now a complete diff. > X-Git-Archeology: > recovered message: > * WIP: Adding RockpiE config > X-Git-Archeology: > recovered message: > Signed-off-by: Igor Pecovnik > X-Git-Archeology: > recovered message: > * Mainline u-boot for ROCK Pi E > X-Git-Archeology: > recovered message: > * Initial ROCK Pi E device tree in kernel > X-Git-Archeology: > recovered message: > * Fixed supplies for ROCK Pi E device tree > X-Git-Archeology: > recovered message: > * Adjusted u-boot load address for rockchip64 boards with 256MB eg. ROCK Pi E > X-Git-Archeology: > recovered message: > * Blacklisted lima on ROCK Pi E > X-Git-Archeology: > recovered message: > * Fixed ROCK Pi E patch after merge from master > X-Git-Archeology: > recovered message: > * Removed mode settings from rk805 regulators > X-Git-Archeology: > recovered message: > * Fixed issues with offloading for gigabit interface of RockPi E > X-Git-Archeology: > recovered message: > * Adjusted ROCK Pi E board config > X-Git-Archeology: > recovered message: > * Added dev branch for ROCK Pi E > X-Git-Archeology: > recovered message: > * Add build targets > X-Git-Archeology: > recovered message: > Signed-off-by: Igor Pecovnik > X-Git-Archeology: > recovered message: > * Exchange legacy to current in ROCK Pi E build targets > X-Git-Archeology: > recovered message: > Co-authored-by: Piotr Szczepanik > X-Git-Archeology: - Revision e1ecb098330dc372740371dc2386f911833a0529: https://github.com/armbian/build/commit/e1ecb098330dc372740371dc2386f911833a0529 > X-Git-Archeology: Date: Sat, 20 Jun 2020 22:39:57 +0200 > X-Git-Archeology: From: Igor Pecovnik > X-Git-Archeology: Subject: Initial ROCK Pi E support (as WIP) (#2042) > X-Git-Archeology: > X-Git-Archeology: - Revision 72257bd0648c28fca32962126bb885a4a2c188cc: https://github.com/armbian/build/commit/72257bd0648c28fca32962126bb885a4a2c188cc > X-Git-Archeology: Date: Tue, 23 Jun 2020 16:37:54 +0200 > X-Git-Archeology: From: Piotr Szczepanik > X-Git-Archeology: Subject: Make USB3 support of ROCK Pi E on par with other rk3328 boards (#2050) > X-Git-Archeology: > X-Git-Archeology: - Revision e36ce875b025e112127cf8cc2d34825ebfe36569: https://github.com/armbian/build/commit/e36ce875b025e112127cf8cc2d34825ebfe36569 > X-Git-Archeology: Date: Tue, 10 Nov 2020 21:43:13 +0100 > X-Git-Archeology: From: Piotr Szczepanik > X-Git-Archeology: Subject: Switched rockchip64-current to linux 5.9.y (#2309) > X-Git-Archeology: > X-Git-Archeology: - Revision ccbc888b3f5731790128684959b55b6552e26190: https://github.com/armbian/build/commit/ccbc888b3f5731790128684959b55b6552e26190 > X-Git-Archeology: Date: Sat, 28 Nov 2020 16:52:34 +0100 > X-Git-Archeology: From: Oleg > X-Git-Archeology: Subject: add dts rk3328-roc-pc, fix WIFI and USB 3.0 rk3328 (#2390) > X-Git-Archeology: > X-Git-Archeology: - Revision 25bd76527e1276c4c00829f68c0ca0742ecc94c1: https://github.com/armbian/build/commit/25bd76527e1276c4c00829f68c0ca0742ecc94c1 > X-Git-Archeology: Date: Sat, 28 Nov 2020 18:10:53 +0100 > X-Git-Archeology: From: Piotr Szczepanik > X-Git-Archeology: Subject: Fix roc-rk3328-pc device tree reference to missing RK_FUNC_1 > X-Git-Archeology: > X-Git-Archeology: - Revision dfd5cf9692e97774f7f0bfd72227144e36f58070: https://github.com/armbian/build/commit/dfd5cf9692e97774f7f0bfd72227144e36f58070 > X-Git-Archeology: Date: Sun, 13 Dec 2020 22:13:03 -0500 > X-Git-Archeology: From: tonymac32 > X-Git-Archeology: Subject: [ rockchip64 ] Clean up patchset > X-Git-Archeology: > X-Git-Archeology: - Revision 25e0f1633467c020f6ae68d09964a522fbfbe613: https://github.com/armbian/build/commit/25e0f1633467c020f6ae68d09964a522fbfbe613 > X-Git-Archeology: Date: Mon, 18 Jan 2021 23:21:40 +0100 > X-Git-Archeology: From: Piotr Szczepanik > X-Git-Archeology: Subject: Adjusted power and pmic configuration for Station M1 in current/dev > X-Git-Archeology: > X-Git-Archeology: - Revision 0cdffb29b07305209efb12cf3b5ac6032d3a1153: https://github.com/armbian/build/commit/0cdffb29b07305209efb12cf3b5ac6032d3a1153 > X-Git-Archeology: Date: Wed, 24 Mar 2021 19:01:53 +0100 > X-Git-Archeology: From: Igor Pecovnik > X-Git-Archeology: Subject: Renaming DEV branch to EDGE (#2704) > X-Git-Archeology: > X-Git-Archeology: - Revision d8dbefd61838e5b0cfc2b93d2d168f3fb2666dfb: https://github.com/armbian/build/commit/d8dbefd61838e5b0cfc2b93d2d168f3fb2666dfb > X-Git-Archeology: Date: Tue, 27 Jul 2021 00:05:09 -0400 > X-Git-Archeology: From: tonymac32 > X-Git-Archeology: Subject: [ rockchip64 ] rk3328 change to mainline USB3 > X-Git-Archeology: > X-Git-Archeology: - Revision a16699260fb786a4d89a1c335722e9fed49d19d2: https://github.com/armbian/build/commit/a16699260fb786a4d89a1c335722e9fed49d19d2 > X-Git-Archeology: Date: Fri, 08 Jul 2022 22:35:59 +1200 > X-Git-Archeology: From: schwar3kat <61094841+schwar3kat@users.noreply.github.com> > X-Git-Archeology: Subject: Refactored orangepi-r1plus-lts dts in kernel add board patch > X-Git-Archeology: > X-Git-Archeology: - Revision 8648dde23ff090b5fb704adab036ed14cd944ba3: https://github.com/armbian/build/commit/8648dde23ff090b5fb704adab036ed14cd944ba3 > X-Git-Archeology: Date: Thu, 22 Sep 2022 10:25:28 +0200 > X-Git-Archeology: From: aiamadeus <42570690+aiamadeus@users.noreply.github.com> > X-Git-Archeology: Subject: rockchip: fixes support for orangepi-r1plus (#4215) > X-Git-Archeology: > X-Git-Archeology: - Revision 6765f734cc4a22aeaa9f99a3ad28c8c322de26f6: https://github.com/armbian/build/commit/6765f734cc4a22aeaa9f99a3ad28c8c322de26f6 > X-Git-Archeology: Date: Tue, 25 Oct 2022 11:26:51 +0200 > X-Git-Archeology: From: Igor Pecovnik > X-Git-Archeology: Subject: Bump rockchip64 edge to 6.0.y (#4337) > X-Git-Archeology: > X-Git-Archeology: - Revision 92f1a22d76b987afa7ba555d5b509adc51d689e7: https://github.com/armbian/build/commit/92f1a22d76b987afa7ba555d5b509adc51d689e7 > X-Git-Archeology: Date: Fri, 16 Dec 2022 13:38:13 +0100 > X-Git-Archeology: From: Igor Pecovnik > X-Git-Archeology: Subject: Re-add rockchip64 6.0 patches (#4575) > X-Git-Archeology: > X-Git-Archeology: - Revision 34ae84fac5d0b66a1ab2d1e51534b7beb13ef245: https://github.com/armbian/build/commit/34ae84fac5d0b66a1ab2d1e51534b7beb13ef245 > X-Git-Archeology: Date: Fri, 05 May 2023 14:22:00 +0200 > X-Git-Archeology: From: amazingfate > X-Git-Archeology: Subject: bump rockchip64 edge to v6.3 > X-Git-Archeology: --- arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus.dts | 109 +++++++--- 1 file changed, 73 insertions(+), 36 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus.dts b/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus.dts index dc83d74045a3..4fe8eb39b64f 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus.dts @@ -1,13 +1,10 @@ // SPDX-License-Identifier: (GPL-2.0+ OR MIT) -/* - * Based on rk3328-nanopi-r2s.dts, which is: - * Copyright (c) 2020 David Bauer - */ /dts-v1/; +#include #include -#include +#include "rk3328-dram-default-timing.dtsi" #include "rk3328.dtsi" / { @@ -35,23 +32,20 @@ leds { pinctrl-0 = <&lan_led_pin>, <&sys_led_pin>, <&wan_led_pin>; pinctrl-names = "default"; - led-0 { - function = LED_FUNCTION_LAN; - color = ; + lan_led: led-0 { gpios = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>; + label = "orangepi-r1-plus:green:lan"; }; - led-1 { - function = LED_FUNCTION_STATUS; - color = ; + sys_led: led-1 { gpios = <&gpio3 RK_PC5 GPIO_ACTIVE_HIGH>; + label = "orangepi-r1-plus:red:status"; linux,default-trigger = "heartbeat"; }; - led-2 { - function = LED_FUNCTION_WAN; - color = ; + wan_led: led-2 { gpios = <&gpio2 RK_PC2 GPIO_ACTIVE_HIGH>; + label = "orangepi-r1-plus:green:wan"; }; }; @@ -62,19 +56,19 @@ vcc_sd: sdmmc-regulator { pinctrl-names = "default"; regulator-name = "vcc_sd"; regulator-boot-on; - vin-supply = <&vcc_io>; + vin-supply = <&vcc_io_33>; }; - vcc_sys: vcc-sys-regulator { + vdd_5v: vdd-5v { compatible = "regulator-fixed"; - regulator-name = "vcc_sys"; + regulator-name = "vdd_5v"; regulator-always-on; regulator-boot-on; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; }; - vdd_5v_lan: vdd-5v-lan-regulator { + vdd_5v_lan: vdd-5v-lan { compatible = "regulator-fixed"; enable-active-high; gpio = <&gpio2 RK_PC6 GPIO_ACTIVE_HIGH>; @@ -83,7 +77,34 @@ vdd_5v_lan: vdd-5v-lan-regulator { regulator-name = "vdd_5v_lan"; regulator-always-on; regulator-boot-on; - vin-supply = <&vcc_sys>; + vin-supply = <&vdd_5v>; + }; + + /delete-node/ dmc-opp-table; + + dmc_opp_table: dmc_opp_table { + compatible = "operating-points-v2"; + + opp-786000000 { + opp-hz = /bits/ 64 <786000000>; + opp-microvolt = <1075000 1075000 1200000>; + }; + opp-798000000 { + opp-hz = /bits/ 64 <798000000>; + opp-microvolt = <1075000 1075000 1200000>; + }; + opp-840000000 { + opp-hz = /bits/ 64 <840000000>; + opp-microvolt = <1075000 1075000 1200000>; + }; + opp-924000000 { + opp-hz = /bits/ 64 <924000000>; + opp-microvolt = <1100000 1100000 1200000>; + }; + opp-1056000000 { + opp-hz = /bits/ 64 <1056000000>; + opp-microvolt = <1175000 1175000 1200000>; + }; }; }; @@ -103,6 +124,16 @@ &cpu3 { cpu-supply = <&vdd_arm>; }; +&dfi { + status = "okay"; +}; + +&dmc { + center-supply = <&vdd_log>; + ddr_timing = <&ddr_timing>; + status = "okay"; +}; + &display_subsystem { status = "disabled"; }; @@ -113,7 +144,7 @@ &gmac2io { clock_in_out = "input"; phy-handle = <&rtl8211e>; phy-mode = "rgmii"; - phy-supply = <&vcc_io>; + phy-supply = <&vcc_io_33>; pinctrl-0 = <&rgmiim1_pins>; pinctrl-names = "default"; snps,aal; @@ -137,6 +168,10 @@ rtl8211e: ethernet-phy@1 { }; }; +&i2c0 { + status = "okay"; +}; + &i2c1 { status = "okay"; @@ -154,18 +189,19 @@ rk805: pmic@18 { 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>; + vcc1-supply = <&vdd_5v>; + vcc2-supply = <&vdd_5v>; + vcc3-supply = <&vdd_5v>; + vcc4-supply = <&vdd_5v>; + vcc5-supply = <&vcc_io_33>; + vcc6-supply = <&vdd_5v>; regulators { vdd_log: DCDC_REG1 { regulator-name = "vdd_log"; regulator-always-on; regulator-boot-on; + regulator-init-microvolt = <1075000>; regulator-min-microvolt = <712500>; regulator-max-microvolt = <1450000>; regulator-ramp-delay = <12500>; @@ -180,6 +216,7 @@ vdd_arm: DCDC_REG2 { regulator-name = "vdd_arm"; regulator-always-on; regulator-boot-on; + regulator-init-microvolt = <1225000>; regulator-min-microvolt = <712500>; regulator-max-microvolt = <1450000>; regulator-ramp-delay = <12500>; @@ -200,8 +237,8 @@ regulator-state-mem { }; }; - vcc_io: DCDC_REG4 { - regulator-name = "vcc_io"; + vcc_io_33: DCDC_REG4 { + regulator-name = "vcc_io_33"; regulator-always-on; regulator-boot-on; regulator-min-microvolt = <3300000>; @@ -256,13 +293,13 @@ regulator-state-mem { }; &io_domains { - pmuio-supply = <&vcc_io>; - vccio1-supply = <&vcc_io>; + pmuio-supply = <&vcc_io_33>; + vccio1-supply = <&vcc_io_33>; vccio2-supply = <&vcc18_emmc>; - vccio3-supply = <&vcc_io>; - vccio4-supply = <&vcc_io>; - vccio5-supply = <&vcc_io>; - vccio6-supply = <&vcc_io>; + vccio3-supply = <&vcc_io_33>; + vccio4-supply = <&vcc_io_33>; + vccio5-supply = <&vcc_io_33>; + vccio6-supply = <&vcc_io_33>; status = "okay"; }; @@ -347,8 +384,8 @@ &uart2 { }; &usb20_otg { - dr_mode = "host"; status = "okay"; + dr_mode = "host"; }; &usbdrd3 { @@ -357,10 +394,10 @@ &usbdrd3 { #address-cells = <1>; #size-cells = <0>; - /* Second port is for USB 3.0 */ rtl8153: device@2 { compatible = "usbbda,8153"; reg = <2>; + realtek,led-data = <0x87>; }; }; -- Armbian