Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 1637de0c9b4dbac0f185e94b2b8cd2c2db78700d

Authored by Brian Swetland
1 parent 2515ddc6db

[ARM] msm: rename ARCH_MSM7X00A to ARCH_MSM 

The MSM architecture covers a wider family of chips than just the MSM7X00A.
Move to a more generic name, in perparation for supporting the specific
SoC variants as sub-architectures (ARCH_MSM7X01A, ARCH_MSM722X, etc).  This
gives us ARCH_MSM for the (many) common peripherals.

This also removes the unused/obsolete config item MSM7X00A_IDLE.

Signed-off-by: Brian Swetland <swetland@google.com>

Showing 5 changed files with 14 additions and 20 deletions Side-by-side Diff

... ... @@ -540,16 +540,15 @@
540 540 help
541 541 Support for TI's OMAP platform (OMAP1 and OMAP2).
542 542  
543   -config ARCH_MSM7X00A
544   - bool "Qualcomm MSM7X00A"
  543 +config ARCH_MSM
  544 + bool "Qualcomm MSM"
545 545 select GENERIC_TIME
546 546 select GENERIC_CLOCKEVENTS
547 547 help
548   - Support for Qualcomm MSM7X00A based systems. This runs on the ARM11
549   - apps processor of the MSM7X00A and depends on a shared memory
  548 + Support for Qualcomm MSM7K based systems. This runs on the ARM11
  549 + apps processor of the MSM7K and depends on a shared memory
550 550 interface to the ARM9 modem processor which runs the baseband stack
551 551 and controls some vital subsystems (clock and power control, etc).
552   - <http://www.cdmatech.com/products/msm7200_chipset_solution.jsp>
553 552  
554 553 endchoice
555 554  
... ... @@ -141,7 +141,7 @@
141 141 machine-$(CONFIG_ARCH_MX3) := mx3
142 142 machine-$(CONFIG_ARCH_ORION5X) := orion5x
143 143 plat-$(CONFIG_PLAT_ORION) := orion
144   - machine-$(CONFIG_ARCH_MSM7X00A) := msm
  144 + machine-$(CONFIG_ARCH_MSM) := msm
145 145 machine-$(CONFIG_ARCH_LOKI) := loki
146 146 machine-$(CONFIG_ARCH_MV78XX0) := mv78xx0
147 147  
arch/arm/configs/msm_defconfig
Diff comments   View file @ 1637de0
... ... @@ -133,7 +133,7 @@
133 133 # CONFIG_ARCH_LH7A40X is not set
134 134 # CONFIG_ARCH_DAVINCI is not set
135 135 # CONFIG_ARCH_OMAP is not set
136   -CONFIG_ARCH_MSM7X00A=y
  136 +CONFIG_ARCH_MSM=y
137 137  
138 138 #
139 139 # Boot options
arch/arm/mach-msm/Kconfig
Diff comments   View file @ 1637de0
1   -if ARCH_MSM7X00A
  1 +if ARCH_MSM
2 2  
3   -comment "MSM7X00A Board Type"
4   - depends on ARCH_MSM7X00A
  3 +comment "MSM Board Type"
  4 + depends on ARCH_MSM
5 5  
6 6 config MACH_HALIBUT
7   - depends on ARCH_MSM7X00A
  7 + depends on ARCH_MSM
8 8 default y
9   - bool "Halibut Board (QCT SURF7200A)"
  9 + bool "Halibut Board (QCT SURF7201A)"
10 10 help
11   - Support for the Qualcomm SURF7200A eval board.
12   -
13   -config MSM7X00A_IDLE
14   - depends on ARCH_MSM7X00A
15   - default y
16   - bool "Idle Support for MSM7X00A"
  11 + Support for the Qualcomm SURF7201A eval board.
17 12  
18 13 endif
... ... @@ -400,9 +400,9 @@
400 400 # ARMv6
401 401 config CPU_V6
402 402 bool "Support ARM V6 processor"
403   - depends on ARCH_INTEGRATOR || MACH_REALVIEW_EB || ARCH_OMAP2 || ARCH_MX3 || ARCH_MSM7X00A || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PB1176
  403 + depends on ARCH_INTEGRATOR || MACH_REALVIEW_EB || ARCH_OMAP2 || ARCH_MX3 || ARCH_MSM || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PB1176
404 404 default y if ARCH_MX3
405   - default y if ARCH_MSM7X00A
  405 + default y if ARCH_MSM
406 406 select CPU_32v6
407 407 select CPU_ABRT_EV6
408 408 select CPU_PABRT_NOIFAR