imx: imx-common: print i.MX 7 SoC names consistently

According to the product website, the full names are i.MX 7Solo and i.MX 7Dual, whereas the short form is i.MX7S and i.MX7D. Be consistent and print the short form for both supported i.MX 7 SoCs.

---
 arch/arm/imx-common/cpu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

index 5fb3ed8..4223187 100644
@@ -138,7 +138,7 @@ const char *get_imx_type(u32 imxtype)
 {
 	switch (imxtype) {
 	case MXC_CPU_MX7S:
-		return "7SOLO";	/* Single-core version of the mx7 */
+		return "7S";	/* Single-core version of the mx7 */
 	case MXC_CPU_MX7D:
 		return "7D";	/* Dual-core version of the mx7 */
 	case MXC_CPU_MX6QP:

2.8.2

Hi Stefan,

That's fine:

I have an off-topic question though: have you ever managed to boot mx7solo with a mainline kernel?

I tried it with warp7 and saw a hang very early in the boot, but I didn't have a chance to debug it yet.

Just curious if you had success in trying to do so.

Thanks

Yes, it works nicely, just make sure you disable the second USB port:

&usbotg2 {
	status = "disabled";
};

&usbmisc2 {
	status = "disabled";
};

&usbphynop2 {
	status = "disabled";
};

Which brings me to another question:
How do we deal with the i.MX 7Solo base device tree?

Currently there is imx7d.dtsi, which is basically the main device tree. I feel ideally we should make a imx7s.dtsi as the base device tree (since i.MX7S has a subset of features) and include that from imx7d.dtsi...

--
Stefan

Thanks, Stefan. I will test this on Monday when I get access to my warp7 board.

I think this makes sense.

Hi Stefan,

Did as suggested, but it did not help booting warp7 with mainline.

Also applied your "clk: imx: do not sleep if IRQ's are still disabled" patch and this is what I get:

Starting kernel ...

Uncompressing Linux... done, booting the kernel.

[    0.000000] Booting Linux on physical CPU 0x0
[    0.000000] Linux version 4.6.0-rc2-00317-ge5f63cc-dirty
(fabio at fabio-Latitude-E6410) (gcc version 4.7.3 (Ubuntu/Linaro
4.7.3-12ubuntu1) ) #329 SMP Tue May 10 12:22:58 BRT 2016
[    0.000000] CPU: ARMv7 Processor [410fc075] revision 5 (ARMv7), cr=10c5387d
[    0.000000] CPU: div instructions available: patching division code
[    0.000000] CPU: PIPT / VIPT nonaliasing data cache, VIPT aliasing
instruction cache
[    0.000000] Machine model: Warp i.MX7 Board
[    0.000000] bootconsole [earlycon0] enabled
[    0.000000] cma: Reserved 16 MiB at 0x9f000000
[    0.000000] Memory policy: Data cache writealloc
[    0.000000] psci: probing for conduit method from DT.
[    0.000000] psci: Using PSCI v0.1 Function IDs from DT
[    0.000000] percpu: Embedded 13 pages/cpu @debbe000 s20544 r8192
d24512 u53248
[    0.000000] Built 1 zonelists in Zone order, mobility grouping on.
Total pages: 130048
[    0.000000] Kernel command line: console=ttymxc0,115200
root=/dev/mmcblk2p2 rootwait rw earlyprintk
[    0.000000] PID hash table entries: 2048 (order: 1, 8192 bytes)
[    0.000000] Dentry cache hash table entries: 65536 (order: 6, 262144 bytes)
[    0.000000] Inode-cache hash table entries: 32768 (order: 5, 131072 bytes)
[    0.000000] Memory: 482132K/524288K available (8196K kernel code,
468K rwdata, 2852K rodata, 1024K init, 8224K bss, 25772K reserved
, 16384K cma-reserved, 0K highmem)
[    0.000000] Virtual kernel memory layout:
[    0.000000]     vector  : 0xffff0000 - 0xffff1000   (   4 kB)
[    0.000000]     fixmap  : 0xffc00000 - 0xfff00000   (3072 kB)
[    0.000000]     vmalloc : 0xe0800000 - 0xff800000   ( 496 MB)
[    0.000000]     lowmem  : 0xc0000000 - 0xe0000000   ( 512 MB)
[    0.000000]     pkmap   : 0xbfe00000 - 0xc0000000   (   2 MB)
[    0.000000]     modules : 0xbf000000 - 0xbfe00000   (  14 MB)
[    0.000000]       .text : 0xc0008000 - 0xc0bca06c   (12041 kB)
[    0.000000]       .init : 0xc0c00000 - 0xc0d00000   (1024 kB)
[    0.000000]       .data : 0xc0d00000 - 0xc0d75180   ( 469 kB)
[    0.000000]        .bss : 0xc0d77000 - 0xc157f060   (8225 kB)
[    0.000000] SLUB: HWalign=64, Order=0-3, MinObjects=0, CPUs=2, Nodes=1
[    0.000000] Running RCU self tests
[    0.000000] Hierarchical RCU implementation.
[    0.000000]  RCU lockdep checking is enabled.
[    0.000000]  Build-time adjustment of leaf fanout to 32.
[    0.000000]  RCU restricting CPUs from NR_CPUS=4 to nr_cpu_ids=2.
[    0.000000] RCU: Adjusting geometry for rcu_fanout_leaf=32, nr_cpu_ids=2
[    0.000000] NR_IRQS:16 nr_irqs:16 16

(hangs here)

Do you select "CONFIG_ARMV7_PSCI_NR_CPUS 2" from
include/configs/mx7_common.h in your mx7s board? Any ideas?

Thanks