Re: [PATCH] board: dts: rockchip: Add NanoPi M4B【请注意，邮件由u-boot-bounces at lists.denx.de代发】
Kever Yang
kever.yang at rock-chips.com
Tue Mar 30 09:34:47 CEST 2021
Hi Alexandre,
On 2021/3/26 下午8:37, Alexandre Vicenzi wrote:
> Add initial support for NanoPi M4B, a minor revision of
> the original NanoPi M4.
>
> Commit details of rk3399-nanopi-m4b.dts sync from Linux 5.12-rc4:
> "arm64: dts: rockchip: Add NanoPi M4B board"
> (sha1: c7b03115003f7f337ab165542cee37148cf30a8a)
>
> Signed-off-by: Alexandre Vicenzi <alexandre.vicenzi at suse.com>
Reviewed-by: Kever Yang <kever.yang at rock-cihps.com>
Thanks,
- Kever
> ---
> arch/arm/dts/Makefile | 1 +
> arch/arm/dts/rk3399-nanopi-m4b-u-boot.dtsi | 7 +++
> arch/arm/dts/rk3399-nanopi-m4b.dts | 52 ++++++++++++++++++
> board/rockchip/evb_rk3399/MAINTAINERS | 6 +++
> configs/nanopi-m4b-rk3399_defconfig | 61 ++++++++++++++++++++++
> doc/board/rockchip/rockchip.rst | 1 +
> 6 files changed, 128 insertions(+)
> create mode 100644 arch/arm/dts/rk3399-nanopi-m4b-u-boot.dtsi
> create mode 100644 arch/arm/dts/rk3399-nanopi-m4b.dts
> create mode 100644 configs/nanopi-m4b-rk3399_defconfig
>
> diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
> index c6710826a0..4817fa92ba 100644
> --- a/arch/arm/dts/Makefile
> +++ b/arch/arm/dts/Makefile
> @@ -131,6 +131,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3399) += \
> rk3399-nanopc-t4.dtb \
> rk3399-nanopi-m4.dtb \
> rk3399-nanopi-m4-2gb.dtb \
> + rk3399-nanopi-m4b.dtb \
> rk3399-nanopi-neo4.dtb \
> rk3399-orangepi.dtb \
> rk3399-pinebook-pro.dtb \
> diff --git a/arch/arm/dts/rk3399-nanopi-m4b-u-boot.dtsi b/arch/arm/dts/rk3399-nanopi-m4b-u-boot.dtsi
> new file mode 100644
> index 0000000000..9c3c1ef810
> --- /dev/null
> +++ b/arch/arm/dts/rk3399-nanopi-m4b-u-boot.dtsi
> @@ -0,0 +1,7 @@
> +// SPDX-License-Identifier: GPL-2.0+
> +/*
> + * Copyright (C) 2021 Alexandre Vicenzi <linux at alxd.me>
> + */
> +
> +#include "rk3399-nanopi4-u-boot.dtsi"
> +#include "rk3399-sdram-ddr3-1866.dtsi"
> diff --git a/arch/arm/dts/rk3399-nanopi-m4b.dts b/arch/arm/dts/rk3399-nanopi-m4b.dts
> new file mode 100644
> index 0000000000..72182c58cc
> --- /dev/null
> +++ b/arch/arm/dts/rk3399-nanopi-m4b.dts
> @@ -0,0 +1,52 @@
> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> +/*
> + * FriendlyElec NanoPi M4B board device tree source
> + *
> + * Copyright (c) 2020 Chen-Yu Tsai <wens at csie.org>
> + */
> +
> +/dts-v1/;
> +#include "rk3399-nanopi-m4.dts"
> +
> +/ {
> + model = "FriendlyElec NanoPi M4B";
> + compatible = "friendlyarm,nanopi-m4b", "rockchip,rk3399";
> +
> + adc-keys {
> + compatible = "adc-keys";
> + io-channels = <&saradc 1>;
> + io-channel-names = "buttons";
> + keyup-threshold-microvolt = <1500000>;
> + poll-interval = <100>;
> +
> + recovery {
> + label = "Recovery";
> + linux,code = <KEY_VENDOR>;
> + press-threshold-microvolt = <18000>;
> + };
> + };
> +};
> +
> +/* No USB type-C PD power manager */
> +/delete-node/ &fusb0;
> +
> +&i2c4 {
> + status = "disabled";
> +};
> +
> +&u2phy0_host {
> + phy-supply = <&vcc5v0_usb2>;
> +};
> +
> +&u2phy0_otg {
> + phy-supply = <&vbus_typec>;
> +};
> +
> +&u2phy1_otg {
> + phy-supply = <&vcc5v0_usb1>;
> +};
> +
> +&vbus_typec {
> + enable-active-high;
> + gpios = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>;
> +};
> diff --git a/board/rockchip/evb_rk3399/MAINTAINERS b/board/rockchip/evb_rk3399/MAINTAINERS
> index 4c889e06a6..a3a71ae2a4 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
>
> +NANOPI-M4B
> +M: Alexandre Vicenzi <linux at alxd.me>
> +S: Maintained
> +F: configs/nanopi-m4b-rk3399_defconfig
> +F: arch/arm/dts/rk3399-nanopi-m4b-u-boot.dtsi
> +
> NANOPI-NEO4
> M: Jagan Teki <jagan at amarulasolutions.com>
> S: Maintained
> diff --git a/configs/nanopi-m4b-rk3399_defconfig b/configs/nanopi-m4b-rk3399_defconfig
> new file mode 100644
> index 0000000000..eceb67e736
> --- /dev/null
> +++ b/configs/nanopi-m4b-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-m4b"
> +CONFIG_DEBUG_UART=y
> +CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-nanopi-m4b.dtb"
> +CONFIG_DISPLAY_BOARDINFO_LATE=y
> +# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
> +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_SETEXPR is not set
> +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_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 955e6858f2..fbb9983988 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 M4B (nanopi-m4b-rk3399)
> - FriendlyARM NanoPi NEO4 (nanopi-neo4-rk3399)
> - Google Bob (chromebook_bob)
> - Khadas Edge (khadas-edge-rk3399)
More information about the U-Boot
mailing list