Hi, Le mardi 16 avril 2019 à 16:26 +0530, Jagan Teki a écrit : > Add initial support for Nanopi M4 board. > > Specification > - Rockchip RK3399 > - Dual-Channel 4GB LPDDR3-1866 > - SD card slot > - eMMC socket > - RTL8211E 1Gbps > - AP6356S WiFI/BT > - HDMI In/Out, DP, MIPI DSI/CSI > - USB 3.0 x4 > - USB Type C power and data > - GPIO1, GPIO2 expansion ports > - DC5V/3A > > Commit details of rk3399-nanopi-m4.dts sync from Linux 5.1-rc2: > "arm64: dts: rockchip: Refine nanopi4 differences" > (sha1: c62ffaf5026d0b7633e62b2cea8450b5543c349a) > > Signed-off-by: Jagan Teki <ja...@amarulasolutions.com>
Reviewed-by: Paul Kocialkowski <paul.kocialkow...@bootlin.com> Cheers, Paul > --- > arch/arm/dts/Makefile | 1 + > arch/arm/dts/rk3399-nanopi-m4-u-boot.dtsi | 7 +++ > arch/arm/dts/rk3399-nanopi-m4.dts | 66 +++++++++++++++++++++++ > board/rockchip/evb_rk3399/MAINTAINERS | 6 +++ > configs/nanopi-m4-rk3399_defconfig | 58 ++++++++++++++++++++ > 5 files changed, 138 insertions(+) > create mode 100644 arch/arm/dts/rk3399-nanopi-m4-u-boot.dtsi > create mode 100644 arch/arm/dts/rk3399-nanopi-m4.dts > create mode 100644 configs/nanopi-m4-rk3399_defconfig > > diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile > index 6d55b0caf8..d2ac26b556 100644 > --- a/arch/arm/dts/Makefile > +++ b/arch/arm/dts/Makefile > @@ -87,6 +87,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \ > rk3399-evb.dtb \ > rk3399-firefly.dtb \ > rk3399-gru-bob.dtb \ > + rk3399-nanopi-m4.dtb \ > rk3399-orangepi.dtb \ > rk3399-puma-ddr1333.dtb \ > rk3399-puma-ddr1600.dtb \ > diff --git a/arch/arm/dts/rk3399-nanopi-m4-u-boot.dtsi > b/arch/arm/dts/rk3399-nanopi-m4-u-boot.dtsi > new file mode 100644 > index 0000000000..1173d496ec > --- /dev/null > +++ b/arch/arm/dts/rk3399-nanopi-m4-u-boot.dtsi > @@ -0,0 +1,7 @@ > +// SPDX-License-Identifier: GPL-2.0+ > +/* > + * Copyright (C) 2019 Jagan Teki <ja...@amarulasolutions.com> > + */ > + > +#include "rk3399-u-boot.dtsi" > +#include "rk3399-sdram-lpddr3-4GB-1866.dtsi" > diff --git a/arch/arm/dts/rk3399-nanopi-m4.dts > b/arch/arm/dts/rk3399-nanopi-m4.dts > new file mode 100644 > index 0000000000..60358ab8c7 > --- /dev/null > +++ b/arch/arm/dts/rk3399-nanopi-m4.dts > @@ -0,0 +1,66 @@ > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > +/* > + * FriendlyElec NanoPi M4 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. > + */ > + > +/dts-v1/; > +#include "rk3399-nanopi4.dtsi" > + > +/ { > + model = "FriendlyElec NanoPi M4"; > + compatible = "friendlyarm,nanopi-m4", "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 07ee8ce92c..ae43805a6a 100644 > --- a/board/rockchip/evb_rk3399/MAINTAINERS > +++ b/board/rockchip/evb_rk3399/MAINTAINERS > @@ -6,6 +6,12 @@ F: include/configs/evb_rk3399.h > F: configs/evb-rk3399_defconfig > F: configs/firefly-rk3399_defconfig > > +NANOPI-M4 > +M: Jagan Teki <ja...@amarulasolutions.com> > +S: Maintained > +F: configs/nanopi-m4-rk3399_defconfig > +F: arch/arm/dts/rk3399-nanopi-m4-u-boot.dtsi > + > ORANGEPI-RK3399 > M: Jagan Teki <ja...@amarulasolutions.com> > S: Maintained > diff --git a/configs/nanopi-m4-rk3399_defconfig > b/configs/nanopi-m4-rk3399_defconfig > new file mode 100644 > index 0000000000..be36a28315 > --- /dev/null > +++ b/configs/nanopi-m4-rk3399_defconfig > @@ -0,0 +1,58 @@ > +CONFIG_ARM=y > +CONFIG_ARCH_ROCKCHIP=y > +CONFIG_SYS_TEXT_BASE=0x00200000 > +CONFIG_SPL_LIBCOMMON_SUPPORT=y > +CONFIG_SPL_LIBGENERIC_SUPPORT=y > +CONFIG_SYS_MALLOC_F_LEN=0x4000 > +CONFIG_ROCKCHIP_RK3399=y > +CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x4000 > +CONFIG_DEBUG_UART_BASE=0xFF1A0000 > +CONFIG_DEBUG_UART_CLOCK=24000000 > +CONFIG_SPL_STACK_R_ADDR=0x80000 > +CONFIG_DEBUG_UART=y > +CONFIG_NR_DRAM_BANKS=1 > +CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-nanopi-m4.dtb" > +# CONFIG_DISPLAY_CPUINFO is not set > +CONFIG_DISPLAY_BOARDINFO_LATE=y > +CONFIG_SPL_STACK_R=y > +CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x4000 > +CONFIG_CMD_BOOTZ=y > +CONFIG_CMD_GPT=y > +CONFIG_CMD_MMC=y > +CONFIG_CMD_SF=y > +CONFIG_CMD_USB=y > +# CONFIG_CMD_SETEXPR is not set > +CONFIG_CMD_TIME=y > +CONFIG_SPL_OF_CONTROL=y > +CONFIG_DEFAULT_DEVICE_TREE="rk3399-nanopi-m4" > +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_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_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_USE_TINY_PRINTF=y > +CONFIG_ERRNO_STR=y -- Paul Kocialkowski, Bootlin Embedded Linux and kernel engineering https://bootlin.com _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
