--- v5
+++ v4
@@ -14,18 +14,18 @@
MAINTAINERS | 4 +
arch/arm/Kconfig | 2 +
arch/arm/Makefile | 1 +
- arch/arm/mach-zte/Kconfig | 26 +++++
+ arch/arm/mach-zte/Kconfig | 24 +++++
arch/arm/mach-zte/Makefile | 2 +
arch/arm/mach-zte/zx297520v3.c | 19 ++++
- 7 files changed, 212 insertions(+)
+ 7 files changed, 210 insertions(+)
diff --git a/Documentation/arch/arm/zte/zx297520v3.rst b/Documentation/arch/arm/zte/zx297520v3.rst
new file mode 100644
-index 000000000000..6621ea72769f
+index 000000000000..a0f25ade0a3d
--- /dev/null
+++ b/Documentation/arch/arm/zte/zx297520v3.rst
@@ -0,0 +1,158 @@
-+.. SPDX-License-Identifier: GPL-2.0-only
++.. SPDX-License-Identifier: GPL-2.0
+
+====================================
+Booting Linux on ZTE zx297520v3 SoCs
@@ -40,10 +40,10 @@
+1. Hardware description
+---------------------------
+Zx297520v3 SoCs use a 64 bit capable Cortex-A53 CPU and GICv3, although they
-+run in arm32 mode only. The CPU has support EL3, but no hypervisor (EL2) and
++run in aarch32 mode only. The CPU has support EL3, but no hypervisor (EL2) and
+it seems to lack VFP and NEON.
+
-+The SoC is used in a number of cheap LTE to WiFi routers, both battery powered
++The SoC is used in a number of cheap LTE to Wifi routers, both battery powered
+MiFis and stationary CPEs. In addition to the CPU these devices usually have
+64 MB Ram (although some is shared with the LTE chip), 128 MB NAND flash, an
+SDIO connected RTL8192-type Wifi chip limited to 2.4 ghz operation, USB 2,
@@ -54,7 +54,7 @@
+Ethernet switch.
+
+Usually the devices have LEDs for status indication, although some have SPI or
-+I2C connected displays
++i2c connected displays
+
+Some have an SD card slot. If it exists, it is a better choice for the root
+file system because it easily outperforms the built-in NAND.
@@ -75,7 +75,7 @@
+The Boot ROM has support for booting custom code via USB. This mode can be
+entered by connecting a Boot PIN to GND or by modifying the third byte on NAND
+(set it to anything other than 0x5A aka 'Z'). A free software tool to start
-+custom U-Boot and kernels can be found here:
++custom uboot and kernels can be found here:
+
+https://github.com/zx297520v3-mainline/zx297520v3-loader
+
@@ -142,7 +142,7 @@
+
+@ This allows EL1 to handle ints hat are normally handled by EL2/3.
+ldr r3, =0xf2000000
-+ldr r4, =(GICD_CTLR_ARE_NS | GICD_CTLR_DS)
++ldr r4, =#(GICD_CTLR_ARE_NS | GICD_CTLR_DS)
+str r4, [r3]
+
+cps #MON_MODE
@@ -225,11 +225,11 @@
machine-$(CONFIG_PLAT_SPEAR) += spear
diff --git a/arch/arm/mach-zte/Kconfig b/arch/arm/mach-zte/Kconfig
new file mode 100644
-index 000000000000..2e3abee94994
+index 000000000000..24699256863b
--- /dev/null
+++ b/arch/arm/mach-zte/Kconfig
-@@ -0,0 +1,26 @@
-+# SPDX-License-Identifier: GPL-2.0-only
+@@ -0,0 +1,24 @@
++# SPDX-License-Identifier: GPL-2.0
+menuconfig ARCH_ZTE
+ bool "ZTE zx family"
+ depends on ARCH_MULTI_V7
@@ -240,19 +240,17 @@
+
+config SOC_ZX297520V3
+ default y if ARCH_ZTE
-+ bool "zx297520v3"
++ bool "ZX297520v3"
+ select ARM_GIC_V3
+ select ARM_AMBA
+ select HAVE_ARM_ARCH_TIMER
+ select PM_GENERIC_DOMAINS if PM
+ help
-+ Support for ZTE zx297520v3 SoC. It is a single core SoC used in cheap
-+ LTE to WiFi routers. These devices can be identified by the occurrence
-+ of the string "zx297520v3" in the boot output and /proc/cpuinfo of
-+ their stock firmware.
-+
-+ Please read Documentation/arch/arm/zte/zx297520v3.rst on how to boot
-+ the kernel.
++ Support for ZTE zx297520v3 SoC. It a single core SoC used in cheap LTE to WiFi routers.
++ These devices can be Identified by the occurrence of the string "zx297520v3" in the boot
++ output and /proc/cpuinfo of their stock firmware.
++
++ Please read Documentation/arch/arm/zte/zx297520v3.rst on how to boot the kernel.
+
+endif
diff --git a/arch/arm/mach-zte/Makefile b/arch/arm/mach-zte/Makefile
@@ -290,6 +288,6 @@
+MACHINE_END
--
-2.53.0
-
-
+2.52.0
+
+