Add support for the FriendlyElec NanoPi K2 board

PATCH New Neil Armstrong 2 participants 6 messages Jun 25, 2018 – Jul 20, 2018

Subsystems (3)

Arm (32-bit) Arm sub-architectures Arm/Amlogic Meson SoC support

lore

Share & tools

lore

Neil Armstrong

author

2018-06-25 14:50 UTC #0 lore raw

cover Add support for the FriendlyElec NanoPi K2 board

This adds platform code for the FriendlyElec NanoPi K2 board based on a Meson GXBB (S905) SoC with the Meson GXBB configuration.

This initial submission only supports:
- UART
- MMC/SDCard
- Ethernet
- Reset Controller
- Clock controller

A sync with Linux 4.17 to get the device tree is also necessary.

Neil Armstrong (1):
ARM: dts: sync meson-gxbb-nanopi-k2 from Linux 4.17

Thomas McKahan (1):
boards: amlogic: Add FriendlyElec NanoPi K2 board support

 arch/arm/dts/Makefile                 |   2 +
 arch/arm/dts/meson-gxbb-nanopi-k2.dts | 323 ++++++++++++++++++++++++++++++++++
 arch/arm/mach-meson/Kconfig           |   8 +
 board/amlogic/nanopi-k2/Kconfig       |  12 ++
 board/amlogic/nanopi-k2/MAINTAINERS   |   6 +
 board/amlogic/nanopi-k2/Makefile      |   7 +
 board/amlogic/nanopi-k2/README        |  99 +++++++++++
 board/amlogic/nanopi-k2/nanopi-k2.c   |  61 +++++++
 configs/nanopi-k2_defconfig           |  40 +++++
 include/configs/nanopi-k2.h           |  18 ++
 10 files changed, 576 insertions(+)
 create mode 100644 arch/arm/dts/meson-gxbb-nanopi-k2.dts
 create mode 100644 board/amlogic/nanopi-k2/Kconfig
 create mode 100644 board/amlogic/nanopi-k2/MAINTAINERS
 create mode 100644 board/amlogic/nanopi-k2/Makefile
 create mode 100644 board/amlogic/nanopi-k2/README
 create mode 100644 board/amlogic/nanopi-k2/nanopi-k2.c
 create mode 100644 configs/nanopi-k2_defconfig
 create mode 100644 include/configs/nanopi-k2.h

Signature · 1 line

2.7.4

Neil Armstrong

author

2018-06-25 14:50 UTC #1 lore raw

PATCH 1/2 ARM: dts: sync meson-gxbb-nanopi-k2 from Linux 4.17

Get the meson-gxbb-nanopi-k2.dts file from Linux 4.17.

Signed-off-by Neil Armstrong <[email protected]>

---
 arch/arm/dts/Makefile                 |   1 +
 arch/arm/dts/meson-gxbb-nanopi-k2.dts | 323 ++++++++++++++++++++++++++++++++++
 2 files changed, 324 insertions(+)
 create mode 100644 arch/arm/dts/meson-gxbb-nanopi-k2.dts

arch/arm/dts/Makefile +1 -0

index 493652e..bcbaae2 100644
@@ -53,6 +53,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \
 	rk3399-puma-ddr1866.dtb \
 	rv1108-evb.dtb
 dtb-$(CONFIG_ARCH_MESON) += \
+	meson-gxbb-nanopi-k2.dtb \
 	meson-gxbb-odroidc2.dtb \
 	meson-gxl-s905x-p212.dtb \
 	meson-gxl-s905x-libretech-cc.dtb \

arch/arm/dts/meson-gxbb-nanopi-k2.dts new file +323 -0

323 lines not on this page · raw message

Signature · 1 line

2.7.4

Tom Rini

2018-07-20 12:35 UTC #2 lore raw

PATCH 1/2 ARM: dts: sync meson-gxbb-nanopi-k2 from Linux 4.17

Quoted 3 lines · Neil Armstrong

Get the meson-gxbb-nanopi-k2.dts file from Linux 4.17.
Signed-off-by Neil Armstrong <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-amlogic/attachments/20180720/5d0c1b1b/attachment.sig>

Neil Armstrong

author

2018-06-25 14:50 UTC #3 lore raw

PATCH 2/2 boards: amlogic: Add FriendlyElec NanoPi K2 board support

In reply to Neil Armstrong

From: Thomas McKahan <[email protected]>

This adds platform code for the FriendlyElec NanoPi K2 board based on a Meson GXBB (S905) SoC with the Meson GXBB configuration.

This initial submission only supports:
- UART
- MMC/SDCard
- Ethernet
- Reset Controller
- Clock controller

Cc Yuefei Tan <[email protected]>

Signed-off-by Thomas McKahan <[email protected]>

Signed-off-by Neil Armstrong <[email protected]>

---
 arch/arm/dts/Makefile               |  1 +
 arch/arm/mach-meson/Kconfig         |  8 +++
 board/amlogic/nanopi-k2/Kconfig     | 12 +++++
 board/amlogic/nanopi-k2/MAINTAINERS |  6 +++
 board/amlogic/nanopi-k2/Makefile    |  7 +++
 board/amlogic/nanopi-k2/README      | 99 +++++++++++++++++++++++++++++++++++++
 board/amlogic/nanopi-k2/nanopi-k2.c | 61 +++++++++++++++++++++++
 configs/nanopi-k2_defconfig         | 40 +++++++++++++++
 include/configs/nanopi-k2.h         | 18 +++++++
 9 files changed, 252 insertions(+)
 create mode 100644 board/amlogic/nanopi-k2/Kconfig
 create mode 100644 board/amlogic/nanopi-k2/MAINTAINERS
 create mode 100644 board/amlogic/nanopi-k2/Makefile
 create mode 100644 board/amlogic/nanopi-k2/README
 create mode 100644 board/amlogic/nanopi-k2/nanopi-k2.c
 create mode 100644 configs/nanopi-k2_defconfig
 create mode 100644 include/configs/nanopi-k2.h

arch/arm/dts/Makefile +1 -0

index bcbaae2..62fc442 100644
@@ -55,6 +55,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \
 dtb-$(CONFIG_ARCH_MESON) += \
 	meson-gxbb-nanopi-k2.dtb \
 	meson-gxbb-odroidc2.dtb \
+	meson-gxbb-nanopi-k2.dtb \
 	meson-gxl-s905x-p212.dtb \
 	meson-gxl-s905x-libretech-cc.dtb \
 	meson-gxl-s905x-khadas-vim.dtb

arch/arm/mach-meson/Kconfig +8 -0

index 9a06ccc..cc3383a 100644
@@ -29,6 +29,12 @@ config TARGET_ODROID_C2
 	  with 2 GiB of RAM, Gigabit Ethernet, HDMI, 4 USB, micro-SD
 	  slot, eMMC, IR receiver and a 40-pin GPIO header.
 
+config TARGET_NANOPI_K2
+	bool "NANOPI_K2"
+	help
+	  NANOPI_K2 is a single board computer based on Meson GXBaby
+	  with 2 GiB of RAM, Gigabit Ethernet,AP6212 Wifi, HDMI, 4 USB,
+	  micro-SD slot, eMMC, IR receiver and a 40-pin GPIO header.
 endif
 
 if MESON_GXL

@@ -64,6 +70,8 @@ config SYS_MALLOC_F_LEN
 
 source "board/amlogic/odroid-c2/Kconfig"
 
+source "board/amlogic/nanopi-k2/Kconfig"
+
 source "board/amlogic/p212/Kconfig"
 
 source "board/amlogic/libretech-cc/Kconfig"

board/amlogic/nanopi-k2/Kconfig new file +12 -0

new file mode 100644
index 0000000..374bda2
@@ -0,0 +1,12 @@
+if TARGET_NANOPI_K2
+
+config SYS_BOARD
+	default "nanopi-k2"
+
+config SYS_VENDOR
+	default "amlogic"
+
+config SYS_CONFIG_NAME
+	default "nanopi-k2"
+
+endif

board/amlogic/nanopi-k2/MAINTAINERS new file +6 -0

new file mode 100644
index 0000000..0452bd1
@@ -0,0 +1,6 @@
+NANOPI-K2
+M:	Neil Armstrong <[email protected]>
+S:	Maintained
+F:	board/amlogic/nanopi-k2/
+F:	include/configs/nanopi-k2.h
+F:	configs/nanopi-k2_defconfig

board/amlogic/nanopi-k2/Makefile new file +7 -0

new file mode 100644
index 0000000..7d9b666
@@ -0,0 +1,7 @@
+#
+# (C) Copyright 2018 Thomas McKahan
+#
+# SPDX-License-Identifier:	GPL-2.0+
+#
+
+obj-y	:= nanopi-k2.o

board/amlogic/nanopi-k2/README new file +99 -0

99 lines not on this page · raw message

board/amlogic/nanopi-k2/nanopi-k2.c new file +61 -0

61 lines not on this page · raw message

configs/nanopi-k2_defconfig new file +40 -0

new file mode 100644
index 0000000..8a0dbf0
@@ -0,0 +1,40 @@
+CONFIG_ARM=y
+CONFIG_ARCH_MESON=y
+CONFIG_SYS_TEXT_BASE=0x01000000
+CONFIG_MESON_GXBB=y
+CONFIG_TARGET_NANOPI_K2=y
+CONFIG_DEBUG_UART_BASE=0xc81004c0
+CONFIG_DEBUG_UART_CLOCK=24000000
+CONFIG_IDENT_STRING=" nanopi-k2"
+CONFIG_DEFAULT_DEVICE_TREE="meson-gxbb-nanopi-k2"
+CONFIG_DEBUG_UART=y
+CONFIG_OF_BOARD_SETUP=y
+# CONFIG_DISPLAY_CPUINFO is not set
+# CONFIG_DISPLAY_BOARDINFO is not set
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_IMI is not set
+CONFIG_CMD_GPIO=y
+CONFIG_CMD_I2C=y
+# CONFIG_CMD_LOADS is not set
+CONFIG_CMD_MMC=y
+# CONFIG_CMD_SETEXPR is not set
+CONFIG_CMD_REGULATOR=y
+CONFIG_OF_CONTROL=y
+CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_DM_GPIO=y
+CONFIG_DM_I2C=y
+CONFIG_SYS_I2C_MESON=y
+CONFIG_DM_REGULATOR=y
+CONFIG_DM_REGULATOR_FIXED=y
+CONFIG_DM_RESET=y
+CONFIG_DM_MMC=y
+CONFIG_MMC_MESON_GX=y
+CONFIG_DM_ETH=y
+CONFIG_ETH_DESIGNWARE=y
+CONFIG_PINCTRL=y
+CONFIG_PINCTRL_MESON_GXBB=y
+CONFIG_DEBUG_UART_MESON=y
+CONFIG_DEBUG_UART_ANNOUNCE=y
+CONFIG_DEBUG_UART_SKIP_INIT=y
+CONFIG_MESON_SERIAL=y
+CONFIG_OF_LIBFDT_OVERLAY=y

include/configs/nanopi-k2.h new file +18 -0

new file mode 100644
index 0000000..f7ecb7b
@@ -0,0 +1,18 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Configuration for NANOPI-K2
+ * (C) Copyright 2018 Thomas McKahan
+ */
+
+#ifndef __CONFIG_H
+#define __CONFIG_H
+
+#define CONFIG_MISC_INIT_R
+
+/* Serial setup */
+
+#define MESON_FDTFILE_SETTING "fdtfile=amlogic/meson-gxbb-nanopi-k2.dtb\0"
+
+#include <configs/meson-gx-common.h>
+
+#endif /* __CONFIG_H */

Signature · 1 line

2.7.4

Tom Rini

2018-07-20 12:35 UTC #4 lore raw

PATCH 2/2 boards: amlogic: Add FriendlyElec NanoPi K2 board support

Quoted 12 lines · Neil Armstrong

From: Thomas McKahan <[email protected]>
This adds platform code for the FriendlyElec NanoPi K2 board based on a Meson GXBB (S905) SoC with the Meson GXBB configuration.
This initial submission only supports:
- UART
- MMC/SDCard
- Ethernet
- Reset Controller
- Clock controller

Quoted 3 lines

Cc Yuefei Tan <[email protected]>
Signed-off-by Thomas McKahan <[email protected]>
Signed-off-by Neil Armstrong <[email protected]>

Applied to u-boot/master, thanks! But please note:
CHECK: Alignment should match open parenthesis #277: FILE: board/amlogic/nanopi-k2/nanopi-k2.c:48:
+ len = meson_sm_read_efuse(EFUSE_SN_OFFSET, serial,
+ EFUSE_SN_SIZE);

A follow-up when you're in these files next would be appreciated, thanks!

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-amlogic/attachments/20180720/2bb67800/attachment.sig>

Neil Armstrong

author

2018-07-20 12:59 UTC #5 lore raw

PATCH 2/2 boards: amlogic: Add FriendlyElec NanoPi K2 board support

Hi Tom,

Quoted 24 lines · Tom Rini

Quoted 12 lines · Neil Armstrong
From: Thomas McKahan <[email protected]>
This adds platform code for the FriendlyElec NanoPi K2 board based on a Meson GXBB (S905) SoC with the Meson GXBB configuration.
This initial submission only supports:
- UART
- MMC/SDCard
- Ethernet
- Reset Controller
- Clock controller
Quoted 3 lines
Cc Yuefei Tan <[email protected]>
Signed-off-by Thomas McKahan <[email protected]>
Signed-off-by Neil Armstrong <[email protected]>
Applied to u-boot/master, thanks! But please note:
CHECK: Alignment should match open parenthesis #277: FILE: board/amlogic/nanopi-k2/nanopi-k2.c:48:
board/amlogic/nanopi-k2/nanopi-k2.c new file +2 -0
+               len = meson_sm_read_efuse(EFUSE_SN_OFFSET, serial,
+                       EFUSE_SN_SIZE);

Quoted 3 lines

A follow-up when you're in these files next would be appreciated, thanks!

Ok, I need to do a cleanup of all these boards anyway, will fix this in the same time.

thanks,
Neil

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL: <http://lists.infradead.org/pipermail/linux-amlogic/attachments/20180720/0bb6223c/attachment.sig>