Commit 6b5a12db authored by Linus Torvalds's avatar Linus Torvalds

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

Pull ARM SoC multiplatform code updates from Arnd Bergmann:
 "This branch is the culmination of 5 years of effort to bring the ARMv6
  and ARMv7 platforms together such that they can all be enabled and
  boot the same kernel.  It has been a tremendous amount of cleanup and
  refactoring by a huge number of people, and creation of several new
  (and major) subsystems to better abstract out all the platform details
  in an appropriate manner.

  The bulk of this branch is a large patchset from Arnd that brings
  several of the more minor and older platforms we have closer to
  multiplatform support.  Among these are MMP, S3C64xx, Orion5x, mv78xx0
  and realview Much of this is moving around header files from old mach
  directories, but there are also some cleanup patches of debug_ll
  (lowlevel debug per-platform options) and other parts.

  Linus Walleij also has some patchs to clean up the older ARM Realview
  platforms by finally introducing DT support, and Rob Herring has some
  for ARM Versatile which is now DT-only.  Both of these platforms are
  now multiplatform.

  Finally, a couple of patches from Russell for Dove PMU, and a fix from
  Valentin Rothberg for Exynos ADC, which were rebased on top of the
  series to avoid conflicts"

* tag 'armsoc-multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (75 commits)
  ARM: realview: don't select SMP_ON_UP for UP builds
  ARM: s3c: simplify s3c_irqwake_{e,}intallow definition
  ARM: s3c64xx: fix pm-debug compilation
  iio: exynos-adc: fix irqf_oneshot.cocci warnings
  ARM: realview: build realview-dt SMP support only when used
  ARM: realview: select apropriate targets
  ARM: realview: clean up header files
  ARM: realview: make all header files local
  ARM: no longer make CPU targets visible separately
  ARM: integrator: use explicit core module options
  ARM: realview: enable multiplatform
  ARM: make default platform work for NOMMU
  ARM: debug-ll: move DEBUG_LL_UART_EFM32 to correct Kconfig location
  ARM: defconfig: use correct debug_ll settings
  ARM: versatile: convert to multi-platform
  ARM: versatile: merge mach code into a single file
  ARM: versatile: switch to DT only booting and remove legacy code
  ARM: versatile: add DT based PCI detection
  ARM: pxa: mark ezx structures as __maybe_unused
  ARM: pxa: mark raumfeld init functions as __maybe_unused
  ...
parents 5083c542 2cb58c01
...@@ -49,7 +49,7 @@ to this new MFP mechanism, here are several key points: ...@@ -49,7 +49,7 @@ to this new MFP mechanism, here are several key points:
internal controllers like PWM, SSP and UART, with 128 internal signals internal controllers like PWM, SSP and UART, with 128 internal signals
which can be routed to external through one or more MFPs (e.g. GPIO<0> which can be routed to external through one or more MFPs (e.g. GPIO<0>
can be routed through either MFP_PIN_GPIO0 as well as MFP_PIN_GPIO0_2, can be routed through either MFP_PIN_GPIO0 as well as MFP_PIN_GPIO0_2,
see arch/arm/mach-pxa/mach/include/mfp-pxa300.h) see arch/arm/mach-pxa/mfp-pxa300.h)
2. Alternate function configuration is removed from this GPIO controller, 2. Alternate function configuration is removed from this GPIO controller,
the remaining functions are pure GPIO-specific, i.e. the remaining functions are pure GPIO-specific, i.e.
...@@ -76,11 +76,11 @@ For board code writers, here are some guidelines: ...@@ -76,11 +76,11 @@ For board code writers, here are some guidelines:
1. include ONE of the following header files in your <board>.c: 1. include ONE of the following header files in your <board>.c:
- #include <mach/mfp-pxa25x.h> - #include "mfp-pxa25x.h"
- #include <mach/mfp-pxa27x.h> - #include "mfp-pxa27x.h"
- #include <mach/mfp-pxa300.h> - #include "mfp-pxa300.h"
- #include <mach/mfp-pxa320.h> - #include "mfp-pxa320.h"
- #include <mach/mfp-pxa930.h> - #include "mfp-pxa930.h"
NOTE: only one file in your <board>.c, depending on the processors used, NOTE: only one file in your <board>.c, depending on the processors used,
because pin configuration definitions may conflict in these file (i.e. because pin configuration definitions may conflict in these file (i.e.
...@@ -203,20 +203,20 @@ make them effective there-after. ...@@ -203,20 +203,20 @@ make them effective there-after.
1. Unified pin definitions - enum constants for all configurable pins 1. Unified pin definitions - enum constants for all configurable pins
2. processor-neutral bit definitions for a possible MFP configuration 2. processor-neutral bit definitions for a possible MFP configuration
- arch/arm/mach-pxa/include/mach/mfp-pxa3xx.h - arch/arm/mach-pxa/mfp-pxa3xx.h
for PXA3xx specific MFPR register bit definitions and PXA3xx common pin for PXA3xx specific MFPR register bit definitions and PXA3xx common pin
configurations configurations
- arch/arm/mach-pxa/include/mach/mfp-pxa2xx.h - arch/arm/mach-pxa/mfp-pxa2xx.h
for PXA2xx specific definitions and PXA25x/PXA27x common pin configurations for PXA2xx specific definitions and PXA25x/PXA27x common pin configurations
- arch/arm/mach-pxa/include/mach/mfp-pxa25x.h - arch/arm/mach-pxa/mfp-pxa25x.h
arch/arm/mach-pxa/include/mach/mfp-pxa27x.h arch/arm/mach-pxa/mfp-pxa27x.h
arch/arm/mach-pxa/include/mach/mfp-pxa300.h arch/arm/mach-pxa/mfp-pxa300.h
arch/arm/mach-pxa/include/mach/mfp-pxa320.h arch/arm/mach-pxa/mfp-pxa320.h
arch/arm/mach-pxa/include/mach/mfp-pxa930.h arch/arm/mach-pxa/mfp-pxa930.h
for processor specific definitions for processor specific definitions
......
...@@ -191,6 +191,7 @@ nodes to be present and contain the properties described below. ...@@ -191,6 +191,7 @@ nodes to be present and contain the properties described below.
"allwinner,sun6i-a31" "allwinner,sun6i-a31"
"allwinner,sun8i-a23" "allwinner,sun8i-a23"
"arm,psci" "arm,psci"
"arm,realview-smp"
"brcm,brahma-b15" "brcm,brahma-b15"
"marvell,armada-375-smp" "marvell,armada-375-smp"
"marvell,armada-380-smp" "marvell,armada-380-smp"
......
...@@ -47,6 +47,9 @@ Required properties: ...@@ -47,6 +47,9 @@ Required properties:
- samsung,syscon-phandle Contains the PMU system controller node - samsung,syscon-phandle Contains the PMU system controller node
(To access the ADC_PHY register on Exynos5250/5420/5800/3250) (To access the ADC_PHY register on Exynos5250/5420/5800/3250)
Optional properties:
- has-touchscreen: If present, indicates that a touchscreen is
connected an usable.
Note: child nodes can be added for auto probing from device tree. Note: child nodes can be added for auto probing from device tree.
......
...@@ -240,7 +240,6 @@ config ARM_PATCH_PHYS_VIRT ...@@ -240,7 +240,6 @@ config ARM_PATCH_PHYS_VIRT
bool "Patch physical to virtual translations at runtime" if EMBEDDED bool "Patch physical to virtual translations at runtime" if EMBEDDED
default y default y
depends on !XIP_KERNEL && MMU depends on !XIP_KERNEL && MMU
depends on !ARCH_REALVIEW || !SPARSEMEM
help help
Patch phys-to-virt and virt-to-phys translation functions at Patch phys-to-virt and virt-to-phys translation functions at
boot and module load time according to the position of the boot and module load time according to the position of the
...@@ -321,7 +320,7 @@ config ARCH_MMAP_RND_BITS_MAX ...@@ -321,7 +320,7 @@ config ARCH_MMAP_RND_BITS_MAX
# #
choice choice
prompt "ARM system type" prompt "ARM system type"
default ARCH_VERSATILE if !MMU default ARM_SINGLE_ARMV7M if !MMU
default ARCH_MULTIPLATFORM if MMU default ARCH_MULTIPLATFORM if MMU
config ARCH_MULTIPLATFORM config ARCH_MULTIPLATFORM
...@@ -353,38 +352,6 @@ config ARM_SINGLE_ARMV7M ...@@ -353,38 +352,6 @@ config ARM_SINGLE_ARMV7M
select SPARSE_IRQ select SPARSE_IRQ
select USE_OF select USE_OF
config ARCH_REALVIEW
bool "ARM Ltd. RealView family"
select ARCH_WANT_OPTIONAL_GPIOLIB
select ARM_AMBA
select ARM_TIMER_SP804
select COMMON_CLK
select COMMON_CLK_VERSATILE
select GENERIC_CLOCKEVENTS
select GPIO_PL061 if GPIOLIB
select ICST
select NEED_MACH_MEMORY_H
select PLAT_VERSATILE
select PLAT_VERSATILE_SCHED_CLOCK
help
This enables support for ARM Ltd RealView boards.
config ARCH_VERSATILE
bool "ARM Ltd. Versatile family"
select ARCH_WANT_OPTIONAL_GPIOLIB
select ARM_AMBA
select ARM_TIMER_SP804
select ARM_VIC
select CLKDEV_LOOKUP
select GENERIC_CLOCKEVENTS
select HAVE_MACH_CLKDEV
select ICST
select PLAT_VERSATILE
select PLAT_VERSATILE_CLOCK
select PLAT_VERSATILE_SCHED_CLOCK
select VERSATILE_FPGA_IRQ
help
This enables support for ARM Ltd Versatile board.
config ARCH_CLPS711X config ARCH_CLPS711X
bool "Cirrus Logic CLPS711x/EP721x/EP731x-based" bool "Cirrus Logic CLPS711x/EP721x/EP731x-based"
...@@ -519,55 +486,15 @@ config ARCH_DOVE ...@@ -519,55 +486,15 @@ config ARCH_DOVE
select CPU_PJ4 select CPU_PJ4
select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS
select MIGHT_HAVE_PCI select MIGHT_HAVE_PCI
select MULTI_IRQ_HANDLER
select MVEBU_MBUS select MVEBU_MBUS
select PINCTRL select PINCTRL
select PINCTRL_DOVE select PINCTRL_DOVE
select PLAT_ORION_LEGACY select PLAT_ORION_LEGACY
help
Support for the Marvell Dove SoC 88AP510
config ARCH_MV78XX0
bool "Marvell MV78xx0"
select ARCH_REQUIRE_GPIOLIB
select CPU_FEROCEON
select GENERIC_CLOCKEVENTS
select MVEBU_MBUS
select PCI
select PLAT_ORION_LEGACY
help
Support for the following Marvell MV78xx0 series SoCs:
MV781x0, MV782x0.
config ARCH_ORION5X
bool "Marvell Orion"
depends on MMU
select ARCH_REQUIRE_GPIOLIB
select CPU_FEROCEON
select GENERIC_CLOCKEVENTS
select MVEBU_MBUS
select PCI
select PLAT_ORION_LEGACY
select MULTI_IRQ_HANDLER
help
Support for the following Marvell Orion 5x series SoCs:
Orion-1 (5181), Orion-VoIP (5181L), Orion-NAS (5182),
Orion-2 (5281), Orion-1-90 (6183).
config ARCH_MMP
bool "Marvell PXA168/910/MMP2"
depends on MMU
select ARCH_REQUIRE_GPIOLIB
select CLKDEV_LOOKUP
select GENERIC_ALLOCATOR
select GENERIC_CLOCKEVENTS
select GPIO_PXA
select IRQ_DOMAIN
select MULTI_IRQ_HANDLER
select PINCTRL
select PLAT_PXA
select SPARSE_IRQ select SPARSE_IRQ
select PM_GENERIC_DOMAINS if PM
help help
Support for Marvell's PXA168/PXA910(MMP) and MMP2 processor line. Support for the Marvell Dove SoC 88AP510
config ARCH_KS8695 config ARCH_KS8695
bool "Micrel/Kendin KS8695" bool "Micrel/Kendin KS8695"
...@@ -692,32 +619,6 @@ config ARCH_S3C24XX ...@@ -692,32 +619,6 @@ config ARCH_S3C24XX
(<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or the (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or the
Samsung SMDK2410 development board (and derivatives). Samsung SMDK2410 development board (and derivatives).
config ARCH_S3C64XX
bool "Samsung S3C64XX"
select ARCH_REQUIRE_GPIOLIB
select ARM_AMBA
select ARM_VIC
select ATAGS
select CLKDEV_LOOKUP
select CLKSRC_SAMSUNG_PWM
select COMMON_CLK_SAMSUNG
select CPU_V6K
select GENERIC_CLOCKEVENTS
select GPIO_SAMSUNG
select HAVE_S3C2410_I2C if I2C
select HAVE_S3C2410_WATCHDOG if WATCHDOG
select HAVE_TCM
select NO_IOPORT_MAP
select PLAT_SAMSUNG
select PM_GENERIC_DOMAINS if PM
select S3C_DEV_NAND
select S3C_GPIO_TRACK
select SAMSUNG_ATAGS
select SAMSUNG_WAKEMASK
select SAMSUNG_WDT_RESET
help
Samsung S3C64XX series based systems
config ARCH_DAVINCI config ARCH_DAVINCI
bool "TI DaVinci" bool "TI DaVinci"
select ARCH_HAS_HOLES_MEMORYMODEL select ARCH_HAS_HOLES_MEMORYMODEL
......
This diff is collapsed.
...@@ -132,6 +132,5 @@ CONFIG_DEBUG_SPINLOCK=y ...@@ -132,6 +132,5 @@ CONFIG_DEBUG_SPINLOCK=y
CONFIG_DEBUG_MUTEXES=y CONFIG_DEBUG_MUTEXES=y
CONFIG_DEBUG_USER=y CONFIG_DEBUG_USER=y
CONFIG_DEBUG_LL=y CONFIG_DEBUG_LL=y
CONFIG_DEBUG_LL_UART_PL01X=y
# CONFIG_CRYPTO_ANSI_CPRNG is not set # CONFIG_CRYPTO_ANSI_CPRNG is not set
CONFIG_LIBCRC32C=y CONFIG_LIBCRC32C=y
...@@ -204,7 +204,6 @@ CONFIG_DEBUG_INFO=y ...@@ -204,7 +204,6 @@ CONFIG_DEBUG_INFO=y
# CONFIG_FTRACE is not set # CONFIG_FTRACE is not set
# CONFIG_ARM_UNWIND is not set # CONFIG_ARM_UNWIND is not set
CONFIG_DEBUG_LL=y CONFIG_DEBUG_LL=y
CONFIG_DEBUG_LL_UART_8250=y
CONFIG_EARLY_PRINTK=y CONFIG_EARLY_PRINTK=y
CONFIG_CRYPTO_ANSI_CPRNG=y CONFIG_CRYPTO_ANSI_CPRNG=y
# CONFIG_CRYPTO_HW is not set # CONFIG_CRYPTO_HW is not set
......
...@@ -11,6 +11,9 @@ CONFIG_MODULES=y ...@@ -11,6 +11,9 @@ CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_UNLOAD=y
CONFIG_PARTITION_ADVANCED=y CONFIG_PARTITION_ADVANCED=y
CONFIG_CMDLINE_PARTITION=y CONFIG_CMDLINE_PARTITION=y
CONFIG_ARCH_MULTI_V7=y
# CONFIG_ARCH_MULTI_V5 is not set
# CONFIG_ARCH_MULTI_V4 is not set
CONFIG_ARCH_VIRT=y CONFIG_ARCH_VIRT=y
CONFIG_ARCH_ALPINE=y CONFIG_ARCH_ALPINE=y
CONFIG_ARCH_MVEBU=y CONFIG_ARCH_MVEBU=y
......
...@@ -11,6 +11,9 @@ CONFIG_KPROBES=y ...@@ -11,6 +11,9 @@ CONFIG_KPROBES=y
CONFIG_MODULES=y CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_UNLOAD=y
# CONFIG_BLK_DEV_BSG is not set # CONFIG_BLK_DEV_BSG is not set
CONFIG_ARCH_MULTI_V5=y
# CONFIG_ARCH_MULTI_V6 is not set
# CONFIG_ARCH_MULTI_V7 is not set
CONFIG_ARCH_MV78XX0=y CONFIG_ARCH_MV78XX0=y
CONFIG_MACH_DB78X00_BP=y CONFIG_MACH_DB78X00_BP=y
CONFIG_MACH_RD78X00_MASA=y CONFIG_MACH_RD78X00_MASA=y
...@@ -132,7 +135,6 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y ...@@ -132,7 +135,6 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y
CONFIG_DEBUG_USER=y CONFIG_DEBUG_USER=y
CONFIG_DEBUG_ERRORS=y CONFIG_DEBUG_ERRORS=y
CONFIG_DEBUG_LL=y CONFIG_DEBUG_LL=y
CONFIG_DEBUG_LL_UART_8250=y
CONFIG_CRYPTO_CBC=m CONFIG_CRYPTO_CBC=m
CONFIG_CRYPTO_ECB=m CONFIG_CRYPTO_ECB=m
CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_PCBC=m
......
...@@ -13,6 +13,9 @@ CONFIG_MODULE_UNLOAD=y ...@@ -13,6 +13,9 @@ CONFIG_MODULE_UNLOAD=y
# CONFIG_BLK_DEV_BSG is not set # CONFIG_BLK_DEV_BSG is not set
CONFIG_PARTITION_ADVANCED=y CONFIG_PARTITION_ADVANCED=y
CONFIG_BSD_DISKLABEL=y CONFIG_BSD_DISKLABEL=y
CONFIG_ARCH_MULTI_V5=y
# CONFIG_ARCH_MULTI_V6 is not set
# CONFIG_ARCH_MULTI_V7 is not set
CONFIG_ARCH_ORION5X=y CONFIG_ARCH_ORION5X=y
CONFIG_ARCH_ORION5X_DT=y CONFIG_ARCH_ORION5X_DT=y
CONFIG_MACH_DB88F5281=y CONFIG_MACH_DB88F5281=y
...@@ -159,7 +162,6 @@ CONFIG_LATENCYTOP=y ...@@ -159,7 +162,6 @@ CONFIG_LATENCYTOP=y
# CONFIG_FTRACE is not set # CONFIG_FTRACE is not set
CONFIG_DEBUG_USER=y CONFIG_DEBUG_USER=y
CONFIG_DEBUG_LL=y CONFIG_DEBUG_LL=y
CONFIG_DEBUG_LL_UART_8250=y
CONFIG_CRYPTO_CBC=m CONFIG_CRYPTO_CBC=m
CONFIG_CRYPTO_ECB=m CONFIG_CRYPTO_ECB=m
CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_PCBC=m
......
...@@ -8,10 +8,19 @@ CONFIG_MODULES=y ...@@ -8,10 +8,19 @@ CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_UNLOAD=y
# CONFIG_BLK_DEV_BSG is not set # CONFIG_BLK_DEV_BSG is not set
# CONFIG_IOSCHED_CFQ is not set # CONFIG_IOSCHED_CFQ is not set
CONFIG_ARCH_MULTI_V6=y
CONFIG_ARCH_REALVIEW=y CONFIG_ARCH_REALVIEW=y
CONFIG_REALVIEW_DT=y
CONFIG_MACH_REALVIEW_EB=y CONFIG_MACH_REALVIEW_EB=y
CONFIG_REALVIEW_EB_ARM1136=y
CONFIG_REALVIEW_EB_ARM1176=y
CONFIG_REALVIEW_EB_A9MP=y
CONFIG_REALVIEW_EB_ARM11MP=y CONFIG_REALVIEW_EB_ARM11MP=y
CONFIG_REALVIEW_EB_ARM11MP_REVB=y
CONFIG_MACH_REALVIEW_PB11MP=y CONFIG_MACH_REALVIEW_PB11MP=y
CONFIG_MACH_REALVIEW_PB1176=y
CONFIG_MACH_REALVIEW_PBA8=y
CONFIG_MACH_REALVIEW_PBX=y
CONFIG_SMP=y CONFIG_SMP=y
CONFIG_HOTPLUG_CPU=y CONFIG_HOTPLUG_CPU=y
CONFIG_AEABI=y CONFIG_AEABI=y
......
...@@ -8,11 +8,19 @@ CONFIG_MODULES=y ...@@ -8,11 +8,19 @@ CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_UNLOAD=y
# CONFIG_BLK_DEV_BSG is not set # CONFIG_BLK_DEV_BSG is not set
# CONFIG_IOSCHED_CFQ is not set # CONFIG_IOSCHED_CFQ is not set
CONFIG_ARCH_MULTI_V6=y
CONFIG_ARCH_REALVIEW=y CONFIG_ARCH_REALVIEW=y
CONFIG_REALVIEW_DT=y
CONFIG_MACH_REALVIEW_EB=y CONFIG_MACH_REALVIEW_EB=y
CONFIG_REALVIEW_EB_ARM1136=y
CONFIG_REALVIEW_EB_ARM1176=y
CONFIG_REALVIEW_EB_A9MP=y
CONFIG_REALVIEW_EB_ARM11MP=y CONFIG_REALVIEW_EB_ARM11MP=y
CONFIG_REALVIEW_EB_ARM11MP_REVB=y
CONFIG_MACH_REALVIEW_PB11MP=y CONFIG_MACH_REALVIEW_PB11MP=y
CONFIG_MACH_REALVIEW_PB1176=y CONFIG_MACH_REALVIEW_PB1176=y
CONFIG_MACH_REALVIEW_PBA8=y
CONFIG_MACH_REALVIEW_PBX=y
CONFIG_AEABI=y CONFIG_AEABI=y
CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_TEXT=0x0
CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_ZBOOT_ROM_BSS=0x0
......
...@@ -5,6 +5,8 @@ CONFIG_KALLSYMS_ALL=y ...@@ -5,6 +5,8 @@ CONFIG_KALLSYMS_ALL=y
CONFIG_MODULES=y CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_UNLOAD=y
# CONFIG_BLK_DEV_BSG is not set # CONFIG_BLK_DEV_BSG is not set
CONFIG_ARCH_MULTI_V6=y
# CONFIG_ARCH_MULTI_V7 is not set
CONFIG_ARCH_S3C64XX=y CONFIG_ARCH_S3C64XX=y
CONFIG_S3C_BOOT_ERROR_RESET=y CONFIG_S3C_BOOT_ERROR_RESET=y
CONFIG_MACH_SMDK6400=y CONFIG_MACH_SMDK6400=y
......
...@@ -6,8 +6,8 @@ CONFIG_SLAB=y ...@@ -6,8 +6,8 @@ CONFIG_SLAB=y
CONFIG_MODULES=y CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_UNLOAD=y
CONFIG_PARTITION_ADVANCED=y CONFIG_PARTITION_ADVANCED=y
# CONFIG_ARCH_MULTI_V7 is not set
CONFIG_ARCH_VERSATILE=y CONFIG_ARCH_VERSATILE=y
CONFIG_MACH_VERSATILE_AB=y
CONFIG_AEABI=y CONFIG_AEABI=y
CONFIG_OABI_COMPAT=y CONFIG_OABI_COMPAT=y
CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_TEXT=0x0
...@@ -82,6 +82,5 @@ CONFIG_MAGIC_SYSRQ=y ...@@ -82,6 +82,5 @@ CONFIG_MAGIC_SYSRQ=y
CONFIG_DEBUG_KERNEL=y CONFIG_DEBUG_KERNEL=y
CONFIG_DEBUG_USER=y CONFIG_DEBUG_USER=y
CONFIG_DEBUG_LL=y CONFIG_DEBUG_LL=y
CONFIG_DEBUG_LL_UART_PL01X=y
CONFIG_FONTS=y CONFIG_FONTS=y
CONFIG_FONT_ACORN_8x8=y CONFIG_FONT_ACORN_8x8=y
...@@ -228,10 +228,26 @@ static inline int cpu_is_xsc3(void) ...@@ -228,10 +228,26 @@ static inline int cpu_is_xsc3(void)
} }
#endif #endif
#if !defined(CONFIG_CPU_XSCALE) && !defined(CONFIG_CPU_XSC3) #if !defined(CONFIG_CPU_XSCALE) && !defined(CONFIG_CPU_XSC3) && \
#define cpu_is_xscale() 0 !defined(CONFIG_CPU_MOHAWK)
#define cpu_is_xscale_family() 0
#else #else
#define cpu_is_xscale() 1 static inline int cpu_is_xscale_family(void)
{
unsigned int id;
id = read_cpuid_id() & 0xffffe000;
switch (id) {
case 0x69052000: /* Intel XScale 1 */
case 0x69054000: /* Intel XScale 2 */
case 0x69056000: /* Intel XScale 3 */
case 0x56056000: /* Marvell XScale 3 */
case 0x56158000: /* Marvell Mohawk */
return 1;
}
return 0;
}
#endif #endif
/* /*
......
...@@ -211,7 +211,7 @@ const struct machine_desc * __init setup_machine_fdt(unsigned int dt_phys) ...@@ -211,7 +211,7 @@ const struct machine_desc * __init setup_machine_fdt(unsigned int dt_phys)
{ {
const struct machine_desc *mdesc, *mdesc_best = NULL; const struct machine_desc *mdesc, *mdesc_best = NULL;
#ifdef CONFIG_ARCH_MULTIPLATFORM #if defined(CONFIG_ARCH_MULTIPLATFORM) || defined(CONFIG_ARM_SINGLE_ARMV7M)
DT_MACHINE_START(GENERIC_DT, "Generic DT based system") DT_MACHINE_START(GENERIC_DT, "Generic DT based system")
MACHINE_END MACHINE_END
......
...@@ -15,6 +15,9 @@ ...@@ -15,6 +15,9 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/io.h> #include <linux/io.h>
#include <asm/thread_notify.h> #include <asm/thread_notify.h>
#include <asm/cputype.h>
asm(" .arch armv5te\n");
static inline void dsp_save_state(u32 *state) static inline void dsp_save_state(u32 *state)
{ {
...@@ -152,6 +155,10 @@ static int __init xscale_cp0_init(void) ...@@ -152,6 +155,10 @@ static int __init xscale_cp0_init(void)
{ {
u32 cp_access; u32 cp_access;
/* do not attempt to probe iwmmxt on non-xscale family CPUs */
if (!cpu_is_xscale_family())
return 0;
cp_access = xscale_cp_access_read() & ~3; cp_access = xscale_cp_access_read() & ~3;
xscale_cp_access_write(cp_access | 1); xscale_cp_access_write(cp_access | 1);
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <mach/common.h> #include <mach/common.h>
#include <mach/cp_intc.h> #include "cp_intc.h"
#include <mach/mux.h> #include <mach/mux.h>
#include <mach/da8xx.h> #include <mach/da8xx.h>
......
...@@ -40,10 +40,10 @@ ...@@ -40,10 +40,10 @@
#include <linux/spi/flash.h> #include <linux/spi/flash.h>
#include <mach/common.h> #include <mach/common.h>
#include <mach/cp_intc.h> #include "cp_intc.h"
#include <mach/da8xx.h> #include <mach/da8xx.h>
#include <mach/mux.h> #include <mach/mux.h>
#include <mach/sram.h> #include "sram.h"
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <mach/common.h> #include <mach/common.h>
#include <mach/cp_intc.h> #include "cp_intc.h"
#include <mach/da8xx.h> #include <mach/da8xx.h>
#include <linux/platform_data/mtd-davinci.h> #include <linux/platform_data/mtd-davinci.h>
#include <linux/platform_data/mtd-davinci-aemif.h> #include <linux/platform_data/mtd-davinci-aemif.h>
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <mach/common.h> #include <mach/common.h>
#include <mach/cp_intc.h> #include "cp_intc.h"
#include <mach/da8xx.h> #include <mach/da8xx.h>
#include <mach/mux.h> #include <mach/mux.h>
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include <mach/hardware.h> #include <mach/hardware.h>
#include <mach/clock.h> #include <mach/clock.h>
#include <mach/psc.h> #include "psc.h"
#include <mach/cputype.h> #include <mach/cputype.h>
#include "clock.h" #include "clock.h"
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include <linux/of_irq.h> #include <linux/of_irq.h>
#include <mach/common.h> #include <mach/common.h>
#include <mach/cp_intc.h> #include "cp_intc.h"
static inline unsigned int cp_intc_read(unsigned offset) static inline unsigned int cp_intc_read(unsigned offset)
{ {
......
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
#include <linux/export.h> #include <linux/export.h>
#include <asm/cpuidle.h> #include <asm/cpuidle.h>
#include <mach/cpuidle.h> #include "cpuidle.h"
#include <mach/ddr2.h> #include "ddr2.h"
#define DAVINCI_CPUIDLE_MAX_STATES 2 #define DAVINCI_CPUIDLE_MAX_STATES 2
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <mach/psc.h> #include "psc.h"
#include <mach/irqs.h> #include <mach/irqs.h>
#include <mach/cputype.h> #include <mach/cputype.h>
#include <mach/common.h> #include <mach/common.h>
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <mach/psc.h> #include "psc.h"
#include <mach/irqs.h> #include <mach/irqs.h>
#include <mach/cputype.h> #include <mach/cputype.h>
#include <mach/common.h> #include <mach/common.h>
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <mach/common.h> #include <mach/common.h>
#include <mach/cp_intc.h> #include "cp_intc.h"
#include <mach/da8xx.h> #include <mach/da8xx.h>
#define DA8XX_NUM_UARTS 3 #define DA8XX_NUM_UARTS 3
......
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
#include <mach/common.h> #include <mach/common.h>
#include <mach/time.h> #include <mach/time.h>
#include <mach/da8xx.h> #include <mach/da8xx.h>
#include <mach/cpuidle.h> #include "cpuidle.h"
#include <mach/sram.h> #include "sram.h"
#include "clock.h" #include "clock.h"
#include "asp.h" #include "asp.h"
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <mach/cputype.h> #include <mach/cputype.h>
#include <mach/psc.h> #include "psc.h"
#include <mach/mux.h> #include <mach/mux.h>
#include <mach/irqs.h> #include <mach/irqs.h>
#include <mach/time.h> #include <mach/time.h>
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <mach/cputype.h> #include <mach/cputype.h>
#include <mach/psc.h> #include "psc.h"
#include <mach/mux.h> #include <mach/mux.h>
#include <mach/irqs.h> #include <mach/irqs.h>
#include <mach/time.h> #include <mach/time.h>
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include <mach/cputype.h> #include <mach/cputype.h>
#include <mach/irqs.h> #include <mach/irqs.h>
#include <mach/psc.h> #include "psc.h"
#include <mach/mux.h> #include <mach/mux.h>
#include <mach/time.h> #include <mach/time.h>
#include <mach/serial.h> #include <mach/serial.h>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include <mach/cputype.h> #include <mach/cputype.h>
#include <mach/irqs.h> #include <mach/irqs.h>
#include <mach/psc.h> #include "psc.h"
#include <mach/mux.h> #include <mach/mux.h>
#include <mach/time.h> #include <mach/time.h>
#include <mach/serial.h> #include <mach/serial.h>
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include <mach/common.h> #include <mach/common.h>
#include <mach/da8xx.h> #include <mach/da8xx.h>
#include <mach/sram.h> #include "sram.h"
#include <mach/pm.h> #include <mach/pm.h>
#include "clock.h" #include "clock.h"
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include <linux/io.h> #include <linux/io.h>
#include <mach/cputype.h> #include <mach/cputype.h>
#include <mach/psc.h> #include "psc.h"
#include "clock.h" #include "clock.h"
......
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
#include <linux/linkage.h> #include <linux/linkage.h>
#include <asm/assembler.h> #include <asm/assembler.h>
#include <mach/psc.h> #include "psc.h"
#include <mach/ddr2.h> #include "ddr2.h"
#include "clock.h" #include "clock.h"
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include <linux/genalloc.h> #include <linux/genalloc.h>
#include <mach/common.h> #include <mach/common.h>
#include <mach/sram.h> #include "sram.h"
static struct gen_pool *sram_pool; static struct gen_pool *sram_pool;
......
...@@ -88,6 +88,7 @@ static void __init cm_a510_init(void) ...@@ -88,6 +88,7 @@ static void __init cm_a510_init(void)
MACHINE_START(CM_A510, "Compulab CM-A510 Board") MACHINE_START(CM_A510, "Compulab CM-A510 Board")
.atag_offset = 0x100, .atag_offset = 0x100,
.nr_irqs = DOVE_NR_IRQS,
.init_machine = cm_a510_init, .init_machine = cm_a510_init,
.map_io = dove_map_io, .map_io = dove_map_io,
.init_early = dove_init_early, .init_early = dove_init_early,
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#include <linux/platform_data/dma-mv_xor.h> #include <linux/platform_data/dma-mv_xor.h>
#include <linux/platform_data/usb-ehci-orion.h> #include <linux/platform_data/usb-ehci-orion.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/soc/dove/pmu.h>
#include <asm/hardware/cache-tauros2.h> #include <asm/hardware/cache-tauros2.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
...@@ -375,6 +376,47 @@ void __init dove_setup_cpu_wins(void) ...@@ -375,6 +376,47 @@ void __init dove_setup_cpu_wins(void)
DOVE_SCRATCHPAD_SIZE); DOVE_SCRATCHPAD_SIZE);
} }
static struct resource orion_wdt_resource[] = {
DEFINE_RES_MEM(TIMER_PHYS_BASE, 0x04),
DEFINE_RES_MEM(RSTOUTn_MASK_PHYS, 0x04),
};
static struct platform_device orion_wdt_device = {
.name = "orion_wdt",
.id = -1,
.num_resources = ARRAY_SIZE(orion_wdt_resource),
.resource = orion_wdt_resource,
};
static void __init __maybe_unused orion_wdt_init(void)
{
platform_device_register(&orion_wdt_device);
}
static const struct dove_pmu_domain_initdata pmu_domains[] __initconst = {
{
.pwr_mask = PMU_PWR_VPU_PWR_DWN_MASK,
.rst_mask = PMU_SW_RST_VIDEO_MASK,
.iso_mask = PMU_ISO_VIDEO_MASK,
.name = "vpu-domain",
}, {
.pwr_mask = PMU_PWR_GPU_PWR_DWN_MASK,
.rst_mask = PMU_SW_RST_GPU_MASK,
.iso_mask = PMU_ISO_GPU_MASK,
.name = "gpu-domain",
}, {
/* sentinel */
},
};
static const struct dove_pmu_initdata pmu_data __initconst = {
.pmc_base = DOVE_PMU_VIRT_BASE,
.pmu_base = DOVE_PMU_VIRT_BASE + 0x8000,
.irq = IRQ_DOVE_PMU,
.irq_domain_start = IRQ_DOVE_PMU_START,
.domains = pmu_domains,
};
void __init dove_init(void) void __init dove_init(void)
{ {
pr_info("Dove 88AP510 SoC, TCLK = %d MHz.\n", pr_info("Dove 88AP510 SoC, TCLK = %d MHz.\n",
...@@ -389,6 +431,7 @@ void __init dove_init(void) ...@@ -389,6 +431,7 @@ void __init dove_init(void)
dove_clk_init(); dove_clk_init();
/* internal devices that every board has */ /* internal devices that every board has */
dove_init_pmu_legacy(&pmu_data);
dove_rtc_init(); dove_rtc_init();
dove_xor0_init(); dove_xor0_init();
dove_xor1_init(); dove_xor1_init();
......
...@@ -94,6 +94,7 @@ static void __init dove_db_init(void) ...@@ -94,6 +94,7 @@ static void __init dove_db_init(void)
MACHINE_START(DOVE_DB, "Marvell DB-MV88AP510-BP Development Board") MACHINE_START(DOVE_DB, "Marvell DB-MV88AP510-BP Development Board")
.atag_offset = 0x100, .atag_offset = 0x100,
.nr_irqs = DOVE_NR_IRQS,
.init_machine = dove_db_init, .init_machine = dove_db_init,
.map_io = dove_map_io, .map_io = dove_map_io,
.init_early = dove_init_early, .init_early = dove_init_early,
......
...@@ -11,6 +11,8 @@ ...@@ -11,6 +11,8 @@
#ifndef __ASM_ARCH_DOVE_H #ifndef __ASM_ARCH_DOVE_H
#define __ASM_ARCH_DOVE_H #define __ASM_ARCH_DOVE_H
#include <mach/irqs.h>
/* /*
* Marvell Dove address maps. * Marvell Dove address maps.
* *
......
/*
* arch/arm/mach-dove/include/mach/entry-macro.S
*
* Low-level IRQ helper macros for Marvell Dove platforms
*
* This file is licensed under the terms of the GNU General Public
* License version 2. This program is licensed "as is" without any
* warranty of any kind, whether express or implied.
*/
#include <mach/bridge-regs.h>
.macro get_irqnr_preamble, base, tmp
ldr \base, =IRQ_VIRT_BASE
.endm
.macro get_irqnr_and_base, irqnr, irqstat, base, tmp
@ check low interrupts
ldr \irqstat, [\base, #IRQ_CAUSE_LOW_OFF]
ldr \tmp, [\base, #IRQ_MASK_LOW_OFF]
mov \irqnr, #32
ands \irqstat, \irqstat, \tmp
@ if no low interrupts set, check high interrupts
ldreq \irqstat, [\base, #IRQ_CAUSE_HIGH_OFF]
ldreq \tmp, [\base, #IRQ_MASK_HIGH_OFF]
moveq \irqnr, #64
andeqs \irqstat, \irqstat, \tmp
@ find first active interrupt source
clzne \irqstat, \irqstat
subne \irqnr, \irqnr, \irqstat
.endm
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
#define NR_PMU_IRQS 7 #define NR_PMU_IRQS 7
#define IRQ_DOVE_RTC (IRQ_DOVE_PMU_START + 5) #define IRQ_DOVE_RTC (IRQ_DOVE_PMU_START + 5)
#define NR_IRQS (IRQ_DOVE_PMU_START + NR_PMU_IRQS) #define DOVE_NR_IRQS (IRQ_DOVE_PMU_START + NR_PMU_IRQS)
#endif #endif
...@@ -51,22 +51,14 @@ ...@@ -51,22 +51,14 @@
#define CLOCK_GATING_GIGA_PHY_MASK (1 << CLOCK_GATING_BIT_GIGA_PHY) #define CLOCK_GATING_GIGA_PHY_MASK (1 << CLOCK_GATING_BIT_GIGA_PHY)
#define PMU_INTERRUPT_CAUSE (DOVE_PMU_VIRT_BASE + 0x50) #define PMU_INTERRUPT_CAUSE (DOVE_PMU_VIRT_BASE + 0x50)
#define PMU_INTERRUPT_MASK (DOVE_PMU_VIRT_BASE + 0x54)
static inline int pmu_to_irq(int pin) #define PMU_SW_RST_VIDEO_MASK BIT(16)
{ #define PMU_SW_RST_GPU_MASK BIT(18)
if (pin < NR_PMU_IRQS)
return pin + IRQ_DOVE_PMU_START;
return -EINVAL; #define PMU_PWR_GPU_PWR_DWN_MASK BIT(2)
} #define PMU_PWR_VPU_PWR_DWN_MASK BIT(3)
static inline int irq_to_pmu(int irq) #define PMU_ISO_VIDEO_MASK BIT(0)
{ #define PMU_ISO_GPU_MASK BIT(1)
if (IRQ_DOVE_PMU_START <= irq && irq < NR_IRQS)
return irq - IRQ_DOVE_PMU_START;
return -EINVAL;
}
#endif #endif
...@@ -7,87 +7,15 @@ ...@@ -7,87 +7,15 @@
* License version 2. This program is licensed "as is" without any * License version 2. This program is licensed "as is" without any
* warranty of any kind, whether express or implied. * warranty of any kind, whether express or implied.
*/ */
#include <linux/kernel.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/gpio.h>
#include <linux/io.h> #include <linux/io.h>
#include <asm/mach/arch.h> #include <asm/exception.h>
#include <plat/irq.h> #include <plat/irq.h>
#include <asm/mach/irq.h>
#include <mach/pm.h>
#include <mach/bridge-regs.h> #include <mach/bridge-regs.h>
#include <plat/orion-gpio.h> #include <plat/orion-gpio.h>
#include "common.h" #include "common.h"
static void pmu_irq_mask(struct irq_data *d)
{
int pin = irq_to_pmu(d->irq);
u32 u;
u = readl(PMU_INTERRUPT_MASK);
u &= ~(1 << (pin & 31));
writel(u, PMU_INTERRUPT_MASK);
}
static void pmu_irq_unmask(struct irq_data *d)
{
int pin = irq_to_pmu(d->irq);
u32 u;
u = readl(PMU_INTERRUPT_MASK);
u |= 1 << (pin & 31);
writel(u, PMU_INTERRUPT_MASK);
}
static void pmu_irq_ack(struct irq_data *d)
{
int pin = irq_to_pmu(d->irq);
u32 u;
/*
* The PMU mask register is not RW0C: it is RW. This means that
* the bits take whatever value is written to them; if you write
* a '1', you will set the interrupt.
*
* Unfortunately this means there is NO race free way to clear
* these interrupts.
*
* So, let's structure the code so that the window is as small as
* possible.
*/
u = ~(1 << (pin & 31));
u &= readl_relaxed(PMU_INTERRUPT_CAUSE);
writel_relaxed(u, PMU_INTERRUPT_CAUSE);
}
static struct irq_chip pmu_irq_chip = {
.name = "pmu_irq",
.irq_mask = pmu_irq_mask,
.irq_unmask = pmu_irq_unmask,
.irq_ack = pmu_irq_ack,
};
static void pmu_irq_handler(struct irq_desc *desc)
{
unsigned long cause = readl(PMU_INTERRUPT_CAUSE);
unsigned int irq;
cause &= readl(PMU_INTERRUPT_MASK);
if (cause == 0) {
do_bad_IRQ(desc);
return;
}
for (irq = 0; irq < NR_PMU_IRQS; irq++) {
if (!(cause & (1 << irq)))
continue;
irq = pmu_to_irq(irq);
generic_handle_irq(irq);
}
}
static int __initdata gpio0_irqs[4] = { static int __initdata gpio0_irqs[4] = {
IRQ_DOVE_GPIO_0_7, IRQ_DOVE_GPIO_0_7,
IRQ_DOVE_GPIO_8_15, IRQ_DOVE_GPIO_8_15,
...@@ -109,14 +37,6 @@ static int __initdata gpio2_irqs[4] = { ...@@ -109,14 +37,6 @@ static int __initdata gpio2_irqs[4] = {
0, 0,
}; };
#ifdef CONFIG_MULTI_IRQ_HANDLER
/*
* Compiling with both non-DT and DT support enabled, will
* break asm irq handler used by non-DT boards. Therefore,
* we provide a C-style irq handler even for non-DT boards,
* if MULTI_IRQ_HANDLER is set.
*/
static void __iomem *dove_irq_base = IRQ_VIRT_BASE; static void __iomem *dove_irq_base = IRQ_VIRT_BASE;
static asmlinkage void static asmlinkage void
...@@ -139,18 +59,13 @@ __exception_irq_entry dove_legacy_handle_irq(struct pt_regs *regs) ...@@ -139,18 +59,13 @@ __exception_irq_entry dove_legacy_handle_irq(struct pt_regs *regs)
return; return;
} }
} }
#endif
void __init dove_init_irq(void) void __init dove_init_irq(void)
{ {
int i;
orion_irq_init(1, IRQ_VIRT_BASE + IRQ_MASK_LOW_OFF); orion_irq_init(1, IRQ_VIRT_BASE + IRQ_MASK_LOW_OFF);
orion_irq_init(33, IRQ_VIRT_BASE + IRQ_MASK_HIGH_OFF); orion_irq_init(33, IRQ_VIRT_BASE + IRQ_MASK_HIGH_OFF);
#ifdef CONFIG_MULTI_IRQ_HANDLER
set_handle_irq(dove_legacy_handle_irq); set_handle_irq(dove_legacy_handle_irq);
#endif
/* /*
* Initialize gpiolib for GPIOs 0-71. * Initialize gpiolib for GPIOs 0-71.
...@@ -163,17 +78,4 @@ void __init dove_init_irq(void) ...@@ -163,17 +78,4 @@ void __init dove_init_irq(void)
orion_gpio_init(NULL, 64, 8, DOVE_GPIO2_VIRT_BASE, 0, orion_gpio_init(NULL, 64, 8, DOVE_GPIO2_VIRT_BASE, 0,
IRQ_DOVE_GPIO_START + 64, gpio2_irqs); IRQ_DOVE_GPIO_START + 64, gpio2_irqs);
/*
* Mask and clear PMU interrupts
*/
writel(0, PMU_INTERRUPT_MASK);
writel(0, PMU_INTERRUPT_CAUSE);
for (i = IRQ_DOVE_PMU_START; i < NR_IRQS; i++) {
irq_set_chip_and_handler(i, &pmu_irq_chip, handle_level_irq);
irq_set_status_flags(i, IRQ_LEVEL);
irq_clear_status_flags(i, IRQ_NOREQUEST);
}
irq_set_chained_handler(IRQ_DOVE_PMU, pmu_irq_handler);
} }
config ARCH_INTEGRATOR menuconfig ARCH_INTEGRATOR
bool "ARM Ltd. Integrator family" bool "ARM Ltd. Integrator family"
depends on ARCH_MULTI_V4T || ARCH_MULTI_V5 || ARCH_MULTI_V6 depends on ARCH_MULTI_V4T || ARCH_MULTI_V5 || ARCH_MULTI_V6
select ARM_AMBA select ARM_AMBA
...@@ -24,8 +24,6 @@ config ARCH_INTEGRATOR ...@@ -24,8 +24,6 @@ config ARCH_INTEGRATOR
if ARCH_INTEGRATOR if ARCH_INTEGRATOR
menu "Integrator Options"
config ARCH_INTEGRATOR_AP config ARCH_INTEGRATOR_AP
bool "Support Integrator/AP and Integrator/PP2 platforms" bool "Support Integrator/AP and Integrator/PP2 platforms"
select CLKSRC_MMIO select CLKSRC_MMIO
...@@ -37,19 +35,6 @@ config ARCH_INTEGRATOR_AP ...@@ -37,19 +35,6 @@ config ARCH_INTEGRATOR_AP
Include support for the ARM(R) Integrator/AP and Include support for the ARM(R) Integrator/AP and
Integrator/PP2 platforms. Integrator/PP2 platforms.
config ARCH_INTEGRATOR_CP
bool "Support Integrator/CP platform"
select ARCH_CINTEGRATOR
select ARM_TIMER_SP804
select SERIAL_AMBA_PL011 if TTY
select SERIAL_AMBA_PL011_CONSOLE if TTY
select SOC_BUS
help
Include support for the ARM(R) Integrator CP platform.
config ARCH_CINTEGRATOR
bool
config INTEGRATOR_IMPD1 config INTEGRATOR_IMPD1
bool "Include support for Integrator/IM-PD1" bool "Include support for Integrator/IM-PD1"
depends on ARCH_INTEGRATOR_AP depends on ARCH_INTEGRATOR_AP
...@@ -64,6 +49,119 @@ config INTEGRATOR_IMPD1 ...@@ -64,6 +49,119 @@ config INTEGRATOR_IMPD1
To compile this driver as a module, choose M here: the To compile this driver as a module, choose M here: the
module will be called impd1. module will be called impd1.
endmenu config INTEGRATOR_CM7TDMI
bool "Integrator/CM7TDMI core module"
depends on ARCH_INTEGRATOR_AP
depends on ARCH_MULTI_V4 && !MMU
select CPU_ARM7TDMI
config INTEGRATOR_CM720T
bool "Integrator/CM720T core module"
depends on ARCH_INTEGRATOR_AP
depends on ARCH_MULTI_V4T
select CPU_ARM720T
config INTEGRATOR_CM740T
bool "Integrator/CM740T core module"
depends on ARCH_INTEGRATOR_AP
depends on ARCH_MULTI_V4T && !MMU
select CPU_ARM740T
config INTEGRATOR_CM920T
bool "Integrator/CM920T core module"
depends on ARCH_INTEGRATOR_AP
depends on ARCH_MULTI_V4T
select CPU_ARM920T
config INTEGRATOR_CM922T_XA10
bool "Integrator/CM922T-XA10 core module"
depends on ARCH_MULTI_V4T
depends on ARCH_INTEGRATOR_AP
select CPU_ARM922T
config INTEGRATOR_CM926EJS
bool "Integrator/CM926EJ-S core module"
depends on ARCH_INTEGRATOR_AP
depends on ARCH_MULTI_V5
select CPU_ARM926T
config INTEGRATOR_CM940T
bool "Integrator/CM940T core module"
depends on ARCH_INTEGRATOR_AP
depends on ARCH_MULTI_V4T && !MMU
select CPU_ARM940T
config INTEGRATOR_CM946ES
bool "Integrator/CM946E-S core module"
depends on ARCH_INTEGRATOR_AP
depends on ARCH_MULTI_V5 && !MMU
select CPU_ARM946E
config INTEGRATOR_CM966ES
bool "Integrator/CM966E-S core module"
depends on ARCH_INTEGRATOR_AP
depends on BROKEN # no kernel support
config INTEGRATOR_CM10200E_REV0
bool "Integrator/CM10200E rev.0 core module"
depends on ARCH_INTEGRATOR_AP && n
depends on ARCH_MULTI_V5
select CPU_ARM1020
config INTEGRATOR_CM10200E
bool "Integrator/CM10200E core module"
depends on ARCH_INTEGRATOR_AP && n
depends on ARCH_MULTI_V5
select CPU_ARM1020E
config INTEGRATOR_CM10220E
bool "Integrator/CM10220E core module"
depends on ARCH_INTEGRATOR_AP
depends on ARCH_MULTI_V5
select CPU_ARM1022
config INTEGRATOR_CM1026EJS
bool "Integrator/CM1026EJ-S core module"
depends on ARCH_INTEGRATOR_AP
depends on ARCH_MULTI_V5
select CPU_ARM1026
config INTEGRATOR_CM1136JFS
bool "Integrator/CM1136JF-S core module"
depends on ARCH_INTEGRATOR_AP
depends on ARCH_MULTI_V6
select CPU_V6
config ARCH_INTEGRATOR_CP
bool "Support Integrator/CP platform"
depends on (!MMU || ARCH_MULTI_V5 || ARCH_MULTI_V6)
select ARM_TIMER_SP804
select SERIAL_AMBA_PL011 if TTY
select SERIAL_AMBA_PL011_CONSOLE if TTY
select SOC_BUS
help
Include support for the ARM(R) Integrator CP platform.
config INTEGRATOR_CT7T
bool "Integrator/CT7TD (ARM7TDMI) core tile"
depends on ARCH_INTEGRATOR_CP
depends on ARCH_MULTI_V4T && !MMU
select CPU_ARM7TDMI
config INTEGRATOR_CT926
bool "Integrator/CT926 (ARM926EJ-S) core tile"
depends on ARCH_INTEGRATOR_CP
depends on ARCH_MULTI_V5
select CPU_ARM926T
config INTEGRATOR_CTB36
bool "Integrator/CTB36 (ARM1136JF-S) core tile"
depends on ARCH_INTEGRATOR_CP
depends on ARCH_MULTI_V6
select CPU_V6
config ARCH_CINTEGRATOR
depends on ARCH_INTEGRATOR_CP
def_bool y
endif endif
#ifndef _IOP13XX_PCI_H_
#define _IOP13XX_PCI_H_
#include <linux/io.h>
#include <mach/irqs.h>
struct pci_sys_data;
struct hw_pci;
int iop13xx_pci_setup(int nr, struct pci_sys_data *sys);
struct pci_bus *iop13xx_scan_bus(int nr, struct pci_sys_data *);
void iop13xx_atu_select(struct hw_pci *plat_pci);
void iop13xx_pci_init(void);
void iop13xx_map_pci_memory(void);
#define IOP_PCI_STATUS_ERROR (PCI_STATUS_PARITY | \
PCI_STATUS_SIG_TARGET_ABORT | \
PCI_STATUS_REC_TARGET_ABORT | \
PCI_STATUS_REC_TARGET_ABORT | \
PCI_STATUS_REC_MASTER_ABORT | \
PCI_STATUS_SIG_SYSTEM_ERROR | \
PCI_STATUS_DETECTED_PARITY)
#define IOP13XX_ATUE_ATUISR_ERROR (IOP13XX_ATUE_STAT_HALT_ON_ERROR | \
IOP13XX_ATUE_STAT_ROOT_SYS_ERR | \
IOP13XX_ATUE_STAT_PCI_IFACE_ERR | \
IOP13XX_ATUE_STAT_ERR_COR | \
IOP13XX_ATUE_STAT_ERR_UNCOR | \
IOP13XX_ATUE_STAT_CRS | \
IOP13XX_ATUE_STAT_DET_PAR_ERR | \
IOP13XX_ATUE_STAT_EXT_REC_MABORT | \
IOP13XX_ATUE_STAT_SIG_TABORT | \
IOP13XX_ATUE_STAT_EXT_REC_TABORT | \
IOP13XX_ATUE_STAT_MASTER_DATA_PAR)
#define IOP13XX_ATUX_ATUISR_ERROR (IOP13XX_ATUX_STAT_TX_SCEM | \
IOP13XX_ATUX_STAT_REC_SCEM | \
IOP13XX_ATUX_STAT_TX_SERR | \
IOP13XX_ATUX_STAT_DET_PAR_ERR | \
IOP13XX_ATUX_STAT_INT_REC_MABORT | \
IOP13XX_ATUX_STAT_REC_SERR | \
IOP13XX_ATUX_STAT_EXT_REC_MABORT | \
IOP13XX_ATUX_STAT_EXT_REC_TABORT | \
IOP13XX_ATUX_STAT_EXT_SIG_TABORT | \
IOP13XX_ATUX_STAT_MASTER_DATA_PAR)
/* PCI interrupts
*/
#define ATUX_INTA IRQ_IOP13XX_XINT0
#define ATUX_INTB IRQ_IOP13XX_XINT1
#define ATUX_INTC IRQ_IOP13XX_XINT2
#define ATUX_INTD IRQ_IOP13XX_XINT3
#define ATUE_INTA IRQ_IOP13XX_ATUE_IMA
#define ATUE_INTB IRQ_IOP13XX_ATUE_IMB
#define ATUE_INTC IRQ_IOP13XX_ATUE_IMC
#define ATUE_INTD IRQ_IOP13XX_ATUE_IMD
#endif /* _IOP13XX_PCI_H_ */
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include <asm/mach/pci.h> #include <asm/mach/pci.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <mach/pci.h> #include "pci.h"
#include <asm/mach/time.h> #include <asm/mach/time.h>
#include <mach/time.h> #include <mach/time.h>
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include <asm/mach/pci.h> #include <asm/mach/pci.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <mach/pci.h> #include "pci.h"
#include <asm/mach/time.h> #include <asm/mach/time.h>
#include <mach/time.h> #include <mach/time.h>
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include <asm/irq.h> #include <asm/irq.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <mach/irqs.h> #include <mach/irqs.h>
#include <mach/msi.h> #include "msi.h"
/* INTCTL0 CP6 R0 Page 4 /* INTCTL0 CP6 R0 Page 4
*/ */
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include <asm/sizes.h> #include <asm/sizes.h>
#include <asm/signal.h> #include <asm/signal.h>
#include <asm/mach/pci.h> #include <asm/mach/pci.h>
#include <mach/pci.h> #include "pci.h"
#define IOP13XX_PCI_DEBUG 0 #define IOP13XX_PCI_DEBUG 0
#define PRINTK(x...) ((void)(IOP13XX_PCI_DEBUG && printk(x))) #define PRINTK(x...) ((void)(IOP13XX_PCI_DEBUG && printk(x)))
......
#ifndef _IOP13XX_PCI_H_
#define _IOP13XX_PCI_H_
#include <linux/io.h>
#include <mach/irqs.h>
#include <linux/types.h> #include <linux/types.h>
extern void __iomem *iop13xx_atue_mem_base; extern void __iomem *iop13xx_atue_mem_base;
extern void __iomem *iop13xx_atux_mem_base; extern void __iomem *iop13xx_atux_mem_base;
extern size_t iop13xx_atue_mem_size; extern size_t iop13xx_atue_mem_size;
extern size_t iop13xx_atux_mem_size; extern size_t iop13xx_atux_mem_size;
struct pci_sys_data;
struct hw_pci;
int iop13xx_pci_setup(int nr, struct pci_sys_data *sys);
struct pci_bus *iop13xx_scan_bus(int nr, struct pci_sys_data *);
void iop13xx_atu_select(struct hw_pci *plat_pci);
void iop13xx_pci_init(void);
void iop13xx_map_pci_memory(void);
#define IOP_PCI_STATUS_ERROR (PCI_STATUS_PARITY | \
PCI_STATUS_SIG_TARGET_ABORT | \
PCI_STATUS_REC_TARGET_ABORT | \
PCI_STATUS_REC_TARGET_ABORT | \
PCI_STATUS_REC_MASTER_ABORT | \
PCI_STATUS_SIG_SYSTEM_ERROR | \
PCI_STATUS_DETECTED_PARITY)
#define IOP13XX_ATUE_ATUISR_ERROR (IOP13XX_ATUE_STAT_HALT_ON_ERROR | \
IOP13XX_ATUE_STAT_ROOT_SYS_ERR | \
IOP13XX_ATUE_STAT_PCI_IFACE_ERR | \
IOP13XX_ATUE_STAT_ERR_COR | \
IOP13XX_ATUE_STAT_ERR_UNCOR | \
IOP13XX_ATUE_STAT_CRS | \
IOP13XX_ATUE_STAT_DET_PAR_ERR | \
IOP13XX_ATUE_STAT_EXT_REC_MABORT | \
IOP13XX_ATUE_STAT_SIG_TABORT | \
IOP13XX_ATUE_STAT_EXT_REC_TABORT | \
IOP13XX_ATUE_STAT_MASTER_DATA_PAR)
#define IOP13XX_ATUX_ATUISR_ERROR (IOP13XX_ATUX_STAT_TX_SCEM | \
IOP13XX_ATUX_STAT_REC_SCEM | \
IOP13XX_ATUX_STAT_TX_SERR | \
IOP13XX_ATUX_STAT_DET_PAR_ERR | \
IOP13XX_ATUX_STAT_INT_REC_MABORT | \
IOP13XX_ATUX_STAT_REC_SERR | \
IOP13XX_ATUX_STAT_EXT_REC_MABORT | \
IOP13XX_ATUX_STAT_EXT_REC_TABORT | \
IOP13XX_ATUX_STAT_EXT_SIG_TABORT | \
IOP13XX_ATUX_STAT_MASTER_DATA_PAR)
/* PCI interrupts
*/
#define ATUX_INTA IRQ_IOP13XX_XINT0
#define ATUX_INTB IRQ_IOP13XX_XINT1
#define ATUX_INTC IRQ_IOP13XX_XINT2
#define ATUX_INTD IRQ_IOP13XX_XINT3
#define ATUE_INTA IRQ_IOP13XX_ATUE_IMA
#define ATUE_INTB IRQ_IOP13XX_ATUE_IMB
#define ATUE_INTC IRQ_IOP13XX_ATUE_IMC
#define ATUE_INTD IRQ_IOP13XX_ATUE_IMD
#endif /* _IOP13XX_PCI_H_ */
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <asm/mach/irq.h> #include <asm/mach/irq.h>
#include <mach/devices.h> #include "devices.h"
#include <mach/gpio-ks8695.h> #include <mach/gpio-ks8695.h>
#include "generic.h" #include "generic.h"
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <asm/mach/irq.h> #include <asm/mach/irq.h>
#include <mach/devices.h> #include "devices.h"
#include <mach/gpio-ks8695.h> #include <mach/gpio-ks8695.h>
#include "generic.h" #include "generic.h"
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include <asm/mach/irq.h> #include <asm/mach/irq.h>
#include <mach/gpio-ks8695.h> #include <mach/gpio-ks8695.h>
#include <mach/devices.h> #include "devices.h"
#include "generic.h" #include "generic.h"
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <mach/devices.h> #include "devices.h"
#include <mach/regs-gpio.h> #include <mach/regs-gpio.h>
#include <mach/gpio-ks8695.h> #include <mach/gpio-ks8695.h>
#include "generic.h" #include "generic.h"
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#include <linux/mtd/partitions.h> #include <linux/mtd/partitions.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <mach/devices.h> #include "devices.h"
#include "generic.h" #include "generic.h"
/* /*
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <mach/regs-sys.h> #include "regs-sys.h"
#include <mach/regs-misc.h> #include <mach/regs-misc.h>
......
...@@ -24,9 +24,9 @@ ...@@ -24,9 +24,9 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <mach/irqs.h> #include <mach/irqs.h>
#include <mach/regs-wan.h> #include "regs-wan.h"
#include <mach/regs-lan.h> #include "regs-lan.h"
#include <mach/regs-hpna.h> #include "regs-hpna.h"
#include <mach/regs-switch.h> #include <mach/regs-switch.h>
#include <mach/regs-misc.h> #include <mach/regs-misc.h>
......
...@@ -33,8 +33,8 @@ ...@@ -33,8 +33,8 @@
#include <asm/mach/pci.h> #include <asm/mach/pci.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <mach/devices.h> #include "devices.h"
#include <mach/regs-pci.h> #include "regs-pci.h"
static int pci_dbg; static int pci_dbg;
......
menuconfig ARCH_MMP
bool "Marvell PXA168/910/MMP2"
depends on ARCH_MULTI_V5 || ARCH_MULTI_V7
select ARCH_REQUIRE_GPIOLIB
select GPIO_PXA
select PINCTRL
select PLAT_PXA
help
Support for Marvell's PXA168/PXA910(MMP) and MMP2 processor line.
if ARCH_MMP if ARCH_MMP
menu "Marvell PXA168/910/MMP2 Implmentations" menu "Marvell PXA168/910/MMP2 Implementations"
if ATAGS
config MACH_ASPENITE config MACH_ASPENITE
bool "Marvell's PXA168 Aspenite Development Board" bool "Marvell's PXA168 Aspenite Development Board"
depends on ARCH_MULTI_V5
select CPU_PXA168 select CPU_PXA168
help help
Say 'Y' here if you want to support the Marvell PXA168-based Say 'Y' here if you want to support the Marvell PXA168-based
...@@ -11,6 +24,7 @@ config MACH_ASPENITE ...@@ -11,6 +24,7 @@ config MACH_ASPENITE
config MACH_ZYLONITE2 config MACH_ZYLONITE2
bool "Marvell's PXA168 Zylonite2 Development Board" bool "Marvell's PXA168 Zylonite2 Development Board"
depends on ARCH_MULTI_V5
select CPU_PXA168 select CPU_PXA168
help help
Say 'Y' here if you want to support the Marvell PXA168-based Say 'Y' here if you want to support the Marvell PXA168-based
...@@ -18,6 +32,7 @@ config MACH_ZYLONITE2 ...@@ -18,6 +32,7 @@ config MACH_ZYLONITE2
config MACH_AVENGERS_LITE config MACH_AVENGERS_LITE
bool "Marvell's PXA168 Avengers Lite Development Board" bool "Marvell's PXA168 Avengers Lite Development Board"
depends on ARCH_MULTI_V5
select CPU_PXA168 select CPU_PXA168
help help
Say 'Y' here if you want to support the Marvell PXA168-based Say 'Y' here if you want to support the Marvell PXA168-based
...@@ -25,6 +40,7 @@ config MACH_AVENGERS_LITE ...@@ -25,6 +40,7 @@ config MACH_AVENGERS_LITE
config MACH_TAVOREVB config MACH_TAVOREVB
bool "Marvell's PXA910 TavorEVB Development Board" bool "Marvell's PXA910 TavorEVB Development Board"
depends on ARCH_MULTI_V5
select CPU_PXA910 select CPU_PXA910
help help
Say 'Y' here if you want to support the Marvell PXA910-based Say 'Y' here if you want to support the Marvell PXA910-based
...@@ -32,6 +48,7 @@ config MACH_TAVOREVB ...@@ -32,6 +48,7 @@ config MACH_TAVOREVB
config MACH_TTC_DKB config MACH_TTC_DKB
bool "Marvell's PXA910 TavorEVB Development Board" bool "Marvell's PXA910 TavorEVB Development Board"
depends on ARCH_MULTI_V5
select CPU_PXA910 select CPU_PXA910
help help
Say 'Y' here if you want to support the Marvell PXA910-based Say 'Y' here if you want to support the Marvell PXA910-based
...@@ -39,7 +56,7 @@ config MACH_TTC_DKB ...@@ -39,7 +56,7 @@ config MACH_TTC_DKB
config MACH_BROWNSTONE config MACH_BROWNSTONE
bool "Marvell's Brownstone Development Platform" bool "Marvell's Brownstone Development Platform"
depends on !CPU_MOHAWK depends on ARCH_MULTI_V7
select CPU_MMP2 select CPU_MMP2
help help
Say 'Y' here if you want to support the Marvell MMP2-based Say 'Y' here if you want to support the Marvell MMP2-based
...@@ -50,7 +67,7 @@ config MACH_BROWNSTONE ...@@ -50,7 +67,7 @@ config MACH_BROWNSTONE
config MACH_FLINT config MACH_FLINT
bool "Marvell's Flint Development Platform" bool "Marvell's Flint Development Platform"
depends on !CPU_MOHAWK depends on ARCH_MULTI_V7
select CPU_MMP2 select CPU_MMP2
help help
Say 'Y' here if you want to support the Marvell MMP2-based Say 'Y' here if you want to support the Marvell MMP2-based
...@@ -61,7 +78,7 @@ config MACH_FLINT ...@@ -61,7 +78,7 @@ config MACH_FLINT
config MACH_MARVELL_JASPER config MACH_MARVELL_JASPER
bool "Marvell's Jasper Development Platform" bool "Marvell's Jasper Development Platform"
depends on !CPU_MOHAWK depends on ARCH_MULTI_V7
select CPU_MMP2 select CPU_MMP2
help help
Say 'Y' here if you want to support the Marvell MMP2-base Say 'Y' here if you want to support the Marvell MMP2-base
...@@ -72,6 +89,7 @@ config MACH_MARVELL_JASPER ...@@ -72,6 +89,7 @@ config MACH_MARVELL_JASPER
config MACH_TETON_BGA config MACH_TETON_BGA
bool "Marvell's PXA168 Teton BGA Development Board" bool "Marvell's PXA168 Teton BGA Development Board"
depends on ARCH_MULTI_V5
select CPU_PXA168 select CPU_PXA168
help help
Say 'Y' here if you want to support the Marvell PXA168-based Say 'Y' here if you want to support the Marvell PXA168-based
...@@ -79,14 +97,16 @@ config MACH_TETON_BGA ...@@ -79,14 +97,16 @@ config MACH_TETON_BGA
config MACH_GPLUGD config MACH_GPLUGD
bool "Marvell's PXA168 GuruPlug Display (gplugD) Board" bool "Marvell's PXA168 GuruPlug Display (gplugD) Board"
depends on ARCH_MULTI_V5
select CPU_PXA168 select CPU_PXA168
help help
Say 'Y' here if you want to support the Marvell PXA168-based Say 'Y' here if you want to support the Marvell PXA168-based
GuruPlug Display (gplugD) Board GuruPlug Display (gplugD) Board
endif
config MACH_MMP_DT config MACH_MMP_DT
bool "Support MMP (ARMv5) platforms from device tree" bool "Support MMP (ARMv5) platforms from device tree"
select USE_OF depends on ARCH_MULTI_V5
select PINCTRL select PINCTRL
select PINCTRL_SINGLE select PINCTRL_SINGLE
select COMMON_CLK select COMMON_CLK
...@@ -99,11 +119,9 @@ config MACH_MMP_DT ...@@ -99,11 +119,9 @@ config MACH_MMP_DT
config MACH_MMP2_DT config MACH_MMP2_DT
bool "Support MMP2 (ARMv7) platforms from device tree" bool "Support MMP2 (ARMv7) platforms from device tree"
depends on !CPU_MOHAWK depends on ARCH_MULTI_V7
select USE_OF
select PINCTRL select PINCTRL
select PINCTRL_SINGLE select PINCTRL_SINGLE
select COMMON_CLK
select ARCH_HAS_RESET_CONTROLLER select ARCH_HAS_RESET_CONTROLLER
select CPU_PJ4 select CPU_PJ4
help help
......
# #
# Makefile for Marvell's PXA168 processors line # Makefile for Marvell's PXA168 processors line
# #
ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/arch/arm/plat-pxa/include
obj-y += common.o devices.o time.o obj-y += common.o devices.o time.o
......
/* /*
* linux/arch/arm/mach-mmp/include/mach/addr-map.h
*
* Common address map definitions * Common address map definitions
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
......
...@@ -22,14 +22,14 @@ ...@@ -22,14 +22,14 @@
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <mach/addr-map.h>
#include <mach/mfp-pxa168.h>
#include <mach/pxa168.h>
#include <mach/irqs.h>
#include <video/pxa168fb.h> #include <video/pxa168fb.h>
#include <linux/input.h> #include <linux/input.h>
#include <linux/platform_data/keypad-pxa27x.h> #include <linux/platform_data/keypad-pxa27x.h>
#include "addr-map.h"
#include "mfp-pxa168.h"
#include "pxa168.h"
#include "irqs.h"
#include "common.h" #include "common.h"
static unsigned long common_pin_config[] __initdata = { static unsigned long common_pin_config[] __initdata = {
......
...@@ -17,10 +17,10 @@ ...@@ -17,10 +17,10 @@
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <mach/addr-map.h> #include "addr-map.h"
#include <mach/mfp-pxa168.h> #include "mfp-pxa168.h"
#include <mach/pxa168.h> #include "pxa168.h"
#include <mach/irqs.h> #include "irqs.h"
#include "common.h" #include "common.h"
......
...@@ -22,10 +22,10 @@ ...@@ -22,10 +22,10 @@
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <mach/addr-map.h> #include "addr-map.h"
#include <mach/mfp-mmp2.h> #include "mfp-mmp2.h"
#include <mach/mmp2.h> #include "mmp2.h"
#include <mach/irqs.h> #include "irqs.h"
#include "common.h" #include "common.h"
......
...@@ -4,8 +4,9 @@ ...@@ -4,8 +4,9 @@
#include <linux/list.h> #include <linux/list.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/clk/mmp.h>
#include <mach/addr-map.h> #include "addr-map.h"
#include "common.h" #include "common.h"
#include "clock.h" #include "clock.h"
...@@ -105,7 +106,8 @@ static struct clk_lookup mmp2_clkregs[] = { ...@@ -105,7 +106,8 @@ static struct clk_lookup mmp2_clkregs[] = {
INIT_CLKREG(&clk_sdh3, "sdhci-pxav3.3", "PXA-SDHCLK"), INIT_CLKREG(&clk_sdh3, "sdhci-pxav3.3", "PXA-SDHCLK"),
}; };
void __init mmp2_clk_init(void) void __init mmp2_clk_init(phys_addr_t mpmu_phys, phys_addr_t apmu_phys,
phys_addr_t apbc_phys)
{ {
clkdev_add_table(ARRAY_AND_SIZE(mmp2_clkregs)); clkdev_add_table(ARRAY_AND_SIZE(mmp2_clkregs));
} }
...@@ -4,8 +4,9 @@ ...@@ -4,8 +4,9 @@
#include <linux/list.h> #include <linux/list.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/clk/mmp.h>
#include <mach/addr-map.h> #include "addr-map.h"
#include "common.h" #include "common.h"
#include "clock.h" #include "clock.h"
...@@ -85,7 +86,8 @@ static struct clk_lookup pxa168_clkregs[] = { ...@@ -85,7 +86,8 @@ static struct clk_lookup pxa168_clkregs[] = {
INIT_CLKREG(&clk_rtc, "sa1100-rtc", NULL), INIT_CLKREG(&clk_rtc, "sa1100-rtc", NULL),
}; };
void __init pxa168_clk_init(void) void __init pxa168_clk_init(phys_addr_t mpmu_phys, phys_addr_t apmu_phys,
phys_addr_t apbc_phys)
{ {
clkdev_add_table(ARRAY_AND_SIZE(pxa168_clkregs)); clkdev_add_table(ARRAY_AND_SIZE(pxa168_clkregs));
} }
...@@ -4,8 +4,9 @@ ...@@ -4,8 +4,9 @@
#include <linux/list.h> #include <linux/list.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/clk/mmp.h>
#include <mach/addr-map.h> #include "addr-map.h"
#include "common.h" #include "common.h"
#include "clock.h" #include "clock.h"
...@@ -61,7 +62,8 @@ static struct clk_lookup pxa910_clkregs[] = { ...@@ -61,7 +62,8 @@ static struct clk_lookup pxa910_clkregs[] = {
INIT_CLKREG(&clk_rtc, "sa1100-rtc", NULL), INIT_CLKREG(&clk_rtc, "sa1100-rtc", NULL),
}; };
void __init pxa910_clk_init(void) void __init pxa910_clk_init(phys_addr_t mpmu_phys, phys_addr_t apmu_phys,
phys_addr_t apbc_phys, phys_addr_t apbcp_phys)
{ {
clkdev_add_table(ARRAY_AND_SIZE(pxa910_clkregs)); clkdev_add_table(ARRAY_AND_SIZE(pxa910_clkregs));
} }
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/io.h> #include <linux/io.h>
#include <mach/regs-apbc.h> #include "regs-apbc.h"
#include "clock.h" #include "clock.h"
static void apbc_clk_enable(struct clk *clk) static void apbc_clk_enable(struct clk *clk)
......
/* /*
* linux/arch/arm/mach-mmp/clock.h
*
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as * it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation. * published by the Free Software Foundation.
......
...@@ -15,8 +15,8 @@ ...@@ -15,8 +15,8 @@
#include <asm/page.h> #include <asm/page.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <asm/system_misc.h> #include <asm/system_misc.h>
#include <mach/addr-map.h> #include "addr-map.h"
#include <mach/cputype.h> #include "cputype.h"
#include "common.h" #include "common.h"
......
...@@ -5,6 +5,3 @@ extern void timer_init(int irq); ...@@ -5,6 +5,3 @@ extern void timer_init(int irq);
extern void __init mmp_map_io(void); extern void __init mmp_map_io(void);
extern void mmp_restart(enum reboot_mode, const char *); extern void mmp_restart(enum reboot_mode, const char *);
extern void __init pxa168_clk_init(void);
extern void __init pxa910_clk_init(void);
extern void __init mmp2_clk_init(void);
...@@ -12,10 +12,10 @@ ...@@ -12,10 +12,10 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <mach/irqs.h> #include "irqs.h"
#include <mach/devices.h> #include "devices.h"
#include <mach/cputype.h> #include "cputype.h"
#include <mach/regs-usb.h> #include "regs-usb.h"
int __init pxa_register_device(struct pxa_device_desc *desc, int __init pxa_register_device(struct pxa_device_desc *desc,
void *data, size_t size) void *data, size_t size)
...@@ -73,6 +73,8 @@ int __init pxa_register_device(struct pxa_device_desc *desc, ...@@ -73,6 +73,8 @@ int __init pxa_register_device(struct pxa_device_desc *desc,
} }
#if IS_ENABLED(CONFIG_USB) || IS_ENABLED(CONFIG_USB_GADGET) #if IS_ENABLED(CONFIG_USB) || IS_ENABLED(CONFIG_USB_GADGET)
#if IS_ENABLED(CONFIG_USB_MV_UDC) || IS_ENABLED(CONFIG_USB_EHCI_MV)
#if IS_ENABLED(CONFIG_CPU_PXA910) || IS_ENABLED(CONFIG_CPU_PXA168)
/***************************************************************************** /*****************************************************************************
* The registers read/write routines * The registers read/write routines
...@@ -112,9 +114,6 @@ static void u2o_write(void __iomem *base, unsigned int offset, ...@@ -112,9 +114,6 @@ static void u2o_write(void __iomem *base, unsigned int offset,
readl_relaxed(base + offset); readl_relaxed(base + offset);
} }
#if IS_ENABLED(CONFIG_USB_MV_UDC) || IS_ENABLED(CONFIG_USB_EHCI_MV)
#if IS_ENABLED(CONFIG_CPU_PXA910) || IS_ENABLED(CONFIG_CPU_PXA168)
static DEFINE_MUTEX(phy_lock); static DEFINE_MUTEX(phy_lock);
static int phy_init_cnt; static int phy_init_cnt;
......
...@@ -21,10 +21,10 @@ ...@@ -21,10 +21,10 @@
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <mach/addr-map.h> #include "addr-map.h"
#include <mach/mfp-mmp2.h> #include "mfp-mmp2.h"
#include <mach/mmp2.h> #include "mmp2.h"
#include <mach/irqs.h> #include "irqs.h"
#include "common.h" #include "common.h"
......
...@@ -16,9 +16,9 @@ ...@@ -16,9 +16,9 @@
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <mach/irqs.h> #include "irqs.h"
#include <mach/pxa168.h> #include "pxa168.h"
#include <mach/mfp-pxa168.h> #include "mfp-pxa168.h"
#include "common.h" #include "common.h"
......
/*
* linux/arch/arm/mach-mmp/include/mach/dma.h
*/
#ifndef __ASM_MACH_DMA_H
#define __ASM_MACH_DMA_H
#include <mach/addr-map.h>
#define DMAC_REGS_VIRT (APB_VIRT_BASE + 0x00000)
#include <plat/dma.h>
#endif /* __ASM_MACH_DMA_H */
#ifndef __ASM_MACH_HARDWARE_H
#define __ASM_MACH_HARDWARE_H
#endif /* __ASM_MACH_HARDWARE_H */
/*
* linux/arch/arm/mach-mmp/include/mach/regs-smc.h
*
* Static Memory Controller Registers
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
#ifndef __ASM_MACH_REGS_SMC_H
#define __ASM_MACH_REGS_SMC_H
#include <mach/addr-map.h>
#define SMC_VIRT_BASE (AXI_VIRT_BASE + 0x83800)
#define SMC_REG(x) (SMC_VIRT_BASE + (x))
#define SMC_MSC0 SMC_REG(0x0020)
#define SMC_MSC1 SMC_REG(0x0024)
#define SMC_SXCNFG0 SMC_REG(0x0030)
#define SMC_SXCNFG1 SMC_REG(0x0034)
#define SMC_MEMCLKCFG SMC_REG(0x0068)
#define SMC_CSDFICFG0 SMC_REG(0x0090)
#define SMC_CSDFICFG1 SMC_REG(0x0094)
#define SMC_CLK_RET_DEL SMC_REG(0x00b0)
#define SMC_ADV_RET_DEL SMC_REG(0x00b4)
#define SMC_CSADRMAP0 SMC_REG(0x00c0)
#define SMC_CSADRMAP1 SMC_REG(0x00c4)
#define SMC_WE_AP0 SMC_REG(0x00e0)
#define SMC_WE_AP1 SMC_REG(0x00e4)
#define SMC_OE_AP0 SMC_REG(0x00f0)
#define SMC_OE_AP1 SMC_REG(0x00f4)
#define SMC_ADV_AP0 SMC_REG(0x0100)
#define SMC_ADV_AP1 SMC_REG(0x0104)
#endif /* __ASM_MACH_REGS_SMC_H */
/*
* arch/arm/mach-mmp/include/mach/uncompress.h
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
#include <linux/serial_reg.h>
#include <mach/addr-map.h>
#include <asm/mach-types.h>
#define UART1_BASE (APB_PHYS_BASE + 0x36000)
#define UART2_BASE (APB_PHYS_BASE + 0x17000)
#define UART3_BASE (APB_PHYS_BASE + 0x18000)
volatile unsigned long *UART;
static inline void putc(char c)
{
/* UART enabled? */
if (!(UART[UART_IER] & UART_IER_UUE))
return;
while (!(UART[UART_LSR] & UART_LSR_THRE))
barrier();
UART[UART_TX] = c;
}
/*
* This does not append a newline
*/
static inline void flush(void)
{
}
static inline void arch_decomp_setup(void)
{
/* default to UART2 */
UART = (unsigned long *)UART2_BASE;
if (machine_is_avengers_lite())
UART = (unsigned long *)UART3_BASE;
}
...@@ -20,12 +20,12 @@ ...@@ -20,12 +20,12 @@
#include <linux/mfd/max8925.h> #include <linux/mfd/max8925.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <mach/irqs.h> #include "irqs.h"
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <mach/addr-map.h> #include "addr-map.h"
#include <mach/mfp-mmp2.h> #include "mfp-mmp2.h"
#include <mach/mmp2.h> #include "mmp2.h"
#include "common.h" #include "common.h"
......
#ifndef __ASM_MACH_MFP_MMP2_H #ifndef __ASM_MACH_MFP_MMP2_H
#define __ASM_MACH_MFP_MMP2_H #define __ASM_MACH_MFP_MMP2_H
#include <mach/mfp.h> #include "mfp.h"
#define MFP_DRIVE_VERY_SLOW (0x0 << 13) #define MFP_DRIVE_VERY_SLOW (0x0 << 13)
#define MFP_DRIVE_SLOW (0x2 << 13) #define MFP_DRIVE_SLOW (0x2 << 13)
......
#ifndef __ASM_MACH_MFP_PXA168_H #ifndef __ASM_MACH_MFP_PXA168_H
#define __ASM_MACH_MFP_PXA168_H #define __ASM_MACH_MFP_PXA168_H
#include <mach/mfp.h> #include "mfp.h"
#define MFP_DRIVE_VERY_SLOW (0x0 << 13) #define MFP_DRIVE_VERY_SLOW (0x0 << 13)
#define MFP_DRIVE_SLOW (0x1 << 13) #define MFP_DRIVE_SLOW (0x1 << 13)
......
#ifndef __ASM_MACH_MFP_PXA910_H #ifndef __ASM_MACH_MFP_PXA910_H
#define __ASM_MACH_MFP_PXA910_H #define __ASM_MACH_MFP_PXA910_H
#include <mach/mfp.h> #include "mfp.h"
#define MFP_DRIVE_VERY_SLOW (0x0 << 13) #define MFP_DRIVE_VERY_SLOW (0x0 << 13)
#define MFP_DRIVE_SLOW (0x2 << 13) #define MFP_DRIVE_SLOW (0x2 << 13)
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment