ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-02-01 16:58:22 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

uboot-rockchip: update NanoPi R2S patches

Browse Source 
Update the patches required for the NanoPi R2S to match the DTS accepted
for upstream Linux. The U-Boot patch meanwhile is still pending
upstream.

Signed-off-by: David Bauer <mail@david-bauer.net>
Signed-off-by: maurerr <mariusd84@gmail.com>
This commit is contained in:
David Bauer 2020-09-28 17:55:21 +02:00 committed by maurerr
parent 6e3ae51677
commit 093861c434
4 changed files with 194 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package/boot/uboot-rockchip/Makefile
View File

@ -6,6 +6,7 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/kernel.mk
PKG_VERSION:=2020.07 PKG_VERSION:=2020.07
PKG_RELEASE:=2
PKG_HASH:=c1f5bf9ee6bb6e648edbf19ce2ca9452f614b08a9f886f1a566aa42e8cf05f6a PKG_HASH:=c1f5bf9ee6bb6e648edbf19ce2ca9452f614b08a9f886f1a566aa42e8cf05f6a

295
package/boot/uboot-rockchip/patches/100-rockchip-rk3328-Add-support-for-FriendlyARM-NanoPi-R.patch
View File

@ -1,4 +1,4 @@
From 67f4c228c2bf515386cd54073104dc2e6eae85ea Mon Sep 17 00:00:00 2001 From 64d37d74519eb5d4dcff8e9164d18f524aa72c8d Mon Sep 17 00:00:00 2001
From: David Bauer <mail@david-bauer.net> From: David Bauer <mail@david-bauer.net>
Date: Fri, 10 Jul 2020 14:58:30 +0200 Date: Fri, 10 Jul 2020 14:58:30 +0200
Subject: [PATCH] rockchip: rk3328: Add support for FriendlyARM NanoPi R2S Subject: [PATCH] rockchip: rk3328: Add support for FriendlyARM NanoPi R2S
@ -17,11 +17,11 @@ WAN - LAN - SYS LED
Signed-off-by: David Bauer <mail@david-bauer.net> Signed-off-by: David Bauer <mail@david-bauer.net>
--- ---
arch/arm/dts/Makefile | 1 + arch/arm/dts/Makefile | 1 +
arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi | 34 +++ arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi | 40 +++
arch/arm/dts/rk3328-nanopi-r2s.dts | 334 +++++++++++++++++++++ arch/arm/dts/rk3328-nanopi-r2s.dts | 387 +++++++++++++++++++++
board/rockchip/evb_rk3328/MAINTAINERS | 7 + board/rockchip/evb_rk3328/MAINTAINERS | 7 +
configs/nanopi-r2s-rk3328_defconfig | 99 ++++++ configs/nanopi-r2s-rk3328_defconfig | 99 ++++++
5 files changed, 475 insertions(+) 5 files changed, 534 insertions(+)
create mode 100644 arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi create mode 100644 arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi
create mode 100644 arch/arm/dts/rk3328-nanopi-r2s.dts create mode 100644 arch/arm/dts/rk3328-nanopi-r2s.dts
create mode 100644 configs/nanopi-r2s-rk3328_defconfig create mode 100644 configs/nanopi-r2s-rk3328_defconfig
@ -38,7 +38,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
rk3328-rock-pi-e.dtb rk3328-rock-pi-e.dtb
--- /dev/null --- /dev/null
+++ b/arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi +++ b/arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi
@@ -0,0 +1,34 @@ @@ -0,0 +1,40 @@
+// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0+
+/* +/*
+ * (C) Copyright 2018-2019 Rockchip Electronics Co., Ltd + * (C) Copyright 2018-2019 Rockchip Electronics Co., Ltd
@ -73,9 +73,15 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
+&vcc_sd { +&vcc_sd {
+ u-boot,dm-spl; + u-boot,dm-spl;
+}; +};
+
+&gmac2io {
+ snps,reset-active-low;
+ snps,reset-gpio = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>;
+ snps,reset-delays-us = <0 10000 50000>;
+};
--- /dev/null --- /dev/null
+++ b/arch/arm/dts/rk3328-nanopi-r2s.dts +++ b/arch/arm/dts/rk3328-nanopi-r2s.dts
@@ -0,0 +1,334 @@ @@ -0,0 +1,387 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/* +/*
+ * Copyright (c) 2020 David Bauer <mail@david-bauer.net> + * Copyright (c) 2020 David Bauer <mail@david-bauer.net>
@ -88,92 +94,103 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
+#include "rk3328.dtsi" +#include "rk3328.dtsi"
+ +
+/ { +/ {
+ model = "FriendlyARM NanoPi R2S"; + model = "FriendlyElec NanoPi R2S";
+ compatible = "friendlyarm,nanopi-r2s", "rockchip,rk3328"; + compatible = "friendlyarm,nanopi-r2s", "rockchip,rk3328";
+ +
+ chosen { + chosen {
+ stdout-path = "serial2:1500000n8"; + stdout-path = "serial2:1500000n8";
+ }; + };
+ +
+ gmac_clkin: external-gmac-clock { + gmac_clk: gmac-clock {
+ compatible = "fixed-clock"; + compatible = "fixed-clock";
+ clock-frequency = <125000000>; + clock-frequency = <125000000>;
+ clock-output-names = "gmac_clkin"; + clock-output-names = "gmac_clk";
+ #clock-cells = <0>; + #clock-cells = <0>;
+ }; + };
+ +
+ vcc_sd: sdmmc-regulator { + keys {
+ compatible = "regulator-fixed"; + compatible = "gpio-keys";
+ gpio = <&gpio0 RK_PD6 GPIO_ACTIVE_LOW>; + pinctrl-0 = <&reset_button_pin>;
+ pinctrl-names = "default"; + pinctrl-names = "default";
+ pinctrl-0 = <&sdmmc0m1_gpio>; +
+ regulator-name = "vcc_sd"; + reset {
+ regulator-min-microvolt = <3300000>; + label = "reset";
+ regulator-max-microvolt = <3300000>; + gpios = <&gpio0 RK_PA0 GPIO_ACTIVE_LOW>;
+ vin-supply = <&vcc_io>; + linux,code = <KEY_RESTART>;
+ debounce-interval = <50>;
+ };
+ }; + };
+ +
+ vcc_sdio: sdmmcio-regulator { + vcc_rtl8153: vcc-rtl8153-regulator {
+ compatible = "regulator-gpio";
+ gpios = <&gpio1 RK_PD4 GPIO_ACTIVE_HIGH>;
+ enable-active-high;
+ states = <1800000 0x1
+ 3300000 0x0>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&sdio_vcc_pin>;
+ regulator-always-on;
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-name = "vcc_sdio";
+ regulator-settling-time-us = <5000>;
+ regulator-type = "voltage";
+ vin-supply = <&vcc_io>;
+ };
+
+ vcc_sys: vcc-sys {
+ compatible = "regulator-fixed"; + compatible = "regulator-fixed";
+ regulator-name = "vcc_sys"; + gpio = <&gpio2 RK_PC6 GPIO_ACTIVE_HIGH>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&rtl8153_en_drv>;
+ regulator-always-on; + regulator-always-on;
+ regulator-boot-on; + regulator-name = "vcc_rtl8153";
+ regulator-min-microvolt = <5000000>; + regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>; + regulator-max-microvolt = <5000000>;
+ enable-active-high;
+ }; + };
+ +
+ leds { + leds {
+ compatible = "gpio-leds"; + compatible = "gpio-leds";
+ + pinctrl-0 = <&lan_led_pin>, <&sys_led_pin>, <&wan_led_pin>;
+ pinctrl-names = "default"; + pinctrl-names = "default";
+ pinctrl-0 = <&led_pins>;
+ +
+ sys { + lan_led: led-0 {
+ gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>;
+ label = "nanopi-r2s:red:sys";
+ };
+
+ lan {
+ gpios = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>; + gpios = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>;
+ label = "nanopi-r2s:green:lan"; + label = "nanopi-r2s:green:lan";
+ }; + };
+ +
+ wan { + sys_led: led-1 {
+ gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>;
+ label = "nanopi-r2s:red:sys";
+ };
+
+ wan_led: led-2 {
+ gpios = <&gpio2 RK_PC2 GPIO_ACTIVE_HIGH>; + gpios = <&gpio2 RK_PC2 GPIO_ACTIVE_HIGH>;
+ label = "nanopi-r2s:green:wan"; + label = "nanopi-r2s:green:wan";
+ }; + };
+ }; + };
+ +
+ gpio_keys { + vcc_io_sdio: sdmmcio-regulator {
+ compatible = "gpio-keys-polled"; + compatible = "regulator-gpio";
+ poll-interval = <100>; + enable-active-high;
+ + gpios = <&gpio1 RK_PD4 GPIO_ACTIVE_HIGH>;
+ pinctrl-0 = <&sdio_vcc_pin>;
+ pinctrl-names = "default"; + pinctrl-names = "default";
+ pinctrl-0 = <&button_pins>; + regulator-name = "vcc_io_sdio";
+ + regulator-always-on;
+ reset { + regulator-min-microvolt = <1800000>;
+ label = "Reset Button"; + regulator-max-microvolt = <3300000>;
+ gpios = <&gpio0 RK_PA0 GPIO_ACTIVE_LOW>; + regulator-settling-time-us = <5000>;
+ linux,code = <KEY_RESTART>; + regulator-type = "voltage";
+ debounce-interval = <50>; + startup-delay-us = <2000>;
+ states = <1800000 0x1
+ 3300000 0x0>;
+ vin-supply = <&vcc_io_33>;
+ }; + };
+
+ vcc_sd: sdmmc-regulator {
+ compatible = "regulator-fixed";
+ gpio = <&gpio0 RK_PD6 GPIO_ACTIVE_LOW>;
+ pinctrl-0 = <&sdmmc0m1_gpio>;
+ pinctrl-names = "default";
+ regulator-name = "vcc_sd";
+ regulator-boot-on;
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ vin-supply = <&vcc_io_33>;
+ };
+
+ vdd_5v: vdd-5v {
+ compatible = "regulator-fixed";
+ regulator-name = "vdd_5v";
+ regulator-always-on;
+ regulator-boot-on;
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ }; + };
+}; +};
+ +
@ -195,19 +212,16 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
+ +
+&gmac2io { +&gmac2io {
+ assigned-clocks = <&cru SCLK_MAC2IO>, <&cru SCLK_MAC2IO_EXT>; + assigned-clocks = <&cru SCLK_MAC2IO>, <&cru SCLK_MAC2IO_EXT>;
+ assigned-clock-parents = <&gmac_clkin>, <&gmac_clkin>; + assigned-clock-parents = <&gmac_clk>, <&gmac_clk>;
+ clock_in_out = "input"; + clock_in_out = "input";
+ phy-supply = <&vcc_io>;
+ phy-handle = <&rtl8211e>; + phy-handle = <&rtl8211e>;
+ phy-mode = "rgmii"; + phy-mode = "rgmii";
+ pinctrl-names = "default"; + phy-supply = <&vcc_io_33>;
+ pinctrl-0 = <&rgmiim1_pins>; + pinctrl-0 = <&rgmiim1_pins>;
+ snps,aal; + pinctrl-names = "default";
+ snps,reset-gpio = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>;
+ snps,reset-active-low;
+ snps,reset-delays-us = <0 10000 50000>;
+ tx_delay = <0x24>;
+ rx_delay = <0x18>; + rx_delay = <0x18>;
+ snps,aal;
+ tx_delay = <0x24>;
+ status = "okay"; + status = "okay";
+ +
+ mdio { + mdio {
@ -215,8 +229,13 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
+ #address-cells = <1>; + #address-cells = <1>;
+ #size-cells = <0>; + #size-cells = <0>;
+ +
+ rtl8211e: ethernet-phy@0 { + rtl8211e: ethernet-phy@1 {
+ reg = <0>; + reg = <1>;
+ pinctrl-0 = <&eth_phy_reset_pin>;
+ pinctrl-names = "default";
+ reset-assert-us = <10000>;
+ reset-deassert-us = <50000>;
+ reset-gpios = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>;
+ }; + };
+ }; + };
+}; +};
@ -224,35 +243,36 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
+&i2c1 { +&i2c1 {
+ status = "okay"; + status = "okay";
+ +
+ rk805: rk805@18 { + rk805: pmic@18 {
+ compatible = "rockchip,rk805"; + compatible = "rockchip,rk805";
+ reg = <0x18>; + reg = <0x18>;
+ interrupt-parent = <&gpio2>; + interrupt-parent = <&gpio1>;
+ interrupts = <6 IRQ_TYPE_LEVEL_LOW>; + interrupts = <24 IRQ_TYPE_LEVEL_LOW>;
+ #clock-cells = <1>; + #clock-cells = <1>;
+ clock-output-names = "xin32k", "rk805-clkout2"; + clock-output-names = "xin32k", "rk805-clkout2";
+ gpio-controller; + gpio-controller;
+ #gpio-cells = <2>; + #gpio-cells = <2>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&pmic_int_l>; + pinctrl-0 = <&pmic_int_l>;
+ pinctrl-names = "default";
+ rockchip,system-power-controller; + rockchip,system-power-controller;
+ wakeup-source; + wakeup-source;
+ +
+ vcc1-supply = <&vcc_sys>; + vcc1-supply = <&vdd_5v>;
+ vcc2-supply = <&vcc_sys>; + vcc2-supply = <&vdd_5v>;
+ vcc3-supply = <&vcc_sys>; + vcc3-supply = <&vdd_5v>;
+ vcc4-supply = <&vcc_sys>; + vcc4-supply = <&vdd_5v>;
+ vcc5-supply = <&vcc_io>; + vcc5-supply = <&vcc_io_33>;
+ vcc6-supply = <&vcc_sys>; + vcc6-supply = <&vdd_5v>;
+ +
+ regulators { + regulators {
+ vdd_logic: DCDC_REG1 { + vdd_log: DCDC_REG1 {
+ regulator-name = "vdd_logic"; + regulator-name = "vdd_log";
+ regulator-always-on;
+ regulator-boot-on;
+ regulator-min-microvolt = <712500>; + regulator-min-microvolt = <712500>;
+ regulator-max-microvolt = <1450000>; + regulator-max-microvolt = <1450000>;
+ regulator-ramp-delay = <12500>; + regulator-ramp-delay = <12500>;
+ regulator-always-on; +
+ regulator-boot-on;
+ regulator-state-mem { + regulator-state-mem {
+ regulator-on-in-suspend; + regulator-on-in-suspend;
+ regulator-suspend-microvolt = <1000000>; + regulator-suspend-microvolt = <1000000>;
@ -261,11 +281,12 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
+ +
+ vdd_arm: DCDC_REG2 { + vdd_arm: DCDC_REG2 {
+ regulator-name = "vdd_arm"; + regulator-name = "vdd_arm";
+ regulator-always-on;
+ regulator-boot-on;
+ regulator-min-microvolt = <712500>; + regulator-min-microvolt = <712500>;
+ regulator-max-microvolt = <1450000>; + regulator-max-microvolt = <1450000>;
+ regulator-ramp-delay = <12500>; + regulator-ramp-delay = <12500>;
+ regulator-always-on; +
+ regulator-boot-on;
+ regulator-state-mem { + regulator-state-mem {
+ regulator-on-in-suspend; + regulator-on-in-suspend;
+ regulator-suspend-microvolt = <950000>; + regulator-suspend-microvolt = <950000>;
@ -276,17 +297,19 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
+ regulator-name = "vcc_ddr"; + regulator-name = "vcc_ddr";
+ regulator-always-on; + regulator-always-on;
+ regulator-boot-on; + regulator-boot-on;
+
+ regulator-state-mem { + regulator-state-mem {
+ regulator-on-in-suspend; + regulator-on-in-suspend;
+ }; + };
+ }; + };
+ +
+ vcc_io: DCDC_REG4 { + vcc_io_33: DCDC_REG4 {
+ regulator-name = "vcc_io"; + regulator-name = "vcc_io_33";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-always-on; + regulator-always-on;
+ regulator-boot-on; + regulator-boot-on;
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+
+ regulator-state-mem { + regulator-state-mem {
+ regulator-on-in-suspend; + regulator-on-in-suspend;
+ regulator-suspend-microvolt = <3300000>; + regulator-suspend-microvolt = <3300000>;
@ -295,10 +318,11 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
+ +
+ vcc_18: LDO_REG1 { + vcc_18: LDO_REG1 {
+ regulator-name = "vcc_18"; + regulator-name = "vcc_18";
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ regulator-always-on; + regulator-always-on;
+ regulator-boot-on; + regulator-boot-on;
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+
+ regulator-state-mem { + regulator-state-mem {
+ regulator-on-in-suspend; + regulator-on-in-suspend;
+ regulator-suspend-microvolt = <1800000>; + regulator-suspend-microvolt = <1800000>;
@ -307,10 +331,11 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
+ +
+ vcc18_emmc: LDO_REG2 { + vcc18_emmc: LDO_REG2 {
+ regulator-name = "vcc18_emmc"; + regulator-name = "vcc18_emmc";
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ regulator-always-on; + regulator-always-on;
+ regulator-boot-on; + regulator-boot-on;
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+
+ regulator-state-mem { + regulator-state-mem {
+ regulator-on-in-suspend; + regulator-on-in-suspend;
+ regulator-suspend-microvolt = <1800000>; + regulator-suspend-microvolt = <1800000>;
@ -319,10 +344,11 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
+ +
+ vdd_10: LDO_REG3 { + vdd_10: LDO_REG3 {
+ regulator-name = "vdd_10"; + regulator-name = "vdd_10";
+ regulator-min-microvolt = <1000000>;
+ regulator-max-microvolt = <1000000>;
+ regulator-always-on; + regulator-always-on;
+ regulator-boot-on; + regulator-boot-on;
+ regulator-min-microvolt = <1000000>;
+ regulator-max-microvolt = <1000000>;
+
+ regulator-state-mem { + regulator-state-mem {
+ regulator-on-in-suspend; + regulator-on-in-suspend;
+ regulator-suspend-microvolt = <1000000>; + regulator-suspend-microvolt = <1000000>;
@ -330,38 +356,55 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
+ }; + };
+ }; + };
+ }; + };
+
+ usb {
+ rtl8153_en_drv: rtl8153-en-drv {
+ rockchip,pins = <2 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
+ };
+ };
+}; +};
+ +
+&io_domains { +&io_domains {
+ status = "okay"; + pmuio-supply = <&vcc_io_33>;
+ + vccio1-supply = <&vcc_io_33>;
+ vccio1-supply = <&vcc_io>;
+ vccio2-supply = <&vcc18_emmc>; + vccio2-supply = <&vcc18_emmc>;
+ vccio3-supply = <&vcc_sdio>; + vccio3-supply = <&vcc_io_sdio>;
+ vccio4-supply = <&vcc_18>; + vccio4-supply = <&vcc_18>;
+ vccio5-supply = <&vcc_io>; + vccio5-supply = <&vcc_io_33>;
+ vccio6-supply = <&vcc_io>; + vccio6-supply = <&vcc_io_33>;
+ pmuio-supply = <&vcc_io>; + status = "okay";
+}; +};
+ +
+&pinctrl { +&pinctrl {
+ leds { + button {
+ led_pins: led-pins { + reset_button_pin: reset-button-pin {
+ rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>, + rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
+ <2 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>,
+ <2 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>;
+ }; + };
+ }; + };
+ +
+ button { + ethernet-phy {
+ button_pins: button-pins { + eth_phy_reset_pin: eth-phy-reset-pin {
+ rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>; + rockchip,pins = <1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>;
+ };
+ };
+
+ leds {
+ lan_led_pin: lan-led-pin {
+ rockchip,pins = <2 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>;
+ };
+
+ sys_led_pin: sys-led-pin {
+ rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
+ };
+
+ wan_led_pin: wan-led-pin {
+ rockchip,pins = <2 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>;
+ }; + };
+ }; + };
+ +
+ pmic { + pmic {
+ pmic_int_l: pmic-int-l { + pmic_int_l: pmic-int-l {
+ rockchip,pins = <2 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>; + rockchip,pins = <1 RK_PD0 RK_FUNC_GPIO &pcfg_pull_up>;
+ }; + };
+ }; + };
+ +
@ -372,16 +415,22 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
+ }; + };
+}; +};
+ +
+&pwm2 {
+ status = "okay";
+};
+
+&sdmmc { +&sdmmc {
+ bus-width = <4>; + bus-width = <4>;
+ cap-mmc-highspeed;
+ cap-sd-highspeed; + cap-sd-highspeed;
+ disable-wp; + disable-wp;
+ max-frequency = <150000000>; + pinctrl-0 = <&sdmmc0_clk>, <&sdmmc0_cmd>, <&sdmmc0_dectn>, <&sdmmc0_bus4>;
+ pinctrl-names = "default"; + pinctrl-names = "default";
+ pinctrl-0 = <&sdmmc0_clk &sdmmc0_cmd &sdmmc0_dectn &sdmmc0_bus4>; + sd-uhs-sdr12;
+ sd-uhs-sdr25;
+ sd-uhs-sdr50;
+ sd-uhs-sdr104;
+ vmmc-supply = <&vcc_sd>; + vmmc-supply = <&vcc_sd>;
+ vqmmc-supply = <&vcc_sdio>; + vqmmc-supply = <&vcc_io_sdio>;
+ status = "okay"; + status = "okay";
+}; +};
+ +
@ -391,16 +440,25 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
+ status = "okay"; + status = "okay";
+}; +};
+ +
+&u2phy {
+ status = "okay";
+};
+
+&u2phy_host {
+ status = "okay";
+};
+
+&u2phy_otg {
+ status = "okay";
+};
+
+&uart2 { +&uart2 {
+ status = "okay"; + status = "okay";
+}; +};
+ +
+&u2phy { +&usb20_otg {
+ status = "okay"; + status = "okay";
+ + dr_mode = "host";
+ u2phy_host: host-port {
+ status = "okay";
+ };
+}; +};
+ +
+&usb_host0_ehci { +&usb_host0_ehci {
@ -410,6 +468,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
+&usb_host0_ohci { +&usb_host0_ohci {
+ status = "okay"; + status = "okay";
+}; +};
+
--- a/board/rockchip/evb_rk3328/MAINTAINERS --- a/board/rockchip/evb_rk3328/MAINTAINERS
+++ b/board/rockchip/evb_rk3328/MAINTAINERS +++ b/board/rockchip/evb_rk3328/MAINTAINERS
@@ -5,6 +5,13 @@ F: board/rockchip/evb_rk3328 @@ -5,6 +5,13 @@ F: board/rockchip/evb_rk3328

18
package/boot/uboot-rockchip/src/of-platdata/nanopi-r2s-rk3328/dt-platdata.c
View File

@ -19,7 +19,7 @@ U_BOOT_DEVICE(syscon_at_ff100000) = {
static const struct dtd_rockchip_rk3328_cru dtv_clock_controller_at_ff440000 = { static const struct dtd_rockchip_rk3328_cru dtv_clock_controller_at_ff440000 = {
.reg = {0xff440000, 0x1000}, .reg = {0xff440000, 0x1000},
.rockchip_grf = 0x3a, .rockchip_grf = 0x3b,
}; };
U_BOOT_DEVICE(clock_controller_at_ff440000) = { U_BOOT_DEVICE(clock_controller_at_ff440000) = {
.name = "rockchip_rk3328_cru", .name = "rockchip_rk3328_cru",
@ -49,7 +49,6 @@ U_BOOT_DEVICE(serial_at_ff130000) = {
static const struct dtd_rockchip_rk3328_dw_mshc dtv_mmc_at_ff500000 = { static const struct dtd_rockchip_rk3328_dw_mshc dtv_mmc_at_ff500000 = {
.bus_width = 0x4, .bus_width = 0x4,
.cap_mmc_highspeed = true,
.cap_sd_highspeed = true, .cap_sd_highspeed = true,
.clocks = { .clocks = {
{&dtv_clock_controller_at_ff440000, {317}}, {&dtv_clock_controller_at_ff440000, {317}},
@ -60,11 +59,15 @@ static const struct dtd_rockchip_rk3328_dw_mshc dtv_mmc_at_ff500000 = {
.fifo_depth = 0x100, .fifo_depth = 0x100,
.interrupts = {0x0, 0xc, 0x4}, .interrupts = {0x0, 0xc, 0x4},
.max_frequency = 0x8f0d180, .max_frequency = 0x8f0d180,
.pinctrl_0 = {0x47, 0x48, 0x49, 0x4a}, .pinctrl_0 = {0x48, 0x49, 0x4a, 0x4b},
.pinctrl_names = "default", .pinctrl_names = "default",
.reg = {0xff500000, 0x4000}, .reg = {0xff500000, 0x4000},
.sd_uhs_sdr104 = true,
.sd_uhs_sdr12 = true,
.sd_uhs_sdr25 = true,
.sd_uhs_sdr50 = true,
.u_boot_spl_fifo_mode = true, .u_boot_spl_fifo_mode = true,
.vmmc_supply = 0x4b, .vmmc_supply = 0x4c,
.vqmmc_supply = 0x1e, .vqmmc_supply = 0x1e,
}; };
U_BOOT_DEVICE(mmc_at_ff500000) = { U_BOOT_DEVICE(mmc_at_ff500000) = {
@ -75,7 +78,7 @@ U_BOOT_DEVICE(mmc_at_ff500000) = {
static const struct dtd_rockchip_rk3328_pinctrl dtv_pinctrl = { static const struct dtd_rockchip_rk3328_pinctrl dtv_pinctrl = {
.ranges = true, .ranges = true,
.rockchip_grf = 0x3a, .rockchip_grf = 0x3b,
}; };
U_BOOT_DEVICE(pinctrl) = { U_BOOT_DEVICE(pinctrl) = {
.name = "rockchip_rk3328_pinctrl", .name = "rockchip_rk3328_pinctrl",
@ -98,9 +101,10 @@ U_BOOT_DEVICE(gpio0_at_ff210000) = {
}; };
static const struct dtd_regulator_fixed dtv_sdmmc_regulator = { static const struct dtd_regulator_fixed dtv_sdmmc_regulator = {
.gpio = {0x60, 0x1e, 0x1}, .gpio = {0x61, 0x1e, 0x1},
.pinctrl_0 = 0x61, .pinctrl_0 = 0x68,
.pinctrl_names = "default", .pinctrl_names = "default",
.regulator_boot_on = true,
.regulator_max_microvolt = 0x325aa0, .regulator_max_microvolt = 0x325aa0,
.regulator_min_microvolt = 0x325aa0, .regulator_min_microvolt = 0x325aa0,
.regulator_name = "vcc_sd", .regulator_name = "vcc_sd",

6
package/boot/uboot-rockchip/src/of-platdata/nanopi-r2s-rk3328/dt-structs-gen.h
View File

@ -10,6 +10,7 @@ struct dtd_regulator_fixed {
fdt32_t gpio[3]; fdt32_t gpio[3];
fdt32_t pinctrl_0; fdt32_t pinctrl_0;
const char * pinctrl_names; const char * pinctrl_names;
bool regulator_boot_on;
fdt32_t regulator_max_microvolt; fdt32_t regulator_max_microvolt;
fdt32_t regulator_min_microvolt; fdt32_t regulator_min_microvolt;
const char * regulator_name; const char * regulator_name;
@ -32,7 +33,6 @@ struct dtd_rockchip_rk3328_dmc {
}; };
struct dtd_rockchip_rk3328_dw_mshc { struct dtd_rockchip_rk3328_dw_mshc {
fdt32_t bus_width; fdt32_t bus_width;
bool cap_mmc_highspeed;
bool cap_sd_highspeed; bool cap_sd_highspeed;
struct phandle_1_arg clocks[4]; struct phandle_1_arg clocks[4];
bool disable_wp; bool disable_wp;
@ -42,6 +42,10 @@ struct dtd_rockchip_rk3328_dw_mshc {
fdt32_t pinctrl_0[4]; fdt32_t pinctrl_0[4];
const char * pinctrl_names; const char * pinctrl_names;
fdt64_t reg[2]; fdt64_t reg[2];
bool sd_uhs_sdr104;
bool sd_uhs_sdr12;
bool sd_uhs_sdr25;
bool sd_uhs_sdr50;
bool u_boot_spl_fifo_mode; bool u_boot_spl_fifo_mode;
fdt32_t vmmc_supply; fdt32_t vmmc_supply;
fdt32_t vqmmc_supply; fdt32_t vqmmc_supply;