History

Merge tag 'armsoc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC cleanups from Olof Johansson: "The cleanup branch keeps going down in size as we've completed a lot of the major legacy platform removals and conversions. A handful of changes this time around, some of the themes or larger sets are: - A bunch of i.MX cleanups around platform detection, init call cleanups - Misc fixes of missing/implicit includes - Removal of ARCH_[WANT_OPTIONAL|REQUIRE]_GPIOLIB" * tag 'armsoc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (40 commits) ARM: mps2: fix typo ARM: s3c64xx: avoid warning about 'struct device_node' bus: mvebu-mbus: make mvebu_mbus_syscore_ops static bus: mvebu-mbus: fix __iomem on register pointers ARM: tegra: Remove board_init_funcs array ARM: iop: Fix indentation ARM: imx: remove cpu_is_mx*() ARM: imx: remove last call to cpu_is_mx5* ARM: imx: rework mx27_pm_init() call ARM: imx: deconstruct mx3_idle ARM: imx: deconstruct mxc_rnga initialization ARM: imx: remove cpu_is_mx1 check ARM: i.MX: Do not explicitly call l2x0_of_init() ARM: i.MX: system.c: Tweak prefetch settings for performance ARM: i.MX: system.c: Replace magic numbers ARM: i.MX: system.c: Remove redundant errata 752271 code ARM: i.MX: system.c: Convert goto to if statement ARM: Kirkwood: fix kirkwood_pm_init() declaration/type ARM: Kirkwood: make kirkwood_disable_mbus_error_propagation() static ARM: orion5x: make orion5x_legacy_handle_irq static ...

Linus Torvalds committed 10 years ago

Commit 6f888fe2 parents 5dd0bf6 3cc561296 files · +222 −436Browse files

Unified · Split

96 files
  1. arch/arm/Kconfig +17 −19
  2. arch/arm/mach-at91/Kconfig +1 −1
  3. arch/arm/mach-bcm/Kconfig +3 −4
  4. arch/arm/mach-berlin/Kconfig +1 −1
  5. arch/arm/mach-digicolor/Kconfig +1 −1
  6. arch/arm/mach-exynos/Kconfig +1 −1
  7. arch/arm/mach-imx/Kconfig +1 −5
  8. arch/arm/mach-imx/Makefile +2 −2
  9. arch/arm/mach-imx/common.h +2 −1
  10. arch/arm/mach-imx/cpu-imx5.c +0 −8
  11. arch/arm/mach-imx/cpu.c +0 −2
  12. arch/arm/mach-imx/devices/Kconfig +0 −4
  13. arch/arm/mach-imx/devices/platform-mxc_rnga.c +0 −53
  14. arch/arm/mach-imx/eukrea-baseboards.h +0 −42
  15. arch/arm/mach-imx/imx27-dt.c +1 −0
  16. arch/arm/mach-imx/imx31-dt.c +12 −0
  17. arch/arm/mach-imx/imx35-dt.c +3 −7
  18. arch/arm/mach-imx/mach-imx50.c +0 −1
  19. arch/arm/mach-imx/mach-imx51.c +0 −1
  20. arch/arm/mach-imx/mach-imx53.c +0 −1
  21. arch/arm/mach-imx/mach-imx6q.c +2 −0
  22. arch/arm/mach-imx/mach-imx6sl.c +2 −0
  23. arch/arm/mach-imx/mach-imx6sx.c +2 −0
  24. arch/arm/mach-imx/mm-imx1.c +1 −1
  25. arch/arm/mach-imx/mm-imx27.c +2 −0
  26. arch/arm/mach-imx/mm-imx3.c +28 −4
  27. arch/arm/mach-imx/mxc.h +0 −101
  28. arch/arm/mach-imx/pm-imx27.c +1 −7
  29. arch/arm/mach-imx/pm-imx3.c +0 −38
  30. arch/arm/mach-imx/system.c +25 −33
  31. arch/arm/mach-imx/tzic.c +5 −5
  32. arch/arm/mach-integrator/Kconfig +2 −2
  33. arch/arm/mach-meson/Kconfig +1 −1
  34. arch/arm/mach-mmp/Kconfig +1 −1
  35. arch/arm/mach-moxart/Kconfig +1 −1
  36. arch/arm/mach-mv78xx0/Kconfig +1 −1
  37. arch/arm/mach-mvebu/Kconfig +2 −2
  38. arch/arm/mach-mvebu/coherency.h +1 −0
  39. arch/arm/mach-mvebu/cpu-reset.c +2 −0
  40. arch/arm/mach-mvebu/kirkwood-pm.c +2 −2
  41. arch/arm/mach-mvebu/kirkwood.c +1 −1
  42. arch/arm/mach-mvebu/pm.c +1 −0
  43. arch/arm/mach-mvebu/pmsu.c +2 −1
  44. arch/arm/mach-mvebu/system-controller.c +1 −1
  45. arch/arm/mach-mxs/Kconfig +1 −1
  46. arch/arm/mach-nomadik/Kconfig +1 −1
  47. arch/arm/mach-omap2/Kconfig +1 −1
  48. arch/arm/mach-orion5x/Kconfig +1 −1
  49. arch/arm/mach-orion5x/irq.c +1 −1
  50. arch/arm/mach-oxnas/Kconfig +1 −1
  51. arch/arm/mach-picoxcell/Kconfig +1 −1
  52. arch/arm/mach-prima2/Kconfig +1 −1
  53. arch/arm/mach-rockchip/Kconfig +1 −1
  54. arch/arm/mach-s3c24xx/Kconfig +1 −1
  55. arch/arm/mach-s3c24xx/include/mach/regs-gpio.h +1 −1
  56. arch/arm/mach-s3c24xx/iotiming-s3c2410.c +1 −1
  57. arch/arm/mach-s3c24xx/mach-n30.c +1 −1
  58. arch/arm/mach-s3c24xx/mach-osiris-dvs.c +1 −1
  59. arch/arm/mach-s3c24xx/pll-s3c2410.c +2 −1
  60. arch/arm/mach-s3c24xx/pll-s3c2440-12000000.c +1 −0
  61. arch/arm/mach-s3c24xx/pll-s3c2440-16934400.c +1 −0
  62. arch/arm/mach-s3c64xx/Kconfig +1 −1
  63. arch/arm/mach-s3c64xx/common.h +1 −0
  64. arch/arm/mach-s3c64xx/include/mach/map.h +1 −1
  65. arch/arm/mach-s5pv210/Kconfig +1 −1
  66. arch/arm/mach-shmobile/Kconfig +1 −1
  67. arch/arm/mach-spear/Kconfig +1 −1
  68. arch/arm/mach-sti/Kconfig +1 −1
  69. arch/arm/mach-sunxi/Kconfig +1 −1
  70. arch/arm/mach-tegra/Kconfig +1 −1
  71. arch/arm/mach-tegra/common.h +22 −0
  72. arch/arm/mach-tegra/cpuidle-tegra114.c +1 −0
  73. arch/arm/mach-tegra/cpuidle-tegra20.c +1 −0
  74. arch/arm/mach-tegra/cpuidle-tegra30.c +1 −0
  75. arch/arm/mach-tegra/cpuidle.h +2 −0
  76. arch/arm/mach-tegra/hotplug.c +1 −0
  77. arch/arm/mach-tegra/irq.c +1 −0
  78. arch/arm/mach-tegra/pm.h +1 −1
  79. arch/arm/mach-tegra/tegra.c +3 −21
  80. arch/arm/mach-u300/Kconfig +1 −1
  81. arch/arm/mach-uniphier/platsmp.c +5 −13
  82. arch/arm/mach-ux500/Kconfig +1 −1
  83. arch/arm/mach-vexpress/Kconfig +1 −1
  84. arch/arm/mach-vexpress/hotplug.c +2 −0
  85. arch/arm/mach-vexpress/spc.c +3 −3
  86. arch/arm/mach-vt8500/Kconfig +1 −1
  87. arch/arm/plat-iop/setup.c +2 −2
  88. arch/arm/plat-samsung/include/plat/cpu-freq-core.h +1 −1
  89. arch/arm/plat-samsung/include/plat/fb-s3c2410.h +1 −1
  90. arch/arm/plat-samsung/include/plat/gpio-cfg.h +1 −1
  91. arch/arm/plat-samsung/pm-check.c +1 −1
  92. arch/arm/plat-samsung/watchdog-reset.c +1 −1
  93. arch/arm/plat-versatile/platsmp.c +2 −0
  94. drivers/bus/mvebu-mbus.c +5 −5
  95. drivers/power/reset/vexpress-poweroff.c +2 −2
  96. include/linux/mbus.h +1 −1
arch/arm/Kconfig+17−19
@@ -327,7 +327,6 @@ choice · 326 unmodified lines
327327 config ARCH_MULTIPLATFORM
328328 bool "Allow multiple platforms to be selected"
329329 depends on MMU
330− select ARCH_WANT_OPTIONAL_GPIOLIB
331330 select ARM_HAS_SG_CHAIN
332331 select ARM_PATCH_PHYS_VIRT
333332 select AUTO_ZRELADDR
@@ -342,7 +341,6 @@ config ARCH_MULTIPLATFORM · 8 unmodified lines
342341 config ARM_SINGLE_ARMV7M
343342 bool "ARMv7-M based platforms (Cortex-M0/M3/M4)"
344343 depends on !MMU
345− select ARCH_WANT_OPTIONAL_GPIOLIB
346344 select ARM_NVIC
347345 select AUTO_ZRELADDR
348346 select CLKSRC_OF
@@ -356,12 +354,12 @@ config ARM_SINGLE_ARMV7M · 7 unmodified lines
356354
357355 config ARCH_CLPS711X
358356 bool "Cirrus Logic CLPS711x/EP721x/EP731x-based"
359− select ARCH_REQUIRE_GPIOLIB
360357 select AUTO_ZRELADDR
361358 select COMMON_CLK
362359 select CPU_ARM720T
363360 select GENERIC_CLOCKEVENTS
364361 select CLPS711X_TIMER
362+ select GPIOLIB
365363 select MFD_SYSCON
366364 select SOC_BUS
367365 help
@@ -369,10 +367,10 @@ config ARCH_CLPS711X · 1 unmodified line
369367
370368 config ARCH_GEMINI
371369 bool "Cortina Systems Gemini"
372− select ARCH_REQUIRE_GPIOLIB
373370 select CLKSRC_MMIO
374371 select CPU_FA526
375372 select GENERIC_CLOCKEVENTS
373+ select GPIOLIB
376374 help
377375 Support for the Cortina Systems Gemini family SoCs
378376
@@ -393,7 +391,6 @@ config ARCH_EBSA110 · 14 unmodified lines
393391 config ARCH_EP93XX
394392 bool "EP93xx-based"
395393 select ARCH_HAS_HOLES_MEMORYMODEL
396− select ARCH_REQUIRE_GPIOLIB
397394 select ARM_AMBA
398395 select ARM_PATCH_PHYS_VIRT
399396 select ARM_VIC
@@ -402,6 +399,7 @@ config ARCH_EP93XX · 2 unmodified lines
402399 select CLKSRC_MMIO
403400 select CPU_ARM920T
404401 select GENERIC_CLOCKEVENTS
402+ select GPIOLIB
405403 help
406404 This enables support for the Cirrus EP93xx series of CPUs.
407405
@@ -442,9 +440,9 @@ config ARCH_IOP13XX · 34 unmodified lines
442440 config ARCH_IOP32X
443441 bool "IOP32x-based"
444442 depends on MMU
445− select ARCH_REQUIRE_GPIOLIB
446443 select CPU_XSCALE
447444 select GPIO_IOP
445+ select GPIOLIB
448446 select NEED_RET_TO_USER
449447 select PCI
450448 select PLAT_IOP
@@ -455,9 +453,9 @@ config ARCH_IOP32X · 4 unmodified lines
455453 config ARCH_IOP33X
456454 bool "IOP33x-based"
457455 depends on MMU
458− select ARCH_REQUIRE_GPIOLIB
459456 select CPU_XSCALE
460457 select GPIO_IOP
458+ select GPIOLIB
461459 select NEED_RET_TO_USER
462460 select PCI
463461 select PLAT_IOP
@@ -468,12 +466,12 @@ config ARCH_IXP4XX · 4 unmodified lines
468466 bool "IXP4xx-based"
469467 depends on MMU
470468 select ARCH_HAS_DMA_SET_COHERENT_MASK
471− select ARCH_REQUIRE_GPIOLIB
472469 select ARCH_SUPPORTS_BIG_ENDIAN
473470 select CLKSRC_MMIO
474471 select CPU_XSCALE
475472 select DMABOUNCE if PCI
476473 select GENERIC_CLOCKEVENTS
474+ select GPIOLIB
477475 select MIGHT_HAVE_PCI
478476 select NEED_MACH_IO_H
479477 select USB_EHCI_BIG_ENDIAN_DESC
@@ -483,9 +481,9 @@ config ARCH_IXP4XX · 3 unmodified lines
483481
484482 config ARCH_DOVE
485483 bool "Marvell Dove"
486− select ARCH_REQUIRE_GPIOLIB
487484 select CPU_PJ4
488485 select GENERIC_CLOCKEVENTS
486+ select GPIOLIB
489487 select MIGHT_HAVE_PCI
490488 select MULTI_IRQ_HANDLER
491489 select MVEBU_MBUS
@@ -499,10 +497,10 @@ config ARCH_DOVE · 7 unmodified lines
499497
500498 config ARCH_KS8695
501499 bool "Micrel/Kendin KS8695"
502− select ARCH_REQUIRE_GPIOLIB
503500 select CLKSRC_MMIO
504501 select CPU_ARM922T
505502 select GENERIC_CLOCKEVENTS
503+ select GPIOLIB
506504 select NEED_MACH_MEMORY_H
507505 help
508506 Support for Micrel/Kendin KS8695 "Centaur" (ARM922T) based
@@ -510,11 +508,11 @@ config ARCH_KS8695 · 1 unmodified line
510508
511509 config ARCH_W90X900
512510 bool "Nuvoton W90X900 CPU"
513− select ARCH_REQUIRE_GPIOLIB
514511 select CLKDEV_LOOKUP
515512 select CLKSRC_MMIO
516513 select CPU_ARM926T
517514 select GENERIC_CLOCKEVENTS
515+ select GPIOLIB
518516 help
519517 Support for Nuvoton (Winbond logic dept.) ARM9 processor,
520518 At present, the w90x900 has been renamed nuc900, regarding
@@ -526,13 +524,13 @@ config ARCH_W90X900 · 5 unmodified lines
526524
527525 config ARCH_LPC32XX
528526 bool "NXP LPC32XX"
529− select ARCH_REQUIRE_GPIOLIB
530527 select ARM_AMBA
531528 select CLKDEV_LOOKUP
532529 select CLKSRC_LPC32XX
533530 select COMMON_CLK
534531 select CPU_ARM926T
535532 select GENERIC_CLOCKEVENTS
533+ select GPIOLIB
536534 select MULTI_IRQ_HANDLER
537535 select SPARSE_IRQ
538536 select USE_OF
@@ -543,7 +541,6 @@ config ARCH_PXA · 4 unmodified lines
543541 bool "PXA2xx/PXA3xx-based"
544542 depends on MMU
545543 select ARCH_MTD_XIP
546− select ARCH_REQUIRE_GPIOLIB
547544 select ARM_CPU_SUSPEND if PM
548545 select AUTO_ZRELADDR
549546 select COMMON_CLK
@@ -554,6 +551,7 @@ config ARCH_PXA · 4 unmodified lines
554551 select CPU_XSCALE if !CPU_XSC3
555552 select GENERIC_CLOCKEVENTS
556553 select GPIO_PXA
554+ select GPIOLIB
557555 select HAVE_IDE
558556 select IRQ_DOMAIN
559557 select MULTI_IRQ_HANDLER
@@ -584,7 +582,6 @@ config ARCH_RPC · 24 unmodified lines
584582 config ARCH_SA1100
585583 bool "SA1100-based"
586584 select ARCH_MTD_XIP
587− select ARCH_REQUIRE_GPIOLIB
588585 select ARCH_SPARSEMEM_ENABLE
589586 select CLKDEV_LOOKUP
590587 select CLKSRC_MMIO
@@ -593,6 +590,7 @@ config ARCH_SA1100 · 2 unmodified lines
593590 select CPU_FREQ
594591 select CPU_SA1100
595592 select GENERIC_CLOCKEVENTS
593+ select GPIOLIB
596594 select HAVE_IDE
597595 select IRQ_DOMAIN
598596 select ISA
@@ -604,12 +602,12 @@ config ARCH_SA1100 · 5 unmodified lines
604602
605603 config ARCH_S3C24XX
606604 bool "Samsung S3C24XX SoCs"
607− select ARCH_REQUIRE_GPIOLIB
608605 select ATAGS
609606 select CLKDEV_LOOKUP
610607 select CLKSRC_SAMSUNG_PWM
611608 select GENERIC_CLOCKEVENTS
612609 select GPIO_SAMSUNG
610+ select GPIOLIB
613611 select HAVE_S3C2410_I2C if I2C
614612 select HAVE_S3C2410_WATCHDOG if WATCHDOG
615613 select HAVE_S3C_RTC if RTC_CLASS
@@ -625,12 +623,12 @@ config ARCH_S3C24XX · 9 unmodified lines
625623 config ARCH_DAVINCI
626624 bool "TI DaVinci"
627625 select ARCH_HAS_HOLES_MEMORYMODEL
628− select ARCH_REQUIRE_GPIOLIB
629626 select CLKDEV_LOOKUP
630627 select CPU_ARM926T
631628 select GENERIC_ALLOCATOR
632629 select GENERIC_CLOCKEVENTS
633630 select GENERIC_IRQ_CHIP
631+ select GPIOLIB
634632 select HAVE_IDE
635633 select USE_OF
636634 select ZONE_DMA
@@ -642,11 +640,11 @@ config ARCH_OMAP1 · 5 unmodified lines
642640 depends on MMU
643641 select ARCH_HAS_HOLES_MEMORYMODEL
644642 select ARCH_OMAP
645− select ARCH_REQUIRE_GPIOLIB
646643 select CLKDEV_LOOKUP
647644 select CLKSRC_MMIO
648645 select GENERIC_CLOCKEVENTS
649646 select GENERIC_IRQ_CHIP
647+ select GPIOLIB
650648 select HAVE_IDE
651649 select IRQ_DOMAIN
652650 select MULTI_IRQ_HANDLER
@@ -868,7 +866,7 @@ source "arch/arm/mach-zynq/Kconfig" · 215 unmodified lines
868866 config ARCH_EFM32
869867 bool "Energy Micro efm32"
870868 depends on ARM_SINGLE_ARMV7M
871− select ARCH_REQUIRE_GPIOLIB
869+ select GPIOLIB
872870 help
873871 Support for Energy Micro's (now Silicon Labs) efm32 Giant Gecko
874872 processors.
@@ -901,7 +899,7 @@ config MACH_STM32F429 · 26 unmodified lines
901899 default y
902900
903901 config ARCH_MPS2
904− bool "ARM MPS2 paltform"
902+ bool "ARM MPS2 platform"
905903 depends on ARM_SINGLE_ARMV7M
906904 select ARM_AMBA
907905 select CLKSRC_MPS2
arch/arm/mach-at91/Kconfig+1−1
@@ -1,8 +1,8 @@
11 menuconfig ARCH_AT91
22 bool "Atmel SoCs"
33 depends on ARCH_MULTI_V4T || ARCH_MULTI_V5 || ARCH_MULTI_V7
4− select ARCH_REQUIRE_GPIOLIB
54 select COMMON_CLK_AT91
5+ select GPIOLIB
66 select PINCTRL
77 select SOC_BUS
88
arch/arm/mach-bcm/Kconfig+3−4
@@ -17,7 +17,7 @@ config ARCH_BCM_IPROC · 16 unmodified lines
1717 select ARM_GLOBAL_TIMER
1818 select COMMON_CLK_IPROC
1919 select CLKSRC_MMIO
20− select ARCH_REQUIRE_GPIOLIB
20+ select GPIOLIB
2121 select ARM_AMBA
2222 select PINCTRL
2323 help
@@ -80,7 +80,7 @@ comment "KONA architected SoCs" · 56 unmodified lines
8080
8181 config ARCH_BCM_MOBILE
8282 bool
83− select ARCH_REQUIRE_GPIOLIB
83+ select GPIOLIB
8484 select ARM_ERRATA_754322
8585 select ARM_ERRATA_775420
8686 select ARM_GIC
@@ -138,7 +138,7 @@ comment "Other Architectures" · 51 unmodified lines
138138 config ARCH_BCM2835
139139 bool "Broadcom BCM2835 family"
140140 depends on ARCH_MULTI_V6 || ARCH_MULTI_V7
141− select ARCH_REQUIRE_GPIOLIB
141+ select GPIOLIB
142142 select ARM_AMBA
143143 select ARM_ERRATA_411920 if ARCH_MULTI_V6
144144 select ARM_TIMER_SP804
@@ -178,7 +178,6 @@ config ARCH_BRCMSTB · 33 unmodified lines
178178 select BRCMSTB_L2_IRQ
179179 select BCM7120_L2_IRQ
180180 select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
181− select ARCH_WANT_OPTIONAL_GPIOLIB
182181 select SOC_BRCMSTB
183182 select SOC_BUS
184183 help
arch/arm/mach-berlin/Kconfig+1−1
@@ -2,11 +2,11 @@ menuconfig ARCH_BERLIN · 1 unmodified line
22 bool "Marvell Berlin SoCs"
33 depends on ARCH_MULTI_V7
44 select ARCH_HAS_RESET_CONTROLLER
5− select ARCH_REQUIRE_GPIOLIB
65 select ARM_GIC
76 select DW_APB_ICTL
87 select DW_APB_TIMER_OF
98 select GENERIC_IRQ_CHIP
9+ select GPIOLIB
1010 select MFD_SYSCON
1111 select PINCTRL
1212
arch/arm/mach-digicolor/Kconfig+1−1
@@ -1,10 +1,10 @@
11 config ARCH_DIGICOLOR
22 bool "Conexant Digicolor SoC Support"
33 depends on ARCH_MULTI_V7
4− select ARCH_REQUIRE_GPIOLIB
54 select CLKSRC_MMIO
65 select DIGICOLOR_TIMER
76 select GENERIC_IRQ_CHIP
7+ select GPIOLIB
88 select MFD_SYSCON
99 select PINCTRL
1010 select PINCTRL_DIGICOLOR
arch/arm/mach-exynos/Kconfig+1−1
@@ -12,13 +12,13 @@ menuconfig ARCH_EXYNOS · 11 unmodified lines
1212 depends on ARCH_MULTI_V7
1313 select ARCH_HAS_BANDGAP
1414 select ARCH_HAS_HOLES_MEMORYMODEL
15− select ARCH_REQUIRE_GPIOLIB
1615 select ARM_AMBA
1716 select ARM_GIC
1817 select COMMON_CLK_SAMSUNG
1918 select EXYNOS_THERMAL
2019 select EXYNOS_PMU
2120 select EXYNOS_SROM
21+ select GPIOLIB
2222 select HAVE_ARM_SCU if SMP
2323 select HAVE_S3C2410_I2C if I2C
2424 select HAVE_S3C2410_WATCHDOG if WATCHDOG
arch/arm/mach-imx/Kconfig+1−5
@@ -1,10 +1,10 @@
11 menuconfig ARCH_MXC
22 bool "Freescale i.MX family"
33 depends on ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7 || ARM_SINGLE_ARMV7M
4− select ARCH_REQUIRE_GPIOLIB
54 select ARCH_SUPPORTS_BIG_ENDIAN
65 select CLKSRC_IMX_GPT
76 select GENERIC_IRQ_CHIP
7+ select GPIOLIB
88 select PINCTRL
99 select PM_OPP if PM
1010 select SOC_BUS
@@ -44,9 +44,6 @@ config MXC_USE_EPIT · 33 unmodified lines
4444 uses the same clocks as the GPT. Anyway, on some systems the GPT
4545 may be in use for other purposes.
4646
47−config ARCH_HAS_RNGA
48− bool
49−
5047 config HAVE_IMX_ANATOP
5148 bool
5249
@@ -90,7 +87,6 @@ config SOC_IMX27 · 37 unmodified lines
9087 config SOC_IMX31
9188 bool
9289 select CPU_V6
93− select IMX_HAVE_PLATFORM_MXC_RNGA
9490 select MXC_AVIC
9591 select SMP_ON_UP if SMP
9692
arch/arm/mach-imx/Makefile+2−2
@@ -8,8 +8,8 @@ obj-$(CONFIG_SOC_IMX25) += cpu-imx25.o mach-imx25.o pm-imx25.o · 7 unmodified lines
88 obj-$(CONFIG_SOC_IMX27) += cpu-imx27.o pm-imx27.o
99 obj-$(CONFIG_SOC_IMX27) += mm-imx27.o ehci-imx27.o
1010
11−obj-$(CONFIG_SOC_IMX31) += mm-imx3.o cpu-imx31.o iomux-imx31.o ehci-imx31.o pm-imx3.o
12−obj-$(CONFIG_SOC_IMX35) += mm-imx3.o cpu-imx35.o ehci-imx35.o pm-imx3.o
11+obj-$(CONFIG_SOC_IMX31) += mm-imx3.o cpu-imx31.o iomux-imx31.o ehci-imx31.o
12+obj-$(CONFIG_SOC_IMX35) += mm-imx3.o cpu-imx35.o ehci-imx35.o
1313
1414 imx5-pm-$(CONFIG_PM) += pm-imx5.o
1515 obj-$(CONFIG_SOC_IMX5) += cpu-imx5.o $(imx5-pm-y)
arch/arm/mach-imx/common.h+2−1
@@ -32,7 +32,6 @@ void imx27_init_early(void); · 31 unmodified lines
3232 void imx31_init_early(void);
3333 void imx35_init_early(void);
3434 void mxc_init_irq(void __iomem *);
35−void tzic_init_irq(void);
3635 void mx1_init_irq(void);
3736 void mx21_init_irq(void);
3837 void mx27_init_irq(void);
@@ -55,6 +54,7 @@ struct platform_device *mxc_register_gpio(char *name, int id, · 16 unmodified lines
5554 void mxc_set_cpu_type(unsigned int type);
5655 void mxc_restart(enum reboot_mode, const char *);
5756 void mxc_arch_reset_init(void __iomem *);
57+void imx1_reset_init(void __iomem *);
5858 void imx_set_aips(void __iomem *);
5959 void imx_aips_allow_unprivileged_access(const char *compat);
6060 int mxc_device_init(void);
@@ -67,6 +67,7 @@ void imx_gpc_set_arm_power_in_lpm(bool power_off); · 6 unmodified lines
6767 void imx_gpc_set_arm_power_up_timing(u32 sw2iso, u32 sw);
6868 void imx_gpc_set_arm_power_down_timing(u32 sw2iso, u32 sw);
6969 void imx25_pm_init(void);
70+void imx27_pm_init(void);
7071
7172 enum mxc_cpu_pwr_mode {
7273 WAIT_CLOCKED, /* wfi only */
arch/arm/mach-imx/cpu-imx5.c+0−8
@@ -60,13 +60,9 @@ static int get_mx51_srev(void) · 59 unmodified lines
6060 /*
6161 * Returns:
6262 * the silicon revision of the cpu
63− * -EINVAL - not a mx51
6463 */
6564 int mx51_revision(void)
6665 {
67− if (!cpu_is_mx51())
68− return -EINVAL;
69−
7066 if (mx5_cpu_rev == -1)
7167 mx5_cpu_rev = get_mx51_srev();
7268
@@ -112,13 +108,9 @@ static int get_mx53_srev(void) · 39 unmodified lines
112108 /*
113109 * Returns:
114110 * the silicon revision of the cpu
115− * -EINVAL - not a mx53
116111 */
117112 int mx53_revision(void)
118113 {
119− if (!cpu_is_mx53())
120− return -EINVAL;
121−
122114 if (mx5_cpu_rev == -1)
123115 mx5_cpu_rev = get_mx53_srev();
124116
arch/arm/mach-imx/cpu.c+0−2
@@ -10,8 +10,6 @@ · 9 unmodified lines
1010 #include "common.h"
1111
1212 unsigned int __mxc_cpu_type;
13−EXPORT_SYMBOL(__mxc_cpu_type);
14−
1513 static unsigned int imx_soc_revision;
1614
1715 void mxc_set_cpu_type(unsigned int type)
arch/arm/mach-imx/devices/Kconfig+0−4
@@ -57,10 +57,6 @@ config IMX_HAVE_PLATFORM_MXC_MMC · 56 unmodified lines
5757 config IMX_HAVE_PLATFORM_MXC_NAND
5858 bool
5959
60−config IMX_HAVE_PLATFORM_MXC_RNGA
61− bool
62− select ARCH_HAS_RNGA
63−
6460 config IMX_HAVE_PLATFORM_MXC_RTC
6561 bool
6662
arch/arm/mach-imx/devices/platform-mxc_rnga.c+0−53
@@ -1,53 +0,0 @@
1−/*
2− * Copyright (C) 2010 Pengutronix
3− * Uwe Kleine-Koenig <u.kleine-koenig@pengutronix.de>
4− *
5− * This program is free software; you can redistribute it and/or modify it under
6− * the terms of the GNU General Public License version 2 as published by the
7− * Free Software Foundation.
8− */
9−#include "../hardware.h"
10−#include "devices-common.h"
11−
12−struct imx_mxc_rnga_data {
13− resource_size_t iobase;
14−};
15−
16−#define imx_mxc_rnga_data_entry_single(soc) \
17− { \
18− .iobase = soc ## _RNGA_BASE_ADDR, \
19− }
20−
21−#ifdef CONFIG_SOC_IMX31
22−static const struct imx_mxc_rnga_data imx31_mxc_rnga_data __initconst =
23− imx_mxc_rnga_data_entry_single(MX31);
24−#endif /* ifdef CONFIG_SOC_IMX31 */
25−
26−static struct platform_device *__init imx_add_mxc_rnga(
27− const struct imx_mxc_rnga_data *data)
28−{
29− struct resource res[] = {
30− {
31− .start = data->iobase,
32− .end = data->iobase + SZ_16K - 1,
33− .flags = IORESOURCE_MEM,
34− },
35− };
36− return imx_add_platform_device("mxc_rnga", -1,
37− res, ARRAY_SIZE(res), NULL, 0);
38−}
39−
40−static int __init imxXX_add_mxc_rnga(void)
41−{
42− struct platform_device *ret;
43−
44−#if defined(CONFIG_SOC_IMX31)
45− if (cpu_is_mx31())
46− ret = imx_add_mxc_rnga(&imx31_mxc_rnga_data);
47− else
48−#endif /* if defined(CONFIG_SOC_IMX31) */
49− ret = ERR_PTR(-ENODEV);
50−
51− return PTR_ERR_OR_ZERO(ret);
52−}
53−arch_initcall(imxXX_add_mxc_rnga);
arch/arm/mach-imx/eukrea-baseboards.h+0−42
@@ -1,42 +0,0 @@
1−/*
2− * Copyright (C) 2010 Eric Benard - eric@eukrea.com
3− *
4− * Based on board-pcm038.h which is :
5− * Copyright (C) 2008 Juergen Beisert (kernel@pengutronix.de)
6− *
7− * This program is free software; you can redistribute it and/or
8− * modify it under the terms of the GNU General Public License
9− * as published by the Free Software Foundation; either version 2
10− * of the License, or (at your option) any later version.
11− * This program is distributed in the hope that it will be useful,
12− * but WITHOUT ANY WARRANTY; without even the implied warranty of
13− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14− * GNU General Public License for more details.
15− *
16− * You should have received a copy of the GNU General Public License
17− * along with this program; if not, write to the Free Software
18− * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
19− * MA 02110-1301, USA.
20− */
21−
22−#ifndef __MACH_EUKREA_BASEBOARDS_H__
23−#define __MACH_EUKREA_BASEBOARDS_H__
24−
25−#ifndef __ASSEMBLY__
26−/*
27− * This CPU module needs a baseboard to work. After basic initializing
28− * its own devices, it calls baseboard's init function.
29− * TODO: Add your own baseboard init function and call it from
30− * inside eukrea_cpuimx25_init() or eukrea_cpuimx35_init()
31− *
32− * This example here is for the development board. Refer
33− * mach-mx25/eukrea_mbimxsd-baseboard.c for cpuimx25
34− * mach-mx3/eukrea_mbimxsd-baseboard.c for cpuimx35
35− */
36−
37−extern void eukrea_mbimxsd25_baseboard_init(void);
38−extern void eukrea_mbimxsd35_baseboard_init(void);
39−
40−#endif
41−
42−#endif /* __MACH_EUKREA_BASEBOARDS_H__ */
arch/arm/mach-imx/imx27-dt.c+1−0
@@ -27,5 +27,6 @@ DT_MACHINE_START(IMX27_DT, "Freescale i.MX27 (Device Tree Support)") · 26 unmodified lines
2727 .map_io = mx27_map_io,
2828 .init_early = imx27_init_early,
2929 .init_irq = mx27_init_irq,
30+ .init_late = imx27_pm_init,
3031 .dt_compat = imx27_dt_board_compat,
3132 MACHINE_END
arch/arm/mach-imx/imx31-dt.c+12−0
@@ -28,10 +28,22 @@ static void __init imx31_dt_timer_init(void) · 27 unmodified lines
2828 mx31_clocks_init_dt();
2929 }
3030
31+/* FIXME: replace with DT binding */
32+static const struct resource imx31_rnga_res[] __initconst = {
33+ DEFINE_RES_MEM(MX31_RNGA_BASE_ADDR, SZ_16K),
34+};
35+
36+static void __init imx31_dt_mach_init(void)
37+{
38+ platform_device_register_simple("mxc_rnga", -1, imx31_rnga_res,
39+ ARRAY_SIZE(imx31_rnga_res));
40+}
41+
3142 DT_MACHINE_START(IMX31_DT, "Freescale i.MX31 (Device Tree Support)")
3243 .map_io = mx31_map_io,
3344 .init_early = imx31_init_early,
3445 .init_irq = mx31_init_irq,
3546 .init_time = imx31_dt_timer_init,
47+ .init_machine = imx31_dt_mach_init,
3648 .dt_compat = imx31_dt_board_compat,
3749 MACHINE_END
arch/arm/mach-imx/imx35-dt.c+3−7
@@ -20,20 +20,16 @@ · 19 unmodified lines
2020 #include "common.h"
2121 #include "mx35.h"
2222
23−static void __init imx35_irq_init(void)
24−{
25− imx_init_l2cache();
26− mx35_init_irq();
27−}
28−
2923 static const char * const imx35_dt_board_compat[] __initconst = {
3024 "fsl,imx35",
3125 NULL
3226 };
3327
3428 DT_MACHINE_START(IMX35_DT, "Freescale i.MX35 (Device Tree Support)")
29+ .l2c_aux_val = 0,
30+ .l2c_aux_mask = ~0,
3531 .map_io = mx35_map_io,
3632 .init_early = imx35_init_early,
37− .init_irq = imx35_irq_init,
33+ .init_irq = mx35_init_irq,
3834 .dt_compat = imx35_dt_board_compat,
3935 MACHINE_END
arch/arm/mach-imx/mach-imx50.c+0−1
@@ -22,6 +22,5 @@ static const char * const imx50_dt_board_compat[] __initconst = { · 21 unmodified lines
2222 };
2323
2424 DT_MACHINE_START(IMX50_DT, "Freescale i.MX50 (Device Tree Support)")
25− .init_irq = tzic_init_irq,
2625 .dt_compat = imx50_dt_board_compat,
2726 MACHINE_END
arch/arm/mach-imx/mach-imx51.c+0−1
@@ -67,7 +67,6 @@ static const char * const imx51_dt_board_compat[] __initconst = { · 66 unmodified lines
6767
6868 DT_MACHINE_START(IMX51_DT, "Freescale i.MX51 (Device Tree Support)")
6969 .init_early = imx51_init_early,
70− .init_irq = tzic_init_irq,
7170 .init_machine = imx51_dt_init,
7271 .init_late = imx51_init_late,
7372 .dt_compat = imx51_dt_board_compat,
arch/arm/mach-imx/mach-imx53.c+0−1
@@ -47,7 +47,6 @@ static const char * const imx53_dt_board_compat[] __initconst = { · 46 unmodified lines
4747
4848 DT_MACHINE_START(IMX53_DT, "Freescale i.MX53 (Device Tree Support)")
4949 .init_early = imx53_init_early,
50− .init_irq = tzic_init_irq,
5150 .init_machine = imx53_dt_init,
5251 .init_late = imx53_init_late,
5352 .dt_compat = imx53_dt_board_compat,
arch/arm/mach-imx/mach-imx6q.c+2−0
@@ -407,6 +407,8 @@ static const char * const imx6q_dt_compat[] __initconst = { · 406 unmodified lines
407407 };
408408
409409 DT_MACHINE_START(IMX6Q, "Freescale i.MX6 Quad/DualLite (Device Tree)")
410+ .l2c_aux_val = 0,
411+ .l2c_aux_mask = ~0,
410412 .smp = smp_ops(imx_smp_ops),
411413 .map_io = imx6q_map_io,
412414 .init_irq = imx6q_init_irq,
arch/arm/mach-imx/mach-imx6sl.c+2−0
@@ -75,6 +75,8 @@ static const char * const imx6sl_dt_compat[] __initconst = { · 74 unmodified lines
7575 };
7676
7777 DT_MACHINE_START(IMX6SL, "Freescale i.MX6 SoloLite (Device Tree)")
78+ .l2c_aux_val = 0,
79+ .l2c_aux_mask = ~0,
7880 .init_irq = imx6sl_init_irq,
7981 .init_machine = imx6sl_init_machine,
8082 .init_late = imx6sl_init_late,
arch/arm/mach-imx/mach-imx6sx.c+2−0
@@ -103,6 +103,8 @@ static const char * const imx6sx_dt_compat[] __initconst = { · 102 unmodified lines
103103 };
104104
105105 DT_MACHINE_START(IMX6SX, "Freescale i.MX6 SoloX (Device Tree)")
106+ .l2c_aux_val = 0,
107+ .l2c_aux_mask = ~0,
106108 .init_irq = imx6sx_init_irq,
107109 .init_machine = imx6sx_init_machine,
108110 .dt_compat = imx6sx_dt_compat,
arch/arm/mach-imx/mm-imx1.c+1−1
@@ -50,7 +50,7 @@ void __init mx1_init_irq(void) · 49 unmodified lines
5050
5151 void __init imx1_soc_init(void)
5252 {
53− mxc_arch_reset_init(MX1_IO_ADDRESS(MX1_WDT_BASE_ADDR));
53+ imx1_reset_init(MX1_IO_ADDRESS(MX1_WDT_BASE_ADDR));
5454 mxc_device_init();
5555
5656 mxc_register_gpio("imx1-gpio", 0, MX1_GPIO1_BASE_ADDR, SZ_256,
arch/arm/mach-imx/mm-imx27.c+2−0
@@ -98,4 +98,6 @@ void __init imx27_soc_init(void) · 97 unmodified lines
9898 /* imx27 has the imx21 type audmux */
9999 platform_device_register_simple("imx21-audmux", 0, imx27_audmux_res,
100100 ARRAY_SIZE(imx27_audmux_res));
101+
102+ imx27_pm_init();
101103 }
arch/arm/mach-imx/mm-imx3.c+28−4
@@ -19,6 +19,7 @@ · 18 unmodified lines
1919 #include <linux/mm.h>
2020 #include <linux/init.h>
2121 #include <linux/err.h>
22+#include <linux/io.h>
2223 #include <linux/pinctrl/machine.h>
2324
2425 #include <asm/pgtable.h>
@@ -38,8 +39,6 @@ static void imx3_idle(void) · 13 unmodified lines
3839 {
3940 unsigned long reg = 0;
4041
41− mx3_cpu_lp_set(MX3_WAIT);
42−
4342 __asm__ __volatile__(
4443 /* disable I and D cache */
4544 "mrc p15, 0, %0, c1, c0, 0\n"
@@ -135,11 +134,20 @@ void __init mx31_map_io(void) · 89 unmodified lines
135134 iotable_init(mx31_io_desc, ARRAY_SIZE(mx31_io_desc));
136135 }
137136
137+static void imx31_idle(void)
138+{
139+ int reg = imx_readl(mx3_ccm_base + MXC_CCM_CCMR);
140+ reg &= ~MXC_CCM_CCMR_LPM_MASK;
141+ imx_writel(reg, mx3_ccm_base + MXC_CCM_CCMR);
142+
143+ imx3_idle();
144+}
145+
138146 void __init imx31_init_early(void)
139147 {
140148 mxc_set_cpu_type(MXC_CPU_MX31);
141149 arch_ioremap_caller = imx3_ioremap_caller;
142− arm_pm_idle = imx3_idle;
150+ arm_pm_idle = imx31_idle;
143151 mx3_ccm_base = MX31_IO_ADDRESS(MX31_CCM_BASE_ADDR);
144152 }
145153
@@ -167,6 +175,10 @@ static const struct resource imx31_audmux_res[] __initconst = { · 21 unmodified lines
167175 DEFINE_RES_MEM(MX31_AUDMUX_BASE_ADDR, SZ_16K),
168176 };
169177
178+static const struct resource imx31_rnga_res[] __initconst = {
179+ DEFINE_RES_MEM(MX31_RNGA_BASE_ADDR, SZ_16K),
180+};
181+
170182 void __init imx31_soc_init(void)
171183 {
172184 int to_version = mx31_revision() >> 4;
@@ -195,6 +207,8 @@ void __init imx31_soc_init(void) · 22 unmodified lines
195207
196208 platform_device_register_simple("imx31-audmux", 0, imx31_audmux_res,
197209 ARRAY_SIZE(imx31_audmux_res));
210+ platform_device_register_simple("mxc_rnga", -1, imx31_rnga_res,
211+ ARRAY_SIZE(imx31_rnga_res));
198212 }
199213 #endif /* ifdef CONFIG_SOC_IMX31 */
200214
@@ -212,11 +226,21 @@ void __init mx35_map_io(void) · 11 unmodified lines
212226 iotable_init(mx35_io_desc, ARRAY_SIZE(mx35_io_desc));
213227 }
214228
229+static void imx35_idle(void)
230+{
231+ int reg = imx_readl(mx3_ccm_base + MXC_CCM_CCMR);
232+ reg &= ~MXC_CCM_CCMR_LPM_MASK;
233+ reg |= MXC_CCM_CCMR_LPM_WAIT_MX35;
234+ imx_writel(reg, mx3_ccm_base + MXC_CCM_CCMR);
235+
236+ imx3_idle();
237+}
238+
215239 void __init imx35_init_early(void)
216240 {
217241 mxc_set_cpu_type(MXC_CPU_MX35);
218242 mxc_iomux_v3_init(MX35_IO_ADDRESS(MX35_IOMUXC_BASE_ADDR));
219− arm_pm_idle = imx3_idle;
243+ arm_pm_idle = imx35_idle;
220244 arch_ioremap_caller = imx3_ioremap_caller;
221245 mx3_ccm_base = MX35_IO_ADDRESS(MX35_CCM_BASE_ADDR);
222246 }
arch/arm/mach-imx/mxc.h+0−101
@@ -45,105 +45,7 @@ · 44 unmodified lines
4545
4646 #ifndef __ASSEMBLY__
4747 extern unsigned int __mxc_cpu_type;
48−#endif
49−
50−#ifdef CONFIG_SOC_IMX1
51−# ifdef mxc_cpu_type
52−# undef mxc_cpu_type
53−# define mxc_cpu_type __mxc_cpu_type
54−# else
55−# define mxc_cpu_type MXC_CPU_MX1
56−# endif
57−# define cpu_is_mx1() (mxc_cpu_type == MXC_CPU_MX1)
58−#else
59−# define cpu_is_mx1() (0)
60−#endif
61−
62−#ifdef CONFIG_SOC_IMX21
63−# ifdef mxc_cpu_type
64−# undef mxc_cpu_type
65−# define mxc_cpu_type __mxc_cpu_type
66−# else
67−# define mxc_cpu_type MXC_CPU_MX21
68−# endif
69−# define cpu_is_mx21() (mxc_cpu_type == MXC_CPU_MX21)
70−#else
71−# define cpu_is_mx21() (0)
72−#endif
7348
74−#ifdef CONFIG_SOC_IMX25
75−# ifdef mxc_cpu_type
76−# undef mxc_cpu_type
77−# define mxc_cpu_type __mxc_cpu_type
78−# else
79−# define mxc_cpu_type MXC_CPU_MX25
80−# endif
81−# define cpu_is_mx25() (mxc_cpu_type == MXC_CPU_MX25)
82−#else
83−# define cpu_is_mx25() (0)
84−#endif
85−
86−#ifdef CONFIG_SOC_IMX27
87−# ifdef mxc_cpu_type
88−# undef mxc_cpu_type
89−# define mxc_cpu_type __mxc_cpu_type
90−# else
91−# define mxc_cpu_type MXC_CPU_MX27
92−# endif
93−# define cpu_is_mx27() (mxc_cpu_type == MXC_CPU_MX27)
94−#else
95−# define cpu_is_mx27() (0)
96−#endif
97−
98−#ifdef CONFIG_SOC_IMX31
99−# ifdef mxc_cpu_type
100−# undef mxc_cpu_type
101−# define mxc_cpu_type __mxc_cpu_type
102−# else
103−# define mxc_cpu_type MXC_CPU_MX31
104−# endif
105−# define cpu_is_mx31() (mxc_cpu_type == MXC_CPU_MX31)
106−#else
107−# define cpu_is_mx31() (0)
108−#endif
109−
110−#ifdef CONFIG_SOC_IMX35
111−# ifdef mxc_cpu_type
112−# undef mxc_cpu_type
113−# define mxc_cpu_type __mxc_cpu_type
114−# else
115−# define mxc_cpu_type MXC_CPU_MX35
116−# endif
117−# define cpu_is_mx35() (mxc_cpu_type == MXC_CPU_MX35)
118−#else
119−# define cpu_is_mx35() (0)
120−#endif
121−
122−#ifdef CONFIG_SOC_IMX51
123−# ifdef mxc_cpu_type
124−# undef mxc_cpu_type
125−# define mxc_cpu_type __mxc_cpu_type
126−# else
127−# define mxc_cpu_type MXC_CPU_MX51
128−# endif
129−# define cpu_is_mx51() (mxc_cpu_type == MXC_CPU_MX51)
130−#else
131−# define cpu_is_mx51() (0)
132−#endif
133−
134−#ifdef CONFIG_SOC_IMX53
135−# ifdef mxc_cpu_type
136−# undef mxc_cpu_type
137−# define mxc_cpu_type __mxc_cpu_type
138−# else
139−# define mxc_cpu_type MXC_CPU_MX53
140−# endif
141−# define cpu_is_mx53() (mxc_cpu_type == MXC_CPU_MX53)
142−#else
143−# define cpu_is_mx53() (0)
144−#endif
145−
146−#ifndef __ASSEMBLY__
14749 #ifdef CONFIG_SOC_IMX6SL
14850 static inline bool cpu_is_imx6sl(void)
14951 {
@@ -190,9 +92,6 @@ int tzic_enable_wake(void); · 40 unmodified lines
19092 extern struct cpu_op *(*get_cpu_op)(int *op);
19193 #endif
19294
193−#define cpu_is_mx3() (cpu_is_mx31() || cpu_is_mx35())
194−#define cpu_is_mx2() (cpu_is_mx21() || cpu_is_mx27())
195−
19695 #define imx_readl readl_relaxed
19796 #define imx_readw readw_relaxed
19897 #define imx_writel writel_relaxed
arch/arm/mach-imx/pm-imx27.c+1−7
@@ -37,13 +37,7 @@ static const struct platform_suspend_ops mx27_suspend_ops = { · 36 unmodified lines
3737 .valid = suspend_valid_only_mem,
3838 };
3939
40−static int __init mx27_pm_init(void)
40+void __init imx27_pm_init(void)
4141 {
42− if (!cpu_is_mx27())
43− return 0;
44−
4542 suspend_set_ops(&mx27_suspend_ops);
46− return 0;
4743 }
48−
49−device_initcall(mx27_pm_init);
arch/arm/mach-imx/pm-imx3.c+0−38
@@ -1,38 +0,0 @@
1−/*
2− * Copyright (C) 2012 Freescale Semiconductor, Inc. All Rights Reserved.
3− *
4− * The code contained herein is licensed under the GNU General Public
5− * License. You may obtain a copy of the GNU General Public License
6− * Version 2 or later at the following locations:
7− *
8− * http://www.opensource.org/licenses/gpl-license.html
9− * http://www.gnu.org/copyleft/gpl.html
10− */
11−#include <linux/io.h>
12−
13−#include "common.h"
14−#include "crmregs-imx3.h"
15−#include "devices/devices-common.h"
16−#include "hardware.h"
17−
18−/*
19− * Set cpu low power mode before WFI instruction. This function is called
20− * mx3 because it can be used for mx31 and mx35.
21− * Currently only WAIT_MODE is supported.
22− */
23−void mx3_cpu_lp_set(enum mx3_cpu_pwr_mode mode)
24−{
25− int reg = imx_readl(mx3_ccm_base + MXC_CCM_CCMR);
26− reg &= ~MXC_CCM_CCMR_LPM_MASK;
27−
28− switch (mode) {
29− case MX3_WAIT:
30− if (cpu_is_mx35())
31− reg |= MXC_CCM_CCMR_LPM_WAIT_MX35;
32− imx_writel(reg, mx3_ccm_base + MXC_CCM_CCMR);
33− break;
34− default:
35− pr_err("Unknown cpu power mode: %d\n", mode);
36− return;
37− }
38−}
arch/arm/mach-imx/system.c+25−33
@@ -34,25 +34,19 @@ · 33 unmodified lines
3434
3535 static void __iomem *wdog_base;
3636 static struct clk *wdog_clk;
37+static int wcr_enable = (1 << 2);
3738
3839 /*
3940 * Reset the system. It is called by machine_restart().
4041 */
4142 void mxc_restart(enum reboot_mode mode, const char *cmd)
4243 {
43− unsigned int wcr_enable;
44−
4544 if (!wdog_base)
4645 goto reset_fallback;
4746
4847 if (!IS_ERR(wdog_clk))
4948 clk_enable(wdog_clk);
5049
51− if (cpu_is_mx1())
52− wcr_enable = (1 << 0);
53− else
54− wcr_enable = (1 << 2);
55−
5650 /* Assert SRS signal */
5751 imx_writew(wcr_enable, wdog_base);
5852 /*
@@ -89,6 +83,14 @@ void __init mxc_arch_reset_init(void __iomem *base) · 30 unmodified lines
8983 clk_prepare(wdog_clk);
9084 }
9185
86+#ifdef CONFIG_SOC_IMX1
87+void __init imx1_reset_init(void __iomem *base)
88+{
89+ wcr_enable = (1 << 0);
90+ mxc_arch_reset_init(base);
91+}
92+#endif
93+
9294 #ifdef CONFIG_CACHE_L2X0
9395 void __init imx_init_l2cache(void)
9496 {
@@ -98,38 +100,28 @@ void __init imx_init_l2cache(void) · 3 unmodified lines
98100
99101 np = of_find_compatible_node(NULL, NULL, "arm,pl310-cache");
100102 if (!np)
101− goto out;
103+ return;
102104
103105 l2x0_base = of_iomap(np, 0);
104− if (!l2x0_base) {
105− of_node_put(np);
106− goto out;
107− }
106+ if (!l2x0_base)
107+ goto put_node;
108108
109− if (readl_relaxed(l2x0_base + L2X0_CTRL) & L2X0_CTRL_EN)
110− goto skip_if_enabled;
109+ if (!(readl_relaxed(l2x0_base + L2X0_CTRL) & L2X0_CTRL_EN)) {
110+ /* Configure the L2 PREFETCH and POWER registers */
111+ val = readl_relaxed(l2x0_base + L310_PREFETCH_CTRL);
112+ val |= L310_PREFETCH_CTRL_DBL_LINEFILL |
113+ L310_PREFETCH_CTRL_INSTR_PREFETCH |
114+ L310_PREFETCH_CTRL_DATA_PREFETCH;
111115
112− /* Configure the L2 PREFETCH and POWER registers */
113− val = readl_relaxed(l2x0_base + L310_PREFETCH_CTRL);
114− val |= 0x70800000;
115− /*
116− * The L2 cache controller(PL310) version on the i.MX6D/Q is r3p1-50rel0
117− * The L2 cache controller(PL310) version on the i.MX6DL/SOLO/SL is r3p2
118− * But according to ARM PL310 errata: 752271
119− * ID: 752271: Double linefill feature can cause data corruption
120− * Fault Status: Present in: r3p0, r3p1, r3p1-50rel0. Fixed in r3p2
121− * Workaround: The only workaround to this erratum is to disable the
122− * double linefill feature. This is the default behavior.
123− */
124− if (cpu_is_imx6q())
125− val &= ~(1 << 30 | 1 << 23);
126− writel_relaxed(val, l2x0_base + L310_PREFETCH_CTRL);
116+ /* Set perfetch offset to improve performance */
117+ val &= ~L310_PREFETCH_CTRL_OFFSET_MASK;
118+ val |= 15;
119+
120+ writel_relaxed(val, l2x0_base + L310_PREFETCH_CTRL);
121+ }
127122
128−skip_if_enabled:
129123 iounmap(l2x0_base);
124+put_node:
130125 of_node_put(np);
131−
132−out:
133− l2x0_of_init(0, ~0);
134126 }
135127 #endif
arch/arm/mach-imx/tzic.c+5−5
@@ -9,12 +9,11 @@ · 8 unmodified lines
99 * http://www.gnu.org/copyleft/gpl.html
1010 */
1111
12−#include <linux/module.h>
13−#include <linux/moduleparam.h>
1412 #include <linux/init.h>
1513 #include <linux/device.h>
1614 #include <linux/errno.h>
1715 #include <linux/io.h>
16+#include <linux/irqchip.h>
1817 #include <linux/irqdomain.h>
1918 #include <linux/of.h>
2019 #include <linux/of_address.h>
@@ -153,13 +152,11 @@ static void __exception_irq_entry tzic_handle_irq(struct pt_regs *regs) · 132 unmodified lines
153152 * interrupts. It registers the interrupt enable and disable functions
154153 * to the kernel for each interrupt source.
155154 */
156−void __init tzic_init_irq(void)
155+static int __init tzic_init_dt(struct device_node *np, struct device_node *p)
157156 {
158− struct device_node *np;
159157 int irq_base;
160158 int i;
161159
162− np = of_find_compatible_node(NULL, NULL, "fsl,tzic");
163160 tzic_base = of_iomap(np, 0);
164161 WARN_ON(!tzic_base);
165162
@@ -199,7 +196,10 @@ void __init tzic_init_irq(void) · 33 unmodified lines
199196 #endif
200197
201198 pr_info("TrustZone Interrupt Controller (TZIC) initialized\n");
199+
200+ return 0;
202201 }
202+IRQCHIP_DECLARE(tzic, "fsl,tzic", tzic_init_dt);
203203
204204 /**
205205 * tzic_enable_wake() - enable wakeup interrupt
arch/arm/mach-integrator/Kconfig+2−2
@@ -32,9 +32,9 @@ config ARCH_INTEGRATOR_AP · 31 unmodified lines
3232 config INTEGRATOR_IMPD1
3333 bool "Include support for Integrator/IM-PD1"
3434 depends on ARCH_INTEGRATOR_AP
35− select ARCH_REQUIRE_GPIOLIB
3635 select ARM_VIC
37− select GPIO_PL061 if GPIOLIB
36+ select GPIO_PL061
37+ select GPIOLIB
3838 help
3939 The IM-PD1 is an add-on logic module for the Integrator which
4040 allows ARM(R) Ltd PrimeCells to be developed and evaluated.
arch/arm/mach-meson/Kconfig+1−1
@@ -1,7 +1,7 @@
11 menuconfig ARCH_MESON
22 bool "Amlogic Meson SoCs"
33 depends on ARCH_MULTI_V7
4− select ARCH_REQUIRE_GPIOLIB
4+ select GPIOLIB
55 select GENERIC_IRQ_CHIP
66 select ARM_GIC
77 select CACHE_L2X0
arch/arm/mach-mmp/Kconfig+1−1
@@ -1,8 +1,8 @@
11 menuconfig ARCH_MMP
22 bool "Marvell PXA168/910/MMP2"
33 depends on ARCH_MULTI_V5 || ARCH_MULTI_V7
4− select ARCH_REQUIRE_GPIOLIB
54 select GPIO_PXA
5+ select GPIOLIB
66 select PINCTRL
77 select PLAT_PXA
88 help
arch/arm/mach-moxart/Kconfig+1−1
@@ -5,7 +5,7 @@ menuconfig ARCH_MOXART · 4 unmodified lines
55 select ARM_DMA_MEM_BUFFERABLE
66 select MOXART_TIMER
77 select GENERIC_IRQ_CHIP
8− select ARCH_REQUIRE_GPIOLIB
8+ select GPIOLIB
99 select PHYLIB if NETDEVICES
1010 help
1111 Say Y here if you want to run your kernel on hardware with a
arch/arm/mach-mv78xx0/Kconfig+1−1
@@ -1,8 +1,8 @@
11 menuconfig ARCH_MV78XX0
22 bool "Marvell MV78xx0"
33 depends on ARCH_MULTI_V5
4− select ARCH_REQUIRE_GPIOLIB
54 select CPU_FEROCEON
5+ select GPIOLIB
66 select MVEBU_MBUS
77 select PCI
88 select PLAT_ORION_LEGACY
arch/arm/mach-mvebu/Kconfig+2−2
@@ -8,7 +8,7 @@ menuconfig ARCH_MVEBU · 7 unmodified lines
88 select SOC_BUS
99 select MVEBU_MBUS
1010 select ZONE_DMA if ARM_LPAE
11− select ARCH_REQUIRE_GPIOLIB
11+ select GPIOLIB
1212 select PCI_QUIRKS if PCI
1313 select OF_ADDRESS_PCI
1414
@@ -119,8 +119,8 @@ config MACH_DOVE · 104 unmodified lines
119119 config MACH_KIRKWOOD
120120 bool "Marvell Kirkwood boards"
121121 depends on ARCH_MULTI_V5
122− select ARCH_REQUIRE_GPIOLIB
123122 select CPU_FEROCEON
123+ select GPIOLIB
124124 select KIRKWOOD_CLK
125125 select MACH_MVEBU_ANY
126126 select ORION_IRQCHIP
arch/arm/mach-mvebu/coherency.h+1−0
@@ -14,6 +14,7 @@ · 13 unmodified lines
1414 #ifndef __MACH_370_XP_COHERENCY_H
1515 #define __MACH_370_XP_COHERENCY_H
1616
17+extern void __iomem *coherency_base; /* for coherency_ll.S */
1718 extern unsigned long coherency_phys_base;
1819 int set_cpu_coherent(void);
1920
arch/arm/mach-mvebu/cpu-reset.c+2−0
@@ -16,6 +16,8 @@ · 15 unmodified lines
1616 #include <linux/io.h>
1717 #include <linux/resource.h>
1818
19+#include "common.h"
20+
1921 static void __iomem *cpu_reset_base;
2022 static size_t cpu_reset_size;
2123
arch/arm/mach-mvebu/kirkwood-pm.c+2−2
@@ -18,6 +18,7 @@ · 17 unmodified lines
1818 #include <linux/suspend.h>
1919 #include <linux/io.h>
2020 #include "kirkwood.h"
21+#include "kirkwood-pm.h"
2122
2223 static void __iomem *ddr_operation_base;
2324 static void __iomem *memory_pm_ctrl;
@@ -66,11 +67,10 @@ static const struct platform_suspend_ops kirkwood_suspend_ops = { · 42 unmodified lines
6667 .valid = kirkwood_pm_valid_standby,
6768 };
6869
69−int __init kirkwood_pm_init(void)
70+void __init kirkwood_pm_init(void)
7071 {
7172 ddr_operation_base = ioremap(DDR_OPERATION_BASE, 4);
7273 memory_pm_ctrl = ioremap(MEMORY_PM_CTRL_PHYS, 4);
7374
7475 suspend_set_ops(&kirkwood_suspend_ops);
75− return 0;
7676 }
arch/arm/mach-mvebu/kirkwood.c+1−1
@@ -150,7 +150,7 @@ eth_fixup_skip: · 149 unmodified lines
150150 * causes mbus errors (which can occur for example for PCI aborts) to
151151 * throw CPU aborts, which we're not set up to deal with.
152152 */
153−void kirkwood_disable_mbus_error_propagation(void)
153+static void kirkwood_disable_mbus_error_propagation(void)
154154 {
155155 void __iomem *cpu_config;
156156
arch/arm/mach-mvebu/pm.c+1−0
@@ -23,6 +23,7 @@ · 22 unmodified lines
2323 #include <asm/suspend.h>
2424
2525 #include "coherency.h"
26+#include "common.h"
2627 #include "pmsu.h"
2728
2829 #define SDRAM_CONFIG_OFFS 0x0
arch/arm/mach-mvebu/pmsu.c+2−1
@@ -25,6 +25,7 @@ · 24 unmodified lines
2525 #include <linux/io.h>
2626 #include <linux/kernel.h>
2727 #include <linux/mbus.h>
28+#include <linux/mvebu-pmsu.h>
2829 #include <linux/of_address.h>
2930 #include <linux/of_device.h>
3031 #include <linux/platform_device.h>
@@ -38,7 +39,7 @@ · 7 unmodified lines
3839 #include <asm/suspend.h>
3940 #include <asm/tlbflush.h>
4041 #include "common.h"
41−
42+#include "pmsu.h"
4243
4344 #define PMSU_BASE_OFFSET 0x100
4445 #define PMSU_REG_SIZE 0x1000
arch/arm/mach-mvebu/system-controller.c+1−1
@@ -127,7 +127,7 @@ int mvebu_system_controller_get_soc_id(u32 *dev, u32 *rev) · 126 unmodified lines
127127 }
128128
129129 #if defined(CONFIG_SMP) && defined(CONFIG_MACH_MVEBU_V7)
130−void mvebu_armada375_smp_wa_init(void)
130+static void mvebu_armada375_smp_wa_init(void)
131131 {
132132 u32 dev, rev;
133133 phys_addr_t resume_addr_reg;
arch/arm/mach-mxs/Kconfig+1−1
@@ -15,7 +15,7 @@ config SOC_IMX28 · 14 unmodified lines
1515 config ARCH_MXS
1616 bool "Freescale MXS (i.MX23, i.MX28) support"
1717 depends on ARCH_MULTI_V5
18− select ARCH_REQUIRE_GPIOLIB
18+ select GPIOLIB
1919 select MXS_TIMER
2020 select PINCTRL
2121 select SOC_BUS
arch/arm/mach-nomadik/Kconfig+1−1
@@ -1,12 +1,12 @@
11 menuconfig ARCH_NOMADIK
22 bool "ST-Ericsson Nomadik"
33 depends on ARCH_MULTI_V5
4− select ARCH_REQUIRE_GPIOLIB
54 select ARM_AMBA
65 select ARM_VIC
76 select CLKSRC_NOMADIK_MTU
87 select CLKSRC_NOMADIK_MTU_SCHED_CLOCK
98 select CPU_ARM926T
9+ select GPIOLIB
1010 select MIGHT_HAVE_CACHE_L2X0
1111 select PINCTRL
1212 select PINCTRL_NOMADIK
arch/arm/mach-omap2/Kconfig+1−1
@@ -92,9 +92,9 @@ config ARCH_OMAP2PLUS · 91 unmodified lines
9292 select ARCH_HAS_BANDGAP
9393 select ARCH_HAS_HOLES_MEMORYMODEL
9494 select ARCH_OMAP
95− select ARCH_REQUIRE_GPIOLIB
9695 select CLKSRC_MMIO
9796 select GENERIC_IRQ_CHIP
97+ select GPIOLIB
9898 select MACH_OMAP_GENERIC
9999 select MEMORY
100100 select MFD_SYSCON
arch/arm/mach-orion5x/Kconfig+1−1
@@ -1,9 +1,9 @@
11 menuconfig ARCH_ORION5X
22 bool "Marvell Orion"
33 depends on MMU && ARCH_MULTI_V5
4− select ARCH_REQUIRE_GPIOLIB
54 select CPU_FEROCEON
65 select GENERIC_CLOCKEVENTS
6+ select GPIOLIB
77 select MVEBU_MBUS
88 select PCI
99 select PLAT_ORION_LEGACY
arch/arm/mach-orion5x/irq.c+1−1
@@ -26,7 +26,7 @@ static int __initdata gpio0_irqs[4] = { · 25 unmodified lines
2626 IRQ_ORION5X_GPIO_24_31,
2727 };
2828
29−asmlinkage void
29+static asmlinkage void
3030 __exception_irq_entry orion5x_legacy_handle_irq(struct pt_regs *regs)
3131 {
3232 u32 stat;
arch/arm/mach-oxnas/Kconfig+1−1
@@ -1,7 +1,7 @@
11 menuconfig ARCH_OXNAS
22 bool "Oxford Semiconductor OXNAS Family SoCs"
3− select ARCH_REQUIRE_GPIOLIB
43 select ARCH_HAS_RESET_CONTROLLER
4+ select GPIOLIB
55 select PINCTRL
66 depends on ARCH_MULTI_V5
77 help
arch/arm/mach-picoxcell/Kconfig+1−1
@@ -1,8 +1,8 @@
11 config ARCH_PICOXCELL
22 bool "Picochip PicoXcell"
33 depends on ARCH_MULTI_V6
4− select ARCH_REQUIRE_GPIOLIB
54 select ARM_VIC
65 select DW_APB_TIMER_OF
6+ select GPIOLIB
77 select HAVE_TCM
88 select NO_IOPORT_MAP
arch/arm/mach-prima2/Kconfig+1−1
@@ -3,8 +3,8 @@ menuconfig ARCH_SIRF · 2 unmodified lines
33 depends on ARCH_MULTI_V7
44 select ARCH_HAS_RESET_CONTROLLER
55 select RESET_CONTROLLER
6− select ARCH_REQUIRE_GPIOLIB
76 select GENERIC_IRQ_CHIP
7+ select GPIOLIB
88 select NO_IOPORT_MAP
99 select REGMAP
1010 select PINCTRL
arch/arm/mach-rockchip/Kconfig+1−1
@@ -4,10 +4,10 @@ config ARCH_ROCKCHIP · 3 unmodified lines
44 select PINCTRL
55 select PINCTRL_ROCKCHIP
66 select ARCH_HAS_RESET_CONTROLLER
7− select ARCH_REQUIRE_GPIOLIB
87 select ARM_AMBA
98 select ARM_GIC
109 select CACHE_L2X0
10+ select GPIOLIB
1111 select HAVE_ARM_ARCH_TIMER
1212 select HAVE_ARM_SCU if SMP
1313 select HAVE_ARM_TWD if SMP
arch/arm/mach-s3c24xx/Kconfig+1−1
@@ -11,7 +11,7 @@ if ARCH_S3C24XX · 10 unmodified lines
1111
1212 config PLAT_S3C24XX
1313 def_bool y
14− select ARCH_REQUIRE_GPIOLIB
14+ select GPIOLIB
1515 select NO_IOPORT_MAP
1616 select S3C_DEV_NAND
1717 select IRQ_DOMAIN
arch/arm/mach-s3c24xx/include/mach/regs-gpio.h+1−1
@@ -520,7 +520,7 @@ · 519 unmodified lines
520520 #define S3C24XX_EXTINT1 S3C24XX_GPIOREG2(0x8C)
521521 #define S3C24XX_EXTINT2 S3C24XX_GPIOREG2(0x90)
522522
523−/* interrupt filtering conrrol for EINT16..EINT23 */
523+/* interrupt filtering control for EINT16..EINT23 */
524524 #define S3C2410_EINFLT0 S3C2410_GPIOREG(0x94)
525525 #define S3C2410_EINFLT1 S3C2410_GPIOREG(0x98)
526526 #define S3C2410_EINFLT2 S3C2410_GPIOREG(0x9C)
arch/arm/mach-s3c24xx/iotiming-s3c2410.c+1−1
@@ -423,7 +423,7 @@ void s3c2410_iotiming_set(struct s3c_cpufreq_config *cfg, · 422 unmodified lines
423423 * @timings: The IO timing information to fill out.
424424 *
425425 * Calculate the @timings timing information from the current frequency
426− * information in @cfg, and the new frequency configur
426+ * information in @cfg, and the new frequency configuration
427427 * through all the IO banks, reading the state and then updating @iot
428428 * as necessary.
429429 *
arch/arm/mach-s3c24xx/mach-n30.c+1−1
@@ -522,7 +522,7 @@ static void __init n30_hwinit(void) · 521 unmodified lines
522522 *
523523 * The pull ups for H6/H7 are enabled on N30 but not on the
524524 * N35/PiN. I suppose is useful for a budget model of the N30
525− * with no bluetooh. It doesn't hurt to have the pull ups
525+ * with no bluetooth. It doesn't hurt to have the pull ups
526526 * enabled on the N35, so leave them enabled for all models.
527527 */
528528 __raw_writel(0x0028aaaa, S3C2410_GPHCON);
arch/arm/mach-s3c24xx/mach-osiris-dvs.c+1−1
@@ -143,7 +143,7 @@ static int osiris_dvs_remove(struct platform_device *pdev) · 142 unmodified lines
143143 return 0;
144144 }
145145
146−/* the CONFIG_PM block is so small, it isn't worth actaully compiling it
146+/* the CONFIG_PM block is so small, it isn't worth actually compiling it
147147 * out if the configuration isn't set. */
148148
149149 static int osiris_dvs_suspend(struct device *dev)
arch/arm/mach-s3c24xx/pll-s3c2410.c+2−1
@@ -32,11 +32,12 @@ · 31 unmodified lines
3232 #include <plat/cpu.h>
3333 #include <plat/cpu-freq-core.h>
3434
35+/* This array should be sorted in ascending order of the frequencies */
3536 static struct cpufreq_frequency_table pll_vals_12MHz[] = {
3637 { .frequency = 34000000, .driver_data = PLLVAL(82, 2, 3), },
3738 { .frequency = 45000000, .driver_data = PLLVAL(82, 1, 3), },
38− { .frequency = 51000000, .driver_data = PLLVAL(161, 3, 3), },
3939 { .frequency = 48000000, .driver_data = PLLVAL(120, 2, 3), },
40+ { .frequency = 51000000, .driver_data = PLLVAL(161, 3, 3), },
4041 { .frequency = 56000000, .driver_data = PLLVAL(142, 2, 3), },
4142 { .frequency = 68000000, .driver_data = PLLVAL(82, 2, 2), },
4243 { .frequency = 79000000, .driver_data = PLLVAL(71, 1, 2), },
arch/arm/mach-s3c24xx/pll-s3c2440-12000000.c+1−0
@@ -20,6 +20,7 @@ · 19 unmodified lines
2020 #include <plat/cpu.h>
2121 #include <plat/cpu-freq-core.h>
2222
23+/* This array should be sorted in ascending order of the frequencies */
2324 static struct cpufreq_frequency_table s3c2440_plls_12[] = {
2425 { .frequency = 75000000, .driver_data = PLLVAL(0x75, 3, 3), }, /* FVco 600.000000 */
2526 { .frequency = 80000000, .driver_data = PLLVAL(0x98, 4, 3), }, /* FVco 640.000000 */
arch/arm/mach-s3c24xx/pll-s3c2440-16934400.c+1−0
@@ -20,6 +20,7 @@ · 19 unmodified lines
2020 #include <plat/cpu.h>
2121 #include <plat/cpu-freq-core.h>
2222
23+/* This array should be sorted in ascending order of the frequencies */
2324 static struct cpufreq_frequency_table s3c2440_plls_169344[] = {
2425 { .frequency = 78019200, .driver_data = PLLVAL(121, 5, 3), }, /* FVco 624.153600 */
2526 { .frequency = 84067200, .driver_data = PLLVAL(131, 5, 3), }, /* FVco 672.537600 */
arch/arm/mach-s3c64xx/Kconfig+1−1
@@ -5,12 +5,12 @@ · 4 unmodified lines
55 menuconfig ARCH_S3C64XX
66 bool "Samsung S3C64XX"
77 depends on ARCH_MULTI_V6
8− select ARCH_REQUIRE_GPIOLIB
98 select ARM_AMBA
109 select ARM_VIC
1110 select CLKSRC_SAMSUNG_PWM
1211 select COMMON_CLK_SAMSUNG
1312 select GPIO_SAMSUNG if ATAGS
13+ select GPIOLIB
1414 select HAVE_S3C2410_I2C if I2C
1515 select HAVE_S3C2410_WATCHDOG if WATCHDOG
1616 select HAVE_TCM
arch/arm/mach-s3c64xx/common.h+1−0
@@ -24,6 +24,7 @@ void s3c64xx_init_io(struct map_desc *mach_desc, int size); · 23 unmodified lines
2424
2525 void s3c64xx_restart(enum reboot_mode mode, const char *cmd);
2626
27+struct device_node;
2728 void s3c64xx_clk_init(struct device_node *np, unsigned long xtal_f,
2829 unsigned long xusbxti_f, bool is_s3c6400, void __iomem *reg_base);
2930 void s3c64xx_set_xtal_freq(unsigned long freq);
arch/arm/mach-s3c64xx/include/mach/map.h+1−1
@@ -99,7 +99,7 @@ · 98 unmodified lines
9999
100100 #define S3C64XX_PA_USB_HSPHY (0x7C100000)
101101
102−/* compatibiltiy defines. */
102+/* compatibility defines. */
103103 #define S3C_PA_TIMER S3C64XX_PA_TIMER
104104 #define S3C_PA_HSMMC0 S3C64XX_PA_HSMMC0
105105 #define S3C_PA_HSMMC1 S3C64XX_PA_HSMMC1
arch/arm/mach-s5pv210/Kconfig+1−1
@@ -11,10 +11,10 @@ config ARCH_S5PV210 · 10 unmodified lines
1111 bool "Samsung S5PV210/S5PC110"
1212 depends on ARCH_MULTI_V7
1313 select ARCH_HAS_HOLES_MEMORYMODEL
14− select ARCH_REQUIRE_GPIOLIB
1514 select ARM_VIC
1615 select CLKSRC_SAMSUNG_PWM
1716 select COMMON_CLK_SAMSUNG
17+ select GPIOLIB
1818 select HAVE_S3C2410_I2C if I2C
1919 select HAVE_S3C2410_WATCHDOG if WATCHDOG
2020 select HAVE_S3C_RTC if RTC_CLASS
arch/arm/mach-shmobile/Kconfig+1−1
@@ -41,7 +41,7 @@ menuconfig ARCH_RENESAS · 40 unmodified lines
4141 select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
4242 select NO_IOPORT_MAP
4343 select PINCTRL
44− select ARCH_REQUIRE_GPIOLIB
44+ select GPIOLIB
4545 select ZONE_DMA if ARM_LPAE
4646
4747 if ARCH_RENESAS
arch/arm/mach-spear/Kconfig+1−1
@@ -5,9 +5,9 @@ · 4 unmodified lines
55 menuconfig PLAT_SPEAR
66 bool "ST SPEAr Family"
77 depends on ARCH_MULTI_V7 || ARCH_MULTI_V5
8− select ARCH_REQUIRE_GPIOLIB
98 select ARM_AMBA
109 select CLKSRC_MMIO
10+ select GPIOLIB
1111
1212 if PLAT_SPEAR
1313
arch/arm/mach-sti/Kconfig+1−1
@@ -10,7 +10,7 @@ menuconfig ARCH_STI · 9 unmodified lines
1010 select MFD_SYSCON
1111 select ARCH_HAS_RESET_CONTROLLER
1212 select HAVE_ARM_SCU if SMP
13− select ARCH_REQUIRE_GPIOLIB
13+ select GPIOLIB
1414 select ARM_ERRATA_754322
1515 select ARM_ERRATA_764369 if SMP
1616 select ARM_ERRATA_775420
arch/arm/mach-sunxi/Kconfig+1−1
@@ -1,10 +1,10 @@
11 menuconfig ARCH_SUNXI
22 bool "Allwinner SoCs"
33 depends on ARCH_MULTI_V7
4− select ARCH_REQUIRE_GPIOLIB
54 select ARCH_HAS_RESET_CONTROLLER
65 select CLKSRC_MMIO
76 select GENERIC_IRQ_CHIP
7+ select GPIOLIB
88 select PINCTRL
99 select SUN4I_TIMER
1010 select RESET_CONTROLLER
arch/arm/mach-tegra/Kconfig+1−1
@@ -1,11 +1,11 @@
11 menuconfig ARCH_TEGRA
22 bool "NVIDIA Tegra"
33 depends on ARCH_MULTI_V7
4− select ARCH_REQUIRE_GPIOLIB
54 select ARCH_SUPPORTS_TRUSTED_FOUNDATIONS
65 select ARM_AMBA
76 select ARM_GIC
87 select CLKSRC_MMIO
8+ select GPIOLIB
99 select HAVE_ARM_SCU if SMP
1010 select HAVE_ARM_TWD if SMP
1111 select PINCTRL
arch/arm/mach-tegra/common.h+22−0
@@ -1,4 +1,26 @@
1+/*
2+ * Copyright (c) 2011, ARM Ltd.
3+ * Copyright (c) 2013, NVIDIA Corporation. All rights reserved.
4+ *
5+ * This program is free software; you can redistribute it and/or modify it
6+ * under the terms and conditions of the GNU General Public License,
7+ * version 2, as published by the Free Software Foundation.
8+ *
9+ * This program is distributed in the hope it will be useful, but WITHOUT
10+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
12+ * more details.
13+ *
14+ * You should have received a copy of the GNU General Public License
15+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
16+ */
17+
18+#ifndef __MACH_TEGRA_COMMON_H
19+#define __MACH_TEGRA_COMMON_H
20+
121 extern const struct smp_operations tegra_smp_ops;
222
323 extern int tegra_cpu_kill(unsigned int cpu);
424 extern void tegra_cpu_die(unsigned int cpu);
25+
26+#endif
arch/arm/mach-tegra/cpuidle-tegra114.c+1−0
@@ -26,6 +26,7 @@ · 25 unmodified lines
2626 #include <asm/suspend.h>
2727 #include <asm/psci.h>
2828
29+#include "cpuidle.h"
2930 #include "pm.h"
3031 #include "sleep.h"
3132
arch/arm/mach-tegra/cpuidle-tegra20.c+1−0
@@ -30,6 +30,7 @@ · 29 unmodified lines
3030 #include <asm/smp_plat.h>
3131 #include <asm/suspend.h>
3232
33+#include "cpuidle.h"
3334 #include "flowctrl.h"
3435 #include "iomap.h"
3536 #include "irq.h"
arch/arm/mach-tegra/cpuidle-tegra30.c+1−0
@@ -30,6 +30,7 @@ · 29 unmodified lines
3030 #include <asm/smp_plat.h>
3131 #include <asm/suspend.h>
3232
33+#include "cpuidle.h"
3334 #include "pm.h"
3435 #include "sleep.h"
3536
arch/arm/mach-tegra/cpuidle.h+2−0
@@ -23,8 +23,10 @@ void tegra20_cpuidle_pcie_irqs_in_use(void); · 22 unmodified lines
2323 int tegra30_cpuidle_init(void);
2424 int tegra114_cpuidle_init(void);
2525 void tegra_cpuidle_init(void);
26+void tegra_cpuidle_pcie_irqs_in_use(void);
2627 #else
2728 static inline void tegra_cpuidle_init(void) {}
29+static inline void tegra_cpuidle_pcie_irqs_in_use(void) {}
2830 #endif
2931
3032 #endif
arch/arm/mach-tegra/hotplug.c+1−0
@@ -17,6 +17,7 @@ · 16 unmodified lines
1717
1818 #include <asm/smp_plat.h>
1919
20+#include "common.h"
2021 #include "sleep.h"
2122
2223 static void (*tegra_hotplug_shutdown)(void);
arch/arm/mach-tegra/irq.c+1−0
@@ -29,6 +29,7 @@ · 28 unmodified lines
2929
3030 #include "board.h"
3131 #include "iomap.h"
32+#include "irq.h"
3233
3334 #define SGI_MASK 0xFFFF
3435
arch/arm/mach-tegra/pm.h+1−1
@@ -36,7 +36,7 @@ void tegra30_sleep_core_init(void); · 35 unmodified lines
3636
3737 void tegra_clear_cpu_in_lp2(void);
3838 bool tegra_set_cpu_in_lp2(void);
39−
39+int tegra_cpu_do_idle(void);
4040 void tegra_idle_lp2_last(void);
4141 extern void (*tegra_tear_down_cpu)(void);
4242
arch/arm/mach-tegra/tegra.c+3−21
@@ -118,32 +118,14 @@ out: · 117 unmodified lines
118118 of_platform_default_populate(NULL, NULL, parent);
119119 }
120120
121−static void __init paz00_init(void)
122−{
123− if (IS_ENABLED(CONFIG_ARCH_TEGRA_2x_SOC))
124− tegra_paz00_wifikill_init();
125−}
126−
127−static struct {
128− char *machine;
129− void (*init)(void);
130−} board_init_funcs[] = {
131− { "compal,paz00", paz00_init },
132−};
133−
134121 static void __init tegra_dt_init_late(void)
135122 {
136− int i;
137−
138123 tegra_init_suspend();
139124 tegra_cpuidle_init();
140125
141− for (i = 0; i < ARRAY_SIZE(board_init_funcs); i++) {
142− if (of_machine_is_compatible(board_init_funcs[i].machine)) {
143− board_init_funcs[i].init();
144− break;
145− }
146− }
126+ if (IS_ENABLED(CONFIG_ARCH_TEGRA_2x_SOC) &&
127+ of_machine_is_compatible("compal,paz00"))
128+ tegra_paz00_wifikill_init();
147129 }
148130
149131 static const char * const tegra_dt_board_compat[] = {
arch/arm/mach-u300/Kconfig+1−1
@@ -1,11 +1,11 @@
11 menuconfig ARCH_U300
22 bool "ST-Ericsson U300 Series"
33 depends on ARCH_MULTI_V5 && MMU
4− select ARCH_REQUIRE_GPIOLIB
54 select ARM_AMBA
65 select ARM_VIC
76 select U300_TIMER
87 select CPU_ARM926T
8+ select GPIOLIB
99 select HAVE_TCM
1010 select PINCTRL
1111 select PINCTRL_COH901
arch/arm/mach-uniphier/platsmp.c+5−13
@@ -101,21 +101,13 @@ static int __init uniphier_smp_prepare_trampoline(unsigned int max_cpus) · 100 unmodified lines
101101 np = of_find_compatible_node(NULL, NULL, "socionext,uniphier-smpctrl");
102102 ret = of_address_to_resource(np, 0, &res);
103103 of_node_put(np);
104− if (!ret) {
105− rom_rsv2_phys = res.start + UNIPHIER_SMPCTRL_ROM_RSV2;
106− } else {
107− /* try old binding too */
108− np = of_find_compatible_node(NULL, NULL,
109− "socionext,uniphier-system-bus-controller");
110− ret = of_address_to_resource(np, 1, &res);
111− of_node_put(np);
112− if (ret) {
113− pr_err("failed to get resource of SMP control\n");
114− return ret;
115− }
116− rom_rsv2_phys = res.start + 0x1000 + UNIPHIER_SMPCTRL_ROM_RSV2;
104+ if (ret) {
105+ pr_err("failed to get resource of SMP control\n");
106+ return ret;
117107 }
118108
109+ rom_rsv2_phys = res.start + UNIPHIER_SMPCTRL_ROM_RSV2;
110+
119111 ret = uniphier_smp_copy_trampoline(rom_rsv2_phys);
120112 if (ret)
121113 return ret;
arch/arm/mach-ux500/Kconfig+1−1
@@ -3,13 +3,13 @@ menuconfig ARCH_U8500 · 2 unmodified lines
33 depends on ARCH_MULTI_V7 && MMU
44 select AB8500_CORE
55 select ABX500_CORE
6− select ARCH_REQUIRE_GPIOLIB
76 select ARM_AMBA
87 select ARM_ERRATA_754322
98 select ARM_ERRATA_764369 if SMP
109 select ARM_GIC
1110 select CACHE_L2X0
1211 select CLKSRC_NOMADIK_MTU
12+ select GPIOLIB
1313 select HAVE_ARM_SCU if SMP
1414 select HAVE_ARM_TWD if SMP
1515 select PINCTRL
arch/arm/mach-vexpress/Kconfig+1−1
@@ -1,13 +1,13 @@
11 menuconfig ARCH_VEXPRESS
22 bool "ARM Ltd. Versatile Express family"
33 depends on ARCH_MULTI_V7
4− select ARCH_REQUIRE_GPIOLIB
54 select ARCH_SUPPORTS_BIG_ENDIAN
65 select ARM_AMBA
76 select ARM_GIC
87 select ARM_GLOBAL_TIMER
98 select ARM_TIMER_SP804
109 select COMMON_CLK_VERSATILE
10+ select GPIOLIB
1111 select HAVE_ARM_SCU if SMP
1212 select HAVE_ARM_TWD if SMP
1313 select HAVE_PATA_PLATFORM
arch/arm/mach-vexpress/hotplug.c+2−0
@@ -15,6 +15,8 @@ · 14 unmodified lines
1515 #include <asm/smp_plat.h>
1616 #include <asm/cp15.h>
1717
18+#include "core.h"
19+
1820 static inline void cpu_enter_lowpower(void)
1921 {
2022 unsigned int v;
arch/arm/mach-vexpress/spc.c+3−3
@@ -31,6 +31,8 @@ · 30 unmodified lines
3131
3232 #include <asm/cacheflush.h>
3333
34+#include "spc.h"
35+
3436 #define SPCLOG "vexpress-spc: "
3537
3638 #define PERF_LVL_A15 0x00
@@ -319,17 +321,15 @@ static int ve_spc_waitforcompletion(int req_type) · 282 unmodified lines
319321
320322 static int ve_spc_set_performance(int cluster, u32 freq)
321323 {
322− u32 perf_cfg_reg, perf_stat_reg;
324+ u32 perf_cfg_reg;
323325 int ret, perf, req_type;
324326
325327 if (cluster_is_a15(cluster)) {
326328 req_type = CA15_DVFS;
327329 perf_cfg_reg = PERF_LVL_A15;
328− perf_stat_reg = PERF_REQ_A15;
329330 } else {
330331 req_type = CA7_DVFS;
331332 perf_cfg_reg = PERF_LVL_A7;
332− perf_stat_reg = PERF_REQ_A7;
333333 }
334334
335335 perf = ve_spc_find_performance_index(cluster, freq);
arch/arm/mach-vt8500/Kconfig+1−1
@@ -1,6 +1,6 @@
11 config ARCH_VT8500
22 bool
3− select ARCH_REQUIRE_GPIOLIB
3+ select GPIOLIB
44 select CLKDEV_LOOKUP
55 select VT8500_TIMER
66 select PINCTRL
arch/arm/plat-iop/setup.c+2−2
@@ -20,12 +20,12 @@ · 19 unmodified lines
2020 * the IOP3xx OCCDR must be mapped uncached and unbuffered.
2121 */
2222 static struct map_desc iop3xx_std_desc[] __initdata = {
23− { /* mem mapped registers */
23+ { /* mem mapped registers */
2424 .virtual = IOP3XX_PERIPHERAL_VIRT_BASE,
2525 .pfn = __phys_to_pfn(IOP3XX_PERIPHERAL_PHYS_BASE),
2626 .length = IOP3XX_PERIPHERAL_SIZE,
2727 .type = MT_UNCACHED,
28− },
28+ },
2929 };
3030
3131 void __init iop3xx_map_io(void)
arch/arm/plat-samsung/include/plat/cpu-freq-core.h+1−1
@@ -39,7 +39,7 @@ struct s3c2410_iobank_timing { · 38 unmodified lines
3939 unsigned int tacs;
4040 unsigned int tcos;
4141 unsigned int tacc;
42− unsigned int tcoh; /* nCS hold afrer nOE/nWE */
42+ unsigned int tcoh; /* nCS hold after nOE/nWE */
4343 unsigned int tcah; /* Address hold after nCS */
4444 unsigned char nwait_en; /* nWait enabled for bank. */
4545 };
arch/arm/plat-samsung/include/plat/fb-s3c2410.h+1−1
@@ -48,7 +48,7 @@ struct s3c2410fb_display { · 47 unmodified lines
4848
4949 struct s3c2410fb_mach_info {
5050
51− struct s3c2410fb_display *displays; /* attached diplays info */
51+ struct s3c2410fb_display *displays; /* attached displays info */
5252 unsigned num_displays; /* number of defined displays */
5353 unsigned default_display;
5454
arch/arm/plat-samsung/include/plat/gpio-cfg.h+1−1
@@ -35,7 +35,7 @@ struct samsung_gpio_chip; · 34 unmodified lines
3535 * struct samsung_gpio_cfg GPIO configuration
3636 * @cfg_eint: Configuration setting when used for external interrupt source
3737 * @get_pull: Read the current pull configuration for the GPIO
38− * @set_pull: Set the current pull configuraiton for the GPIO
38+ * @set_pull: Set the current pull configuration for the GPIO
3939 * @set_config: Set the current configuration for the GPIO
4040 * @get_config: Read the current configuration for the GPIO
4141 *
arch/arm/plat-samsung/pm-check.c+1−1
@@ -5,7 +5,7 @@ · 4 unmodified lines
55 * http://armlinux.simtec.co.uk
66 * Ben Dooks <ben@simtec.co.uk>
77 *
8− * S3C Power Mangament - suspend/resume memory corruptiuon check.
8+ * S3C Power Mangament - suspend/resume memory corruption check.
99 *
1010 * This program is free software; you can redistribute it and/or modify
1111 * it under the terms of the GNU General Public License version 2 as
arch/arm/plat-samsung/watchdog-reset.c+1−1
@@ -3,7 +3,7 @@ · 2 unmodified lines
33 * Copyright (c) 2008 Simtec Electronics
44 * Ben Dooks <ben@simtec.co.uk>
55 *
6− * Coyright (c) 2013 Tomasz Figa <tomasz.figa@gmail.com>
6+ * Copyright (c) 2013 Tomasz Figa <tomasz.figa@gmail.com>
77 *
88 * Watchdog reset support for Samsung SoCs.
99 *
arch/arm/plat-versatile/platsmp.c+2−0
@@ -18,6 +18,8 @@ · 17 unmodified lines
1818 #include <asm/cacheflush.h>
1919 #include <asm/smp_plat.h>
2020
21+#include <plat/platsmp.h>
22+
2123 /*
2224 * Write pen_release in a way that is guaranteed to be visible to all
2325 * observers, irrespective of whether they're taking part in coherency
drivers/bus/mvebu-mbus.c+5−5
@@ -117,7 +117,7 @@ struct mvebu_mbus_soc_data { · 116 unmodified lines
117117 unsigned int (*win_remap_offset)(const int win);
118118 void (*setup_cpu_target)(struct mvebu_mbus_state *s);
119119 int (*save_cpu_target)(struct mvebu_mbus_state *s,
120− u32 *store_addr);
120+ u32 __iomem *store_addr);
121121 int (*show_cpu_target)(struct mvebu_mbus_state *s,
122122 struct seq_file *seq, void *v);
123123 };
@@ -728,7 +728,7 @@ mvebu_mbus_default_setup_cpu_target(struct mvebu_mbus_state *mbus) · 604 unmodified lines
728728
729729 static int
730730 mvebu_mbus_default_save_cpu_target(struct mvebu_mbus_state *mbus,
731− u32 *store_addr)
731+ u32 __iomem *store_addr)
732732 {
733733 int i;
734734
@@ -780,7 +780,7 @@ mvebu_mbus_dove_setup_cpu_target(struct mvebu_mbus_state *mbus) · 45 unmodified lines
780780
781781 static int
782782 mvebu_mbus_dove_save_cpu_target(struct mvebu_mbus_state *mbus,
783− u32 *store_addr)
783+ u32 __iomem *store_addr)
784784 {
785785 int i;
786786
@@ -796,7 +796,7 @@ mvebu_mbus_dove_save_cpu_target(struct mvebu_mbus_state *mbus, · 9 unmodified lines
796796 return 4;
797797 }
798798
799−int mvebu_mbus_save_cpu_target(u32 *store_addr)
799+int mvebu_mbus_save_cpu_target(u32 __iomem *store_addr)
800800 {
801801 return mbus_state.soc->save_cpu_target(&mbus_state, store_addr);
802802 }
@@ -1089,7 +1089,7 @@ static void mvebu_mbus_resume(void) · 286 unmodified lines
10891089 }
10901090 }
10911091
1092−struct syscore_ops mvebu_mbus_syscore_ops = {
1092+static struct syscore_ops mvebu_mbus_syscore_ops = {
10931093 .suspend = mvebu_mbus_suspend,
10941094 .resume = mvebu_mbus_resume,
10951095 };
drivers/power/reset/vexpress-poweroff.c+2−2
@@ -74,8 +74,8 @@ static ssize_t vexpress_reset_active_store(struct device *dev, · 73 unmodified lines
7474 return err ? err : count;
7575 }
7676
77−DEVICE_ATTR(active, S_IRUGO | S_IWUSR, vexpress_reset_active_show,
78− vexpress_reset_active_store);
77+static DEVICE_ATTR(active, S_IRUGO | S_IWUSR, vexpress_reset_active_show,
78+ vexpress_reset_active_store);
7979
8080
8181 enum vexpress_reset_func { FUNC_RESET, FUNC_SHUTDOWN, FUNC_REBOOT };
include/linux/mbus.h+1−1
@@ -66,7 +66,7 @@ static inline const struct mbus_dram_target_info *mv_mbus_dram_info_nooverlap(vo · 65 unmodified lines
6666 }
6767 #endif
6868
69−int mvebu_mbus_save_cpu_target(u32 *store_addr);
69+int mvebu_mbus_save_cpu_target(u32 __iomem *store_addr);
7070 void mvebu_mbus_get_pcie_mem_aperture(struct resource *res);
7171 void mvebu_mbus_get_pcie_io_aperture(struct resource *res);
7272 int mvebu_mbus_get_dram_win_info(phys_addr_t phyaddr, u8 *target, u8 *attr);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t