Commit 23f510bc authored by Kumar Gala's avatar Kumar Gala

[POWERPC] 85xx: Renamed MPC8568 MDS board code to match other boards

Renamed the MPC8568 MDS platform code to follow other 85xx boards.  There
isn't anything specific about the 8568 MDS code that wouldn't apply to another
85xx MDS system at this point.
Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent 6936c625
# #
# Automatically generated make config: don't edit # Automatically generated make config: don't edit
# Linux kernel version: 2.6.20-rc5 # Linux kernel version: 2.6.20
# Wed Feb 7 23:54:25 2007 # Sat Feb 17 16:26:53 2007
# #
# CONFIG_PPC64 is not set # CONFIG_PPC64 is not set
CONFIG_PPC32=y CONFIG_PPC32=y
...@@ -34,9 +34,9 @@ CONFIG_DEFAULT_UIMAGE=y ...@@ -34,9 +34,9 @@ CONFIG_DEFAULT_UIMAGE=y
# CONFIG_PPC_83xx is not set # CONFIG_PPC_83xx is not set
CONFIG_PPC_85xx=y CONFIG_PPC_85xx=y
# CONFIG_PPC_86xx is not set # CONFIG_PPC_86xx is not set
# CONFIG_PPC_8xx is not set
# CONFIG_40x is not set # CONFIG_40x is not set
# CONFIG_44x is not set # CONFIG_44x is not set
# CONFIG_8xx is not set
# CONFIG_E200 is not set # CONFIG_E200 is not set
CONFIG_85xx=y CONFIG_85xx=y
CONFIG_E500=y CONFIG_E500=y
...@@ -63,6 +63,7 @@ CONFIG_LOCALVERSION_AUTO=y ...@@ -63,6 +63,7 @@ CONFIG_LOCALVERSION_AUTO=y
CONFIG_SWAP=y CONFIG_SWAP=y
CONFIG_SYSVIPC=y CONFIG_SYSVIPC=y
# CONFIG_IPC_NS is not set # CONFIG_IPC_NS is not set
CONFIG_SYSVIPC_SYSCTL=y
# CONFIG_POSIX_MQUEUE is not set # CONFIG_POSIX_MQUEUE is not set
# CONFIG_BSD_PROCESS_ACCT is not set # CONFIG_BSD_PROCESS_ACCT is not set
# CONFIG_TASKSTATS is not set # CONFIG_TASKSTATS is not set
...@@ -130,7 +131,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" ...@@ -130,7 +131,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
# CONFIG_MPC8540_ADS is not set # CONFIG_MPC8540_ADS is not set
# CONFIG_MPC8560_ADS is not set # CONFIG_MPC8560_ADS is not set
# CONFIG_MPC85xx_CDS is not set # CONFIG_MPC85xx_CDS is not set
CONFIG_MPC8568_MDS=y CONFIG_MPC85xx_MDS=y
CONFIG_MPC85xx=y CONFIG_MPC85xx=y
CONFIG_PPC_INDIRECT_PCI_BE=y CONFIG_PPC_INDIRECT_PCI_BE=y
CONFIG_MPIC=y CONFIG_MPIC=y
...@@ -162,6 +163,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y ...@@ -162,6 +163,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
# CONFIG_SPARSEMEM_STATIC is not set # CONFIG_SPARSEMEM_STATIC is not set
CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_SPLIT_PTLOCK_CPUS=4
# CONFIG_RESOURCES_64BIT is not set # CONFIG_RESOURCES_64BIT is not set
CONFIG_ZONE_DMA_FLAG=1
CONFIG_PROC_DEVICETREE=y CONFIG_PROC_DEVICETREE=y
# CONFIG_CMDLINE_BOOL is not set # CONFIG_CMDLINE_BOOL is not set
# CONFIG_PM is not set # CONFIG_PM is not set
...@@ -171,6 +173,7 @@ CONFIG_ISA_DMA_API=y ...@@ -171,6 +173,7 @@ CONFIG_ISA_DMA_API=y
# #
# Bus options # Bus options
# #
CONFIG_ZONE_DMA=y
# CONFIG_MPIC_WEIRD is not set # CONFIG_MPIC_WEIRD is not set
# CONFIG_PPC_I8259 is not set # CONFIG_PPC_I8259 is not set
CONFIG_PPC_INDIRECT_PCI=y CONFIG_PPC_INDIRECT_PCI=y
...@@ -216,6 +219,7 @@ CONFIG_UNIX=y ...@@ -216,6 +219,7 @@ CONFIG_UNIX=y
CONFIG_XFRM=y CONFIG_XFRM=y
# CONFIG_XFRM_USER is not set # CONFIG_XFRM_USER is not set
# CONFIG_XFRM_SUB_POLICY is not set # CONFIG_XFRM_SUB_POLICY is not set
# CONFIG_XFRM_MIGRATE is not set
# CONFIG_NET_KEY is not set # CONFIG_NET_KEY is not set
CONFIG_INET=y CONFIG_INET=y
CONFIG_IP_MULTICAST=y CONFIG_IP_MULTICAST=y
...@@ -301,6 +305,7 @@ CONFIG_STANDALONE=y ...@@ -301,6 +305,7 @@ CONFIG_STANDALONE=y
CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_PREVENT_FIRMWARE_BUILD=y
# CONFIG_FW_LOADER is not set # CONFIG_FW_LOADER is not set
# CONFIG_DEBUG_DRIVER is not set # CONFIG_DEBUG_DRIVER is not set
# CONFIG_DEBUG_DEVRES is not set
# CONFIG_SYS_HYPERVISOR is not set # CONFIG_SYS_HYPERVISOR is not set
# #
...@@ -341,7 +346,6 @@ CONFIG_BLK_DEV_INITRD=y ...@@ -341,7 +346,6 @@ CONFIG_BLK_DEV_INITRD=y
# #
# Misc devices # Misc devices
# #
# CONFIG_TIFM_CORE is not set
# #
# ATA/ATAPI/MFM/RLL support # ATA/ATAPI/MFM/RLL support
...@@ -543,6 +547,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 ...@@ -543,6 +547,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
# CONFIG_SERIAL_UARTLITE is not set # CONFIG_SERIAL_UARTLITE is not set
CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE=y
CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_SERIAL_CORE_CONSOLE=y
# CONFIG_SERIAL_OF_PLATFORM is not set
CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTYS=y
CONFIG_LEGACY_PTYS=y CONFIG_LEGACY_PTYS=y
CONFIG_LEGACY_PTY_COUNT=256 CONFIG_LEGACY_PTY_COUNT=256
...@@ -698,6 +703,7 @@ CONFIG_FIRMWARE_EDID=y ...@@ -698,6 +703,7 @@ CONFIG_FIRMWARE_EDID=y
# HID Devices # HID Devices
# #
CONFIG_HID=y CONFIG_HID=y
# CONFIG_HID_DEBUG is not set
# #
# USB support # USB support
...@@ -759,6 +765,10 @@ CONFIG_HID=y ...@@ -759,6 +765,10 @@ CONFIG_HID=y
# DMA Devices # DMA Devices
# #
#
# Auxiliary Display support
#
# #
# Virtualization # Virtualization
# #
...@@ -896,7 +906,8 @@ CONFIG_BITREVERSE=y ...@@ -896,7 +906,8 @@ CONFIG_BITREVERSE=y
CONFIG_CRC32=y CONFIG_CRC32=y
# CONFIG_LIBCRC32C is not set # CONFIG_LIBCRC32C is not set
CONFIG_PLIST=y CONFIG_PLIST=y
CONFIG_IOMAP_COPY=y CONFIG_HAS_IOMEM=y
CONFIG_HAS_IOPORT=y
# #
# Instrumentation Support # Instrumentation Support
...@@ -914,6 +925,7 @@ CONFIG_ENABLE_MUST_CHECK=y ...@@ -914,6 +925,7 @@ CONFIG_ENABLE_MUST_CHECK=y
# CONFIG_DEBUG_FS is not set # CONFIG_DEBUG_FS is not set
# CONFIG_HEADERS_CHECK is not set # CONFIG_HEADERS_CHECK is not set
CONFIG_DEBUG_KERNEL=y CONFIG_DEBUG_KERNEL=y
# CONFIG_DEBUG_SHIRQ is not set
CONFIG_LOG_BUF_SHIFT=14 CONFIG_LOG_BUF_SHIFT=14
CONFIG_DETECT_SOFTLOCKUP=y CONFIG_DETECT_SOFTLOCKUP=y
# CONFIG_SCHEDSTATS is not set # CONFIG_SCHEDSTATS is not set
...@@ -922,7 +934,6 @@ CONFIG_DETECT_SOFTLOCKUP=y ...@@ -922,7 +934,6 @@ CONFIG_DETECT_SOFTLOCKUP=y
# CONFIG_RT_MUTEX_TESTER is not set # CONFIG_RT_MUTEX_TESTER is not set
# CONFIG_DEBUG_SPINLOCK is not set # CONFIG_DEBUG_SPINLOCK is not set
# CONFIG_DEBUG_MUTEXES is not set # CONFIG_DEBUG_MUTEXES is not set
# CONFIG_DEBUG_RWSEMS is not set
# CONFIG_DEBUG_SPINLOCK_SLEEP is not set # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
# CONFIG_DEBUG_KOBJECT is not set # CONFIG_DEBUG_KOBJECT is not set
...@@ -932,6 +943,8 @@ CONFIG_DETECT_SOFTLOCKUP=y ...@@ -932,6 +943,8 @@ CONFIG_DETECT_SOFTLOCKUP=y
# CONFIG_DEBUG_LIST is not set # CONFIG_DEBUG_LIST is not set
CONFIG_FORCED_INLINING=y CONFIG_FORCED_INLINING=y
# CONFIG_RCU_TORTURE_TEST is not set # CONFIG_RCU_TORTURE_TEST is not set
# CONFIG_DEBUG_STACKOVERFLOW is not set
# CONFIG_DEBUG_STACK_USAGE is not set
CONFIG_DEBUGGER=y CONFIG_DEBUGGER=y
# CONFIG_XMON is not set # CONFIG_XMON is not set
# CONFIG_BDI_SWITCH is not set # CONFIG_BDI_SWITCH is not set
...@@ -943,6 +956,8 @@ CONFIG_PPC_EARLY_DEBUG=y ...@@ -943,6 +956,8 @@ CONFIG_PPC_EARLY_DEBUG=y
# CONFIG_PPC_EARLY_DEBUG_RTAS_CONSOLE is not set # CONFIG_PPC_EARLY_DEBUG_RTAS_CONSOLE is not set
# CONFIG_PPC_EARLY_DEBUG_MAPLE is not set # CONFIG_PPC_EARLY_DEBUG_MAPLE is not set
# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set # CONFIG_PPC_EARLY_DEBUG_ISERIES is not set
# CONFIG_PPC_EARLY_DEBUG_PAS_REALMODE is not set
# CONFIG_PPC_EARLY_DEBUG_BEAT is not set
# #
# Security options # Security options
...@@ -970,8 +985,10 @@ CONFIG_CRYPTO_MD5=y ...@@ -970,8 +985,10 @@ CONFIG_CRYPTO_MD5=y
# CONFIG_CRYPTO_GF128MUL is not set # CONFIG_CRYPTO_GF128MUL is not set
CONFIG_CRYPTO_ECB=m CONFIG_CRYPTO_ECB=m
CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_CBC=y
CONFIG_CRYPTO_PCBC=m
# CONFIG_CRYPTO_LRW is not set # CONFIG_CRYPTO_LRW is not set
CONFIG_CRYPTO_DES=y CONFIG_CRYPTO_DES=y
# CONFIG_CRYPTO_FCRYPT is not set
# CONFIG_CRYPTO_BLOWFISH is not set # CONFIG_CRYPTO_BLOWFISH is not set
# CONFIG_CRYPTO_TWOFISH is not set # CONFIG_CRYPTO_TWOFISH is not set
# CONFIG_CRYPTO_SERPENT is not set # CONFIG_CRYPTO_SERPENT is not set
...@@ -985,6 +1002,7 @@ CONFIG_CRYPTO_DES=y ...@@ -985,6 +1002,7 @@ CONFIG_CRYPTO_DES=y
# CONFIG_CRYPTO_DEFLATE is not set # CONFIG_CRYPTO_DEFLATE is not set
# CONFIG_CRYPTO_MICHAEL_MIC is not set # CONFIG_CRYPTO_MICHAEL_MIC is not set
# CONFIG_CRYPTO_CRC32C is not set # CONFIG_CRYPTO_CRC32C is not set
# CONFIG_CRYPTO_CAMELLIA is not set
# CONFIG_CRYPTO_TEST is not set # CONFIG_CRYPTO_TEST is not set
# #
......
...@@ -23,12 +23,12 @@ config MPC85xx_CDS ...@@ -23,12 +23,12 @@ config MPC85xx_CDS
help help
This option enables support for the MPC85xx CDS board This option enables support for the MPC85xx CDS board
config MPC8568_MDS config MPC85xx_MDS
bool "Freescale MPC8568 MDS" bool "Freescale MPC85xx MDS"
select DEFAULT_UIMAGE select DEFAULT_UIMAGE
# select QUICC_ENGINE # select QUICC_ENGINE
help help
This option enables support for the MPC8568 MDS board This option enables support for the MPC85xx MDS board
endchoice endchoice
...@@ -47,7 +47,7 @@ config MPC85xx ...@@ -47,7 +47,7 @@ config MPC85xx
bool bool
select PPC_UDBG_16550 select PPC_UDBG_16550
select PPC_INDIRECT_PCI select PPC_INDIRECT_PCI
default y if MPC8540_ADS || MPC85xx_CDS || MPC8560_ADS || MPC8568_MDS default y if MPC8540_ADS || MPC85xx_CDS || MPC8560_ADS || MPC85xx_MDS
config PPC_INDIRECT_PCI_BE config PPC_INDIRECT_PCI_BE
bool bool
......
...@@ -5,4 +5,4 @@ obj-$(CONFIG_PPC_85xx) += misc.o pci.o ...@@ -5,4 +5,4 @@ obj-$(CONFIG_PPC_85xx) += misc.o pci.o
obj-$(CONFIG_MPC8540_ADS) += mpc85xx_ads.o obj-$(CONFIG_MPC8540_ADS) += mpc85xx_ads.o
obj-$(CONFIG_MPC8560_ADS) += mpc85xx_ads.o obj-$(CONFIG_MPC8560_ADS) += mpc85xx_ads.o
obj-$(CONFIG_MPC85xx_CDS) += mpc85xx_cds.o obj-$(CONFIG_MPC85xx_CDS) += mpc85xx_cds.o
obj-$(CONFIG_MPC8568_MDS) += mpc8568_mds.o obj-$(CONFIG_MPC85xx_MDS) += mpc85xx_mds.o
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* Yin Olivia <Hong-hua.Yin@freescale.com> * Yin Olivia <Hong-hua.Yin@freescale.com>
* *
* Description: * Description:
* MPC8568E MDS PB board specific routines. * MPC85xx MDS board specific routines.
* *
* This program is free software; you can redistribute it and/or modify it * This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the * under the terms of the GNU General Public License as published by the
...@@ -69,13 +69,13 @@ unsigned long isa_mem_base = 0; ...@@ -69,13 +69,13 @@ unsigned long isa_mem_base = 0;
* Setup the architecture * Setup the architecture
* *
*/ */
static void __init mpc8568_mds_setup_arch(void) static void __init mpc85xx_mds_setup_arch(void)
{ {
struct device_node *np; struct device_node *np;
static u8 *bcsr_regs = NULL; static u8 *bcsr_regs = NULL;
if (ppc_md.progress) if (ppc_md.progress)
ppc_md.progress("mpc8568_mds_setup_arch()", 0); ppc_md.progress("mpc85xx_mds_setup_arch()", 0);
np = of_find_node_by_type(NULL, "cpu"); np = of_find_node_by_type(NULL, "cpu");
if (np != NULL) { if (np != NULL) {
...@@ -143,26 +143,26 @@ static void __init mpc8568_mds_setup_arch(void) ...@@ -143,26 +143,26 @@ static void __init mpc8568_mds_setup_arch(void)
#endif /* CONFIG_QUICC_ENGINE */ #endif /* CONFIG_QUICC_ENGINE */
} }
static struct of_device_id mpc8568_ids[] = { static struct of_device_id mpc85xx_ids[] = {
{ .type = "soc", }, { .type = "soc", },
{ .compatible = "soc", }, { .compatible = "soc", },
{ .type = "qe", }, { .type = "qe", },
{}, {},
}; };
static int __init mpc8568_publish_devices(void) static int __init mpc85xx_publish_devices(void)
{ {
if (!machine_is(mpc8568_mds)) if (!machine_is(mpc85xx_mds))
return 0; return 0;
/* Publish the QE devices */ /* Publish the QE devices */
of_platform_bus_probe(NULL,mpc8568_ids,NULL); of_platform_bus_probe(NULL,mpc85xx_ids,NULL);
return 0; return 0;
} }
device_initcall(mpc8568_publish_devices); device_initcall(mpc85xx_publish_devices);
static void __init mpc8568_mds_pic_init(void) static void __init mpc85xx_mds_pic_init(void)
{ {
struct mpic *mpic; struct mpic *mpic;
struct resource r; struct resource r;
...@@ -215,18 +215,18 @@ static void __init mpc8568_mds_pic_init(void) ...@@ -215,18 +215,18 @@ static void __init mpc8568_mds_pic_init(void)
#endif /* CONFIG_QUICC_ENGINE */ #endif /* CONFIG_QUICC_ENGINE */
} }
static int __init mpc8568_mds_probe(void) static int __init mpc85xx_mds_probe(void)
{ {
unsigned long root = of_get_flat_dt_root(); unsigned long root = of_get_flat_dt_root();
return of_flat_dt_is_compatible(root, "MPC85xxMDS"); return of_flat_dt_is_compatible(root, "MPC85xxMDS");
} }
define_machine(mpc8568_mds) { define_machine(mpc85xx_mds) {
.name = "MPC85xx MDS", .name = "MPC85xx MDS",
.probe = mpc8568_mds_probe, .probe = mpc85xx_mds_probe,
.setup_arch = mpc8568_mds_setup_arch, .setup_arch = mpc85xx_mds_setup_arch,
.init_IRQ = mpc8568_mds_pic_init, .init_IRQ = mpc85xx_mds_pic_init,
.get_irq = mpic_get_irq, .get_irq = mpic_get_irq,
.restart = mpc85xx_restart, .restart = mpc85xx_restart,
.calibrate_decr = generic_calibrate_decr, .calibrate_decr = generic_calibrate_decr,
......
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