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 ...
Unified · Split
| @@ -327,7 +327,6 @@ choice · 326 unmodified lines | ||
| 327 | 327 | config ARCH_MULTIPLATFORM |
| 328 | 328 | bool "Allow multiple platforms to be selected" |
| 329 | 329 | depends on MMU |
| 330 | − select ARCH_WANT_OPTIONAL_GPIOLIB | |
| 331 | 330 | select ARM_HAS_SG_CHAIN |
| 332 | 331 | select ARM_PATCH_PHYS_VIRT |
| 333 | 332 | select AUTO_ZRELADDR |
| @@ -342,7 +341,6 @@ config ARCH_MULTIPLATFORM · 8 unmodified lines | ||
| 342 | 341 | config ARM_SINGLE_ARMV7M |
| 343 | 342 | bool "ARMv7-M based platforms (Cortex-M0/M3/M4)" |
| 344 | 343 | depends on !MMU |
| 345 | − select ARCH_WANT_OPTIONAL_GPIOLIB | |
| 346 | 344 | select ARM_NVIC |
| 347 | 345 | select AUTO_ZRELADDR |
| 348 | 346 | select CLKSRC_OF |
| @@ -356,12 +354,12 @@ config ARM_SINGLE_ARMV7M · 7 unmodified lines | ||
| 356 | 354 | |
| 357 | 355 | config ARCH_CLPS711X |
| 358 | 356 | bool "Cirrus Logic CLPS711x/EP721x/EP731x-based" |
| 359 | − select ARCH_REQUIRE_GPIOLIB | |
| 360 | 357 | select AUTO_ZRELADDR |
| 361 | 358 | select COMMON_CLK |
| 362 | 359 | select CPU_ARM720T |
| 363 | 360 | select GENERIC_CLOCKEVENTS |
| 364 | 361 | select CLPS711X_TIMER |
| 362 | + select GPIOLIB | |
| 365 | 363 | select MFD_SYSCON |
| 366 | 364 | select SOC_BUS |
| 367 | 365 | help |
| @@ -369,10 +367,10 @@ config ARCH_CLPS711X · 1 unmodified line | ||
| 369 | 367 | |
| 370 | 368 | config ARCH_GEMINI |
| 371 | 369 | bool "Cortina Systems Gemini" |
| 372 | − select ARCH_REQUIRE_GPIOLIB | |
| 373 | 370 | select CLKSRC_MMIO |
| 374 | 371 | select CPU_FA526 |
| 375 | 372 | select GENERIC_CLOCKEVENTS |
| 373 | + select GPIOLIB | |
| 376 | 374 | help |
| 377 | 375 | Support for the Cortina Systems Gemini family SoCs |
| 378 | 376 | |
| @@ -393,7 +391,6 @@ config ARCH_EBSA110 · 14 unmodified lines | ||
| 393 | 391 | config ARCH_EP93XX |
| 394 | 392 | bool "EP93xx-based" |
| 395 | 393 | select ARCH_HAS_HOLES_MEMORYMODEL |
| 396 | − select ARCH_REQUIRE_GPIOLIB | |
| 397 | 394 | select ARM_AMBA |
| 398 | 395 | select ARM_PATCH_PHYS_VIRT |
| 399 | 396 | select ARM_VIC |
| @@ -402,6 +399,7 @@ config ARCH_EP93XX · 2 unmodified lines | ||
| 402 | 399 | select CLKSRC_MMIO |
| 403 | 400 | select CPU_ARM920T |
| 404 | 401 | select GENERIC_CLOCKEVENTS |
| 402 | + select GPIOLIB | |
| 405 | 403 | help |
| 406 | 404 | This enables support for the Cirrus EP93xx series of CPUs. |
| 407 | 405 | |
| @@ -442,9 +440,9 @@ config ARCH_IOP13XX · 34 unmodified lines | ||
| 442 | 440 | config ARCH_IOP32X |
| 443 | 441 | bool "IOP32x-based" |
| 444 | 442 | depends on MMU |
| 445 | − select ARCH_REQUIRE_GPIOLIB | |
| 446 | 443 | select CPU_XSCALE |
| 447 | 444 | select GPIO_IOP |
| 445 | + select GPIOLIB | |
| 448 | 446 | select NEED_RET_TO_USER |
| 449 | 447 | select PCI |
| 450 | 448 | select PLAT_IOP |
| @@ -455,9 +453,9 @@ config ARCH_IOP32X · 4 unmodified lines | ||
| 455 | 453 | config ARCH_IOP33X |
| 456 | 454 | bool "IOP33x-based" |
| 457 | 455 | depends on MMU |
| 458 | − select ARCH_REQUIRE_GPIOLIB | |
| 459 | 456 | select CPU_XSCALE |
| 460 | 457 | select GPIO_IOP |
| 458 | + select GPIOLIB | |
| 461 | 459 | select NEED_RET_TO_USER |
| 462 | 460 | select PCI |
| 463 | 461 | select PLAT_IOP |
| @@ -468,12 +466,12 @@ config ARCH_IXP4XX · 4 unmodified lines | ||
| 468 | 466 | bool "IXP4xx-based" |
| 469 | 467 | depends on MMU |
| 470 | 468 | select ARCH_HAS_DMA_SET_COHERENT_MASK |
| 471 | − select ARCH_REQUIRE_GPIOLIB | |
| 472 | 469 | select ARCH_SUPPORTS_BIG_ENDIAN |
| 473 | 470 | select CLKSRC_MMIO |
| 474 | 471 | select CPU_XSCALE |
| 475 | 472 | select DMABOUNCE if PCI |
| 476 | 473 | select GENERIC_CLOCKEVENTS |
| 474 | + select GPIOLIB | |
| 477 | 475 | select MIGHT_HAVE_PCI |
| 478 | 476 | select NEED_MACH_IO_H |
| 479 | 477 | select USB_EHCI_BIG_ENDIAN_DESC |
| @@ -483,9 +481,9 @@ config ARCH_IXP4XX · 3 unmodified lines | ||
| 483 | 481 | |
| 484 | 482 | config ARCH_DOVE |
| 485 | 483 | bool "Marvell Dove" |
| 486 | − select ARCH_REQUIRE_GPIOLIB | |
| 487 | 484 | select CPU_PJ4 |
| 488 | 485 | select GENERIC_CLOCKEVENTS |
| 486 | + select GPIOLIB | |
| 489 | 487 | select MIGHT_HAVE_PCI |
| 490 | 488 | select MULTI_IRQ_HANDLER |
| 491 | 489 | select MVEBU_MBUS |
| @@ -499,10 +497,10 @@ config ARCH_DOVE · 7 unmodified lines | ||
| 499 | 497 | |
| 500 | 498 | config ARCH_KS8695 |
| 501 | 499 | bool "Micrel/Kendin KS8695" |
| 502 | − select ARCH_REQUIRE_GPIOLIB | |
| 503 | 500 | select CLKSRC_MMIO |
| 504 | 501 | select CPU_ARM922T |
| 505 | 502 | select GENERIC_CLOCKEVENTS |
| 503 | + select GPIOLIB | |
| 506 | 504 | select NEED_MACH_MEMORY_H |
| 507 | 505 | help |
| 508 | 506 | Support for Micrel/Kendin KS8695 "Centaur" (ARM922T) based |
| @@ -510,11 +508,11 @@ config ARCH_KS8695 · 1 unmodified line | ||
| 510 | 508 | |
| 511 | 509 | config ARCH_W90X900 |
| 512 | 510 | bool "Nuvoton W90X900 CPU" |
| 513 | − select ARCH_REQUIRE_GPIOLIB | |
| 514 | 511 | select CLKDEV_LOOKUP |
| 515 | 512 | select CLKSRC_MMIO |
| 516 | 513 | select CPU_ARM926T |
| 517 | 514 | select GENERIC_CLOCKEVENTS |
| 515 | + select GPIOLIB | |
| 518 | 516 | help |
| 519 | 517 | Support for Nuvoton (Winbond logic dept.) ARM9 processor, |
| 520 | 518 | At present, the w90x900 has been renamed nuc900, regarding |
| @@ -526,13 +524,13 @@ config ARCH_W90X900 · 5 unmodified lines | ||
| 526 | 524 | |
| 527 | 525 | config ARCH_LPC32XX |
| 528 | 526 | bool "NXP LPC32XX" |
| 529 | − select ARCH_REQUIRE_GPIOLIB | |
| 530 | 527 | select ARM_AMBA |
| 531 | 528 | select CLKDEV_LOOKUP |
| 532 | 529 | select CLKSRC_LPC32XX |
| 533 | 530 | select COMMON_CLK |
| 534 | 531 | select CPU_ARM926T |
| 535 | 532 | select GENERIC_CLOCKEVENTS |
| 533 | + select GPIOLIB | |
| 536 | 534 | select MULTI_IRQ_HANDLER |
| 537 | 535 | select SPARSE_IRQ |
| 538 | 536 | select USE_OF |
| @@ -543,7 +541,6 @@ config ARCH_PXA · 4 unmodified lines | ||
| 543 | 541 | bool "PXA2xx/PXA3xx-based" |
| 544 | 542 | depends on MMU |
| 545 | 543 | select ARCH_MTD_XIP |
| 546 | − select ARCH_REQUIRE_GPIOLIB | |
| 547 | 544 | select ARM_CPU_SUSPEND if PM |
| 548 | 545 | select AUTO_ZRELADDR |
| 549 | 546 | select COMMON_CLK |
| @@ -554,6 +551,7 @@ config ARCH_PXA · 4 unmodified lines | ||
| 554 | 551 | select CPU_XSCALE if !CPU_XSC3 |
| 555 | 552 | select GENERIC_CLOCKEVENTS |
| 556 | 553 | select GPIO_PXA |
| 554 | + select GPIOLIB | |
| 557 | 555 | select HAVE_IDE |
| 558 | 556 | select IRQ_DOMAIN |
| 559 | 557 | select MULTI_IRQ_HANDLER |
| @@ -584,7 +582,6 @@ config ARCH_RPC · 24 unmodified lines | ||
| 584 | 582 | config ARCH_SA1100 |
| 585 | 583 | bool "SA1100-based" |
| 586 | 584 | select ARCH_MTD_XIP |
| 587 | − select ARCH_REQUIRE_GPIOLIB | |
| 588 | 585 | select ARCH_SPARSEMEM_ENABLE |
| 589 | 586 | select CLKDEV_LOOKUP |
| 590 | 587 | select CLKSRC_MMIO |
| @@ -593,6 +590,7 @@ config ARCH_SA1100 · 2 unmodified lines | ||
| 593 | 590 | select CPU_FREQ |
| 594 | 591 | select CPU_SA1100 |
| 595 | 592 | select GENERIC_CLOCKEVENTS |
| 593 | + select GPIOLIB | |
| 596 | 594 | select HAVE_IDE |
| 597 | 595 | select IRQ_DOMAIN |
| 598 | 596 | select ISA |
| @@ -604,12 +602,12 @@ config ARCH_SA1100 · 5 unmodified lines | ||
| 604 | 602 | |
| 605 | 603 | config ARCH_S3C24XX |
| 606 | 604 | bool "Samsung S3C24XX SoCs" |
| 607 | − select ARCH_REQUIRE_GPIOLIB | |
| 608 | 605 | select ATAGS |
| 609 | 606 | select CLKDEV_LOOKUP |
| 610 | 607 | select CLKSRC_SAMSUNG_PWM |
| 611 | 608 | select GENERIC_CLOCKEVENTS |
| 612 | 609 | select GPIO_SAMSUNG |
| 610 | + select GPIOLIB | |
| 613 | 611 | select HAVE_S3C2410_I2C if I2C |
| 614 | 612 | select HAVE_S3C2410_WATCHDOG if WATCHDOG |
| 615 | 613 | select HAVE_S3C_RTC if RTC_CLASS |
| @@ -625,12 +623,12 @@ config ARCH_S3C24XX · 9 unmodified lines | ||
| 625 | 623 | config ARCH_DAVINCI |
| 626 | 624 | bool "TI DaVinci" |
| 627 | 625 | select ARCH_HAS_HOLES_MEMORYMODEL |
| 628 | − select ARCH_REQUIRE_GPIOLIB | |
| 629 | 626 | select CLKDEV_LOOKUP |
| 630 | 627 | select CPU_ARM926T |
| 631 | 628 | select GENERIC_ALLOCATOR |
| 632 | 629 | select GENERIC_CLOCKEVENTS |
| 633 | 630 | select GENERIC_IRQ_CHIP |
| 631 | + select GPIOLIB | |
| 634 | 632 | select HAVE_IDE |
| 635 | 633 | select USE_OF |
| 636 | 634 | select ZONE_DMA |
| @@ -642,11 +640,11 @@ config ARCH_OMAP1 · 5 unmodified lines | ||
| 642 | 640 | depends on MMU |
| 643 | 641 | select ARCH_HAS_HOLES_MEMORYMODEL |
| 644 | 642 | select ARCH_OMAP |
| 645 | − select ARCH_REQUIRE_GPIOLIB | |
| 646 | 643 | select CLKDEV_LOOKUP |
| 647 | 644 | select CLKSRC_MMIO |
| 648 | 645 | select GENERIC_CLOCKEVENTS |
| 649 | 646 | select GENERIC_IRQ_CHIP |
| 647 | + select GPIOLIB | |
| 650 | 648 | select HAVE_IDE |
| 651 | 649 | select IRQ_DOMAIN |
| 652 | 650 | select MULTI_IRQ_HANDLER |
| @@ -868,7 +866,7 @@ source "arch/arm/mach-zynq/Kconfig" · 215 unmodified lines | ||
| 868 | 866 | config ARCH_EFM32 |
| 869 | 867 | bool "Energy Micro efm32" |
| 870 | 868 | depends on ARM_SINGLE_ARMV7M |
| 871 | − select ARCH_REQUIRE_GPIOLIB | |
| 869 | + select GPIOLIB | |
| 872 | 870 | help |
| 873 | 871 | Support for Energy Micro's (now Silicon Labs) efm32 Giant Gecko |
| 874 | 872 | processors. |
| @@ -901,7 +899,7 @@ config MACH_STM32F429 · 26 unmodified lines | ||
| 901 | 899 | default y |
| 902 | 900 | |
| 903 | 901 | config ARCH_MPS2 |
| 904 | − bool "ARM MPS2 paltform" | |
| 902 | + bool "ARM MPS2 platform" | |
| 905 | 903 | depends on ARM_SINGLE_ARMV7M |
| 906 | 904 | select ARM_AMBA |
| 907 | 905 | select CLKSRC_MPS2 |
| @@ -1,8 +1,8 @@ | ||
| 1 | 1 | menuconfig ARCH_AT91 |
| 2 | 2 | bool "Atmel SoCs" |
| 3 | 3 | depends on ARCH_MULTI_V4T || ARCH_MULTI_V5 || ARCH_MULTI_V7 |
| 4 | − select ARCH_REQUIRE_GPIOLIB | |
| 5 | 4 | select COMMON_CLK_AT91 |
| 5 | + select GPIOLIB | |
| 6 | 6 | select PINCTRL |
| 7 | 7 | select SOC_BUS |
| 8 | 8 | |
| @@ -17,7 +17,7 @@ config ARCH_BCM_IPROC · 16 unmodified lines | ||
| 17 | 17 | select ARM_GLOBAL_TIMER |
| 18 | 18 | select COMMON_CLK_IPROC |
| 19 | 19 | select CLKSRC_MMIO |
| 20 | − select ARCH_REQUIRE_GPIOLIB | |
| 20 | + select GPIOLIB | |
| 21 | 21 | select ARM_AMBA |
| 22 | 22 | select PINCTRL |
| 23 | 23 | help |
| @@ -80,7 +80,7 @@ comment "KONA architected SoCs" · 56 unmodified lines | ||
| 80 | 80 | |
| 81 | 81 | config ARCH_BCM_MOBILE |
| 82 | 82 | bool |
| 83 | − select ARCH_REQUIRE_GPIOLIB | |
| 83 | + select GPIOLIB | |
| 84 | 84 | select ARM_ERRATA_754322 |
| 85 | 85 | select ARM_ERRATA_775420 |
| 86 | 86 | select ARM_GIC |
| @@ -138,7 +138,7 @@ comment "Other Architectures" · 51 unmodified lines | ||
| 138 | 138 | config ARCH_BCM2835 |
| 139 | 139 | bool "Broadcom BCM2835 family" |
| 140 | 140 | depends on ARCH_MULTI_V6 || ARCH_MULTI_V7 |
| 141 | − select ARCH_REQUIRE_GPIOLIB | |
| 141 | + select GPIOLIB | |
| 142 | 142 | select ARM_AMBA |
| 143 | 143 | select ARM_ERRATA_411920 if ARCH_MULTI_V6 |
| 144 | 144 | select ARM_TIMER_SP804 |
| @@ -178,7 +178,6 @@ config ARCH_BRCMSTB · 33 unmodified lines | ||
| 178 | 178 | select BRCMSTB_L2_IRQ |
| 179 | 179 | select BCM7120_L2_IRQ |
| 180 | 180 | select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE |
| 181 | − select ARCH_WANT_OPTIONAL_GPIOLIB | |
| 182 | 181 | select SOC_BRCMSTB |
| 183 | 182 | select SOC_BUS |
| 184 | 183 | help |
| @@ -2,11 +2,11 @@ menuconfig ARCH_BERLIN · 1 unmodified line | ||
| 2 | 2 | bool "Marvell Berlin SoCs" |
| 3 | 3 | depends on ARCH_MULTI_V7 |
| 4 | 4 | select ARCH_HAS_RESET_CONTROLLER |
| 5 | − select ARCH_REQUIRE_GPIOLIB | |
| 6 | 5 | select ARM_GIC |
| 7 | 6 | select DW_APB_ICTL |
| 8 | 7 | select DW_APB_TIMER_OF |
| 9 | 8 | select GENERIC_IRQ_CHIP |
| 9 | + select GPIOLIB | |
| 10 | 10 | select MFD_SYSCON |
| 11 | 11 | select PINCTRL |
| 12 | 12 | |
| @@ -1,10 +1,10 @@ | ||
| 1 | 1 | config ARCH_DIGICOLOR |
| 2 | 2 | bool "Conexant Digicolor SoC Support" |
| 3 | 3 | depends on ARCH_MULTI_V7 |
| 4 | − select ARCH_REQUIRE_GPIOLIB | |
| 5 | 4 | select CLKSRC_MMIO |
| 6 | 5 | select DIGICOLOR_TIMER |
| 7 | 6 | select GENERIC_IRQ_CHIP |
| 7 | + select GPIOLIB | |
| 8 | 8 | select MFD_SYSCON |
| 9 | 9 | select PINCTRL |
| 10 | 10 | select PINCTRL_DIGICOLOR |
| @@ -12,13 +12,13 @@ menuconfig ARCH_EXYNOS · 11 unmodified lines | ||
| 12 | 12 | depends on ARCH_MULTI_V7 |
| 13 | 13 | select ARCH_HAS_BANDGAP |
| 14 | 14 | select ARCH_HAS_HOLES_MEMORYMODEL |
| 15 | − select ARCH_REQUIRE_GPIOLIB | |
| 16 | 15 | select ARM_AMBA |
| 17 | 16 | select ARM_GIC |
| 18 | 17 | select COMMON_CLK_SAMSUNG |
| 19 | 18 | select EXYNOS_THERMAL |
| 20 | 19 | select EXYNOS_PMU |
| 21 | 20 | select EXYNOS_SROM |
| 21 | + select GPIOLIB | |
| 22 | 22 | select HAVE_ARM_SCU if SMP |
| 23 | 23 | select HAVE_S3C2410_I2C if I2C |
| 24 | 24 | select HAVE_S3C2410_WATCHDOG if WATCHDOG |
| @@ -1,10 +1,10 @@ | ||
| 1 | 1 | menuconfig ARCH_MXC |
| 2 | 2 | bool "Freescale i.MX family" |
| 3 | 3 | depends on ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7 || ARM_SINGLE_ARMV7M |
| 4 | − select ARCH_REQUIRE_GPIOLIB | |
| 5 | 4 | select ARCH_SUPPORTS_BIG_ENDIAN |
| 6 | 5 | select CLKSRC_IMX_GPT |
| 7 | 6 | select GENERIC_IRQ_CHIP |
| 7 | + select GPIOLIB | |
| 8 | 8 | select PINCTRL |
| 9 | 9 | select PM_OPP if PM |
| 10 | 10 | select SOC_BUS |
| @@ -44,9 +44,6 @@ config MXC_USE_EPIT · 33 unmodified lines | ||
| 44 | 44 | uses the same clocks as the GPT. Anyway, on some systems the GPT |
| 45 | 45 | may be in use for other purposes. |
| 46 | 46 | |
| 47 | −config ARCH_HAS_RNGA | |
| 48 | − bool | |
| 49 | − | |
| 50 | 47 | config HAVE_IMX_ANATOP |
| 51 | 48 | bool |
| 52 | 49 | |
| @@ -90,7 +87,6 @@ config SOC_IMX27 · 37 unmodified lines | ||
| 90 | 87 | config SOC_IMX31 |
| 91 | 88 | bool |
| 92 | 89 | select CPU_V6 |
| 93 | − select IMX_HAVE_PLATFORM_MXC_RNGA | |
| 94 | 90 | select MXC_AVIC |
| 95 | 91 | select SMP_ON_UP if SMP |
| 96 | 92 | |
| @@ -8,8 +8,8 @@ obj-$(CONFIG_SOC_IMX25) += cpu-imx25.o mach-imx25.o pm-imx25.o · 7 unmodified lines | ||
| 8 | 8 | obj-$(CONFIG_SOC_IMX27) += cpu-imx27.o pm-imx27.o |
| 9 | 9 | obj-$(CONFIG_SOC_IMX27) += mm-imx27.o ehci-imx27.o |
| 10 | 10 | |
| 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 | |
| 13 | 13 | |
| 14 | 14 | imx5-pm-$(CONFIG_PM) += pm-imx5.o |
| 15 | 15 | obj-$(CONFIG_SOC_IMX5) += cpu-imx5.o $(imx5-pm-y) |
| @@ -32,7 +32,6 @@ void imx27_init_early(void); · 31 unmodified lines | ||
| 32 | 32 | void imx31_init_early(void); |
| 33 | 33 | void imx35_init_early(void); |
| 34 | 34 | void mxc_init_irq(void __iomem *); |
| 35 | −void tzic_init_irq(void); | |
| 36 | 35 | void mx1_init_irq(void); |
| 37 | 36 | void mx21_init_irq(void); |
| 38 | 37 | void mx27_init_irq(void); |
| @@ -55,6 +54,7 @@ struct platform_device *mxc_register_gpio(char *name, int id, · 16 unmodified lines | ||
| 55 | 54 | void mxc_set_cpu_type(unsigned int type); |
| 56 | 55 | void mxc_restart(enum reboot_mode, const char *); |
| 57 | 56 | void mxc_arch_reset_init(void __iomem *); |
| 57 | +void imx1_reset_init(void __iomem *); | |
| 58 | 58 | void imx_set_aips(void __iomem *); |
| 59 | 59 | void imx_aips_allow_unprivileged_access(const char *compat); |
| 60 | 60 | int mxc_device_init(void); |
| @@ -67,6 +67,7 @@ void imx_gpc_set_arm_power_in_lpm(bool power_off); · 6 unmodified lines | ||
| 67 | 67 | void imx_gpc_set_arm_power_up_timing(u32 sw2iso, u32 sw); |
| 68 | 68 | void imx_gpc_set_arm_power_down_timing(u32 sw2iso, u32 sw); |
| 69 | 69 | void imx25_pm_init(void); |
| 70 | +void imx27_pm_init(void); | |
| 70 | 71 | |
| 71 | 72 | enum mxc_cpu_pwr_mode { |
| 72 | 73 | WAIT_CLOCKED, /* wfi only */ |
| @@ -60,13 +60,9 @@ static int get_mx51_srev(void) · 59 unmodified lines | ||
| 60 | 60 | /* |
| 61 | 61 | * Returns: |
| 62 | 62 | * the silicon revision of the cpu |
| 63 | − * -EINVAL - not a mx51 | |
| 64 | 63 | */ |
| 65 | 64 | int mx51_revision(void) |
| 66 | 65 | { |
| 67 | − if (!cpu_is_mx51()) | |
| 68 | − return -EINVAL; | |
| 69 | − | |
| 70 | 66 | if (mx5_cpu_rev == -1) |
| 71 | 67 | mx5_cpu_rev = get_mx51_srev(); |
| 72 | 68 | |
| @@ -112,13 +108,9 @@ static int get_mx53_srev(void) · 39 unmodified lines | ||
| 112 | 108 | /* |
| 113 | 109 | * Returns: |
| 114 | 110 | * the silicon revision of the cpu |
| 115 | − * -EINVAL - not a mx53 | |
| 116 | 111 | */ |
| 117 | 112 | int mx53_revision(void) |
| 118 | 113 | { |
| 119 | − if (!cpu_is_mx53()) | |
| 120 | − return -EINVAL; | |
| 121 | − | |
| 122 | 114 | if (mx5_cpu_rev == -1) |
| 123 | 115 | mx5_cpu_rev = get_mx53_srev(); |
| 124 | 116 | |
| @@ -10,8 +10,6 @@ · 9 unmodified lines | ||
| 10 | 10 | #include "common.h" |
| 11 | 11 | |
| 12 | 12 | unsigned int __mxc_cpu_type; |
| 13 | −EXPORT_SYMBOL(__mxc_cpu_type); | |
| 14 | − | |
| 15 | 13 | static unsigned int imx_soc_revision; |
| 16 | 14 | |
| 17 | 15 | void mxc_set_cpu_type(unsigned int type) |
| @@ -57,10 +57,6 @@ config IMX_HAVE_PLATFORM_MXC_MMC · 56 unmodified lines | ||
| 57 | 57 | config IMX_HAVE_PLATFORM_MXC_NAND |
| 58 | 58 | bool |
| 59 | 59 | |
| 60 | −config IMX_HAVE_PLATFORM_MXC_RNGA | |
| 61 | − bool | |
| 62 | − select ARCH_HAS_RNGA | |
| 63 | − | |
| 64 | 60 | config IMX_HAVE_PLATFORM_MXC_RTC |
| 65 | 61 | bool |
| 66 | 62 | |
| @@ -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); | |
| @@ -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__ */ | |
| @@ -27,5 +27,6 @@ DT_MACHINE_START(IMX27_DT, "Freescale i.MX27 (Device Tree Support)") · 26 unmodified lines | ||
| 27 | 27 | .map_io = mx27_map_io, |
| 28 | 28 | .init_early = imx27_init_early, |
| 29 | 29 | .init_irq = mx27_init_irq, |
| 30 | + .init_late = imx27_pm_init, | |
| 30 | 31 | .dt_compat = imx27_dt_board_compat, |
| 31 | 32 | MACHINE_END |
| @@ -28,10 +28,22 @@ static void __init imx31_dt_timer_init(void) · 27 unmodified lines | ||
| 28 | 28 | mx31_clocks_init_dt(); |
| 29 | 29 | } |
| 30 | 30 | |
| 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 | + | |
| 31 | 42 | DT_MACHINE_START(IMX31_DT, "Freescale i.MX31 (Device Tree Support)") |
| 32 | 43 | .map_io = mx31_map_io, |
| 33 | 44 | .init_early = imx31_init_early, |
| 34 | 45 | .init_irq = mx31_init_irq, |
| 35 | 46 | .init_time = imx31_dt_timer_init, |
| 47 | + .init_machine = imx31_dt_mach_init, | |
| 36 | 48 | .dt_compat = imx31_dt_board_compat, |
| 37 | 49 | MACHINE_END |
| @@ -20,20 +20,16 @@ · 19 unmodified lines | ||
| 20 | 20 | #include "common.h" |
| 21 | 21 | #include "mx35.h" |
| 22 | 22 | |
| 23 | −static void __init imx35_irq_init(void) | |
| 24 | −{ | |
| 25 | − imx_init_l2cache(); | |
| 26 | − mx35_init_irq(); | |
| 27 | −} | |
| 28 | − | |
| 29 | 23 | static const char * const imx35_dt_board_compat[] __initconst = { |
| 30 | 24 | "fsl,imx35", |
| 31 | 25 | NULL |
| 32 | 26 | }; |
| 33 | 27 | |
| 34 | 28 | DT_MACHINE_START(IMX35_DT, "Freescale i.MX35 (Device Tree Support)") |
| 29 | + .l2c_aux_val = 0, | |
| 30 | + .l2c_aux_mask = ~0, | |
| 35 | 31 | .map_io = mx35_map_io, |
| 36 | 32 | .init_early = imx35_init_early, |
| 37 | − .init_irq = imx35_irq_init, | |
| 33 | + .init_irq = mx35_init_irq, | |
| 38 | 34 | .dt_compat = imx35_dt_board_compat, |
| 39 | 35 | MACHINE_END |
| @@ -22,6 +22,5 @@ static const char * const imx50_dt_board_compat[] __initconst = { · 21 unmodified lines | ||
| 22 | 22 | }; |
| 23 | 23 | |
| 24 | 24 | DT_MACHINE_START(IMX50_DT, "Freescale i.MX50 (Device Tree Support)") |
| 25 | − .init_irq = tzic_init_irq, | |
| 26 | 25 | .dt_compat = imx50_dt_board_compat, |
| 27 | 26 | MACHINE_END |
| @@ -67,7 +67,6 @@ static const char * const imx51_dt_board_compat[] __initconst = { · 66 unmodified lines | ||
| 67 | 67 | |
| 68 | 68 | DT_MACHINE_START(IMX51_DT, "Freescale i.MX51 (Device Tree Support)") |
| 69 | 69 | .init_early = imx51_init_early, |
| 70 | − .init_irq = tzic_init_irq, | |
| 71 | 70 | .init_machine = imx51_dt_init, |
| 72 | 71 | .init_late = imx51_init_late, |
| 73 | 72 | .dt_compat = imx51_dt_board_compat, |
| @@ -47,7 +47,6 @@ static const char * const imx53_dt_board_compat[] __initconst = { · 46 unmodified lines | ||
| 47 | 47 | |
| 48 | 48 | DT_MACHINE_START(IMX53_DT, "Freescale i.MX53 (Device Tree Support)") |
| 49 | 49 | .init_early = imx53_init_early, |
| 50 | − .init_irq = tzic_init_irq, | |
| 51 | 50 | .init_machine = imx53_dt_init, |
| 52 | 51 | .init_late = imx53_init_late, |
| 53 | 52 | .dt_compat = imx53_dt_board_compat, |
| @@ -407,6 +407,8 @@ static const char * const imx6q_dt_compat[] __initconst = { · 406 unmodified lines | ||
| 407 | 407 | }; |
| 408 | 408 | |
| 409 | 409 | DT_MACHINE_START(IMX6Q, "Freescale i.MX6 Quad/DualLite (Device Tree)") |
| 410 | + .l2c_aux_val = 0, | |
| 411 | + .l2c_aux_mask = ~0, | |
| 410 | 412 | .smp = smp_ops(imx_smp_ops), |
| 411 | 413 | .map_io = imx6q_map_io, |
| 412 | 414 | .init_irq = imx6q_init_irq, |
| @@ -75,6 +75,8 @@ static const char * const imx6sl_dt_compat[] __initconst = { · 74 unmodified lines | ||
| 75 | 75 | }; |
| 76 | 76 | |
| 77 | 77 | DT_MACHINE_START(IMX6SL, "Freescale i.MX6 SoloLite (Device Tree)") |
| 78 | + .l2c_aux_val = 0, | |
| 79 | + .l2c_aux_mask = ~0, | |
| 78 | 80 | .init_irq = imx6sl_init_irq, |
| 79 | 81 | .init_machine = imx6sl_init_machine, |
| 80 | 82 | .init_late = imx6sl_init_late, |
| @@ -103,6 +103,8 @@ static const char * const imx6sx_dt_compat[] __initconst = { · 102 unmodified lines | ||
| 103 | 103 | }; |
| 104 | 104 | |
| 105 | 105 | DT_MACHINE_START(IMX6SX, "Freescale i.MX6 SoloX (Device Tree)") |
| 106 | + .l2c_aux_val = 0, | |
| 107 | + .l2c_aux_mask = ~0, | |
| 106 | 108 | .init_irq = imx6sx_init_irq, |
| 107 | 109 | .init_machine = imx6sx_init_machine, |
| 108 | 110 | .dt_compat = imx6sx_dt_compat, |
| @@ -50,7 +50,7 @@ void __init mx1_init_irq(void) · 49 unmodified lines | ||
| 50 | 50 | |
| 51 | 51 | void __init imx1_soc_init(void) |
| 52 | 52 | { |
| 53 | − mxc_arch_reset_init(MX1_IO_ADDRESS(MX1_WDT_BASE_ADDR)); | |
| 53 | + imx1_reset_init(MX1_IO_ADDRESS(MX1_WDT_BASE_ADDR)); | |
| 54 | 54 | mxc_device_init(); |
| 55 | 55 | |
| 56 | 56 | mxc_register_gpio("imx1-gpio", 0, MX1_GPIO1_BASE_ADDR, SZ_256, |
| @@ -98,4 +98,6 @@ void __init imx27_soc_init(void) · 97 unmodified lines | ||
| 98 | 98 | /* imx27 has the imx21 type audmux */ |
| 99 | 99 | platform_device_register_simple("imx21-audmux", 0, imx27_audmux_res, |
| 100 | 100 | ARRAY_SIZE(imx27_audmux_res)); |
| 101 | + | |
| 102 | + imx27_pm_init(); | |
| 101 | 103 | } |
| @@ -19,6 +19,7 @@ · 18 unmodified lines | ||
| 19 | 19 | #include <linux/mm.h> |
| 20 | 20 | #include <linux/init.h> |
| 21 | 21 | #include <linux/err.h> |
| 22 | +#include <linux/io.h> | |
| 22 | 23 | #include <linux/pinctrl/machine.h> |
| 23 | 24 | |
| 24 | 25 | #include <asm/pgtable.h> |
| @@ -38,8 +39,6 @@ static void imx3_idle(void) · 13 unmodified lines | ||
| 38 | 39 | { |
| 39 | 40 | unsigned long reg = 0; |
| 40 | 41 | |
| 41 | − mx3_cpu_lp_set(MX3_WAIT); | |
| 42 | − | |
| 43 | 42 | __asm__ __volatile__( |
| 44 | 43 | /* disable I and D cache */ |
| 45 | 44 | "mrc p15, 0, %0, c1, c0, 0\n" |
| @@ -135,11 +134,20 @@ void __init mx31_map_io(void) · 89 unmodified lines | ||
| 135 | 134 | iotable_init(mx31_io_desc, ARRAY_SIZE(mx31_io_desc)); |
| 136 | 135 | } |
| 137 | 136 | |
| 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 | + | |
| 138 | 146 | void __init imx31_init_early(void) |
| 139 | 147 | { |
| 140 | 148 | mxc_set_cpu_type(MXC_CPU_MX31); |
| 141 | 149 | arch_ioremap_caller = imx3_ioremap_caller; |
| 142 | − arm_pm_idle = imx3_idle; | |
| 150 | + arm_pm_idle = imx31_idle; | |
| 143 | 151 | mx3_ccm_base = MX31_IO_ADDRESS(MX31_CCM_BASE_ADDR); |
| 144 | 152 | } |
| 145 | 153 | |
| @@ -167,6 +175,10 @@ static const struct resource imx31_audmux_res[] __initconst = { · 21 unmodified lines | ||
| 167 | 175 | DEFINE_RES_MEM(MX31_AUDMUX_BASE_ADDR, SZ_16K), |
| 168 | 176 | }; |
| 169 | 177 | |
| 178 | +static const struct resource imx31_rnga_res[] __initconst = { | |
| 179 | + DEFINE_RES_MEM(MX31_RNGA_BASE_ADDR, SZ_16K), | |
| 180 | +}; | |
| 181 | + | |
| 170 | 182 | void __init imx31_soc_init(void) |
| 171 | 183 | { |
| 172 | 184 | int to_version = mx31_revision() >> 4; |
| @@ -195,6 +207,8 @@ void __init imx31_soc_init(void) · 22 unmodified lines | ||
| 195 | 207 | |
| 196 | 208 | platform_device_register_simple("imx31-audmux", 0, imx31_audmux_res, |
| 197 | 209 | ARRAY_SIZE(imx31_audmux_res)); |
| 210 | + platform_device_register_simple("mxc_rnga", -1, imx31_rnga_res, | |
| 211 | + ARRAY_SIZE(imx31_rnga_res)); | |
| 198 | 212 | } |
| 199 | 213 | #endif /* ifdef CONFIG_SOC_IMX31 */ |
| 200 | 214 | |
| @@ -212,11 +226,21 @@ void __init mx35_map_io(void) · 11 unmodified lines | ||
| 212 | 226 | iotable_init(mx35_io_desc, ARRAY_SIZE(mx35_io_desc)); |
| 213 | 227 | } |
| 214 | 228 | |
| 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 | + | |
| 215 | 239 | void __init imx35_init_early(void) |
| 216 | 240 | { |
| 217 | 241 | mxc_set_cpu_type(MXC_CPU_MX35); |
| 218 | 242 | mxc_iomux_v3_init(MX35_IO_ADDRESS(MX35_IOMUXC_BASE_ADDR)); |
| 219 | − arm_pm_idle = imx3_idle; | |
| 243 | + arm_pm_idle = imx35_idle; | |
| 220 | 244 | arch_ioremap_caller = imx3_ioremap_caller; |
| 221 | 245 | mx3_ccm_base = MX35_IO_ADDRESS(MX35_CCM_BASE_ADDR); |
| 222 | 246 | } |
| @@ -45,105 +45,7 @@ · 44 unmodified lines | ||
| 45 | 45 | |
| 46 | 46 | #ifndef __ASSEMBLY__ |
| 47 | 47 | 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 | |
| 73 | 48 | |
| 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__ | |
| 147 | 49 | #ifdef CONFIG_SOC_IMX6SL |
| 148 | 50 | static inline bool cpu_is_imx6sl(void) |
| 149 | 51 | { |
| @@ -190,9 +92,6 @@ int tzic_enable_wake(void); · 40 unmodified lines | ||
| 190 | 92 | extern struct cpu_op *(*get_cpu_op)(int *op); |
| 191 | 93 | #endif |
| 192 | 94 | |
| 193 | −#define cpu_is_mx3() (cpu_is_mx31() || cpu_is_mx35()) | |
| 194 | −#define cpu_is_mx2() (cpu_is_mx21() || cpu_is_mx27()) | |
| 195 | − | |
| 196 | 95 | #define imx_readl readl_relaxed |
| 197 | 96 | #define imx_readw readw_relaxed |
| 198 | 97 | #define imx_writel writel_relaxed |
| @@ -37,13 +37,7 @@ static const struct platform_suspend_ops mx27_suspend_ops = { · 36 unmodified lines | ||
| 37 | 37 | .valid = suspend_valid_only_mem, |
| 38 | 38 | }; |
| 39 | 39 | |
| 40 | −static int __init mx27_pm_init(void) | |
| 40 | +void __init imx27_pm_init(void) | |
| 41 | 41 | { |
| 42 | − if (!cpu_is_mx27()) | |
| 43 | − return 0; | |
| 44 | − | |
| 45 | 42 | suspend_set_ops(&mx27_suspend_ops); |
| 46 | − return 0; | |
| 47 | 43 | } |
| 48 | − | |
| 49 | −device_initcall(mx27_pm_init); | |
| @@ -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 | −} | |
| @@ -34,25 +34,19 @@ · 33 unmodified lines | ||
| 34 | 34 | |
| 35 | 35 | static void __iomem *wdog_base; |
| 36 | 36 | static struct clk *wdog_clk; |
| 37 | +static int wcr_enable = (1 << 2); | |
| 37 | 38 | |
| 38 | 39 | /* |
| 39 | 40 | * Reset the system. It is called by machine_restart(). |
| 40 | 41 | */ |
| 41 | 42 | void mxc_restart(enum reboot_mode mode, const char *cmd) |
| 42 | 43 | { |
| 43 | − unsigned int wcr_enable; | |
| 44 | − | |
| 45 | 44 | if (!wdog_base) |
| 46 | 45 | goto reset_fallback; |
| 47 | 46 | |
| 48 | 47 | if (!IS_ERR(wdog_clk)) |
| 49 | 48 | clk_enable(wdog_clk); |
| 50 | 49 | |
| 51 | − if (cpu_is_mx1()) | |
| 52 | − wcr_enable = (1 << 0); | |
| 53 | − else | |
| 54 | − wcr_enable = (1 << 2); | |
| 55 | − | |
| 56 | 50 | /* Assert SRS signal */ |
| 57 | 51 | imx_writew(wcr_enable, wdog_base); |
| 58 | 52 | /* |
| @@ -89,6 +83,14 @@ void __init mxc_arch_reset_init(void __iomem *base) · 30 unmodified lines | ||
| 89 | 83 | clk_prepare(wdog_clk); |
| 90 | 84 | } |
| 91 | 85 | |
| 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 | + | |
| 92 | 94 | #ifdef CONFIG_CACHE_L2X0 |
| 93 | 95 | void __init imx_init_l2cache(void) |
| 94 | 96 | { |
| @@ -98,38 +100,28 @@ void __init imx_init_l2cache(void) · 3 unmodified lines | ||
| 98 | 100 | |
| 99 | 101 | np = of_find_compatible_node(NULL, NULL, "arm,pl310-cache"); |
| 100 | 102 | if (!np) |
| 101 | − goto out; | |
| 103 | + return; | |
| 102 | 104 | |
| 103 | 105 | 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; | |
| 108 | 108 | |
| 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; | |
| 111 | 115 | |
| 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 | + } | |
| 127 | 122 | |
| 128 | −skip_if_enabled: | |
| 129 | 123 | iounmap(l2x0_base); |
| 124 | +put_node: | |
| 130 | 125 | of_node_put(np); |
| 131 | − | |
| 132 | −out: | |
| 133 | − l2x0_of_init(0, ~0); | |
| 134 | 126 | } |
| 135 | 127 | #endif |
| @@ -9,12 +9,11 @@ · 8 unmodified lines | ||
| 9 | 9 | * http://www.gnu.org/copyleft/gpl.html |
| 10 | 10 | */ |
| 11 | 11 | |
| 12 | −#include <linux/module.h> | |
| 13 | −#include <linux/moduleparam.h> | |
| 14 | 12 | #include <linux/init.h> |
| 15 | 13 | #include <linux/device.h> |
| 16 | 14 | #include <linux/errno.h> |
| 17 | 15 | #include <linux/io.h> |
| 16 | +#include <linux/irqchip.h> | |
| 18 | 17 | #include <linux/irqdomain.h> |
| 19 | 18 | #include <linux/of.h> |
| 20 | 19 | #include <linux/of_address.h> |
| @@ -153,13 +152,11 @@ static void __exception_irq_entry tzic_handle_irq(struct pt_regs *regs) · 132 unmodified lines | ||
| 153 | 152 | * interrupts. It registers the interrupt enable and disable functions |
| 154 | 153 | * to the kernel for each interrupt source. |
| 155 | 154 | */ |
| 156 | −void __init tzic_init_irq(void) | |
| 155 | +static int __init tzic_init_dt(struct device_node *np, struct device_node *p) | |
| 157 | 156 | { |
| 158 | − struct device_node *np; | |
| 159 | 157 | int irq_base; |
| 160 | 158 | int i; |
| 161 | 159 | |
| 162 | − np = of_find_compatible_node(NULL, NULL, "fsl,tzic"); | |
| 163 | 160 | tzic_base = of_iomap(np, 0); |
| 164 | 161 | WARN_ON(!tzic_base); |
| 165 | 162 | |
| @@ -199,7 +196,10 @@ void __init tzic_init_irq(void) · 33 unmodified lines | ||
| 199 | 196 | #endif |
| 200 | 197 | |
| 201 | 198 | pr_info("TrustZone Interrupt Controller (TZIC) initialized\n"); |
| 199 | + | |
| 200 | + return 0; | |
| 202 | 201 | } |
| 202 | +IRQCHIP_DECLARE(tzic, "fsl,tzic", tzic_init_dt); | |
| 203 | 203 | |
| 204 | 204 | /** |
| 205 | 205 | * tzic_enable_wake() - enable wakeup interrupt |
| @@ -32,9 +32,9 @@ config ARCH_INTEGRATOR_AP · 31 unmodified lines | ||
| 32 | 32 | config INTEGRATOR_IMPD1 |
| 33 | 33 | bool "Include support for Integrator/IM-PD1" |
| 34 | 34 | depends on ARCH_INTEGRATOR_AP |
| 35 | − select ARCH_REQUIRE_GPIOLIB | |
| 36 | 35 | select ARM_VIC |
| 37 | − select GPIO_PL061 if GPIOLIB | |
| 36 | + select GPIO_PL061 | |
| 37 | + select GPIOLIB | |
| 38 | 38 | help |
| 39 | 39 | The IM-PD1 is an add-on logic module for the Integrator which |
| 40 | 40 | allows ARM(R) Ltd PrimeCells to be developed and evaluated. |
| @@ -1,7 +1,7 @@ | ||
| 1 | 1 | menuconfig ARCH_MESON |
| 2 | 2 | bool "Amlogic Meson SoCs" |
| 3 | 3 | depends on ARCH_MULTI_V7 |
| 4 | − select ARCH_REQUIRE_GPIOLIB | |
| 4 | + select GPIOLIB | |
| 5 | 5 | select GENERIC_IRQ_CHIP |
| 6 | 6 | select ARM_GIC |
| 7 | 7 | select CACHE_L2X0 |
| @@ -1,8 +1,8 @@ | ||
| 1 | 1 | menuconfig ARCH_MMP |
| 2 | 2 | bool "Marvell PXA168/910/MMP2" |
| 3 | 3 | depends on ARCH_MULTI_V5 || ARCH_MULTI_V7 |
| 4 | − select ARCH_REQUIRE_GPIOLIB | |
| 5 | 4 | select GPIO_PXA |
| 5 | + select GPIOLIB | |
| 6 | 6 | select PINCTRL |
| 7 | 7 | select PLAT_PXA |
| 8 | 8 | help |
| @@ -5,7 +5,7 @@ menuconfig ARCH_MOXART · 4 unmodified lines | ||
| 5 | 5 | select ARM_DMA_MEM_BUFFERABLE |
| 6 | 6 | select MOXART_TIMER |
| 7 | 7 | select GENERIC_IRQ_CHIP |
| 8 | − select ARCH_REQUIRE_GPIOLIB | |
| 8 | + select GPIOLIB | |
| 9 | 9 | select PHYLIB if NETDEVICES |
| 10 | 10 | help |
| 11 | 11 | Say Y here if you want to run your kernel on hardware with a |
| @@ -1,8 +1,8 @@ | ||
| 1 | 1 | menuconfig ARCH_MV78XX0 |
| 2 | 2 | bool "Marvell MV78xx0" |
| 3 | 3 | depends on ARCH_MULTI_V5 |
| 4 | − select ARCH_REQUIRE_GPIOLIB | |
| 5 | 4 | select CPU_FEROCEON |
| 5 | + select GPIOLIB | |
| 6 | 6 | select MVEBU_MBUS |
| 7 | 7 | select PCI |
| 8 | 8 | select PLAT_ORION_LEGACY |
| @@ -8,7 +8,7 @@ menuconfig ARCH_MVEBU · 7 unmodified lines | ||
| 8 | 8 | select SOC_BUS |
| 9 | 9 | select MVEBU_MBUS |
| 10 | 10 | select ZONE_DMA if ARM_LPAE |
| 11 | − select ARCH_REQUIRE_GPIOLIB | |
| 11 | + select GPIOLIB | |
| 12 | 12 | select PCI_QUIRKS if PCI |
| 13 | 13 | select OF_ADDRESS_PCI |
| 14 | 14 | |
| @@ -119,8 +119,8 @@ config MACH_DOVE · 104 unmodified lines | ||
| 119 | 119 | config MACH_KIRKWOOD |
| 120 | 120 | bool "Marvell Kirkwood boards" |
| 121 | 121 | depends on ARCH_MULTI_V5 |
| 122 | − select ARCH_REQUIRE_GPIOLIB | |
| 123 | 122 | select CPU_FEROCEON |
| 123 | + select GPIOLIB | |
| 124 | 124 | select KIRKWOOD_CLK |
| 125 | 125 | select MACH_MVEBU_ANY |
| 126 | 126 | select ORION_IRQCHIP |
| @@ -14,6 +14,7 @@ · 13 unmodified lines | ||
| 14 | 14 | #ifndef __MACH_370_XP_COHERENCY_H |
| 15 | 15 | #define __MACH_370_XP_COHERENCY_H |
| 16 | 16 | |
| 17 | +extern void __iomem *coherency_base; /* for coherency_ll.S */ | |
| 17 | 18 | extern unsigned long coherency_phys_base; |
| 18 | 19 | int set_cpu_coherent(void); |
| 19 | 20 | |
| @@ -16,6 +16,8 @@ · 15 unmodified lines | ||
| 16 | 16 | #include <linux/io.h> |
| 17 | 17 | #include <linux/resource.h> |
| 18 | 18 | |
| 19 | +#include "common.h" | |
| 20 | + | |
| 19 | 21 | static void __iomem *cpu_reset_base; |
| 20 | 22 | static size_t cpu_reset_size; |
| 21 | 23 | |
| @@ -18,6 +18,7 @@ · 17 unmodified lines | ||
| 18 | 18 | #include <linux/suspend.h> |
| 19 | 19 | #include <linux/io.h> |
| 20 | 20 | #include "kirkwood.h" |
| 21 | +#include "kirkwood-pm.h" | |
| 21 | 22 | |
| 22 | 23 | static void __iomem *ddr_operation_base; |
| 23 | 24 | static void __iomem *memory_pm_ctrl; |
| @@ -66,11 +67,10 @@ static const struct platform_suspend_ops kirkwood_suspend_ops = { · 42 unmodified lines | ||
| 66 | 67 | .valid = kirkwood_pm_valid_standby, |
| 67 | 68 | }; |
| 68 | 69 | |
| 69 | −int __init kirkwood_pm_init(void) | |
| 70 | +void __init kirkwood_pm_init(void) | |
| 70 | 71 | { |
| 71 | 72 | ddr_operation_base = ioremap(DDR_OPERATION_BASE, 4); |
| 72 | 73 | memory_pm_ctrl = ioremap(MEMORY_PM_CTRL_PHYS, 4); |
| 73 | 74 | |
| 74 | 75 | suspend_set_ops(&kirkwood_suspend_ops); |
| 75 | − return 0; | |
| 76 | 76 | } |
| @@ -150,7 +150,7 @@ eth_fixup_skip: · 149 unmodified lines | ||
| 150 | 150 | * causes mbus errors (which can occur for example for PCI aborts) to |
| 151 | 151 | * throw CPU aborts, which we're not set up to deal with. |
| 152 | 152 | */ |
| 153 | −void kirkwood_disable_mbus_error_propagation(void) | |
| 153 | +static void kirkwood_disable_mbus_error_propagation(void) | |
| 154 | 154 | { |
| 155 | 155 | void __iomem *cpu_config; |
| 156 | 156 | |
| @@ -23,6 +23,7 @@ · 22 unmodified lines | ||
| 23 | 23 | #include <asm/suspend.h> |
| 24 | 24 | |
| 25 | 25 | #include "coherency.h" |
| 26 | +#include "common.h" | |
| 26 | 27 | #include "pmsu.h" |
| 27 | 28 | |
| 28 | 29 | #define SDRAM_CONFIG_OFFS 0x0 |
| @@ -25,6 +25,7 @@ · 24 unmodified lines | ||
| 25 | 25 | #include <linux/io.h> |
| 26 | 26 | #include <linux/kernel.h> |
| 27 | 27 | #include <linux/mbus.h> |
| 28 | +#include <linux/mvebu-pmsu.h> | |
| 28 | 29 | #include <linux/of_address.h> |
| 29 | 30 | #include <linux/of_device.h> |
| 30 | 31 | #include <linux/platform_device.h> |
| @@ -38,7 +39,7 @@ · 7 unmodified lines | ||
| 38 | 39 | #include <asm/suspend.h> |
| 39 | 40 | #include <asm/tlbflush.h> |
| 40 | 41 | #include "common.h" |
| 41 | − | |
| 42 | +#include "pmsu.h" | |
| 42 | 43 | |
| 43 | 44 | #define PMSU_BASE_OFFSET 0x100 |
| 44 | 45 | #define PMSU_REG_SIZE 0x1000 |
| @@ -127,7 +127,7 @@ int mvebu_system_controller_get_soc_id(u32 *dev, u32 *rev) · 126 unmodified lines | ||
| 127 | 127 | } |
| 128 | 128 | |
| 129 | 129 | #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) | |
| 131 | 131 | { |
| 132 | 132 | u32 dev, rev; |
| 133 | 133 | phys_addr_t resume_addr_reg; |
| @@ -15,7 +15,7 @@ config SOC_IMX28 · 14 unmodified lines | ||
| 15 | 15 | config ARCH_MXS |
| 16 | 16 | bool "Freescale MXS (i.MX23, i.MX28) support" |
| 17 | 17 | depends on ARCH_MULTI_V5 |
| 18 | − select ARCH_REQUIRE_GPIOLIB | |
| 18 | + select GPIOLIB | |
| 19 | 19 | select MXS_TIMER |
| 20 | 20 | select PINCTRL |
| 21 | 21 | select SOC_BUS |
| @@ -1,12 +1,12 @@ | ||
| 1 | 1 | menuconfig ARCH_NOMADIK |
| 2 | 2 | bool "ST-Ericsson Nomadik" |
| 3 | 3 | depends on ARCH_MULTI_V5 |
| 4 | − select ARCH_REQUIRE_GPIOLIB | |
| 5 | 4 | select ARM_AMBA |
| 6 | 5 | select ARM_VIC |
| 7 | 6 | select CLKSRC_NOMADIK_MTU |
| 8 | 7 | select CLKSRC_NOMADIK_MTU_SCHED_CLOCK |
| 9 | 8 | select CPU_ARM926T |
| 9 | + select GPIOLIB | |
| 10 | 10 | select MIGHT_HAVE_CACHE_L2X0 |
| 11 | 11 | select PINCTRL |
| 12 | 12 | select PINCTRL_NOMADIK |
| @@ -92,9 +92,9 @@ config ARCH_OMAP2PLUS · 91 unmodified lines | ||
| 92 | 92 | select ARCH_HAS_BANDGAP |
| 93 | 93 | select ARCH_HAS_HOLES_MEMORYMODEL |
| 94 | 94 | select ARCH_OMAP |
| 95 | − select ARCH_REQUIRE_GPIOLIB | |
| 96 | 95 | select CLKSRC_MMIO |
| 97 | 96 | select GENERIC_IRQ_CHIP |
| 97 | + select GPIOLIB | |
| 98 | 98 | select MACH_OMAP_GENERIC |
| 99 | 99 | select MEMORY |
| 100 | 100 | select MFD_SYSCON |
| @@ -1,9 +1,9 @@ | ||
| 1 | 1 | menuconfig ARCH_ORION5X |
| 2 | 2 | bool "Marvell Orion" |
| 3 | 3 | depends on MMU && ARCH_MULTI_V5 |
| 4 | − select ARCH_REQUIRE_GPIOLIB | |
| 5 | 4 | select CPU_FEROCEON |
| 6 | 5 | select GENERIC_CLOCKEVENTS |
| 6 | + select GPIOLIB | |
| 7 | 7 | select MVEBU_MBUS |
| 8 | 8 | select PCI |
| 9 | 9 | select PLAT_ORION_LEGACY |
| @@ -26,7 +26,7 @@ static int __initdata gpio0_irqs[4] = { · 25 unmodified lines | ||
| 26 | 26 | IRQ_ORION5X_GPIO_24_31, |
| 27 | 27 | }; |
| 28 | 28 | |
| 29 | −asmlinkage void | |
| 29 | +static asmlinkage void | |
| 30 | 30 | __exception_irq_entry orion5x_legacy_handle_irq(struct pt_regs *regs) |
| 31 | 31 | { |
| 32 | 32 | u32 stat; |
| @@ -1,7 +1,7 @@ | ||
| 1 | 1 | menuconfig ARCH_OXNAS |
| 2 | 2 | bool "Oxford Semiconductor OXNAS Family SoCs" |
| 3 | − select ARCH_REQUIRE_GPIOLIB | |
| 4 | 3 | select ARCH_HAS_RESET_CONTROLLER |
| 4 | + select GPIOLIB | |
| 5 | 5 | select PINCTRL |
| 6 | 6 | depends on ARCH_MULTI_V5 |
| 7 | 7 | help |
| @@ -1,8 +1,8 @@ | ||
| 1 | 1 | config ARCH_PICOXCELL |
| 2 | 2 | bool "Picochip PicoXcell" |
| 3 | 3 | depends on ARCH_MULTI_V6 |
| 4 | − select ARCH_REQUIRE_GPIOLIB | |
| 5 | 4 | select ARM_VIC |
| 6 | 5 | select DW_APB_TIMER_OF |
| 6 | + select GPIOLIB | |
| 7 | 7 | select HAVE_TCM |
| 8 | 8 | select NO_IOPORT_MAP |
| @@ -3,8 +3,8 @@ menuconfig ARCH_SIRF · 2 unmodified lines | ||
| 3 | 3 | depends on ARCH_MULTI_V7 |
| 4 | 4 | select ARCH_HAS_RESET_CONTROLLER |
| 5 | 5 | select RESET_CONTROLLER |
| 6 | − select ARCH_REQUIRE_GPIOLIB | |
| 7 | 6 | select GENERIC_IRQ_CHIP |
| 7 | + select GPIOLIB | |
| 8 | 8 | select NO_IOPORT_MAP |
| 9 | 9 | select REGMAP |
| 10 | 10 | select PINCTRL |
| @@ -4,10 +4,10 @@ config ARCH_ROCKCHIP · 3 unmodified lines | ||
| 4 | 4 | select PINCTRL |
| 5 | 5 | select PINCTRL_ROCKCHIP |
| 6 | 6 | select ARCH_HAS_RESET_CONTROLLER |
| 7 | − select ARCH_REQUIRE_GPIOLIB | |
| 8 | 7 | select ARM_AMBA |
| 9 | 8 | select ARM_GIC |
| 10 | 9 | select CACHE_L2X0 |
| 10 | + select GPIOLIB | |
| 11 | 11 | select HAVE_ARM_ARCH_TIMER |
| 12 | 12 | select HAVE_ARM_SCU if SMP |
| 13 | 13 | select HAVE_ARM_TWD if SMP |
| @@ -11,7 +11,7 @@ if ARCH_S3C24XX · 10 unmodified lines | ||
| 11 | 11 | |
| 12 | 12 | config PLAT_S3C24XX |
| 13 | 13 | def_bool y |
| 14 | − select ARCH_REQUIRE_GPIOLIB | |
| 14 | + select GPIOLIB | |
| 15 | 15 | select NO_IOPORT_MAP |
| 16 | 16 | select S3C_DEV_NAND |
| 17 | 17 | select IRQ_DOMAIN |
| @@ -520,7 +520,7 @@ · 519 unmodified lines | ||
| 520 | 520 | #define S3C24XX_EXTINT1 S3C24XX_GPIOREG2(0x8C) |
| 521 | 521 | #define S3C24XX_EXTINT2 S3C24XX_GPIOREG2(0x90) |
| 522 | 522 | |
| 523 | −/* interrupt filtering conrrol for EINT16..EINT23 */ | |
| 523 | +/* interrupt filtering control for EINT16..EINT23 */ | |
| 524 | 524 | #define S3C2410_EINFLT0 S3C2410_GPIOREG(0x94) |
| 525 | 525 | #define S3C2410_EINFLT1 S3C2410_GPIOREG(0x98) |
| 526 | 526 | #define S3C2410_EINFLT2 S3C2410_GPIOREG(0x9C) |
| @@ -423,7 +423,7 @@ void s3c2410_iotiming_set(struct s3c_cpufreq_config *cfg, · 422 unmodified lines | ||
| 423 | 423 | * @timings: The IO timing information to fill out. |
| 424 | 424 | * |
| 425 | 425 | * 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 | |
| 427 | 427 | * through all the IO banks, reading the state and then updating @iot |
| 428 | 428 | * as necessary. |
| 429 | 429 | * |
| @@ -522,7 +522,7 @@ static void __init n30_hwinit(void) · 521 unmodified lines | ||
| 522 | 522 | * |
| 523 | 523 | * The pull ups for H6/H7 are enabled on N30 but not on the |
| 524 | 524 | * 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 | |
| 526 | 526 | * enabled on the N35, so leave them enabled for all models. |
| 527 | 527 | */ |
| 528 | 528 | __raw_writel(0x0028aaaa, S3C2410_GPHCON); |
| @@ -143,7 +143,7 @@ static int osiris_dvs_remove(struct platform_device *pdev) · 142 unmodified lines | ||
| 143 | 143 | return 0; |
| 144 | 144 | } |
| 145 | 145 | |
| 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 | |
| 147 | 147 | * out if the configuration isn't set. */ |
| 148 | 148 | |
| 149 | 149 | static int osiris_dvs_suspend(struct device *dev) |
| @@ -32,11 +32,12 @@ · 31 unmodified lines | ||
| 32 | 32 | #include <plat/cpu.h> |
| 33 | 33 | #include <plat/cpu-freq-core.h> |
| 34 | 34 | |
| 35 | +/* This array should be sorted in ascending order of the frequencies */ | |
| 35 | 36 | static struct cpufreq_frequency_table pll_vals_12MHz[] = { |
| 36 | 37 | { .frequency = 34000000, .driver_data = PLLVAL(82, 2, 3), }, |
| 37 | 38 | { .frequency = 45000000, .driver_data = PLLVAL(82, 1, 3), }, |
| 38 | − { .frequency = 51000000, .driver_data = PLLVAL(161, 3, 3), }, | |
| 39 | 39 | { .frequency = 48000000, .driver_data = PLLVAL(120, 2, 3), }, |
| 40 | + { .frequency = 51000000, .driver_data = PLLVAL(161, 3, 3), }, | |
| 40 | 41 | { .frequency = 56000000, .driver_data = PLLVAL(142, 2, 3), }, |
| 41 | 42 | { .frequency = 68000000, .driver_data = PLLVAL(82, 2, 2), }, |
| 42 | 43 | { .frequency = 79000000, .driver_data = PLLVAL(71, 1, 2), }, |
| @@ -20,6 +20,7 @@ · 19 unmodified lines | ||
| 20 | 20 | #include <plat/cpu.h> |
| 21 | 21 | #include <plat/cpu-freq-core.h> |
| 22 | 22 | |
| 23 | +/* This array should be sorted in ascending order of the frequencies */ | |
| 23 | 24 | static struct cpufreq_frequency_table s3c2440_plls_12[] = { |
| 24 | 25 | { .frequency = 75000000, .driver_data = PLLVAL(0x75, 3, 3), }, /* FVco 600.000000 */ |
| 25 | 26 | { .frequency = 80000000, .driver_data = PLLVAL(0x98, 4, 3), }, /* FVco 640.000000 */ |
| @@ -20,6 +20,7 @@ · 19 unmodified lines | ||
| 20 | 20 | #include <plat/cpu.h> |
| 21 | 21 | #include <plat/cpu-freq-core.h> |
| 22 | 22 | |
| 23 | +/* This array should be sorted in ascending order of the frequencies */ | |
| 23 | 24 | static struct cpufreq_frequency_table s3c2440_plls_169344[] = { |
| 24 | 25 | { .frequency = 78019200, .driver_data = PLLVAL(121, 5, 3), }, /* FVco 624.153600 */ |
| 25 | 26 | { .frequency = 84067200, .driver_data = PLLVAL(131, 5, 3), }, /* FVco 672.537600 */ |
| @@ -5,12 +5,12 @@ · 4 unmodified lines | ||
| 5 | 5 | menuconfig ARCH_S3C64XX |
| 6 | 6 | bool "Samsung S3C64XX" |
| 7 | 7 | depends on ARCH_MULTI_V6 |
| 8 | − select ARCH_REQUIRE_GPIOLIB | |
| 9 | 8 | select ARM_AMBA |
| 10 | 9 | select ARM_VIC |
| 11 | 10 | select CLKSRC_SAMSUNG_PWM |
| 12 | 11 | select COMMON_CLK_SAMSUNG |
| 13 | 12 | select GPIO_SAMSUNG if ATAGS |
| 13 | + select GPIOLIB | |
| 14 | 14 | select HAVE_S3C2410_I2C if I2C |
| 15 | 15 | select HAVE_S3C2410_WATCHDOG if WATCHDOG |
| 16 | 16 | select HAVE_TCM |
| @@ -24,6 +24,7 @@ void s3c64xx_init_io(struct map_desc *mach_desc, int size); · 23 unmodified lines | ||
| 24 | 24 | |
| 25 | 25 | void s3c64xx_restart(enum reboot_mode mode, const char *cmd); |
| 26 | 26 | |
| 27 | +struct device_node; | |
| 27 | 28 | void s3c64xx_clk_init(struct device_node *np, unsigned long xtal_f, |
| 28 | 29 | unsigned long xusbxti_f, bool is_s3c6400, void __iomem *reg_base); |
| 29 | 30 | void s3c64xx_set_xtal_freq(unsigned long freq); |
| @@ -99,7 +99,7 @@ · 98 unmodified lines | ||
| 99 | 99 | |
| 100 | 100 | #define S3C64XX_PA_USB_HSPHY (0x7C100000) |
| 101 | 101 | |
| 102 | −/* compatibiltiy defines. */ | |
| 102 | +/* compatibility defines. */ | |
| 103 | 103 | #define S3C_PA_TIMER S3C64XX_PA_TIMER |
| 104 | 104 | #define S3C_PA_HSMMC0 S3C64XX_PA_HSMMC0 |
| 105 | 105 | #define S3C_PA_HSMMC1 S3C64XX_PA_HSMMC1 |
| @@ -11,10 +11,10 @@ config ARCH_S5PV210 · 10 unmodified lines | ||
| 11 | 11 | bool "Samsung S5PV210/S5PC110" |
| 12 | 12 | depends on ARCH_MULTI_V7 |
| 13 | 13 | select ARCH_HAS_HOLES_MEMORYMODEL |
| 14 | − select ARCH_REQUIRE_GPIOLIB | |
| 15 | 14 | select ARM_VIC |
| 16 | 15 | select CLKSRC_SAMSUNG_PWM |
| 17 | 16 | select COMMON_CLK_SAMSUNG |
| 17 | + select GPIOLIB | |
| 18 | 18 | select HAVE_S3C2410_I2C if I2C |
| 19 | 19 | select HAVE_S3C2410_WATCHDOG if WATCHDOG |
| 20 | 20 | select HAVE_S3C_RTC if RTC_CLASS |
| @@ -41,7 +41,7 @@ menuconfig ARCH_RENESAS · 40 unmodified lines | ||
| 41 | 41 | select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE |
| 42 | 42 | select NO_IOPORT_MAP |
| 43 | 43 | select PINCTRL |
| 44 | − select ARCH_REQUIRE_GPIOLIB | |
| 44 | + select GPIOLIB | |
| 45 | 45 | select ZONE_DMA if ARM_LPAE |
| 46 | 46 | |
| 47 | 47 | if ARCH_RENESAS |
| @@ -5,9 +5,9 @@ · 4 unmodified lines | ||
| 5 | 5 | menuconfig PLAT_SPEAR |
| 6 | 6 | bool "ST SPEAr Family" |
| 7 | 7 | depends on ARCH_MULTI_V7 || ARCH_MULTI_V5 |
| 8 | − select ARCH_REQUIRE_GPIOLIB | |
| 9 | 8 | select ARM_AMBA |
| 10 | 9 | select CLKSRC_MMIO |
| 10 | + select GPIOLIB | |
| 11 | 11 | |
| 12 | 12 | if PLAT_SPEAR |
| 13 | 13 | |
| @@ -10,7 +10,7 @@ menuconfig ARCH_STI · 9 unmodified lines | ||
| 10 | 10 | select MFD_SYSCON |
| 11 | 11 | select ARCH_HAS_RESET_CONTROLLER |
| 12 | 12 | select HAVE_ARM_SCU if SMP |
| 13 | − select ARCH_REQUIRE_GPIOLIB | |
| 13 | + select GPIOLIB | |
| 14 | 14 | select ARM_ERRATA_754322 |
| 15 | 15 | select ARM_ERRATA_764369 if SMP |
| 16 | 16 | select ARM_ERRATA_775420 |
| @@ -1,10 +1,10 @@ | ||
| 1 | 1 | menuconfig ARCH_SUNXI |
| 2 | 2 | bool "Allwinner SoCs" |
| 3 | 3 | depends on ARCH_MULTI_V7 |
| 4 | − select ARCH_REQUIRE_GPIOLIB | |
| 5 | 4 | select ARCH_HAS_RESET_CONTROLLER |
| 6 | 5 | select CLKSRC_MMIO |
| 7 | 6 | select GENERIC_IRQ_CHIP |
| 7 | + select GPIOLIB | |
| 8 | 8 | select PINCTRL |
| 9 | 9 | select SUN4I_TIMER |
| 10 | 10 | select RESET_CONTROLLER |
| @@ -1,11 +1,11 @@ | ||
| 1 | 1 | menuconfig ARCH_TEGRA |
| 2 | 2 | bool "NVIDIA Tegra" |
| 3 | 3 | depends on ARCH_MULTI_V7 |
| 4 | − select ARCH_REQUIRE_GPIOLIB | |
| 5 | 4 | select ARCH_SUPPORTS_TRUSTED_FOUNDATIONS |
| 6 | 5 | select ARM_AMBA |
| 7 | 6 | select ARM_GIC |
| 8 | 7 | select CLKSRC_MMIO |
| 8 | + select GPIOLIB | |
| 9 | 9 | select HAVE_ARM_SCU if SMP |
| 10 | 10 | select HAVE_ARM_TWD if SMP |
| 11 | 11 | select PINCTRL |
| @@ -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 | + | |
| 1 | 21 | extern const struct smp_operations tegra_smp_ops; |
| 2 | 22 | |
| 3 | 23 | extern int tegra_cpu_kill(unsigned int cpu); |
| 4 | 24 | extern void tegra_cpu_die(unsigned int cpu); |
| 25 | + | |
| 26 | +#endif | |
| @@ -26,6 +26,7 @@ · 25 unmodified lines | ||
| 26 | 26 | #include <asm/suspend.h> |
| 27 | 27 | #include <asm/psci.h> |
| 28 | 28 | |
| 29 | +#include "cpuidle.h" | |
| 29 | 30 | #include "pm.h" |
| 30 | 31 | #include "sleep.h" |
| 31 | 32 | |
| @@ -30,6 +30,7 @@ · 29 unmodified lines | ||
| 30 | 30 | #include <asm/smp_plat.h> |
| 31 | 31 | #include <asm/suspend.h> |
| 32 | 32 | |
| 33 | +#include "cpuidle.h" | |
| 33 | 34 | #include "flowctrl.h" |
| 34 | 35 | #include "iomap.h" |
| 35 | 36 | #include "irq.h" |
| @@ -30,6 +30,7 @@ · 29 unmodified lines | ||
| 30 | 30 | #include <asm/smp_plat.h> |
| 31 | 31 | #include <asm/suspend.h> |
| 32 | 32 | |
| 33 | +#include "cpuidle.h" | |
| 33 | 34 | #include "pm.h" |
| 34 | 35 | #include "sleep.h" |
| 35 | 36 | |
| @@ -23,8 +23,10 @@ void tegra20_cpuidle_pcie_irqs_in_use(void); · 22 unmodified lines | ||
| 23 | 23 | int tegra30_cpuidle_init(void); |
| 24 | 24 | int tegra114_cpuidle_init(void); |
| 25 | 25 | void tegra_cpuidle_init(void); |
| 26 | +void tegra_cpuidle_pcie_irqs_in_use(void); | |
| 26 | 27 | #else |
| 27 | 28 | static inline void tegra_cpuidle_init(void) {} |
| 29 | +static inline void tegra_cpuidle_pcie_irqs_in_use(void) {} | |
| 28 | 30 | #endif |
| 29 | 31 | |
| 30 | 32 | #endif |
| @@ -17,6 +17,7 @@ · 16 unmodified lines | ||
| 17 | 17 | |
| 18 | 18 | #include <asm/smp_plat.h> |
| 19 | 19 | |
| 20 | +#include "common.h" | |
| 20 | 21 | #include "sleep.h" |
| 21 | 22 | |
| 22 | 23 | static void (*tegra_hotplug_shutdown)(void); |
| @@ -29,6 +29,7 @@ · 28 unmodified lines | ||
| 29 | 29 | |
| 30 | 30 | #include "board.h" |
| 31 | 31 | #include "iomap.h" |
| 32 | +#include "irq.h" | |
| 32 | 33 | |
| 33 | 34 | #define SGI_MASK 0xFFFF |
| 34 | 35 | |
| @@ -36,7 +36,7 @@ void tegra30_sleep_core_init(void); · 35 unmodified lines | ||
| 36 | 36 | |
| 37 | 37 | void tegra_clear_cpu_in_lp2(void); |
| 38 | 38 | bool tegra_set_cpu_in_lp2(void); |
| 39 | − | |
| 39 | +int tegra_cpu_do_idle(void); | |
| 40 | 40 | void tegra_idle_lp2_last(void); |
| 41 | 41 | extern void (*tegra_tear_down_cpu)(void); |
| 42 | 42 | |
| @@ -118,32 +118,14 @@ out: · 117 unmodified lines | ||
| 118 | 118 | of_platform_default_populate(NULL, NULL, parent); |
| 119 | 119 | } |
| 120 | 120 | |
| 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 | − | |
| 134 | 121 | static void __init tegra_dt_init_late(void) |
| 135 | 122 | { |
| 136 | − int i; | |
| 137 | − | |
| 138 | 123 | tegra_init_suspend(); |
| 139 | 124 | tegra_cpuidle_init(); |
| 140 | 125 | |
| 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(); | |
| 147 | 129 | } |
| 148 | 130 | |
| 149 | 131 | static const char * const tegra_dt_board_compat[] = { |
| @@ -1,11 +1,11 @@ | ||
| 1 | 1 | menuconfig ARCH_U300 |
| 2 | 2 | bool "ST-Ericsson U300 Series" |
| 3 | 3 | depends on ARCH_MULTI_V5 && MMU |
| 4 | − select ARCH_REQUIRE_GPIOLIB | |
| 5 | 4 | select ARM_AMBA |
| 6 | 5 | select ARM_VIC |
| 7 | 6 | select U300_TIMER |
| 8 | 7 | select CPU_ARM926T |
| 8 | + select GPIOLIB | |
| 9 | 9 | select HAVE_TCM |
| 10 | 10 | select PINCTRL |
| 11 | 11 | select PINCTRL_COH901 |
| @@ -101,21 +101,13 @@ static int __init uniphier_smp_prepare_trampoline(unsigned int max_cpus) · 100 unmodified lines | ||
| 101 | 101 | np = of_find_compatible_node(NULL, NULL, "socionext,uniphier-smpctrl"); |
| 102 | 102 | ret = of_address_to_resource(np, 0, &res); |
| 103 | 103 | 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; | |
| 117 | 107 | } |
| 118 | 108 | |
| 109 | + rom_rsv2_phys = res.start + UNIPHIER_SMPCTRL_ROM_RSV2; | |
| 110 | + | |
| 119 | 111 | ret = uniphier_smp_copy_trampoline(rom_rsv2_phys); |
| 120 | 112 | if (ret) |
| 121 | 113 | return ret; |
| @@ -3,13 +3,13 @@ menuconfig ARCH_U8500 · 2 unmodified lines | ||
| 3 | 3 | depends on ARCH_MULTI_V7 && MMU |
| 4 | 4 | select AB8500_CORE |
| 5 | 5 | select ABX500_CORE |
| 6 | − select ARCH_REQUIRE_GPIOLIB | |
| 7 | 6 | select ARM_AMBA |
| 8 | 7 | select ARM_ERRATA_754322 |
| 9 | 8 | select ARM_ERRATA_764369 if SMP |
| 10 | 9 | select ARM_GIC |
| 11 | 10 | select CACHE_L2X0 |
| 12 | 11 | select CLKSRC_NOMADIK_MTU |
| 12 | + select GPIOLIB | |
| 13 | 13 | select HAVE_ARM_SCU if SMP |
| 14 | 14 | select HAVE_ARM_TWD if SMP |
| 15 | 15 | select PINCTRL |
| @@ -1,13 +1,13 @@ | ||
| 1 | 1 | menuconfig ARCH_VEXPRESS |
| 2 | 2 | bool "ARM Ltd. Versatile Express family" |
| 3 | 3 | depends on ARCH_MULTI_V7 |
| 4 | − select ARCH_REQUIRE_GPIOLIB | |
| 5 | 4 | select ARCH_SUPPORTS_BIG_ENDIAN |
| 6 | 5 | select ARM_AMBA |
| 7 | 6 | select ARM_GIC |
| 8 | 7 | select ARM_GLOBAL_TIMER |
| 9 | 8 | select ARM_TIMER_SP804 |
| 10 | 9 | select COMMON_CLK_VERSATILE |
| 10 | + select GPIOLIB | |
| 11 | 11 | select HAVE_ARM_SCU if SMP |
| 12 | 12 | select HAVE_ARM_TWD if SMP |
| 13 | 13 | select HAVE_PATA_PLATFORM |
| @@ -15,6 +15,8 @@ · 14 unmodified lines | ||
| 15 | 15 | #include <asm/smp_plat.h> |
| 16 | 16 | #include <asm/cp15.h> |
| 17 | 17 | |
| 18 | +#include "core.h" | |
| 19 | + | |
| 18 | 20 | static inline void cpu_enter_lowpower(void) |
| 19 | 21 | { |
| 20 | 22 | unsigned int v; |
| @@ -31,6 +31,8 @@ · 30 unmodified lines | ||
| 31 | 31 | |
| 32 | 32 | #include <asm/cacheflush.h> |
| 33 | 33 | |
| 34 | +#include "spc.h" | |
| 35 | + | |
| 34 | 36 | #define SPCLOG "vexpress-spc: " |
| 35 | 37 | |
| 36 | 38 | #define PERF_LVL_A15 0x00 |
| @@ -319,17 +321,15 @@ static int ve_spc_waitforcompletion(int req_type) · 282 unmodified lines | ||
| 319 | 321 | |
| 320 | 322 | static int ve_spc_set_performance(int cluster, u32 freq) |
| 321 | 323 | { |
| 322 | − u32 perf_cfg_reg, perf_stat_reg; | |
| 324 | + u32 perf_cfg_reg; | |
| 323 | 325 | int ret, perf, req_type; |
| 324 | 326 | |
| 325 | 327 | if (cluster_is_a15(cluster)) { |
| 326 | 328 | req_type = CA15_DVFS; |
| 327 | 329 | perf_cfg_reg = PERF_LVL_A15; |
| 328 | − perf_stat_reg = PERF_REQ_A15; | |
| 329 | 330 | } else { |
| 330 | 331 | req_type = CA7_DVFS; |
| 331 | 332 | perf_cfg_reg = PERF_LVL_A7; |
| 332 | − perf_stat_reg = PERF_REQ_A7; | |
| 333 | 333 | } |
| 334 | 334 | |
| 335 | 335 | perf = ve_spc_find_performance_index(cluster, freq); |
| @@ -1,6 +1,6 @@ | ||
| 1 | 1 | config ARCH_VT8500 |
| 2 | 2 | bool |
| 3 | − select ARCH_REQUIRE_GPIOLIB | |
| 3 | + select GPIOLIB | |
| 4 | 4 | select CLKDEV_LOOKUP |
| 5 | 5 | select VT8500_TIMER |
| 6 | 6 | select PINCTRL |
| @@ -20,12 +20,12 @@ · 19 unmodified lines | ||
| 20 | 20 | * the IOP3xx OCCDR must be mapped uncached and unbuffered. |
| 21 | 21 | */ |
| 22 | 22 | static struct map_desc iop3xx_std_desc[] __initdata = { |
| 23 | − { /* mem mapped registers */ | |
| 23 | + { /* mem mapped registers */ | |
| 24 | 24 | .virtual = IOP3XX_PERIPHERAL_VIRT_BASE, |
| 25 | 25 | .pfn = __phys_to_pfn(IOP3XX_PERIPHERAL_PHYS_BASE), |
| 26 | 26 | .length = IOP3XX_PERIPHERAL_SIZE, |
| 27 | 27 | .type = MT_UNCACHED, |
| 28 | − }, | |
| 28 | + }, | |
| 29 | 29 | }; |
| 30 | 30 | |
| 31 | 31 | void __init iop3xx_map_io(void) |
| @@ -39,7 +39,7 @@ struct s3c2410_iobank_timing { · 38 unmodified lines | ||
| 39 | 39 | unsigned int tacs; |
| 40 | 40 | unsigned int tcos; |
| 41 | 41 | unsigned int tacc; |
| 42 | − unsigned int tcoh; /* nCS hold afrer nOE/nWE */ | |
| 42 | + unsigned int tcoh; /* nCS hold after nOE/nWE */ | |
| 43 | 43 | unsigned int tcah; /* Address hold after nCS */ |
| 44 | 44 | unsigned char nwait_en; /* nWait enabled for bank. */ |
| 45 | 45 | }; |
| @@ -48,7 +48,7 @@ struct s3c2410fb_display { · 47 unmodified lines | ||
| 48 | 48 | |
| 49 | 49 | struct s3c2410fb_mach_info { |
| 50 | 50 | |
| 51 | − struct s3c2410fb_display *displays; /* attached diplays info */ | |
| 51 | + struct s3c2410fb_display *displays; /* attached displays info */ | |
| 52 | 52 | unsigned num_displays; /* number of defined displays */ |
| 53 | 53 | unsigned default_display; |
| 54 | 54 | |
| @@ -35,7 +35,7 @@ struct samsung_gpio_chip; · 34 unmodified lines | ||
| 35 | 35 | * struct samsung_gpio_cfg GPIO configuration |
| 36 | 36 | * @cfg_eint: Configuration setting when used for external interrupt source |
| 37 | 37 | * @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 | |
| 39 | 39 | * @set_config: Set the current configuration for the GPIO |
| 40 | 40 | * @get_config: Read the current configuration for the GPIO |
| 41 | 41 | * |
| @@ -5,7 +5,7 @@ · 4 unmodified lines | ||
| 5 | 5 | * http://armlinux.simtec.co.uk |
| 6 | 6 | * Ben Dooks <ben@simtec.co.uk> |
| 7 | 7 | * |
| 8 | − * S3C Power Mangament - suspend/resume memory corruptiuon check. | |
| 8 | + * S3C Power Mangament - suspend/resume memory corruption check. | |
| 9 | 9 | * |
| 10 | 10 | * This program is free software; you can redistribute it and/or modify |
| 11 | 11 | * it under the terms of the GNU General Public License version 2 as |
| @@ -3,7 +3,7 @@ · 2 unmodified lines | ||
| 3 | 3 | * Copyright (c) 2008 Simtec Electronics |
| 4 | 4 | * Ben Dooks <ben@simtec.co.uk> |
| 5 | 5 | * |
| 6 | − * Coyright (c) 2013 Tomasz Figa <tomasz.figa@gmail.com> | |
| 6 | + * Copyright (c) 2013 Tomasz Figa <tomasz.figa@gmail.com> | |
| 7 | 7 | * |
| 8 | 8 | * Watchdog reset support for Samsung SoCs. |
| 9 | 9 | * |
| @@ -18,6 +18,8 @@ · 17 unmodified lines | ||
| 18 | 18 | #include <asm/cacheflush.h> |
| 19 | 19 | #include <asm/smp_plat.h> |
| 20 | 20 | |
| 21 | +#include <plat/platsmp.h> | |
| 22 | + | |
| 21 | 23 | /* |
| 22 | 24 | * Write pen_release in a way that is guaranteed to be visible to all |
| 23 | 25 | * observers, irrespective of whether they're taking part in coherency |
| @@ -117,7 +117,7 @@ struct mvebu_mbus_soc_data { · 116 unmodified lines | ||
| 117 | 117 | unsigned int (*win_remap_offset)(const int win); |
| 118 | 118 | void (*setup_cpu_target)(struct mvebu_mbus_state *s); |
| 119 | 119 | int (*save_cpu_target)(struct mvebu_mbus_state *s, |
| 120 | − u32 *store_addr); | |
| 120 | + u32 __iomem *store_addr); | |
| 121 | 121 | int (*show_cpu_target)(struct mvebu_mbus_state *s, |
| 122 | 122 | struct seq_file *seq, void *v); |
| 123 | 123 | }; |
| @@ -728,7 +728,7 @@ mvebu_mbus_default_setup_cpu_target(struct mvebu_mbus_state *mbus) · 604 unmodified lines | ||
| 728 | 728 | |
| 729 | 729 | static int |
| 730 | 730 | mvebu_mbus_default_save_cpu_target(struct mvebu_mbus_state *mbus, |
| 731 | − u32 *store_addr) | |
| 731 | + u32 __iomem *store_addr) | |
| 732 | 732 | { |
| 733 | 733 | int i; |
| 734 | 734 | |
| @@ -780,7 +780,7 @@ mvebu_mbus_dove_setup_cpu_target(struct mvebu_mbus_state *mbus) · 45 unmodified lines | ||
| 780 | 780 | |
| 781 | 781 | static int |
| 782 | 782 | mvebu_mbus_dove_save_cpu_target(struct mvebu_mbus_state *mbus, |
| 783 | − u32 *store_addr) | |
| 783 | + u32 __iomem *store_addr) | |
| 784 | 784 | { |
| 785 | 785 | int i; |
| 786 | 786 | |
| @@ -796,7 +796,7 @@ mvebu_mbus_dove_save_cpu_target(struct mvebu_mbus_state *mbus, · 9 unmodified lines | ||
| 796 | 796 | return 4; |
| 797 | 797 | } |
| 798 | 798 | |
| 799 | −int mvebu_mbus_save_cpu_target(u32 *store_addr) | |
| 799 | +int mvebu_mbus_save_cpu_target(u32 __iomem *store_addr) | |
| 800 | 800 | { |
| 801 | 801 | return mbus_state.soc->save_cpu_target(&mbus_state, store_addr); |
| 802 | 802 | } |
| @@ -1089,7 +1089,7 @@ static void mvebu_mbus_resume(void) · 286 unmodified lines | ||
| 1089 | 1089 | } |
| 1090 | 1090 | } |
| 1091 | 1091 | |
| 1092 | −struct syscore_ops mvebu_mbus_syscore_ops = { | |
| 1092 | +static struct syscore_ops mvebu_mbus_syscore_ops = { | |
| 1093 | 1093 | .suspend = mvebu_mbus_suspend, |
| 1094 | 1094 | .resume = mvebu_mbus_resume, |
| 1095 | 1095 | }; |
| @@ -74,8 +74,8 @@ static ssize_t vexpress_reset_active_store(struct device *dev, · 73 unmodified lines | ||
| 74 | 74 | return err ? err : count; |
| 75 | 75 | } |
| 76 | 76 | |
| 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); | |
| 79 | 79 | |
| 80 | 80 | |
| 81 | 81 | enum vexpress_reset_func { FUNC_RESET, FUNC_SHUTDOWN, FUNC_REBOOT }; |
| @@ -66,7 +66,7 @@ static inline const struct mbus_dram_target_info *mv_mbus_dram_info_nooverlap(vo · 65 unmodified lines | ||
| 66 | 66 | } |
| 67 | 67 | #endif |
| 68 | 68 | |
| 69 | −int mvebu_mbus_save_cpu_target(u32 *store_addr); | |
| 69 | +int mvebu_mbus_save_cpu_target(u32 __iomem *store_addr); | |
| 70 | 70 | void mvebu_mbus_get_pcie_mem_aperture(struct resource *res); |
| 71 | 71 | void mvebu_mbus_get_pcie_io_aperture(struct resource *res); |
| 72 | 72 | int mvebu_mbus_get_dram_win_info(phys_addr_t phyaddr, u8 *target, u8 *attr); |