* Add initial support for Ingenic X1000 SoC and Y&A CU Neo board v7.
@ 2019-12-09 13:00 周琰杰 (Zhou Yanjie)
2019-12-09 13:00 ` [PATCH v7 1/6] MIPS: Ingenic: Initial X1000 support 周琰杰 (Zhou Yanjie)
` (5 more replies)
0 siblings, 6 replies; 11+ messages in thread
From: 周琰杰 (Zhou Yanjie) @ 2019-12-09 13:00 UTC (permalink / raw)
To: linux-mips
Cc: linux-kernel, devicetree, robh+dt, paul.burton, paulburton,
jhogan, mripard, shawnguo, mark.rutland, ebiederm, ralf, heiko,
icenowy, laurent.pinchart, krzk, geert+renesas, paul,
prasannatsmkumar, sernia.zhou, zhenwenjin, 772753199
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 <zhouyanjie@zoho.com>"
to "周琰杰 (Zhou Yanjie) <zhouyanjie@wanyeetech.com>" because
the old mailbox is in an unstable state.
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH v7 1/6] MIPS: Ingenic: Initial X1000 support.
2019-12-09 13:00 Add initial support for Ingenic X1000 SoC and Y&A CU Neo board v7 周琰杰 (Zhou Yanjie)
@ 2019-12-09 13:00 ` 周琰杰 (Zhou Yanjie)
2019-12-09 13:00 ` [PATCH v7 2/6] dt-bindings: Document yna vendor-prefix 周琰杰 (Zhou Yanjie)
` (4 subsequent siblings)
5 siblings, 0 replies; 11+ messages in thread
From: 周琰杰 (Zhou Yanjie) @ 2019-12-09 13:00 UTC (permalink / raw)
To: linux-mips
Cc: linux-kernel, devicetree, robh+dt, paul.burton, paulburton,
jhogan, mripard, shawnguo, mark.rutland, ebiederm, ralf, heiko,
icenowy, laurent.pinchart, krzk, geert+renesas, paul,
prasannatsmkumar, sernia.zhou, zhenwenjin, 772753199
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) <zhouyanjie@wanyeetech.com>
---
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 <zhouyanjie@zoho.com>"
to "周琰杰 (Zhou Yanjie) <zhouyanjie@wanyeetech.com>" 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
diff --git a/arch/mips/boot/dts/ingenic/x1000.dtsi b/arch/mips/boot/dts/ingenic/x1000.dtsi
new file mode 100644
index 00000000..13a6c9ff
--- /dev/null
+++ b/arch/mips/boot/dts/ingenic/x1000.dtsi
@@ -0,0 +1,176 @@
+// SPDX-License-Identifier: GPL-2.0
+#include <dt-bindings/clock/x1000-cgu.h>
+
+/ {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ compatible = "ingenic,x1000", "ingenic,x1000e";
+
+ cpuintc: interrupt-controller {
+ #address-cells = <0>;
+ #interrupt-cells = <1>;
+ interrupt-controller;
+ compatible = "mti,cpu-interrupt-controller";
+ };
+
+ intc: interrupt-controller@10001000 {
+ compatible = "ingenic,x1000-intc", "ingenic,jz4780-intc";
+ reg = <0x10001000 0x50>;
+
+ interrupt-controller;
+ #interrupt-cells = <1>;
+
+ interrupt-parent = <&cpuintc>;
+ interrupts = <2>;
+ };
+
+ exclk: ext {
+ compatible = "fixed-clock";
+ #clock-cells = <0>;
+ };
+
+ rtclk: rtc {
+ compatible = "fixed-clock";
+ #clock-cells = <0>;
+ clock-frequency = <32768>;
+ };
+
+ cgu: x1000-cgu@10000000 {
+ compatible = "ingenic,x1000-cgu";
+ reg = <0x10000000 0x100>;
+
+ #clock-cells = <1>;
+
+ clocks = <&exclk>, <&rtclk>;
+ clock-names = "ext", "rtc";
+ };
+
+ tcu: timer@10002000 {
+ compatible = "ingenic,x1000-tcu",
+ "ingenic,jz4770-tcu",
+ "simple-mfd";
+ reg = <0x10002000 0x1000>;
+ #address-cells = <1>;
+ #size-cells = <1>;
+ ranges = <0x0 0x10002000 0x1000>;
+
+ #clock-cells = <1>;
+
+ clocks = <&cgu X1000_CLK_RTCLK
+ &cgu X1000_CLK_EXCLK
+ &cgu X1000_CLK_PCLK>;
+ clock-names = "rtc", "ext", "pclk";
+
+ interrupt-controller;
+ #interrupt-cells = <1>;
+
+ interrupt-parent = <&intc>;
+ interrupts = <27 26 25>;
+ };
+
+ pinctrl: pin-controller@10010000 {
+ compatible = "ingenic,x1000-pinctrl";
+ reg = <0x10010000 0x800>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ gpa: gpio@0 {
+ compatible = "ingenic,x1000-gpio";
+ reg = <0>;
+
+ gpio-controller;
+ gpio-ranges = <&pinctrl 0 0 32>;
+ #gpio-cells = <2>;
+
+ interrupt-controller;
+ #interrupt-cells = <2>;
+
+ interrupt-parent = <&intc>;
+ interrupts = <17>;
+ };
+
+ gpb: gpio@1 {
+ compatible = "ingenic,x1000-gpio";
+ reg = <1>;
+
+ gpio-controller;
+ gpio-ranges = <&pinctrl 0 32 32>;
+ #gpio-cells = <2>;
+
+ interrupt-controller;
+ #interrupt-cells = <2>;
+
+ interrupt-parent = <&intc>;
+ interrupts = <16>;
+ };
+
+ gpc: gpio@2 {
+ compatible = "ingenic,x1000-gpio";
+ reg = <2>;
+
+ gpio-controller;
+ gpio-ranges = <&pinctrl 0 64 32>;
+ #gpio-cells = <2>;
+
+ interrupt-controller;
+ #interrupt-cells = <2>;
+
+ interrupt-parent = <&intc>;
+ interrupts = <15>;
+ };
+
+ gpd: gpio@3 {
+ compatible = "ingenic,x1000-gpio";
+ reg = <3>;
+
+ gpio-controller;
+ gpio-ranges = <&pinctrl 0 96 32>;
+ #gpio-cells = <2>;
+
+ interrupt-controller;
+ #interrupt-cells = <2>;
+
+ interrupt-parent = <&intc>;
+ interrupts = <14>;
+ };
+ };
+
+ uart0: serial@10030000 {
+ compatible = "ingenic,x1000-uart";
+ reg = <0x10030000 0x100>;
+
+ interrupt-parent = <&intc>;
+ interrupts = <51>;
+
+ clocks = <&exclk>, <&cgu X1000_CLK_UART0>;
+ clock-names = "baud", "module";
+
+ status = "disabled";
+ };
+
+ uart1: serial@10031000 {
+ compatible = "ingenic,x1000-uart";
+ reg = <0x10031000 0x100>;
+
+ interrupt-parent = <&intc>;
+ interrupts = <50>;
+
+ clocks = <&exclk>, <&cgu X1000_CLK_UART1>;
+ clock-names = "baud", "module";
+
+ status = "disabled";
+ };
+
+ uart2: serial@10032000 {
+ compatible = "ingenic,x1000-uart";
+ reg = <0x10032000 0x100>;
+
+ interrupt-parent = <&intc>;
+ interrupts = <49>;
+
+ clocks = <&exclk>, <&cgu X1000_CLK_UART2>;
+ clock-names = "baud", "module";
+
+ status = "disabled";
+ };
+};
diff --git a/arch/mips/jz4740/Kconfig b/arch/mips/jz4740/Kconfig
index 4dd0c44..6b96844 100644
--- a/arch/mips/jz4740/Kconfig
+++ b/arch/mips/jz4740/Kconfig
@@ -33,3 +33,9 @@ config MACH_JZ4780
select MIPS_CPU_SCACHE
select SYS_HAS_CPU_MIPS32_R2
select SYS_SUPPORTS_HIGHMEM
+
+config MACH_X1000
+ bool
+ select MIPS_CPU_SCACHE
+ select SYS_HAS_CPU_MIPS32_R2
+ select SYS_SUPPORTS_HIGHMEM
--
2.7.4
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v7 2/6] dt-bindings: Document yna vendor-prefix.
2019-12-09 13:00 Add initial support for Ingenic X1000 SoC and Y&A CU Neo board v7 周琰杰 (Zhou Yanjie)
2019-12-09 13:00 ` [PATCH v7 1/6] MIPS: Ingenic: Initial X1000 support 周琰杰 (Zhou Yanjie)
@ 2019-12-09 13:00 ` 周琰杰 (Zhou Yanjie)
2019-12-09 13:00 ` [PATCH v7 3/6] dt-bindings: MIPS: Add Ingenic XBurst based boards 周琰杰 (Zhou Yanjie)
` (3 subsequent siblings)
5 siblings, 0 replies; 11+ messages in thread
From: 周琰杰 (Zhou Yanjie) @ 2019-12-09 13:00 UTC (permalink / raw)
To: linux-mips
Cc: linux-kernel, devicetree, robh+dt, paul.burton, paulburton,
jhogan, mripard, shawnguo, mark.rutland, ebiederm, ralf, heiko,
icenowy, laurent.pinchart, krzk, geert+renesas, paul,
prasannatsmkumar, sernia.zhou, zhenwenjin, 772753199
The "yna" is an acronym of the "YSH & ATIL".
Signed-off-by: 周琰杰 (Zhou Yanjie) <zhouyanjie@wanyeetech.com>
---
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 <zhouyanjie@zoho.com>"
to "周琰杰 (Zhou Yanjie) <zhouyanjie@wanyeetech.com>" because
the old mailbox is in an unstable state.
Documentation/devicetree/bindings/vendor-prefixes.yaml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentation/devicetree/bindings/vendor-prefixes.yaml
index 967e78c..47ddd88 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
+++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
@@ -1054,6 +1054,8 @@ patternProperties:
description: Xilinx
"^xunlong,.*":
description: Shenzhen Xunlong Software CO.,Limited
+ "^yna,.*":
+ description: YSH & ATIL
"^yones-toptech,.*":
description: Yones Toptech Co., Ltd.
"^ysoft,.*":
--
2.7.4
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v7 3/6] dt-bindings: MIPS: Add Ingenic XBurst based boards.
2019-12-09 13:00 Add initial support for Ingenic X1000 SoC and Y&A CU Neo board v7 周琰杰 (Zhou Yanjie)
2019-12-09 13:00 ` [PATCH v7 1/6] MIPS: Ingenic: Initial X1000 support 周琰杰 (Zhou Yanjie)
2019-12-09 13:00 ` [PATCH v7 2/6] dt-bindings: Document yna vendor-prefix 周琰杰 (Zhou Yanjie)
@ 2019-12-09 13:00 ` 周琰杰 (Zhou Yanjie)
2019-12-09 13:00 ` [PATCH v7 4/6] MIPS: Ingenic: Initial YSH & ATIL CU Neo board support 周琰杰 (Zhou Yanjie)
` (2 subsequent siblings)
5 siblings, 0 replies; 11+ messages in thread
From: 周琰杰 (Zhou Yanjie) @ 2019-12-09 13:00 UTC (permalink / raw)
To: linux-mips
Cc: linux-kernel, devicetree, robh+dt, paul.burton, paulburton,
jhogan, mripard, shawnguo, mark.rutland, ebiederm, ralf, heiko,
icenowy, laurent.pinchart, krzk, geert+renesas, paul,
prasannatsmkumar, sernia.zhou, zhenwenjin, 772753199
Add Ingenic XBurst based boards, prepare for later dts.
Signed-off-by: 周琰杰 (Zhou Yanjie) <zhouyanjie@wanyeetech.com>
---
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 <zhouyanjie@zoho.com>"
to "周琰杰 (Zhou Yanjie) <zhouyanjie@wanyeetech.com>" 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
diff --git a/Documentation/devicetree/bindings/mips/ingenic/devices.yaml b/Documentation/devicetree/bindings/mips/ingenic/devices.yaml
new file mode 100644
index 00000000..78dcf6e
--- /dev/null
+++ b/Documentation/devicetree/bindings/mips/ingenic/devices.yaml
@@ -0,0 +1,35 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.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
+...
--
2.7.4
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v7 4/6] MIPS: Ingenic: Initial YSH & ATIL CU Neo board support.
2019-12-09 13:00 Add initial support for Ingenic X1000 SoC and Y&A CU Neo board v7 周琰杰 (Zhou Yanjie)
` (2 preceding siblings ...)
2019-12-09 13:00 ` [PATCH v7 3/6] dt-bindings: MIPS: Add Ingenic XBurst based boards 周琰杰 (Zhou Yanjie)
@ 2019-12-09 13:00 ` 周琰杰 (Zhou Yanjie)
2019-12-09 13:00 ` [PATCH v7 5/6] MIPS: X1000: Add missing X1000 nodes 周琰杰 (Zhou Yanjie)
2019-12-09 13:00 ` [PATCH v7 6/6] MIPS: CU1000: Add devicetree & config with PDMA/MSC/RTC/WDT/NET enabled 周琰杰 (Zhou Yanjie)
5 siblings, 0 replies; 11+ messages in thread
From: 周琰杰 (Zhou Yanjie) @ 2019-12-09 13:00 UTC (permalink / raw)
To: linux-mips
Cc: linux-kernel, devicetree, robh+dt, paul.burton, paulburton,
jhogan, mripard, shawnguo, mark.rutland, ebiederm, ralf, heiko,
icenowy, laurent.pinchart, krzk, geert+renesas, paul,
prasannatsmkumar, sernia.zhou, zhenwenjin, 772753199
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) <zhouyanjie@wanyeetech.com>
---
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 <zhouyanjie@zoho.com>"
to "周琰杰 (Zhou Yanjie) <zhouyanjie@wanyeetech.com>" 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
diff --git a/arch/mips/boot/dts/ingenic/Makefile b/arch/mips/boot/dts/ingenic/Makefile
index 9cc4844..e165429 100644
--- a/arch/mips/boot/dts/ingenic/Makefile
+++ b/arch/mips/boot/dts/ingenic/Makefile
@@ -2,5 +2,6 @@
dtb-$(CONFIG_JZ4740_QI_LB60) += qi_lb60.dtb
dtb-$(CONFIG_JZ4770_GCW0) += gcw0.dtb
dtb-$(CONFIG_JZ4780_CI20) += ci20.dtb
+dtb-$(CONFIG_X1000_CU1000_NEO) += cu1000-neo.dtb
obj-$(CONFIG_BUILTIN_DTB) += $(addsuffix .o, $(dtb-y))
diff --git a/arch/mips/boot/dts/ingenic/cu1000-neo.dts b/arch/mips/boot/dts/ingenic/cu1000-neo.dts
new file mode 100644
index 00000000..6f1a7e9
--- /dev/null
+++ b/arch/mips/boot/dts/ingenic/cu1000-neo.dts
@@ -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 = <0x0 0x04000000>;
+ };
+};
+
+&exclk {
+ clock-frequency = <24000000>;
+};
+
+&tcu {
+ /* 1500 kHz for the system timer and clocksource */
+ assigned-clocks = <&tcu TCU_CLK_TIMER0>, <&tcu TCU_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;
+ };
+};
diff --git a/arch/mips/configs/cu1000-neo_defconfig b/arch/mips/configs/cu1000-neo_defconfig
new file mode 100644
index 00000000..4fafe92
--- /dev/null
+++ b/arch/mips/configs/cu1000-neo_defconfig
@@ -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"
diff --git a/arch/mips/jz4740/Kconfig b/arch/mips/jz4740/Kconfig
index 6b96844..412d2fa 100644
--- a/arch/mips/jz4740/Kconfig
+++ b/arch/mips/jz4740/Kconfig
@@ -16,6 +16,10 @@ config JZ4780_CI20
bool "MIPS Creator CI20"
select MACH_JZ4780
+config X1000_CU1000_NEO
+ bool "YSH & ATIL CU1000 Module with Neo backplane"
+ select MACH_X1000
+
endchoice
config MACH_JZ4740
--
2.7.4
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v7 5/6] MIPS: X1000: Add missing X1000 nodes.
2019-12-09 13:00 Add initial support for Ingenic X1000 SoC and Y&A CU Neo board v7 周琰杰 (Zhou Yanjie)
` (3 preceding siblings ...)
2019-12-09 13:00 ` [PATCH v7 4/6] MIPS: Ingenic: Initial YSH & ATIL CU Neo board support 周琰杰 (Zhou Yanjie)
@ 2019-12-09 13:00 ` 周琰杰 (Zhou Yanjie)
2019-12-09 15:15 ` Paul Cercueil
2019-12-09 13:00 ` [PATCH v7 6/6] MIPS: CU1000: Add devicetree & config with PDMA/MSC/RTC/WDT/NET enabled 周琰杰 (Zhou Yanjie)
5 siblings, 1 reply; 11+ messages in thread
From: 周琰杰 (Zhou Yanjie) @ 2019-12-09 13:00 UTC (permalink / raw)
To: linux-mips
Cc: linux-kernel, devicetree, robh+dt, paul.burton, paulburton,
jhogan, mripard, shawnguo, mark.rutland, ebiederm, ralf, heiko,
icenowy, laurent.pinchart, krzk, geert+renesas, paul,
prasannatsmkumar, sernia.zhou, zhenwenjin, 772753199
Add the appropriate DT node to probe pdma/msc/rtc/watchdog/ethernet
driver using the devicetree.
Signed-off-by: 周琰杰 (Zhou Yanjie) <zhouyanjie@wanyeetech.com>
---
Notes:
v7:
New patch, merge[05/12],[07/12],[09/12],[11/12] in v6.
arch/mips/boot/dts/ingenic/x1000.dtsi | 96 +++++++++++++++++++++++++++++++++++
1 file changed, 96 insertions(+)
diff --git a/arch/mips/boot/dts/ingenic/x1000.dtsi b/arch/mips/boot/dts/ingenic/x1000.dtsi
index 13a6c9ff..398a756 100644
--- a/arch/mips/boot/dts/ingenic/x1000.dtsi
+++ b/arch/mips/boot/dts/ingenic/x1000.dtsi
@@ -1,5 +1,6 @@
// SPDX-License-Identifier: GPL-2.0
#include <dt-bindings/clock/x1000-cgu.h>
+#include <dt-bindings/dma/x1000-dma.h>
/ {
#address-cells = <1>;
@@ -68,6 +69,25 @@
interrupts = <27 26 25>;
};
+ wdt: watchdog@10002000 {
+ compatible = "ingenic,x1000-watchdog", "ingenic,jz4780-watchdog";
+ reg = <0x10002000 0x10>;
+
+ clocks = <&cgu X1000_CLK_RTCLK>;
+ clock-names = "rtc";
+ };
+
+ rtc: rtc@10003000 {
+ compatible = "ingenic,x1000-rtc", "ingenic,jz4780-rtc";
+ reg = <0x10003000 0x4c>;
+
+ interrupt-parent = <&intc>;
+ interrupts = <32>;
+
+ clocks = <&cgu X1000_CLK_RTCLK>;
+ clock-names = "rtc";
+ };
+
pinctrl: pin-controller@10010000 {
compatible = "ingenic,x1000-pinctrl";
reg = <0x10010000 0x800>;
@@ -173,4 +193,80 @@
status = "disabled";
};
+
+ pdma: dma-controller@13420000 {
+ compatible = "ingenic,x1000-dma";
+ reg = <0x13420000 0x400
+ 0x13421000 0x40>;
+ #dma-cells = <2>;
+
+ interrupt-parent = <&intc>;
+ interrupts = <10>;
+
+ clocks = <&cgu X1000_CLK_PDMA>;
+ };
+
+ mac: mac@134b0000 {
+ compatible = "ingenic,x1000-mac", "snps,dwmac";
+ reg = <0x134b0000 0x2000>;
+
+ interrupt-parent = <&intc>;
+ interrupts = <55>;
+ interrupt-names = "macirq";
+
+ clocks = <&cgu X1000_CLK_MAC>;
+ clock-names = "stmmaceth";
+
+ status = "disabled";
+
+ mdio: mdio {
+ compatible = "snps,dwmac-mdio";
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ status = "disabled";
+ };
+ };
+
+ msc0: msc@13450000 {
+ compatible = "ingenic,x1000-mmc";
+ reg = <0x13450000 0x1000>;
+
+ interrupt-parent = <&intc>;
+ interrupts = <37>;
+
+ clocks = <&cgu X1000_CLK_MSC0>;
+ clock-names = "mmc";
+
+ cap-sd-highspeed;
+ cap-mmc-highspeed;
+ cap-sdio-irq;
+
+ dmas = <&pdma X1000_DMA_MSC0_RX 0xffffffff>,
+ <&pdma X1000_DMA_MSC0_TX 0xffffffff>;
+ dma-names = "rx", "tx";
+
+ status = "disabled";
+ };
+
+ msc1: msc@13460000 {
+ compatible = "ingenic,x1000-mmc";
+ reg = <0x13460000 0x1000>;
+
+ interrupt-parent = <&intc>;
+ interrupts = <36>;
+
+ clocks = <&cgu X1000_CLK_MSC1>;
+ clock-names = "mmc";
+
+ cap-sd-highspeed;
+ cap-mmc-highspeed;
+ cap-sdio-irq;
+
+ dmas = <&pdma X1000_DMA_MSC1_RX 0xffffffff>,
+ <&pdma X1000_DMA_MSC1_TX 0xffffffff>;
+ dma-names = "rx", "tx";
+
+ status = "disabled";
+ };
};
--
2.7.4
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v7 6/6] MIPS: CU1000: Add devicetree & config with PDMA/MSC/RTC/WDT/NET enabled.
2019-12-09 13:00 Add initial support for Ingenic X1000 SoC and Y&A CU Neo board v7 周琰杰 (Zhou Yanjie)
` (4 preceding siblings ...)
2019-12-09 13:00 ` [PATCH v7 5/6] MIPS: X1000: Add missing X1000 nodes 周琰杰 (Zhou Yanjie)
@ 2019-12-09 13:00 ` 周琰杰 (Zhou Yanjie)
2019-12-09 15:07 ` Paul Cercueil
5 siblings, 1 reply; 11+ messages in thread
From: 周琰杰 (Zhou Yanjie) @ 2019-12-09 13:00 UTC (permalink / raw)
To: linux-mips
Cc: linux-kernel, devicetree, robh+dt, paul.burton, paulburton,
jhogan, mripard, shawnguo, mark.rutland, ebiederm, ralf, heiko,
icenowy, laurent.pinchart, krzk, geert+renesas, paul,
prasannatsmkumar, sernia.zhou, zhenwenjin, 772753199
Add the CU1000 Neo devicetree and defconfig with PDMA, MMC, RTC, WDT
and NET enabled.
Signed-off-by: 周琰杰 (Zhou Yanjie) <zhouyanjie@wanyeetech.com>
---
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(-)
diff --git a/arch/mips/boot/dts/ingenic/cu1000-neo.dts b/arch/mips/boot/dts/ingenic/cu1000-neo.dts
index 6f1a7e9..b0733da 100644
--- a/arch/mips/boot/dts/ingenic/cu1000-neo.dts
+++ b/arch/mips/boot/dts/ingenic/cu1000-neo.dts
@@ -43,10 +43,57 @@
status = "okay";
};
+&mac {
+ phy-mode = "rmii";
+ phy-handle = <&lan8720a>;
+
+ pinctrl-names = "default";
+ pinctrl-0 = <&pins_mac>;
+
+ snps,reset-gpio = <&gpc 23 GPIO_ACTIVE_LOW>; /* PC23 */
+ snps,reset-active-low;
+ snps,reset-delays-us = <0 10000 30000>;
+
+ status = "okay";
+};
+
+&mdio {
+ status = "okay";
+
+ lan8720a: ethernet-phy@0 {
+ compatible = "ethernet-phy-id0007.c0f0", "ethernet-phy-ieee802.3-c22";
+ reg = <0>;
+ };
+};
+
+&msc0 {
+ bus-width = <8>;
+ max-frequency = <50000000>;
+
+ pinctrl-names = "default";
+ pinctrl-0 = <&pins_msc0>;
+
+ non-removable;
+
+ status = "okay";
+};
+
&pinctrl {
pins_uart2: uart2 {
function = "uart2";
groups = "uart2-data-d";
bias-disable;
};
+
+ pins_mac: mac {
+ function = "mac";
+ groups = "mac";
+ bias-disable;
+ };
+
+ pins_msc0: msc0 {
+ function = "mmc0";
+ groups = "mmc0-1bit", "mmc0-4bit", "mmc0-8bit";
+ bias-disable;
+ };
};
diff --git a/arch/mips/configs/cu1000-neo_defconfig b/arch/mips/configs/cu1000-neo_defconfig
index 4fafe92..9f988ed 100644
--- a/arch/mips/configs/cu1000-neo_defconfig
+++ b/arch/mips/configs/cu1000-neo_defconfig
@@ -16,8 +16,6 @@ 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
@@ -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
--
2.7.4
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH v7 6/6] MIPS: CU1000: Add devicetree & config with PDMA/MSC/RTC/WDT/NET enabled.
2019-12-09 13:00 ` [PATCH v7 6/6] MIPS: CU1000: Add devicetree & config with PDMA/MSC/RTC/WDT/NET enabled 周琰杰 (Zhou Yanjie)
@ 2019-12-09 15:07 ` Paul Cercueil
2019-12-10 1:30 ` zhouyanjie
0 siblings, 1 reply; 11+ messages in thread
From: Paul Cercueil @ 2019-12-09 15:07 UTC (permalink / raw)
To: 周琰杰 (Zhou Yanjie)
Cc: linux-mips, linux-kernel, devicetree, robh+dt, paul.burton,
paulburton, jhogan, mripard, shawnguo, mark.rutland, ebiederm,
ralf, heiko, icenowy, laurent.pinchart, krzk, geert+renesas,
prasannatsmkumar, sernia.zhou, zhenwenjin, 772753199
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)
<zhouyanjie@wanyeetech.com> a écrit :
> Add the CU1000 Neo devicetree and defconfig with PDMA, MMC, RTC, WDT
> and NET enabled.
>
> Signed-off-by: 周琰杰 (Zhou Yanjie) <zhouyanjie@wanyeetech.com>
> ---
>
> 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(-)
>
> diff --git a/arch/mips/boot/dts/ingenic/cu1000-neo.dts
> b/arch/mips/boot/dts/ingenic/cu1000-neo.dts
> index 6f1a7e9..b0733da 100644
> --- a/arch/mips/boot/dts/ingenic/cu1000-neo.dts
> +++ b/arch/mips/boot/dts/ingenic/cu1000-neo.dts
> @@ -43,10 +43,57 @@
> status = "okay";
> };
>
> +&mac {
> + phy-mode = "rmii";
> + phy-handle = <&lan8720a>;
> +
> + pinctrl-names = "default";
> + pinctrl-0 = <&pins_mac>;
> +
> + snps,reset-gpio = <&gpc 23 GPIO_ACTIVE_LOW>; /* PC23 */
> + snps,reset-active-low;
> + snps,reset-delays-us = <0 10000 30000>;
> +
> + status = "okay";
> +};
> +
> +&mdio {
> + status = "okay";
> +
> + lan8720a: ethernet-phy@0 {
> + compatible = "ethernet-phy-id0007.c0f0",
> "ethernet-phy-ieee802.3-c22";
> + reg = <0>;
> + };
> +};
> +
> +&msc0 {
> + bus-width = <8>;
> + max-frequency = <50000000>;
> +
> + pinctrl-names = "default";
> + pinctrl-0 = <&pins_msc0>;
> +
> + non-removable;
> +
> + status = "okay";
> +};
> +
> &pinctrl {
> pins_uart2: uart2 {
> function = "uart2";
> groups = "uart2-data-d";
> bias-disable;
> };
> +
> + pins_mac: mac {
> + function = "mac";
> + groups = "mac";
> + bias-disable;
> + };
> +
> + pins_msc0: msc0 {
> + function = "mmc0";
> + groups = "mmc0-1bit", "mmc0-4bit", "mmc0-8bit";
> + bias-disable;
> + };
> };
> diff --git a/arch/mips/configs/cu1000-neo_defconfig
> b/arch/mips/configs/cu1000-neo_defconfig
> index 4fafe92..9f988ed 100644
> --- a/arch/mips/configs/cu1000-neo_defconfig
> +++ b/arch/mips/configs/cu1000-neo_defconfig
> @@ -16,8 +16,6 @@ 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
> @@ -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
> --
> 2.7.4
>
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v7 5/6] MIPS: X1000: Add missing X1000 nodes.
2019-12-09 13:00 ` [PATCH v7 5/6] MIPS: X1000: Add missing X1000 nodes 周琰杰 (Zhou Yanjie)
@ 2019-12-09 15:15 ` Paul Cercueil
2019-12-10 1:27 ` zhouyanjie
0 siblings, 1 reply; 11+ messages in thread
From: Paul Cercueil @ 2019-12-09 15:15 UTC (permalink / raw)
To: 周琰杰 (Zhou Yanjie)
Cc: linux-mips, linux-kernel, devicetree, robh+dt, paul.burton,
paulburton, jhogan, mripard, shawnguo, mark.rutland, ebiederm,
ralf, heiko, icenowy, laurent.pinchart, krzk, geert+renesas,
prasannatsmkumar, sernia.zhou, zhenwenjin, 772753199
Hi Zhou,
Le lun., déc. 9, 2019 at 21:00, 周琰杰 (Zhou Yanjie)
<zhouyanjie@wanyeetech.com> a écrit :
> Add the appropriate DT node to probe pdma/msc/rtc/watchdog/ethernet
> driver using the devicetree.
>
> Signed-off-by: 周琰杰 (Zhou Yanjie) <zhouyanjie@wanyeetech.com>
> ---
>
> Notes:
> v7:
> New patch, merge[05/12],[07/12],[09/12],[11/12] in v6.
>
> arch/mips/boot/dts/ingenic/x1000.dtsi | 96
> +++++++++++++++++++++++++++++++++++
> 1 file changed, 96 insertions(+)
>
> diff --git a/arch/mips/boot/dts/ingenic/x1000.dtsi
> b/arch/mips/boot/dts/ingenic/x1000.dtsi
> index 13a6c9ff..398a756 100644
> --- a/arch/mips/boot/dts/ingenic/x1000.dtsi
> +++ b/arch/mips/boot/dts/ingenic/x1000.dtsi
> @@ -1,5 +1,6 @@
> // SPDX-License-Identifier: GPL-2.0
> #include <dt-bindings/clock/x1000-cgu.h>
> +#include <dt-bindings/dma/x1000-dma.h>
>
> / {
> #address-cells = <1>;
> @@ -68,6 +69,25 @@
> interrupts = <27 26 25>;
> };
>
> + wdt: watchdog@10002000 {
> + compatible = "ingenic,x1000-watchdog", "ingenic,jz4780-watchdog";
> + reg = <0x10002000 0x10>;
> +
> + clocks = <&cgu X1000_CLK_RTCLK>;
> + clock-names = "rtc";
> + };
The watchdog node should be a children of the TCU node, see
Documentation/devicetree/bindings/timer/ingenic,tcu.txt
> +
> + rtc: rtc@10003000 {
> + compatible = "ingenic,x1000-rtc", "ingenic,jz4780-rtc";
> + reg = <0x10003000 0x4c>;
> +
> + interrupt-parent = <&intc>;
> + interrupts = <32>;
> +
> + clocks = <&cgu X1000_CLK_RTCLK>;
> + clock-names = "rtc";
> + };
> +
> pinctrl: pin-controller@10010000 {
> compatible = "ingenic,x1000-pinctrl";
> reg = <0x10010000 0x800>;
> @@ -173,4 +193,80 @@
>
> status = "disabled";
> };
> +
> + pdma: dma-controller@13420000 {
> + compatible = "ingenic,x1000-dma";
> + reg = <0x13420000 0x400
> + 0x13421000 0x40>;
> + #dma-cells = <2>;
> +
> + interrupt-parent = <&intc>;
> + interrupts = <10>;
> +
> + clocks = <&cgu X1000_CLK_PDMA>;
> + };
> +
> + mac: mac@134b0000 {
Please name the nodes according to the devicetree specification; this
should be 'ethernet@134b0000'.
> + compatible = "ingenic,x1000-mac", "snps,dwmac";
> + reg = <0x134b0000 0x2000>;
> +
> + interrupt-parent = <&intc>;
> + interrupts = <55>;
> + interrupt-names = "macirq";
> +
> + clocks = <&cgu X1000_CLK_MAC>;
> + clock-names = "stmmaceth";
> +
> + status = "disabled";
> +
> + mdio: mdio {
> + compatible = "snps,dwmac-mdio";
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + status = "disabled";
> + };
> + };
> +
> + msc0: msc@13450000 {
This should be 'mmc@13450000'
> + compatible = "ingenic,x1000-mmc";
> + reg = <0x13450000 0x1000>;
> +
> + interrupt-parent = <&intc>;
> + interrupts = <37>;
> +
> + clocks = <&cgu X1000_CLK_MSC0>;
> + clock-names = "mmc";
> +
> + cap-sd-highspeed;
> + cap-mmc-highspeed;
> + cap-sdio-irq;
> +
> + dmas = <&pdma X1000_DMA_MSC0_RX 0xffffffff>,
> + <&pdma X1000_DMA_MSC0_TX 0xffffffff>;
> + dma-names = "rx", "tx";
> +
> + status = "disabled";
> + };
> +
> + msc1: msc@13460000 {
This should be 'mmc@13460000'.
Cheers,
-Paul
> + compatible = "ingenic,x1000-mmc";
> + reg = <0x13460000 0x1000>;
> +
> + interrupt-parent = <&intc>;
> + interrupts = <36>;
> +
> + clocks = <&cgu X1000_CLK_MSC1>;
> + clock-names = "mmc";
> +
> + cap-sd-highspeed;
> + cap-mmc-highspeed;
> + cap-sdio-irq;
> +
> + dmas = <&pdma X1000_DMA_MSC1_RX 0xffffffff>,
> + <&pdma X1000_DMA_MSC1_TX 0xffffffff>;
> + dma-names = "rx", "tx";
> +
> + status = "disabled";
> + };
> };
> --
> 2.7.4
>
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v7 5/6] MIPS: X1000: Add missing X1000 nodes.
2019-12-09 15:15 ` Paul Cercueil
@ 2019-12-10 1:27 ` zhouyanjie
0 siblings, 0 replies; 11+ messages in thread
From: zhouyanjie @ 2019-12-10 1:27 UTC (permalink / raw)
To: Paul Cercueil
Cc: linux-mips, linux-kernel, devicetree, robh+dt, paul.burton,
paulburton, jhogan, mripard, shawnguo, mark.rutland, ebiederm,
ralf, heiko, icenowy, laurent.pinchart, krzk, geert+renesas,
prasannatsmkumar, sernia.zhou, zhenwenjin, 772753199
Hi Paul,
On 2019年12月09日 23:15, Paul Cercueil wrote:
> Hi Zhou,
>
>
> Le lun., déc. 9, 2019 at 21:00, 周琰杰 (Zhou Yanjie)
> <zhouyanjie@wanyeetech.com> a écrit :
>> Add the appropriate DT node to probe pdma/msc/rtc/watchdog/ethernet
>> driver using the devicetree.
>>
>> Signed-off-by: 周琰杰 (Zhou Yanjie) <zhouyanjie@wanyeetech.com>
>> ---
>>
>> Notes:
>> v7:
>> New patch, merge[05/12],[07/12],[09/12],[11/12] in v6.
>>
>> arch/mips/boot/dts/ingenic/x1000.dtsi | 96
>> +++++++++++++++++++++++++++++++++++
>> 1 file changed, 96 insertions(+)
>>
>> diff --git a/arch/mips/boot/dts/ingenic/x1000.dtsi
>> b/arch/mips/boot/dts/ingenic/x1000.dtsi
>> index 13a6c9ff..398a756 100644
>> --- a/arch/mips/boot/dts/ingenic/x1000.dtsi
>> +++ b/arch/mips/boot/dts/ingenic/x1000.dtsi
>> @@ -1,5 +1,6 @@
>> // SPDX-License-Identifier: GPL-2.0
>> #include <dt-bindings/clock/x1000-cgu.h>
>> +#include <dt-bindings/dma/x1000-dma.h>
>>
>> / {
>> #address-cells = <1>;
>> @@ -68,6 +69,25 @@
>> interrupts = <27 26 25>;
>> };
>>
>> + wdt: watchdog@10002000 {
>> + compatible = "ingenic,x1000-watchdog",
>> "ingenic,jz4780-watchdog";
>> + reg = <0x10002000 0x10>;
>> +
>> + clocks = <&cgu X1000_CLK_RTCLK>;
>> + clock-names = "rtc";
>> + };
>
> The watchdog node should be a children of the TCU node, see
> Documentation/devicetree/bindings/timer/ingenic,tcu.txt
>
Sure, I'll check it and change this in v8.
>
>> +
>> + rtc: rtc@10003000 {
>> + compatible = "ingenic,x1000-rtc", "ingenic,jz4780-rtc";
>> + reg = <0x10003000 0x4c>;
>> +
>> + interrupt-parent = <&intc>;
>> + interrupts = <32>;
>> +
>> + clocks = <&cgu X1000_CLK_RTCLK>;
>> + clock-names = "rtc";
>> + };
>> +
>> pinctrl: pin-controller@10010000 {
>> compatible = "ingenic,x1000-pinctrl";
>> reg = <0x10010000 0x800>;
>> @@ -173,4 +193,80 @@
>>
>> status = "disabled";
>> };
>> +
>> + pdma: dma-controller@13420000 {
>> + compatible = "ingenic,x1000-dma";
>> + reg = <0x13420000 0x400
>> + 0x13421000 0x40>;
>> + #dma-cells = <2>;
>> +
>> + interrupt-parent = <&intc>;
>> + interrupts = <10>;
>> +
>> + clocks = <&cgu X1000_CLK_PDMA>;
>> + };
>> +
>> + mac: mac@134b0000 {
>
> Please name the nodes according to the devicetree specification; this
> should be 'ethernet@134b0000'.
>
OK, I'll change it in v8.
>
>> + compatible = "ingenic,x1000-mac", "snps,dwmac";
>> + reg = <0x134b0000 0x2000>;
>> +
>> + interrupt-parent = <&intc>;
>> + interrupts = <55>;
>> + interrupt-names = "macirq";
>> +
>> + clocks = <&cgu X1000_CLK_MAC>;
>> + clock-names = "stmmaceth";
>> +
>> + status = "disabled";
>> +
>> + mdio: mdio {
>> + compatible = "snps,dwmac-mdio";
>> + #address-cells = <1>;
>> + #size-cells = <0>;
>> +
>> + status = "disabled";
>> + };
>> + };
>> +
>> + msc0: msc@13450000 {
>
> This should be 'mmc@13450000'
>
OK, I'll change it in v8.
>
>> + compatible = "ingenic,x1000-mmc";
>> + reg = <0x13450000 0x1000>;
>> +
>> + interrupt-parent = <&intc>;
>> + interrupts = <37>;
>> +
>> + clocks = <&cgu X1000_CLK_MSC0>;
>> + clock-names = "mmc";
>> +
>> + cap-sd-highspeed;
>> + cap-mmc-highspeed;
>> + cap-sdio-irq;
>> +
>> + dmas = <&pdma X1000_DMA_MSC0_RX 0xffffffff>,
>> + <&pdma X1000_DMA_MSC0_TX 0xffffffff>;
>> + dma-names = "rx", "tx";
>> +
>> + status = "disabled";
>> + };
>> +
>> + msc1: msc@13460000 {
>
> This should be 'mmc@13460000'.
>
OK, I'll change it in v8.
Thanks and best regards!
> Cheers,
> -Paul
>
>> + compatible = "ingenic,x1000-mmc";
>> + reg = <0x13460000 0x1000>;
>> +
>> + interrupt-parent = <&intc>;
>> + interrupts = <36>;
>> +
>> + clocks = <&cgu X1000_CLK_MSC1>;
>> + clock-names = "mmc";
>> +
>> + cap-sd-highspeed;
>> + cap-mmc-highspeed;
>> + cap-sdio-irq;
>> +
>> + dmas = <&pdma X1000_DMA_MSC1_RX 0xffffffff>,
>> + <&pdma X1000_DMA_MSC1_TX 0xffffffff>;
>> + dma-names = "rx", "tx";
>> +
>> + status = "disabled";
>> + };
>> };
>> --
>> 2.7.4
>>
>
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v7 6/6] MIPS: CU1000: Add devicetree & config with PDMA/MSC/RTC/WDT/NET enabled.
2019-12-09 15:07 ` Paul Cercueil
@ 2019-12-10 1:30 ` zhouyanjie
0 siblings, 0 replies; 11+ messages in thread
From: zhouyanjie @ 2019-12-10 1:30 UTC (permalink / raw)
To: Paul Cercueil
Cc: linux-mips, linux-kernel, devicetree, robh+dt, paul.burton,
paulburton, jhogan, mripard, shawnguo, mark.rutland, ebiederm,
ralf, heiko, icenowy, laurent.pinchart, krzk, geert+renesas,
prasannatsmkumar, sernia.zhou, zhenwenjin, 772753199
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)
> <zhouyanjie@wanyeetech.com> a écrit :
>> Add the CU1000 Neo devicetree and defconfig with PDMA, MMC, RTC, WDT
>> and NET enabled.
>>
>> Signed-off-by: 周琰杰 (Zhou Yanjie) <zhouyanjie@wanyeetech.com>
>> ---
>>
>> 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(-)
>>
>> diff --git a/arch/mips/boot/dts/ingenic/cu1000-neo.dts
>> b/arch/mips/boot/dts/ingenic/cu1000-neo.dts
>> index 6f1a7e9..b0733da 100644
>> --- a/arch/mips/boot/dts/ingenic/cu1000-neo.dts
>> +++ b/arch/mips/boot/dts/ingenic/cu1000-neo.dts
>> @@ -43,10 +43,57 @@
>> status = "okay";
>> };
>>
>> +&mac {
>> + phy-mode = "rmii";
>> + phy-handle = <&lan8720a>;
>> +
>> + pinctrl-names = "default";
>> + pinctrl-0 = <&pins_mac>;
>> +
>> + snps,reset-gpio = <&gpc 23 GPIO_ACTIVE_LOW>; /* PC23 */
>> + snps,reset-active-low;
>> + snps,reset-delays-us = <0 10000 30000>;
>> +
>> + status = "okay";
>> +};
>> +
>> +&mdio {
>> + status = "okay";
>> +
>> + lan8720a: ethernet-phy@0 {
>> + compatible = "ethernet-phy-id0007.c0f0",
>> "ethernet-phy-ieee802.3-c22";
>> + reg = <0>;
>> + };
>> +};
>> +
>> +&msc0 {
>> + bus-width = <8>;
>> + max-frequency = <50000000>;
>> +
>> + pinctrl-names = "default";
>> + pinctrl-0 = <&pins_msc0>;
>> +
>> + non-removable;
>> +
>> + status = "okay";
>> +};
>> +
>> &pinctrl {
>> pins_uart2: uart2 {
>> function = "uart2";
>> groups = "uart2-data-d";
>> bias-disable;
>> };
>> +
>> + pins_mac: mac {
>> + function = "mac";
>> + groups = "mac";
>> + bias-disable;
>> + };
>> +
>> + pins_msc0: msc0 {
>> + function = "mmc0";
>> + groups = "mmc0-1bit", "mmc0-4bit", "mmc0-8bit";
>> + bias-disable;
>> + };
>> };
>> diff --git a/arch/mips/configs/cu1000-neo_defconfig
>> b/arch/mips/configs/cu1000-neo_defconfig
>> index 4fafe92..9f988ed 100644
>> --- a/arch/mips/configs/cu1000-neo_defconfig
>> +++ b/arch/mips/configs/cu1000-neo_defconfig
>> @@ -16,8 +16,6 @@ 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
>> @@ -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
>> --
>> 2.7.4
>>
>
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2019-12-10 1:31 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-09 13:00 Add initial support for Ingenic X1000 SoC and Y&A CU Neo board v7 周琰杰 (Zhou Yanjie)
2019-12-09 13:00 ` [PATCH v7 1/6] MIPS: Ingenic: Initial X1000 support 周琰杰 (Zhou Yanjie)
2019-12-09 13:00 ` [PATCH v7 2/6] dt-bindings: Document yna vendor-prefix 周琰杰 (Zhou Yanjie)
2019-12-09 13:00 ` [PATCH v7 3/6] dt-bindings: MIPS: Add Ingenic XBurst based boards 周琰杰 (Zhou Yanjie)
2019-12-09 13:00 ` [PATCH v7 4/6] MIPS: Ingenic: Initial YSH & ATIL CU Neo board support 周琰杰 (Zhou Yanjie)
2019-12-09 13:00 ` [PATCH v7 5/6] MIPS: X1000: Add missing X1000 nodes 周琰杰 (Zhou Yanjie)
2019-12-09 15:15 ` Paul Cercueil
2019-12-10 1:27 ` zhouyanjie
2019-12-09 13:00 ` [PATCH v7 6/6] MIPS: CU1000: Add devicetree & config with PDMA/MSC/RTC/WDT/NET enabled 周琰杰 (Zhou Yanjie)
2019-12-09 15:07 ` Paul Cercueil
2019-12-10 1:30 ` zhouyanjie
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).