v6->v7:
1.Merge [05/12],[07/12],[09/12],[11/12] in v6 to [5/6] in v7.
2.Merge [06/12],[08/12],[10/12],[12/12] in v6 to [5/6] in v7.
3.Change my Signed-off-by from "Zhou Yanjie [off-list ref]"
to "周琰杰 (Zhou Yanjie) [off-list ref]" because
the old mailbox is in an unstable state.
Support the Ingenic X1000 SoC using the code under arch/mips/jz4740.
This is left unselectable in Kconfig until a X1000 based board is
added in a later commit.
Signed-off-by: 周琰杰 (Zhou Yanjie) <redacted>
---
Notes:
v1->v2:
Rebase on top of mips-next, use ingenic-timer driver
for system timer and clocksource.
v2->v3:
Drop the 'apb' node.
v3->v4:
Adjust the node order to make it consistent with
other Ingenic boards.
v4->v5:
No change.
v5->v6:
No change.
v6->v7:
Change my Signed-off-by from "Zhou Yanjie [off-list ref]"
to "周琰杰 (Zhou Yanjie) [off-list ref]" because
the old mailbox is in an unstable state.
arch/mips/boot/dts/ingenic/x1000.dtsi | 176 ++++++++++++++++++++++++++++++++++
arch/mips/jz4740/Kconfig | 6 ++
2 files changed, 182 insertions(+)
create mode 100644 arch/mips/boot/dts/ingenic/x1000.dtsi
Add Ingenic XBurst based boards, prepare for later dts.
Signed-off-by: 周琰杰 (Zhou Yanjie) <redacted>
---
Notes:
v1->v2:
No change.
v2->v3:
No change.
v3->v4:
Adjust the description to make it more reasonable.
v4->v5:
Adjust item naming to prevent conflicts with
subsequent "CU Geo" boards.
v5->v6:
No change.
v6->v7:
Change my Signed-off-by from "Zhou Yanjie [off-list ref]"
to "周琰杰 (Zhou Yanjie) [off-list ref]" because
the old mailbox is in an unstable state.
.../devicetree/bindings/mips/ingenic/devices.yaml | 35 ++++++++++++++++++++++
1 file changed, 35 insertions(+)
create mode 100644 Documentation/devicetree/bindings/mips/ingenic/devices.yaml
@@ -0,0 +1,35 @@+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)+%YAML1.2+---+$id:http://devicetree.org/schemas/mips/ingenic/devices.yaml#+$schema:http://devicetree.org/meta-schemas/core.yaml#++title:Ingenic XBurst based Platforms Device Tree Bindings++maintainers:+-周琰杰 (Zhou Yanjie) <zhouyanjie@wanyeetech.com>+description:|+Devices with a Ingenic XBurst CPU shall have the following properties.++properties:+$nodename:+const:'/'+compatible:+oneOf:++-description:Qi Hardware Ben NanoNote+items:+-const:qi,lb60++-description:Game Consoles Worldwide GCW Zero+items:+-const:gcw,zero++-description:MIPS Creator CI20+items:+-const:img,ci20++-description:YSH & ATIL General Board CU Neo+items:+-const:yna,cu1000-neo+...
@@ -35,11 +33,17 @@ CONFIG_HZ_100=y # CONFIG_COMPACTION is not set CONFIG_CMA=y CONFIG_CMA_AREAS=7+CONFIG_NET=y+CONFIG_UNIX=y+CONFIG_INET=y CONFIG_UEVENT_HELPER=y CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_DEVTMPFS=y # CONFIG_FW_LOADER is not set # CONFIG_ALLOW_DEV_COREDUMP is not set+CONFIG_NETDEVICES=y+CONFIG_STMMAC_ETH=y+CONFIG_SMSC_PHY=y # CONFIG_INPUT_MOUSEDEV is not set # CONFIG_INPUT_KEYBOARD is not set # CONFIG_INPUT_MOUSE is not set
@@ -55,17 +59,26 @@ CONFIG_SERIAL_8250_INGENIC=y CONFIG_SERIAL_OF_PLATFORM=y # CONFIG_HW_RANDOM is not set CONFIG_GPIO_SYSFS=y+CONFIG_WATCHDOG=y+CONFIG_JZ4740_WDT=y # CONFIG_HWMON is not set # CONFIG_LCD_CLASS_DEVICE is not set # CONFIG_BACKLIGHT_CLASS_DEVICE is not set # CONFIG_VGA_CONSOLE is not set # CONFIG_HID is not set # CONFIG_USB_SUPPORT is not set+CONFIG_MMC=y+CONFIG_MMC_JZ4740=y+CONFIG_RTC_CLASS=y+CONFIG_RTC_DRV_JZ4740=y+CONFIG_DMADEVICES=y+CONFIG_DMA_JZ4780=y # CONFIG_IOMMU_SUPPORT is not set CONFIG_NVMEM=y CONFIG_NVMEM_SYSFS=y CONFIG_EXT4_FS=y # CONFIG_DNOTIFY is not set+CONFIG_AUTOFS_FS=y CONFIG_PROC_KCORE=y # CONFIG_PROC_PAGE_MONITOR is not set CONFIG_TMPFS=y
The "yna" is an acronym of the "YSH & ATIL".
Signed-off-by: 周琰杰 (Zhou Yanjie) <redacted>
---
Notes:
v1->v2:
No change.
v2->v3:
No change.
v3->v4:
No change.
v4->v5:
No change.
v5->v6:
No change.
v6->v7:
Change my Signed-off-by from "Zhou Yanjie [off-list ref]"
to "周琰杰 (Zhou Yanjie) [off-list ref]" because
the old mailbox is in an unstable state.
Documentation/devicetree/bindings/vendor-prefixes.yaml | 2 ++
1 file changed, 2 insertions(+)
Add a device tree for the Ingenic X1000 based YSH & ATIL CU Neo board.
Note that this is unselectable via Kconfig until the X1000 SoC is made
selectable in a later commit.
Signed-off-by: 周琰杰 (Zhou Yanjie) <redacted>
---
Notes:
v1->v2:
Rebase on top of mips-next, use TCU for system timer and clocksource.
v2->v3:
No change.
v3->v4:
1.Adjust "model" in "cu1000.dts" to match the description in "devices.yaml".
2.Adjust "bool" in "Kconfig" to avoid duplicate names with subsequent boards.
v4->v5:
1.Rename "cu1000" to "cu1000-neo" to prevent conflicts with subsequent boards
such as "cu1000-geo", and so on.
2.Remove "CONFIG_HZ=100" and "mem=32M@0x0" from defconfg.
3.Modify incorrect comments in DT.
v5->v6:
1.Use "stdout-path = "serial2:115200n8"" instead "stdout-path = &uart2" in DT.
2.Remove "console=ttyS2,115200n8" and "CONFIG_CMDLINE_OVERRIDE=y" from defconfg.
v6->v7:
Change my Signed-off-by from "Zhou Yanjie [off-list ref]"
to "周琰杰 (Zhou Yanjie) [off-list ref]" because
the old mailbox is in an unstable state.
arch/mips/boot/dts/ingenic/Makefile | 1 +
arch/mips/boot/dts/ingenic/cu1000-neo.dts | 52 ++++++++++++++++
arch/mips/configs/cu1000-neo_defconfig | 98 +++++++++++++++++++++++++++++++
arch/mips/jz4740/Kconfig | 4 ++
4 files changed, 155 insertions(+)
create mode 100644 arch/mips/boot/dts/ingenic/cu1000-neo.dts
create mode 100644 arch/mips/configs/cu1000-neo_defconfig
@@ -0,0 +1,52 @@+// SPDX-License-Identifier: GPL-2.0+/dts-v1/;++#include"x1000.dtsi"+#include<dt-bindings/gpio/gpio.h>+#include<dt-bindings/clock/ingenic,tcu.h>++/{+compatible="yna,cu1000-neo","ingenic,x1000";+model="YSH & ATIL General Board CU Neo";++aliases{+serial2=&uart2;+};++chosen{+stdout-path="serial2:115200n8";+};++memory{+device_type="memory";+reg=<0x00x04000000>;+};+};++&exclk{+clock-frequency=<24000000>;+};++&tcu{+/* 1500 kHz for the system timer and clocksource */+assigned-clocks=<&tcuTCU_CLK_TIMER0>,<&tcuTCU_CLK_TIMER2>;+assigned-clock-rates=<1500000>,<1500000>;++/* Use channel #0 for the system timer channel #2 for the clocksource */+ingenic,pwm-channels-mask=<0xfa>;+};++&uart2{+pinctrl-names="default";+pinctrl-0=<&pins_uart2>;++status="okay";+};++&pinctrl{+pins_uart2:uart2{+function="uart2";+groups="uart2-data-d";+bias-disable;+};+};
@@ -0,0 +1,98 @@+CONFIG_LOCALVERSION_AUTO=y+CONFIG_KERNEL_GZIP=y+CONFIG_SYSVIPC=y+CONFIG_NO_HZ_IDLE=y+CONFIG_HIGH_RES_TIMERS=y+CONFIG_PREEMPT=y+CONFIG_IKCONFIG=y+CONFIG_IKCONFIG_PROC=y+CONFIG_LOG_BUF_SHIFT=14+CONFIG_CGROUPS=y+CONFIG_MEMCG=y+CONFIG_MEMCG_KMEM=y+CONFIG_CGROUP_SCHED=y+CONFIG_CGROUP_FREEZER=y+CONFIG_CGROUP_DEVICE=y+CONFIG_CGROUP_CPUACCT=y+CONFIG_NAMESPACES=y+CONFIG_USER_NS=y+CONFIG_BLK_DEV_INITRD=y+CONFIG_INITRAMFS_SOURCE="arch/mips/boot/ramdisk.cpio.gz"+CONFIG_CC_OPTIMIZE_FOR_SIZE=y+CONFIG_SYSCTL_SYSCALL=y+CONFIG_KALLSYMS_ALL=y+CONFIG_EMBEDDED=y+# CONFIG_VM_EVENT_COUNTERS is not set+# CONFIG_COMPAT_BRK is not set+CONFIG_SLAB=y+CONFIG_MACH_INGENIC=y+CONFIG_X1000_CU1000_NEO=y+CONFIG_HIGHMEM=y+CONFIG_HZ_100=y+# CONFIG_SECCOMP is not set+# CONFIG_SUSPEND is not set+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set+# CONFIG_COMPACTION is not set+CONFIG_CMA=y+CONFIG_CMA_AREAS=7+CONFIG_UEVENT_HELPER=y+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"+CONFIG_DEVTMPFS=y+# CONFIG_FW_LOADER is not set+# CONFIG_ALLOW_DEV_COREDUMP is not set+# CONFIG_INPUT_MOUSEDEV is not set+# CONFIG_INPUT_KEYBOARD is not set+# CONFIG_INPUT_MOUSE is not set+# CONFIG_SERIO is not set+CONFIG_VT_HW_CONSOLE_BINDING=y+CONFIG_LEGACY_PTY_COUNT=2+CONFIG_SERIAL_EARLYCON=y+CONFIG_SERIAL_8250=y+CONFIG_SERIAL_8250_CONSOLE=y+CONFIG_SERIAL_8250_NR_UARTS=3+CONFIG_SERIAL_8250_RUNTIME_UARTS=3+CONFIG_SERIAL_8250_INGENIC=y+CONFIG_SERIAL_OF_PLATFORM=y+# CONFIG_HW_RANDOM is not set+CONFIG_GPIO_SYSFS=y+# CONFIG_HWMON is not set+# CONFIG_LCD_CLASS_DEVICE is not set+# CONFIG_BACKLIGHT_CLASS_DEVICE is not set+# CONFIG_VGA_CONSOLE is not set+# CONFIG_HID is not set+# CONFIG_USB_SUPPORT is not set+# CONFIG_IOMMU_SUPPORT is not set+CONFIG_NVMEM=y+CONFIG_NVMEM_SYSFS=y+CONFIG_EXT4_FS=y+# CONFIG_DNOTIFY is not set+CONFIG_PROC_KCORE=y+# CONFIG_PROC_PAGE_MONITOR is not set+CONFIG_TMPFS=y+CONFIG_CONFIGFS_FS=y+CONFIG_NLS=y+CONFIG_NLS_CODEPAGE_936=y+CONFIG_NLS_CODEPAGE_950=y+CONFIG_NLS_ASCII=y+CONFIG_NLS_ISO8859_1=y+CONFIG_NLS_UTF8=y+CONFIG_CRYPTO_ECHAINIV=y+CONFIG_CRYPTO_AES=y+CONFIG_CRYPTO_DEFLATE=y+CONFIG_CRYPTO_LZO=y+CONFIG_PRINTK_TIME=y+CONFIG_CONSOLE_LOGLEVEL_DEFAULT=15+CONFIG_CONSOLE_LOGLEVEL_QUIET=15+CONFIG_MESSAGE_LOGLEVEL_DEFAULT=7+CONFIG_DEBUG_INFO=y+CONFIG_STRIP_ASM_SYMS=y+CONFIG_DEBUG_FS=y+CONFIG_MAGIC_SYSRQ=y+CONFIG_PANIC_ON_OOPS=y+CONFIG_PANIC_TIMEOUT=10+# CONFIG_SCHED_DEBUG is not set+# CONFIG_DEBUG_PREEMPT is not set+CONFIG_STACKTRACE=y+# CONFIG_FTRACE is not set+CONFIG_CMDLINE_BOOL=y+CONFIG_CMDLINE="earlycon clk_ignore_unused"
From: Paul Cercueil <paul@crapouillou.net> Date: 2019-12-09 15:07:43
Hi Zhou,
You modify here in patch [06/06] two files that were introduced in [04/06]. Just merge the two patches into one then, and make it last in the patchset.
-Paul
Le lun., déc. 9, 2019 at 21:00, 周琰杰 (Zhou Yanjie) [off-list ref] a écrit :
quoted hunk
Add the CU1000 Neo devicetree and defconfig with PDMA, MMC, RTC, WDT
and NET enabled.
Signed-off-by: 周琰杰 (Zhou Yanjie) <redacted>
---
Notes:
v7:
New patch, merge[06/12],[08/12],[10/12],[12/12] in v6.
arch/mips/boot/dts/ingenic/cu1000-neo.dts | 47 +++++++++++++++++++++++++++++++
arch/mips/configs/cu1000-neo_defconfig | 17 +++++++++--
2 files changed, 62 insertions(+), 2 deletions(-)
@@ -35,11 +33,17 @@ CONFIG_HZ_100=y # CONFIG_COMPACTION is not set CONFIG_CMA=y CONFIG_CMA_AREAS=7+CONFIG_NET=y+CONFIG_UNIX=y+CONFIG_INET=y CONFIG_UEVENT_HELPER=y CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_DEVTMPFS=y # CONFIG_FW_LOADER is not set # CONFIG_ALLOW_DEV_COREDUMP is not set+CONFIG_NETDEVICES=y+CONFIG_STMMAC_ETH=y+CONFIG_SMSC_PHY=y # CONFIG_INPUT_MOUSEDEV is not set # CONFIG_INPUT_KEYBOARD is not set # CONFIG_INPUT_MOUSE is not set
@@ -55,17 +59,26 @@ CONFIG_SERIAL_8250_INGENIC=y CONFIG_SERIAL_OF_PLATFORM=y # CONFIG_HW_RANDOM is not set CONFIG_GPIO_SYSFS=y+CONFIG_WATCHDOG=y+CONFIG_JZ4740_WDT=y # CONFIG_HWMON is not set # CONFIG_LCD_CLASS_DEVICE is not set # CONFIG_BACKLIGHT_CLASS_DEVICE is not set # CONFIG_VGA_CONSOLE is not set # CONFIG_HID is not set # CONFIG_USB_SUPPORT is not set+CONFIG_MMC=y+CONFIG_MMC_JZ4740=y+CONFIG_RTC_CLASS=y+CONFIG_RTC_DRV_JZ4740=y+CONFIG_DMADEVICES=y+CONFIG_DMA_JZ4780=y # CONFIG_IOMMU_SUPPORT is not set CONFIG_NVMEM=y CONFIG_NVMEM_SYSFS=y CONFIG_EXT4_FS=y # CONFIG_DNOTIFY is not set+CONFIG_AUTOFS_FS=y CONFIG_PROC_KCORE=y # CONFIG_PROC_PAGE_MONITOR is not set CONFIG_TMPFS=y--
Hi Paul,
On 2019年12月09日 23:07, Paul Cercueil wrote:
Hi Zhou,
You modify here in patch [06/06] two files that were introduced in [04/06]. Just merge the two patches into one then, and make it last in the patchset.
Sure, I will merge the two patches in v8.
Thanks and best regards!
-Paul
Le lun., déc. 9, 2019 at 21:00, 周琰杰 (Zhou Yanjie) [off-list ref] a écrit :
quoted
Add the CU1000 Neo devicetree and defconfig with PDMA, MMC, RTC, WDT
and NET enabled.
Signed-off-by: 周琰杰 (Zhou Yanjie) <redacted>
---
Notes:
v7:
New patch, merge[06/12],[08/12],[10/12],[12/12] in v6.
arch/mips/boot/dts/ingenic/cu1000-neo.dts | 47 +++++++++++++++++++++++++++++++
arch/mips/configs/cu1000-neo_defconfig | 17 +++++++++--
2 files changed, 62 insertions(+), 2 deletions(-)
@@ -35,11 +33,17 @@ CONFIG_HZ_100=y # CONFIG_COMPACTION is not set CONFIG_CMA=y CONFIG_CMA_AREAS=7+CONFIG_NET=y+CONFIG_UNIX=y+CONFIG_INET=y CONFIG_UEVENT_HELPER=y CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_DEVTMPFS=y # CONFIG_FW_LOADER is not set # CONFIG_ALLOW_DEV_COREDUMP is not set+CONFIG_NETDEVICES=y+CONFIG_STMMAC_ETH=y+CONFIG_SMSC_PHY=y # CONFIG_INPUT_MOUSEDEV is not set # CONFIG_INPUT_KEYBOARD is not set # CONFIG_INPUT_MOUSE is not set
@@ -55,17 +59,26 @@ CONFIG_SERIAL_8250_INGENIC=y CONFIG_SERIAL_OF_PLATFORM=y # CONFIG_HW_RANDOM is not set CONFIG_GPIO_SYSFS=y+CONFIG_WATCHDOG=y+CONFIG_JZ4740_WDT=y # CONFIG_HWMON is not set # CONFIG_LCD_CLASS_DEVICE is not set # CONFIG_BACKLIGHT_CLASS_DEVICE is not set # CONFIG_VGA_CONSOLE is not set # CONFIG_HID is not set # CONFIG_USB_SUPPORT is not set+CONFIG_MMC=y+CONFIG_MMC_JZ4740=y+CONFIG_RTC_CLASS=y+CONFIG_RTC_DRV_JZ4740=y+CONFIG_DMADEVICES=y+CONFIG_DMA_JZ4780=y # CONFIG_IOMMU_SUPPORT is not set CONFIG_NVMEM=y CONFIG_NVMEM_SYSFS=y CONFIG_EXT4_FS=y # CONFIG_DNOTIFY is not set+CONFIG_AUTOFS_FS=y CONFIG_PROC_KCORE=y # CONFIG_PROC_PAGE_MONITOR is not set CONFIG_TMPFS=y