| Message ID | 20201018052548.29195-1-libunko@qq.com |
|---|---|
| State | Changes Requested |
| Delegated to: | Kever Yang |
| Headers | show |
| Series | rockchip: rk3399: Add Nanopi M4V2 board support | expand |
On Sun, Oct 18, 2020 at 5:39 PM Shuying Li <lishuying.top@gmail.com> wrote: > > From: Libunko <libunko@qq.com> > > Add initial support for Nanopi M4V2 board. > > Specification > - Rockchip RK3399 > - Dual-Channel 4GB LPDDR4 > - SD card slot > - eMMC socket > - RTL8211E 1Gbps > - AP6356S WiFI/BT > - HDMI In/Out, MIPI DSI/CSI > - USB 3.0 x4 > - USB Type C power and data > - GPIO1, GPIO2 expansion ports > - DC5V/3A > > Signed-off-by: Shuying Li <libunko@qq.com> > --- > arch/arm/dts/Makefile | 1 + > arch/arm/dts/rk3399-nanopi-m4v2-u-boot.dtsi | 7 +++ > arch/arm/dts/rk3399-nanopi-m4v2.dts | 67 +++++++++++++++++++++ > board/rockchip/evb_rk3399/MAINTAINERS | 6 ++ > configs/nanopi-m4v2-rk3399_defconfig | 61 +++++++++++++++++++ > doc/board/rockchip/rockchip.rst | 1 + > 6 files changed, 143 insertions(+) > create mode 100644 arch/arm/dts/rk3399-nanopi-m4v2-u-boot.dtsi > create mode 100644 arch/arm/dts/rk3399-nanopi-m4v2.dts > create mode 100644 configs/nanopi-m4v2-rk3399_defconfig > > diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile > index f8f529435b..7e8dfcef88 100644 > --- a/arch/arm/dts/Makefile > +++ b/arch/arm/dts/Makefile > @@ -130,6 +130,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3399) += \ > rk3399-nanopc-t4.dtb \ > rk3399-nanopi-m4.dtb \ > rk3399-nanopi-m4-2gb.dtb \ > + rk3399-nanopi-m4v2.dtb \ > rk3399-nanopi-neo4.dtb \ > rk3399-orangepi.dtb \ > rk3399-pinebook-pro.dtb \ > diff --git a/arch/arm/dts/rk3399-nanopi-m4v2-u-boot.dtsi b/arch/arm/dts/rk3399-nanopi-m4v2-u-boot.dtsi > new file mode 100644 > index 0000000000..ff8e99cb7f > --- /dev/null > +++ b/arch/arm/dts/rk3399-nanopi-m4v2-u-boot.dtsi > @@ -0,0 +1,7 @@ > +// SPDX-License-Identifier: GPL-2.0+ > +/* > + * Copyright (C) 2020 Shuying Li <libunko@qq.com> > + */ > + > +#include "rk3399-nanopi4-u-boot.dtsi" > +#include "rk3399-sdram-lpddr4-100.dtsi" > diff --git a/arch/arm/dts/rk3399-nanopi-m4v2.dts b/arch/arm/dts/rk3399-nanopi-m4v2.dts > new file mode 100644 > index 0000000000..03d956d2c4 > --- /dev/null > +++ b/arch/arm/dts/rk3399-nanopi-m4v2.dts > @@ -0,0 +1,67 @@ > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > +/* > + * FriendlyElec NanoPi M4V2 board device tree source > + * > + * Copyright (c) 2018 FriendlyElec Computer Tech. Co., Ltd. > + * (http://www.friendlyarm.com) > + * > + * Copyright (c) 2018 Collabora Ltd. > + * Copyright (c) 2019 Arm Ltd. > + * Copyright (C) 2020 Shuying Li <libunko@qq.com> > + */ > + > +/dts-v1/; > +#include "rk3399-nanopi4.dtsi" > + > +/ { > + model = "FriendlyElec NanoPi M4V2"; > + compatible = "friendlyarm,nanopi-m4v2", "rockchip,rk3399"; > + > + vdd_5v: vdd-5v { > + compatible = "regulator-fixed"; > + regulator-name = "vdd_5v"; > + regulator-always-on; > + regulator-boot-on; > + }; > + > + vcc5v0_core: vcc5v0-core { > + compatible = "regulator-fixed"; > + regulator-name = "vcc5v0_core"; > + regulator-always-on; > + regulator-boot-on; > + vin-supply = <&vdd_5v>; > + }; > + > + vcc5v0_usb1: vcc5v0-usb1 { > + compatible = "regulator-fixed"; > + regulator-name = "vcc5v0_usb1"; > + regulator-always-on; > + regulator-boot-on; > + vin-supply = <&vcc5v0_sys>; > + }; > + > + vcc5v0_usb2: vcc5v0-usb2 { > + compatible = "regulator-fixed"; > + regulator-name = "vcc5v0_usb2"; > + regulator-always-on; > + regulator-boot-on; > + vin-supply = <&vcc5v0_sys>; > + }; > +}; > + > +&vcc3v3_sys { > + vin-supply = <&vcc5v0_core>; > +}; > + > +&u2phy0_host { > + phy-supply = <&vcc5v0_usb1>; > +}; > + > +&u2phy1_host { > + phy-supply = <&vcc5v0_usb2>; > +}; > + > +&vbus_typec { > + regulator-always-on; > + vin-supply = <&vdd_5v>; > +}; > diff --git a/board/rockchip/evb_rk3399/MAINTAINERS b/board/rockchip/evb_rk3399/MAINTAINERS > index 4c889e06a6..9967d68a88 100644 > --- a/board/rockchip/evb_rk3399/MAINTAINERS > +++ b/board/rockchip/evb_rk3399/MAINTAINERS > @@ -49,6 +49,12 @@ S: Maintained > F: configs/nanopi-m4-2gb-rk3399_defconfig > F: arch/arm/dts/rk3399-nanopi-m4-2gb-u-boot.dtsi > > +NANOPC-M4V2 > +M: Shuying Li <libunko@qq.com> > +S: Maintained > +F: configs/nanopi-m4v2-rk3399_defconfig > +F: arch/arm/dts/rk3399-nanopi-m4v2-u-boot.dtsi > + > NANOPI-NEO4 > M: Jagan Teki <jagan@amarulasolutions.com> > S: Maintained > diff --git a/configs/nanopi-m4v2-rk3399_defconfig b/configs/nanopi-m4v2-rk3399_defconfig > new file mode 100644 > index 0000000000..d5c58d549f > --- /dev/null > +++ b/configs/nanopi-m4v2-rk3399_defconfig > @@ -0,0 +1,61 @@ > +CONFIG_ARM=y > +CONFIG_ARCH_ROCKCHIP=y > +CONFIG_SYS_TEXT_BASE=0x00200000 > +CONFIG_NR_DRAM_BANKS=1 > +CONFIG_ENV_OFFSET=0x3F8000 > +CONFIG_ROCKCHIP_RK3399=y > +CONFIG_TARGET_EVB_RK3399=y > +CONFIG_DEBUG_UART_BASE=0xFF1A0000 > +CONFIG_DEBUG_UART_CLOCK=24000000 > +CONFIG_DEFAULT_DEVICE_TREE="rk3399-nanopi-m4v2" > +CONFIG_DEBUG_UART=y > +CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-nanopi-m4v2.dtb" > +CONFIG_DISPLAY_BOARDINFO_LATE=y > +CONFIG_SPL_STACK_R=y > +CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000 > +CONFIG_TPL=y > +CONFIG_CMD_BOOTZ=y > +CONFIG_CMD_GPT=y > +CONFIG_CMD_MMC=y > +CONFIG_CMD_USB=y > +CONFIG_CMD_TIME=y > +CONFIG_SPL_OF_CONTROL=y > +CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" > +CONFIG_ENV_IS_IN_MMC=y > +CONFIG_SYS_RELOC_GD_ENV_ADDR=y > +CONFIG_ROCKCHIP_GPIO=y > +CONFIG_SYS_I2C_ROCKCHIP=y > +CONFIG_MMC_DW=y > +CONFIG_MMC_DW_ROCKCHIP=y > +CONFIG_MMC_SDHCI=y > +CONFIG_MMC_SDHCI_ROCKCHIP=y > +CONFIG_DM_ETH=y > +CONFIG_ETH_DESIGNWARE=y > +CONFIG_GMAC_ROCKCHIP=y > +CONFIG_PMIC_RK8XX=y > +CONFIG_REGULATOR_PWM=y > +CONFIG_REGULATOR_RK8XX=y > +CONFIG_PWM_ROCKCHIP=y > +CONFIG_RAM_RK3399_LPDDR4=y > +CONFIG_DM_RESET=y > +CONFIG_BAUDRATE=1500000 > +CONFIG_DEBUG_UART_SHIFT=2 > +CONFIG_SYSRESET=y > +CONFIG_USB=y > +CONFIG_USB_XHCI_HCD=y > +CONFIG_USB_XHCI_DWC3=y > +CONFIG_USB_EHCI_HCD=y > +CONFIG_USB_EHCI_GENERIC=y > +CONFIG_USB_KEYBOARD=y > +CONFIG_USB_HOST_ETHER=y > +CONFIG_USB_ETHER_ASIX=y > +CONFIG_USB_ETHER_ASIX88179=y > +CONFIG_USB_ETHER_MCS7830=y > +CONFIG_USB_ETHER_RTL8152=y > +CONFIG_USB_ETHER_SMSC95XX=y > +CONFIG_DM_VIDEO=y > +CONFIG_DISPLAY=y > +CONFIG_VIDEO_ROCKCHIP=y > +CONFIG_DISPLAY_ROCKCHIP_HDMI=y > +CONFIG_SPL_TINY_MEMSET=y > +CONFIG_ERRNO_STR=y > diff --git a/doc/board/rockchip/rockchip.rst b/doc/board/rockchip/rockchip.rst > index 8c92de0c92..25746f1a2e 100644 > --- a/doc/board/rockchip/rockchip.rst > +++ b/doc/board/rockchip/rockchip.rst > @@ -61,6 +61,7 @@ List of mainline supported rockchip boards: > - Firefly ROC-RK3399-PC > - FriendlyElec NanoPC-T4 (nanopc-t4-rk3399) > - FriendlyElec NanoPi M4 (nanopi-m4-rk3399) > + - FriendlyElec NanoPi M4V2 (nanopi-m4v2-rk3399) > - FriendlyARM NanoPi NEO4 (nanopi-neo4-rk3399) > - Google Bob (chromebook_bob) > - Khadas Edge (khadas-edge-rk3399) > -- > 2.25.1 >
On Sat, Oct 24, 2020 at 12:17 AM Jagan Teki <jagan@amarulasolutions.com> wrote: > > On Sun, Oct 18, 2020 at 5:39 PM Shuying Li <lishuying.top@gmail.com> wrote: > > > > From: Libunko <libunko@qq.com> > > > > Add initial support for Nanopi M4V2 board. > > > > Specification > > - Rockchip RK3399 > > - Dual-Channel 4GB LPDDR4 > > - SD card slot > > - eMMC socket > > - RTL8211E 1Gbps > > - AP6356S WiFI/BT > > - HDMI In/Out, MIPI DSI/CSI > > - USB 3.0 x4 > > - USB Type C power and data > > - GPIO1, GPIO2 expansion ports > > - DC5V/3A > > > > Signed-off-by: Shuying Li <libunko@qq.com> > > --- > > arch/arm/dts/Makefile | 1 + > > arch/arm/dts/rk3399-nanopi-m4v2-u-boot.dtsi | 7 +++ > > arch/arm/dts/rk3399-nanopi-m4v2.dts | 67 +++++++++++++++++++++ Hope you sync the dts from Linux, if yes please add sha1 on the commit message. The rest looks fine. Reviewed-by: Jagan Teki <jagan@amarulasolutions.com>
Hi Shuying, I can't find a rk3399-nanopi-m4v2.dts at mainline kernel, does this a copy of rk3399-nanopi-m4.dts? What's the difference between m4 and m4v2, is it possible to use the same dts in U-Boot? Thanks, - Kever On 2020/10/18 下午1:25, Shuying Li wrote: > From: Libunko <libunko@qq.com> > > Add initial support for Nanopi M4V2 board. > > Specification > - Rockchip RK3399 > - Dual-Channel 4GB LPDDR4 > - SD card slot > - eMMC socket > - RTL8211E 1Gbps > - AP6356S WiFI/BT > - HDMI In/Out, MIPI DSI/CSI > - USB 3.0 x4 > - USB Type C power and data > - GPIO1, GPIO2 expansion ports > - DC5V/3A > > Signed-off-by: Shuying Li <libunko@qq.com> > --- > arch/arm/dts/Makefile | 1 + > arch/arm/dts/rk3399-nanopi-m4v2-u-boot.dtsi | 7 +++ > arch/arm/dts/rk3399-nanopi-m4v2.dts | 67 +++++++++++++++++++++ > board/rockchip/evb_rk3399/MAINTAINERS | 6 ++ > configs/nanopi-m4v2-rk3399_defconfig | 61 +++++++++++++++++++ > doc/board/rockchip/rockchip.rst | 1 + > 6 files changed, 143 insertions(+) > create mode 100644 arch/arm/dts/rk3399-nanopi-m4v2-u-boot.dtsi > create mode 100644 arch/arm/dts/rk3399-nanopi-m4v2.dts > create mode 100644 configs/nanopi-m4v2-rk3399_defconfig > > diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile > index f8f529435b..7e8dfcef88 100644 > --- a/arch/arm/dts/Makefile > +++ b/arch/arm/dts/Makefile > @@ -130,6 +130,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3399) += \ > rk3399-nanopc-t4.dtb \ > rk3399-nanopi-m4.dtb \ > rk3399-nanopi-m4-2gb.dtb \ > + rk3399-nanopi-m4v2.dtb \ > rk3399-nanopi-neo4.dtb \ > rk3399-orangepi.dtb \ > rk3399-pinebook-pro.dtb \ > diff --git a/arch/arm/dts/rk3399-nanopi-m4v2-u-boot.dtsi b/arch/arm/dts/rk3399-nanopi-m4v2-u-boot.dtsi > new file mode 100644 > index 0000000000..ff8e99cb7f > --- /dev/null > +++ b/arch/arm/dts/rk3399-nanopi-m4v2-u-boot.dtsi > @@ -0,0 +1,7 @@ > +// SPDX-License-Identifier: GPL-2.0+ > +/* > + * Copyright (C) 2020 Shuying Li <libunko@qq.com> > + */ > + > +#include "rk3399-nanopi4-u-boot.dtsi" > +#include "rk3399-sdram-lpddr4-100.dtsi" > diff --git a/arch/arm/dts/rk3399-nanopi-m4v2.dts b/arch/arm/dts/rk3399-nanopi-m4v2.dts > new file mode 100644 > index 0000000000..03d956d2c4 > --- /dev/null > +++ b/arch/arm/dts/rk3399-nanopi-m4v2.dts > @@ -0,0 +1,67 @@ > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > +/* > + * FriendlyElec NanoPi M4V2 board device tree source > + * > + * Copyright (c) 2018 FriendlyElec Computer Tech. Co., Ltd. > + * (http://www.friendlyarm.com) > + * > + * Copyright (c) 2018 Collabora Ltd. > + * Copyright (c) 2019 Arm Ltd. > + * Copyright (C) 2020 Shuying Li <libunko@qq.com> > + */ > + > +/dts-v1/; > +#include "rk3399-nanopi4.dtsi" > + > +/ { > + model = "FriendlyElec NanoPi M4V2"; > + compatible = "friendlyarm,nanopi-m4v2", "rockchip,rk3399"; > + > + vdd_5v: vdd-5v { > + compatible = "regulator-fixed"; > + regulator-name = "vdd_5v"; > + regulator-always-on; > + regulator-boot-on; > + }; > + > + vcc5v0_core: vcc5v0-core { > + compatible = "regulator-fixed"; > + regulator-name = "vcc5v0_core"; > + regulator-always-on; > + regulator-boot-on; > + vin-supply = <&vdd_5v>; > + }; > + > + vcc5v0_usb1: vcc5v0-usb1 { > + compatible = "regulator-fixed"; > + regulator-name = "vcc5v0_usb1"; > + regulator-always-on; > + regulator-boot-on; > + vin-supply = <&vcc5v0_sys>; > + }; > + > + vcc5v0_usb2: vcc5v0-usb2 { > + compatible = "regulator-fixed"; > + regulator-name = "vcc5v0_usb2"; > + regulator-always-on; > + regulator-boot-on; > + vin-supply = <&vcc5v0_sys>; > + }; > +}; > + > +&vcc3v3_sys { > + vin-supply = <&vcc5v0_core>; > +}; > + > +&u2phy0_host { > + phy-supply = <&vcc5v0_usb1>; > +}; > + > +&u2phy1_host { > + phy-supply = <&vcc5v0_usb2>; > +}; > + > +&vbus_typec { > + regulator-always-on; > + vin-supply = <&vdd_5v>; > +}; > diff --git a/board/rockchip/evb_rk3399/MAINTAINERS b/board/rockchip/evb_rk3399/MAINTAINERS > index 4c889e06a6..9967d68a88 100644 > --- a/board/rockchip/evb_rk3399/MAINTAINERS > +++ b/board/rockchip/evb_rk3399/MAINTAINERS > @@ -49,6 +49,12 @@ S: Maintained > F: configs/nanopi-m4-2gb-rk3399_defconfig > F: arch/arm/dts/rk3399-nanopi-m4-2gb-u-boot.dtsi > > +NANOPC-M4V2 > +M: Shuying Li <libunko@qq.com> > +S: Maintained > +F: configs/nanopi-m4v2-rk3399_defconfig > +F: arch/arm/dts/rk3399-nanopi-m4v2-u-boot.dtsi > + > NANOPI-NEO4 > M: Jagan Teki <jagan@amarulasolutions.com> > S: Maintained > diff --git a/configs/nanopi-m4v2-rk3399_defconfig b/configs/nanopi-m4v2-rk3399_defconfig > new file mode 100644 > index 0000000000..d5c58d549f > --- /dev/null > +++ b/configs/nanopi-m4v2-rk3399_defconfig > @@ -0,0 +1,61 @@ > +CONFIG_ARM=y > +CONFIG_ARCH_ROCKCHIP=y > +CONFIG_SYS_TEXT_BASE=0x00200000 > +CONFIG_NR_DRAM_BANKS=1 > +CONFIG_ENV_OFFSET=0x3F8000 > +CONFIG_ROCKCHIP_RK3399=y > +CONFIG_TARGET_EVB_RK3399=y > +CONFIG_DEBUG_UART_BASE=0xFF1A0000 > +CONFIG_DEBUG_UART_CLOCK=24000000 > +CONFIG_DEFAULT_DEVICE_TREE="rk3399-nanopi-m4v2" > +CONFIG_DEBUG_UART=y > +CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-nanopi-m4v2.dtb" > +CONFIG_DISPLAY_BOARDINFO_LATE=y > +CONFIG_SPL_STACK_R=y > +CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000 > +CONFIG_TPL=y > +CONFIG_CMD_BOOTZ=y > +CONFIG_CMD_GPT=y > +CONFIG_CMD_MMC=y > +CONFIG_CMD_USB=y > +CONFIG_CMD_TIME=y > +CONFIG_SPL_OF_CONTROL=y > +CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" > +CONFIG_ENV_IS_IN_MMC=y > +CONFIG_SYS_RELOC_GD_ENV_ADDR=y > +CONFIG_ROCKCHIP_GPIO=y > +CONFIG_SYS_I2C_ROCKCHIP=y > +CONFIG_MMC_DW=y > +CONFIG_MMC_DW_ROCKCHIP=y > +CONFIG_MMC_SDHCI=y > +CONFIG_MMC_SDHCI_ROCKCHIP=y > +CONFIG_DM_ETH=y > +CONFIG_ETH_DESIGNWARE=y > +CONFIG_GMAC_ROCKCHIP=y > +CONFIG_PMIC_RK8XX=y > +CONFIG_REGULATOR_PWM=y > +CONFIG_REGULATOR_RK8XX=y > +CONFIG_PWM_ROCKCHIP=y > +CONFIG_RAM_RK3399_LPDDR4=y > +CONFIG_DM_RESET=y > +CONFIG_BAUDRATE=1500000 > +CONFIG_DEBUG_UART_SHIFT=2 > +CONFIG_SYSRESET=y > +CONFIG_USB=y > +CONFIG_USB_XHCI_HCD=y > +CONFIG_USB_XHCI_DWC3=y > +CONFIG_USB_EHCI_HCD=y > +CONFIG_USB_EHCI_GENERIC=y > +CONFIG_USB_KEYBOARD=y > +CONFIG_USB_HOST_ETHER=y > +CONFIG_USB_ETHER_ASIX=y > +CONFIG_USB_ETHER_ASIX88179=y > +CONFIG_USB_ETHER_MCS7830=y > +CONFIG_USB_ETHER_RTL8152=y > +CONFIG_USB_ETHER_SMSC95XX=y > +CONFIG_DM_VIDEO=y > +CONFIG_DISPLAY=y > +CONFIG_VIDEO_ROCKCHIP=y > +CONFIG_DISPLAY_ROCKCHIP_HDMI=y > +CONFIG_SPL_TINY_MEMSET=y > +CONFIG_ERRNO_STR=y > diff --git a/doc/board/rockchip/rockchip.rst b/doc/board/rockchip/rockchip.rst > index 8c92de0c92..25746f1a2e 100644 > --- a/doc/board/rockchip/rockchip.rst > +++ b/doc/board/rockchip/rockchip.rst > @@ -61,6 +61,7 @@ List of mainline supported rockchip boards: > - Firefly ROC-RK3399-PC > - FriendlyElec NanoPC-T4 (nanopc-t4-rk3399) > - FriendlyElec NanoPi M4 (nanopi-m4-rk3399) > + - FriendlyElec NanoPi M4V2 (nanopi-m4v2-rk3399) > - FriendlyARM NanoPi NEO4 (nanopi-neo4-rk3399) > - Google Bob (chromebook_bob) > - Khadas Edge (khadas-edge-rk3399)
Hi All, Shuying kindly pointed me to his branch: git clone -b v2020.10.m4v2 https://github.com/Libunko/u-boot.git What needs to be done to get this into mainline? Jam -- Sent from: http://u-boot.10912.n7.nabble.com/
Hi! I tested this patch, all working well apart from ethernet: Model: FriendlyElec NanoPi M4V2 Net: Error: ethernet@fe300000 address not set. No ethernet found. Hit any key to stop autoboot: 0 => nfs mdio_register: non unique device name 'ethernet@fe300000' mdio_register: non unique device name 'ethernet@fe300000' mdio_register: non unique device name 'ethernet@fe300000' mdio_register: non unique device name 'ethernet@fe300000' No ethernet found. mdio_register: non unique device name 'ethernet@fe300000' Any tips to get ethernet going ? thinking about it, i should try a NanopiM4 V1... thanks! On Sat, 16 Jan 2021 at 12:41, Jamislike <jamainerobeng@gmail.com> wrote: > > Hi All, > Shuying kindly pointed me to his branch: > > git clone -b v2020.10.m4v2 https://github.com/Libunko/u-boot.git > > What needs to be done to get this into mainline? > Jam > > > > > > -- > Sent from: http://u-boot.10912.n7.nabble.com/
On Fri, 5 Feb 2021 at 16:15, Christopher Obbard <chris@64studio.com> wrote: > > Hi! > > I tested this patch, all working well apart from ethernet: > > Model: FriendlyElec NanoPi M4V2 > Net: > Error: ethernet@fe300000 address not set. > No ethernet found. > Any tips to get ethernet going ? > > thinking about it, i should try a NanopiM4 V1... right, I had to set ethaddr first in the environment... The vendor u-boot seems to derive a default ethernet address from the serial number. thanks! > > thanks! > > On Sat, 16 Jan 2021 at 12:41, Jamislike <jamainerobeng@gmail.com> wrote: > > > > Hi All, > > Shuying kindly pointed me to his branch: > > > > git clone -b v2020.10.m4v2 https://github.com/Libunko/u-boot.git > > > > What needs to be done to get this into mainline? > > Jam > > > > > > > > > > > > -- > > Sent from: http://u-boot.10912.n7.nabble.com/
Hi Shuying Li & Libunko, Would you be able to resend this patch to uboot mailing list ? If you are no longer interested, I can resend it if you would like. Thank you Chris On Sun, 18 Oct 2020 at 13:10, Shuying Li <lishuying.top@gmail.com> wrote: > > From: Libunko <libunko@qq.com> > > Add initial support for Nanopi M4V2 board. > > Specification > - Rockchip RK3399 > - Dual-Channel 4GB LPDDR4 > - SD card slot > - eMMC socket > - RTL8211E 1Gbps > - AP6356S WiFI/BT > - HDMI In/Out, MIPI DSI/CSI > - USB 3.0 x4 > - USB Type C power and data > - GPIO1, GPIO2 expansion ports > - DC5V/3A > > Signed-off-by: Shuying Li <libunko@qq.com> > --- > arch/arm/dts/Makefile | 1 + > arch/arm/dts/rk3399-nanopi-m4v2-u-boot.dtsi | 7 +++ > arch/arm/dts/rk3399-nanopi-m4v2.dts | 67 +++++++++++++++++++++ > board/rockchip/evb_rk3399/MAINTAINERS | 6 ++ > configs/nanopi-m4v2-rk3399_defconfig | 61 +++++++++++++++++++ > doc/board/rockchip/rockchip.rst | 1 + > 6 files changed, 143 insertions(+) > create mode 100644 arch/arm/dts/rk3399-nanopi-m4v2-u-boot.dtsi > create mode 100644 arch/arm/dts/rk3399-nanopi-m4v2.dts > create mode 100644 configs/nanopi-m4v2-rk3399_defconfig > > diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile > index f8f529435b..7e8dfcef88 100644 > --- a/arch/arm/dts/Makefile > +++ b/arch/arm/dts/Makefile > @@ -130,6 +130,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3399) += \ > rk3399-nanopc-t4.dtb \ > rk3399-nanopi-m4.dtb \ > rk3399-nanopi-m4-2gb.dtb \ > + rk3399-nanopi-m4v2.dtb \ > rk3399-nanopi-neo4.dtb \ > rk3399-orangepi.dtb \ > rk3399-pinebook-pro.dtb \ > diff --git a/arch/arm/dts/rk3399-nanopi-m4v2-u-boot.dtsi b/arch/arm/dts/rk3399-nanopi-m4v2-u-boot.dtsi > new file mode 100644 > index 0000000000..ff8e99cb7f > --- /dev/null > +++ b/arch/arm/dts/rk3399-nanopi-m4v2-u-boot.dtsi > @@ -0,0 +1,7 @@ > +// SPDX-License-Identifier: GPL-2.0+ > +/* > + * Copyright (C) 2020 Shuying Li <libunko@qq.com> > + */ > + > +#include "rk3399-nanopi4-u-boot.dtsi" > +#include "rk3399-sdram-lpddr4-100.dtsi" > diff --git a/arch/arm/dts/rk3399-nanopi-m4v2.dts b/arch/arm/dts/rk3399-nanopi-m4v2.dts > new file mode 100644 > index 0000000000..03d956d2c4 > --- /dev/null > +++ b/arch/arm/dts/rk3399-nanopi-m4v2.dts > @@ -0,0 +1,67 @@ > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > +/* > + * FriendlyElec NanoPi M4V2 board device tree source > + * > + * Copyright (c) 2018 FriendlyElec Computer Tech. Co., Ltd. > + * (http://www.friendlyarm.com) > + * > + * Copyright (c) 2018 Collabora Ltd. > + * Copyright (c) 2019 Arm Ltd. > + * Copyright (C) 2020 Shuying Li <libunko@qq.com> > + */ > + > +/dts-v1/; > +#include "rk3399-nanopi4.dtsi" > + > +/ { > + model = "FriendlyElec NanoPi M4V2"; > + compatible = "friendlyarm,nanopi-m4v2", "rockchip,rk3399"; > + > + vdd_5v: vdd-5v { > + compatible = "regulator-fixed"; > + regulator-name = "vdd_5v"; > + regulator-always-on; > + regulator-boot-on; > + }; > + > + vcc5v0_core: vcc5v0-core { > + compatible = "regulator-fixed"; > + regulator-name = "vcc5v0_core"; > + regulator-always-on; > + regulator-boot-on; > + vin-supply = <&vdd_5v>; > + }; > + > + vcc5v0_usb1: vcc5v0-usb1 { > + compatible = "regulator-fixed"; > + regulator-name = "vcc5v0_usb1"; > + regulator-always-on; > + regulator-boot-on; > + vin-supply = <&vcc5v0_sys>; > + }; > + > + vcc5v0_usb2: vcc5v0-usb2 { > + compatible = "regulator-fixed"; > + regulator-name = "vcc5v0_usb2"; > + regulator-always-on; > + regulator-boot-on; > + vin-supply = <&vcc5v0_sys>; > + }; > +}; > + > +&vcc3v3_sys { > + vin-supply = <&vcc5v0_core>; > +}; > + > +&u2phy0_host { > + phy-supply = <&vcc5v0_usb1>; > +}; > + > +&u2phy1_host { > + phy-supply = <&vcc5v0_usb2>; > +}; > + > +&vbus_typec { > + regulator-always-on; > + vin-supply = <&vdd_5v>; > +}; > diff --git a/board/rockchip/evb_rk3399/MAINTAINERS b/board/rockchip/evb_rk3399/MAINTAINERS > index 4c889e06a6..9967d68a88 100644 > --- a/board/rockchip/evb_rk3399/MAINTAINERS > +++ b/board/rockchip/evb_rk3399/MAINTAINERS > @@ -49,6 +49,12 @@ S: Maintained > F: configs/nanopi-m4-2gb-rk3399_defconfig > F: arch/arm/dts/rk3399-nanopi-m4-2gb-u-boot.dtsi > > +NANOPC-M4V2 > +M: Shuying Li <libunko@qq.com> > +S: Maintained > +F: configs/nanopi-m4v2-rk3399_defconfig > +F: arch/arm/dts/rk3399-nanopi-m4v2-u-boot.dtsi > + > NANOPI-NEO4 > M: Jagan Teki <jagan@amarulasolutions.com> > S: Maintained > diff --git a/configs/nanopi-m4v2-rk3399_defconfig b/configs/nanopi-m4v2-rk3399_defconfig > new file mode 100644 > index 0000000000..d5c58d549f > --- /dev/null > +++ b/configs/nanopi-m4v2-rk3399_defconfig > @@ -0,0 +1,61 @@ > +CONFIG_ARM=y > +CONFIG_ARCH_ROCKCHIP=y > +CONFIG_SYS_TEXT_BASE=0x00200000 > +CONFIG_NR_DRAM_BANKS=1 > +CONFIG_ENV_OFFSET=0x3F8000 > +CONFIG_ROCKCHIP_RK3399=y > +CONFIG_TARGET_EVB_RK3399=y > +CONFIG_DEBUG_UART_BASE=0xFF1A0000 > +CONFIG_DEBUG_UART_CLOCK=24000000 > +CONFIG_DEFAULT_DEVICE_TREE="rk3399-nanopi-m4v2" > +CONFIG_DEBUG_UART=y > +CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-nanopi-m4v2.dtb" > +CONFIG_DISPLAY_BOARDINFO_LATE=y > +CONFIG_SPL_STACK_R=y > +CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000 > +CONFIG_TPL=y > +CONFIG_CMD_BOOTZ=y > +CONFIG_CMD_GPT=y > +CONFIG_CMD_MMC=y > +CONFIG_CMD_USB=y > +CONFIG_CMD_TIME=y > +CONFIG_SPL_OF_CONTROL=y > +CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" > +CONFIG_ENV_IS_IN_MMC=y > +CONFIG_SYS_RELOC_GD_ENV_ADDR=y > +CONFIG_ROCKCHIP_GPIO=y > +CONFIG_SYS_I2C_ROCKCHIP=y > +CONFIG_MMC_DW=y > +CONFIG_MMC_DW_ROCKCHIP=y > +CONFIG_MMC_SDHCI=y > +CONFIG_MMC_SDHCI_ROCKCHIP=y > +CONFIG_DM_ETH=y > +CONFIG_ETH_DESIGNWARE=y > +CONFIG_GMAC_ROCKCHIP=y > +CONFIG_PMIC_RK8XX=y > +CONFIG_REGULATOR_PWM=y > +CONFIG_REGULATOR_RK8XX=y > +CONFIG_PWM_ROCKCHIP=y > +CONFIG_RAM_RK3399_LPDDR4=y > +CONFIG_DM_RESET=y > +CONFIG_BAUDRATE=1500000 > +CONFIG_DEBUG_UART_SHIFT=2 > +CONFIG_SYSRESET=y > +CONFIG_USB=y > +CONFIG_USB_XHCI_HCD=y > +CONFIG_USB_XHCI_DWC3=y > +CONFIG_USB_EHCI_HCD=y > +CONFIG_USB_EHCI_GENERIC=y > +CONFIG_USB_KEYBOARD=y > +CONFIG_USB_HOST_ETHER=y > +CONFIG_USB_ETHER_ASIX=y > +CONFIG_USB_ETHER_ASIX88179=y > +CONFIG_USB_ETHER_MCS7830=y > +CONFIG_USB_ETHER_RTL8152=y > +CONFIG_USB_ETHER_SMSC95XX=y > +CONFIG_DM_VIDEO=y > +CONFIG_DISPLAY=y > +CONFIG_VIDEO_ROCKCHIP=y > +CONFIG_DISPLAY_ROCKCHIP_HDMI=y > +CONFIG_SPL_TINY_MEMSET=y > +CONFIG_ERRNO_STR=y > diff --git a/doc/board/rockchip/rockchip.rst b/doc/board/rockchip/rockchip.rst > index 8c92de0c92..25746f1a2e 100644 > --- a/doc/board/rockchip/rockchip.rst > +++ b/doc/board/rockchip/rockchip.rst > @@ -61,6 +61,7 @@ List of mainline supported rockchip boards: > - Firefly ROC-RK3399-PC > - FriendlyElec NanoPC-T4 (nanopc-t4-rk3399) > - FriendlyElec NanoPi M4 (nanopi-m4-rk3399) > + - FriendlyElec NanoPi M4V2 (nanopi-m4v2-rk3399) > - FriendlyARM NanoPi NEO4 (nanopi-neo4-rk3399) > - Google Bob (chromebook_bob) > - Khadas Edge (khadas-edge-rk3399) > -- > 2.25.1 >
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index f8f529435b..7e8dfcef88 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -130,6 +130,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3399) += \ rk3399-nanopc-t4.dtb \ rk3399-nanopi-m4.dtb \ rk3399-nanopi-m4-2gb.dtb \ + rk3399-nanopi-m4v2.dtb \ rk3399-nanopi-neo4.dtb \ rk3399-orangepi.dtb \ rk3399-pinebook-pro.dtb \ diff --git a/arch/arm/dts/rk3399-nanopi-m4v2-u-boot.dtsi b/arch/arm/dts/rk3399-nanopi-m4v2-u-boot.dtsi new file mode 100644 index 0000000000..ff8e99cb7f --- /dev/null +++ b/arch/arm/dts/rk3399-nanopi-m4v2-u-boot.dtsi @@ -0,0 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2020 Shuying Li <libunko@qq.com> + */ + +#include "rk3399-nanopi4-u-boot.dtsi" +#include "rk3399-sdram-lpddr4-100.dtsi" diff --git a/arch/arm/dts/rk3399-nanopi-m4v2.dts b/arch/arm/dts/rk3399-nanopi-m4v2.dts new file mode 100644 index 0000000000..03d956d2c4 --- /dev/null +++ b/arch/arm/dts/rk3399-nanopi-m4v2.dts @@ -0,0 +1,67 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * FriendlyElec NanoPi M4V2 board device tree source + * + * Copyright (c) 2018 FriendlyElec Computer Tech. Co., Ltd. + * (http://www.friendlyarm.com) + * + * Copyright (c) 2018 Collabora Ltd. + * Copyright (c) 2019 Arm Ltd. + * Copyright (C) 2020 Shuying Li <libunko@qq.com> + */ + +/dts-v1/; +#include "rk3399-nanopi4.dtsi" + +/ { + model = "FriendlyElec NanoPi M4V2"; + compatible = "friendlyarm,nanopi-m4v2", "rockchip,rk3399"; + + vdd_5v: vdd-5v { + compatible = "regulator-fixed"; + regulator-name = "vdd_5v"; + regulator-always-on; + regulator-boot-on; + }; + + vcc5v0_core: vcc5v0-core { + compatible = "regulator-fixed"; + regulator-name = "vcc5v0_core"; + regulator-always-on; + regulator-boot-on; + vin-supply = <&vdd_5v>; + }; + + vcc5v0_usb1: vcc5v0-usb1 { + compatible = "regulator-fixed"; + regulator-name = "vcc5v0_usb1"; + regulator-always-on; + regulator-boot-on; + vin-supply = <&vcc5v0_sys>; + }; + + vcc5v0_usb2: vcc5v0-usb2 { + compatible = "regulator-fixed"; + regulator-name = "vcc5v0_usb2"; + regulator-always-on; + regulator-boot-on; + vin-supply = <&vcc5v0_sys>; + }; +}; + +&vcc3v3_sys { + vin-supply = <&vcc5v0_core>; +}; + +&u2phy0_host { + phy-supply = <&vcc5v0_usb1>; +}; + +&u2phy1_host { + phy-supply = <&vcc5v0_usb2>; +}; + +&vbus_typec { + regulator-always-on; + vin-supply = <&vdd_5v>; +}; diff --git a/board/rockchip/evb_rk3399/MAINTAINERS b/board/rockchip/evb_rk3399/MAINTAINERS index 4c889e06a6..9967d68a88 100644 --- a/board/rockchip/evb_rk3399/MAINTAINERS +++ b/board/rockchip/evb_rk3399/MAINTAINERS @@ -49,6 +49,12 @@ S: Maintained F: configs/nanopi-m4-2gb-rk3399_defconfig F: arch/arm/dts/rk3399-nanopi-m4-2gb-u-boot.dtsi +NANOPC-M4V2 +M: Shuying Li <libunko@qq.com> +S: Maintained +F: configs/nanopi-m4v2-rk3399_defconfig +F: arch/arm/dts/rk3399-nanopi-m4v2-u-boot.dtsi + NANOPI-NEO4 M: Jagan Teki <jagan@amarulasolutions.com> S: Maintained diff --git a/configs/nanopi-m4v2-rk3399_defconfig b/configs/nanopi-m4v2-rk3399_defconfig new file mode 100644 index 0000000000..d5c58d549f --- /dev/null +++ b/configs/nanopi-m4v2-rk3399_defconfig @@ -0,0 +1,61 @@ +CONFIG_ARM=y +CONFIG_ARCH_ROCKCHIP=y +CONFIG_SYS_TEXT_BASE=0x00200000 +CONFIG_NR_DRAM_BANKS=1 +CONFIG_ENV_OFFSET=0x3F8000 +CONFIG_ROCKCHIP_RK3399=y +CONFIG_TARGET_EVB_RK3399=y +CONFIG_DEBUG_UART_BASE=0xFF1A0000 +CONFIG_DEBUG_UART_CLOCK=24000000 +CONFIG_DEFAULT_DEVICE_TREE="rk3399-nanopi-m4v2" +CONFIG_DEBUG_UART=y +CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-nanopi-m4v2.dtb" +CONFIG_DISPLAY_BOARDINFO_LATE=y +CONFIG_SPL_STACK_R=y +CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000 +CONFIG_TPL=y +CONFIG_CMD_BOOTZ=y +CONFIG_CMD_GPT=y +CONFIG_CMD_MMC=y +CONFIG_CMD_USB=y +CONFIG_CMD_TIME=y +CONFIG_SPL_OF_CONTROL=y +CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" +CONFIG_ENV_IS_IN_MMC=y +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_ROCKCHIP_GPIO=y +CONFIG_SYS_I2C_ROCKCHIP=y +CONFIG_MMC_DW=y +CONFIG_MMC_DW_ROCKCHIP=y +CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_ROCKCHIP=y +CONFIG_DM_ETH=y +CONFIG_ETH_DESIGNWARE=y +CONFIG_GMAC_ROCKCHIP=y +CONFIG_PMIC_RK8XX=y +CONFIG_REGULATOR_PWM=y +CONFIG_REGULATOR_RK8XX=y +CONFIG_PWM_ROCKCHIP=y +CONFIG_RAM_RK3399_LPDDR4=y +CONFIG_DM_RESET=y +CONFIG_BAUDRATE=1500000 +CONFIG_DEBUG_UART_SHIFT=2 +CONFIG_SYSRESET=y +CONFIG_USB=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_XHCI_DWC3=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_GENERIC=y +CONFIG_USB_KEYBOARD=y +CONFIG_USB_HOST_ETHER=y +CONFIG_USB_ETHER_ASIX=y +CONFIG_USB_ETHER_ASIX88179=y +CONFIG_USB_ETHER_MCS7830=y +CONFIG_USB_ETHER_RTL8152=y +CONFIG_USB_ETHER_SMSC95XX=y +CONFIG_DM_VIDEO=y +CONFIG_DISPLAY=y +CONFIG_VIDEO_ROCKCHIP=y +CONFIG_DISPLAY_ROCKCHIP_HDMI=y +CONFIG_SPL_TINY_MEMSET=y +CONFIG_ERRNO_STR=y diff --git a/doc/board/rockchip/rockchip.rst b/doc/board/rockchip/rockchip.rst index 8c92de0c92..25746f1a2e 100644 --- a/doc/board/rockchip/rockchip.rst +++ b/doc/board/rockchip/rockchip.rst @@ -61,6 +61,7 @@ List of mainline supported rockchip boards: - Firefly ROC-RK3399-PC - FriendlyElec NanoPC-T4 (nanopc-t4-rk3399) - FriendlyElec NanoPi M4 (nanopi-m4-rk3399) + - FriendlyElec NanoPi M4V2 (nanopi-m4v2-rk3399) - FriendlyARM NanoPi NEO4 (nanopi-neo4-rk3399) - Google Bob (chromebook_bob) - Khadas Edge (khadas-edge-rk3399)