From 284fa3a7b6f464dd3878014c734e81544305f3fe Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Wed, 29 Jul 2020 00:18:30 +0800 Subject: [PATCH] target/rockchip: sync with upstream source --- package/base-files/Makefile | 2 +- ...Add-support-for-FriendlyARM-NanoPi-R.patch | 41 ++++++++----------- .../nanopi-r2s-rk3328/dt-platdata.c | 4 +- 3 files changed, 21 insertions(+), 26 deletions(-) diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 71a52c3b41..4dec9291d7 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -12,7 +12,7 @@ include $(INCLUDE_DIR)/version.mk include $(INCLUDE_DIR)/feeds.mk PKG_NAME:=base-files -PKG_RELEASE:=201 +PKG_RELEASE:=202 PKG_FLAGS:=nonshared PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ diff --git a/package/boot/uboot-rockchip/patches/100-rockchip-rk3328-Add-support-for-FriendlyARM-NanoPi-R.patch b/package/boot/uboot-rockchip/patches/100-rockchip-rk3328-Add-support-for-FriendlyARM-NanoPi-R.patch index 7e38db03e1..bc65fb69ef 100644 --- a/package/boot/uboot-rockchip/patches/100-rockchip-rk3328-Add-support-for-FriendlyARM-NanoPi-R.patch +++ b/package/boot/uboot-rockchip/patches/100-rockchip-rk3328-Add-support-for-FriendlyARM-NanoPi-R.patch @@ -1,4 +1,4 @@ -From bd067ecdb13efb78e0f166b53837dc141ca47380 Mon Sep 17 00:00:00 2001 +From 67f4c228c2bf515386cd54073104dc2e6eae85ea Mon Sep 17 00:00:00 2001 From: David Bauer Date: Fri, 10 Jul 2020 14:58:30 +0200 Subject: [PATCH] rockchip: rk3328: Add support for FriendlyARM NanoPi R2S @@ -18,19 +18,17 @@ Signed-off-by: David Bauer --- arch/arm/dts/Makefile | 1 + arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi | 34 +++ - arch/arm/dts/rk3328-nanopi-r2s.dts | 323 +++++++++++++++++++++ + arch/arm/dts/rk3328-nanopi-r2s.dts | 334 +++++++++++++++++++++ board/rockchip/evb_rk3328/MAINTAINERS | 7 + - configs/nanopi-r2s-rk3328_defconfig | 99 +++++++ - 5 files changed, 464 insertions(+) + configs/nanopi-r2s-rk3328_defconfig | 99 ++++++ + 5 files changed, 475 insertions(+) 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 configs/nanopi-r2s-rk3328_defconfig -diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile -index cee10f533f..a6bd8ea0d8 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile -@@ -107,6 +107,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3308) += \ +@@ -106,6 +106,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3308) += \ dtb-$(CONFIG_ROCKCHIP_RK3328) += \ rk3328-evb.dtb \ @@ -38,9 +36,6 @@ index cee10f533f..a6bd8ea0d8 100644 rk3328-roc-cc.dtb \ rk3328-rock64.dtb \ rk3328-rock-pi-e.dtb -diff --git a/arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi b/arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi -new file mode 100644 -index 0000000000..4159348402 --- /dev/null +++ b/arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi @@ -0,0 +1,34 @@ @@ -78,12 +73,9 @@ index 0000000000..4159348402 +&vcc_sd { + u-boot,dm-spl; +}; -diff --git a/arch/arm/dts/rk3328-nanopi-r2s.dts b/arch/arm/dts/rk3328-nanopi-r2s.dts -new file mode 100644 -index 0000000000..073cfd7bb2 --- /dev/null +++ b/arch/arm/dts/rk3328-nanopi-r2s.dts -@@ -0,0 +1,323 @@ +@@ -0,0 +1,334 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2020 David Bauer @@ -206,16 +198,27 @@ index 0000000000..073cfd7bb2 + assigned-clock-parents = <&gmac_clkin>, <&gmac_clkin>; + clock_in_out = "input"; + phy-supply = <&vcc_io>; ++ phy-handle = <&rtl8211e>; + phy-mode = "rgmii"; + pinctrl-names = "default"; + pinctrl-0 = <&rgmiim1_pins>; -+ snps,force_thresh_dma_mode; ++ snps,aal; + 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>; + status = "okay"; ++ ++ mdio { ++ compatible = "snps,dwmac-mdio"; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ rtl8211e: ethernet-phy@0 { ++ reg = <0>; ++ }; ++ }; +}; + +&i2c1 { @@ -407,8 +410,6 @@ index 0000000000..073cfd7bb2 +&usb_host0_ohci { + status = "okay"; +}; -diff --git a/board/rockchip/evb_rk3328/MAINTAINERS b/board/rockchip/evb_rk3328/MAINTAINERS -index e7dd59ff4e..14fda46e8f 100644 --- a/board/rockchip/evb_rk3328/MAINTAINERS +++ b/board/rockchip/evb_rk3328/MAINTAINERS @@ -5,6 +5,13 @@ F: board/rockchip/evb_rk3328 @@ -425,9 +426,6 @@ index e7dd59ff4e..14fda46e8f 100644 ROC-RK3328-CC M: Loic Devulder M: Chen-Yu Tsai -diff --git a/configs/nanopi-r2s-rk3328_defconfig b/configs/nanopi-r2s-rk3328_defconfig -new file mode 100644 -index 0000000000..2c028e9d0b --- /dev/null +++ b/configs/nanopi-r2s-rk3328_defconfig @@ -0,0 +1,99 @@ @@ -530,6 +528,3 @@ index 0000000000..2c028e9d0b +CONFIG_TPL_TINY_MEMSET=y +CONFIG_ERRNO_STR=y +CONFIG_SMBIOS_MANUFACTURER="pine64" --- -2.27.0 - diff --git a/package/boot/uboot-rockchip/src/of-platdata/nanopi-r2s-rk3328/dt-platdata.c b/package/boot/uboot-rockchip/src/of-platdata/nanopi-r2s-rk3328/dt-platdata.c index 226c85b6a4..fa42c1a760 100644 --- a/package/boot/uboot-rockchip/src/of-platdata/nanopi-r2s-rk3328/dt-platdata.c +++ b/package/boot/uboot-rockchip/src/of-platdata/nanopi-r2s-rk3328/dt-platdata.c @@ -98,8 +98,8 @@ U_BOOT_DEVICE(gpio0_at_ff210000) = { }; static const struct dtd_regulator_fixed dtv_sdmmc_regulator = { - .gpio = {0x5f, 0x1e, 0x1}, - .pinctrl_0 = 0x60, + .gpio = {0x60, 0x1e, 0x1}, + .pinctrl_0 = 0x61, .pinctrl_names = "default", .regulator_max_microvolt = 0x325aa0, .regulator_min_microvolt = 0x325aa0,