From 5ee48fb6230628512aa2cbaa74ff76c2a8966248 Mon Sep 17 00:00:00 2001 From: Eric Miao Date: Wed, 20 Aug 2008 10:18:26 +0800 Subject: [PATCH] --- yaml --- r: 112436 b: refs/heads/master c: ad826e22c1343ceca76d814539a6fc94dd474def h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-pxa/Kconfig | 4 - trunk/arch/arm/mach-pxa/Makefile | 1 - .../arm/mach-pxa/include/mach/mfp-pxa320.h | 8 +- trunk/arch/arm/mach-pxa/mp900.c | 100 ------------------ 5 files changed, 5 insertions(+), 110 deletions(-) delete mode 100644 trunk/arch/arm/mach-pxa/mp900.c diff --git a/[refs] b/[refs] index 2fd2fb92ac41..053272faa4cd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 49ea26d0a0fa8eebc4bf0432ec3ad35a35202615 +refs/heads/master: ad826e22c1343ceca76d814539a6fc94dd474def diff --git a/trunk/arch/arm/mach-pxa/Kconfig b/trunk/arch/arm/mach-pxa/Kconfig index 7238bb77f5da..e8ee7ec9ff6d 100644 --- a/trunk/arch/arm/mach-pxa/Kconfig +++ b/trunk/arch/arm/mach-pxa/Kconfig @@ -49,10 +49,6 @@ config MACH_MAINSTONE select PXA27x select HAVE_PWM -config MACH_MP900C - bool "Nec Mobilepro 900/c" - select PXA25x - config ARCH_PXA_IDP bool "Accelent Xscale IDP" select PXA25x diff --git a/trunk/arch/arm/mach-pxa/Makefile b/trunk/arch/arm/mach-pxa/Makefile index ac0e8e39c79a..99ecbe7f8506 100644 --- a/trunk/arch/arm/mach-pxa/Makefile +++ b/trunk/arch/arm/mach-pxa/Makefile @@ -25,7 +25,6 @@ obj-$(CONFIG_ARCH_GUMSTIX) += gumstix.o obj-$(CONFIG_ARCH_LUBBOCK) += lubbock.o obj-$(CONFIG_MACH_LOGICPD_PXA270) += lpd270.o obj-$(CONFIG_MACH_MAINSTONE) += mainstone.o -obj-$(CONFIG_MACH_MP900C) += mp900.o obj-$(CONFIG_ARCH_PXA_IDP) += idp.o obj-$(CONFIG_MACH_TRIZEPS4) += trizeps4.o obj-$(CONFIG_MACH_COLIBRI) += colibri.o diff --git a/trunk/arch/arm/mach-pxa/include/mach/mfp-pxa320.h b/trunk/arch/arm/mach-pxa/include/mach/mfp-pxa320.h index 74990510cf34..67f8385ea548 100644 --- a/trunk/arch/arm/mach-pxa/include/mach/mfp-pxa320.h +++ b/trunk/arch/arm/mach-pxa/include/mach/mfp-pxa320.h @@ -257,10 +257,10 @@ #define GPIO38_SSP2_RXD MFP_CFG(GPIO38, AF2) #define GPIO38_SSP2_TXD MFP_CFG(GPIO38, AF5) -#define GPIO69_SSP3_SCLK MFP_CFG(GPIO69, AF2, DS08X, FLOAT) -#define GPIO70_SSP3_FRM MFP_CFG(GPIO70, AF2, DS08X, DRIVE_LOW) -#define GPIO89_SSP3_SCLK MFP_CFG(GPIO89, AF1, DS08X, FLOAT) -#define GPIO90_SSP3_FRM MFP_CFG(GPIO90, AF1, DS08X, DRIVE_LOW) +#define GPIO69_SSP3_SCLK MFP_CFG_X(GPIO69, AF2, DS08X, FLOAT) +#define GPIO70_SSP3_FRM MFP_CFG_X(GPIO70, AF2, DS08X, DRIVE_LOW) +#define GPIO89_SSP3_SCLK MFP_CFG_X(GPIO89, AF1, DS08X, FLOAT) +#define GPIO90_SSP3_FRM MFP_CFG_X(GPIO90, AF1, DS08X, DRIVE_LOW) #define GPIO71_SSP3_RXD MFP_CFG_X(GPIO71, AF5, DS08X, FLOAT) #define GPIO71_SSP3_TXD MFP_CFG_X(GPIO71, AF2, DS08X, DRIVE_LOW) #define GPIO72_SSP3_RXD MFP_CFG_X(GPIO72, AF2, DS08X, FLOAT) diff --git a/trunk/arch/arm/mach-pxa/mp900.c b/trunk/arch/arm/mach-pxa/mp900.c deleted file mode 100644 index 8a73814126b1..000000000000 --- a/trunk/arch/arm/mach-pxa/mp900.c +++ /dev/null @@ -1,100 +0,0 @@ -/* - * linux/arch/arm/mach-pxa/mp900.c - * - * Support for the NEC MobilePro900/C platform - * - * Based on mach-pxa/gumstix.c - * - * 2007, 2008 Kristoffer Ericson - * 2007, 2008 Michael Petchkovsky - * - * 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 -#include -#include -#include -#include - -#include -#include -#include -#include -#include "generic.h" - -static void isp116x_pfm_delay(struct device *dev, int delay) -{ - - /* 400Mhz PXA2 = 2.5ns / instruction */ - - int cyc = delay / 10; - - /* 4 Instructions = 4 x 2.5ns = 10ns */ - __asm__ volatile ("0:\n" - "subs %0, %1, #1\n" - "bge 0b\n" - :"=r" (cyc) - :"0"(cyc) - ); -} - -static struct isp116x_platform_data isp116x_pfm_data = { - .remote_wakeup_enable = 1, - .delay = isp116x_pfm_delay, -}; - -static struct resource isp116x_pfm_resources[] = { - [0] = { - .start = 0x0d000000, - .end = 0x0d000000 + 1, - .flags = IORESOURCE_MEM, - }, - [1] = { - .start = 0x0d000000 + 4, - .end = 0x0d000000 + 5, - .flags = IORESOURCE_MEM, - }, - [2] = { - .start = 61, - .end = 61, - .flags = IORESOURCE_IRQ, - }, -}; - -static struct platform_device mp900c_dummy_device = { - .name = "mp900c_dummy", - .id = -1, -}; - -static struct platform_device mp900c_usb = { - .name = "isp116x-hcd", - .num_resources = ARRAY_SIZE(isp116x_pfm_resources), - .resource = isp116x_pfm_resources, - .dev.platform_data = &isp116x_pfm_data, -}; - -static struct platform_device *devices[] __initdata = { - &mp900c_dummy_device, - &mp900c_usb, -}; - -static void __init mp900c_init(void) -{ - printk(KERN_INFO "MobilePro 900/C machine init\n"); - platform_add_devices(devices, ARRAY_SIZE(devices)); -} - -/* Maintainer - Michael Petchkovsky */ -MACHINE_START(NEC_MP900, "MobilePro900/C") - .phys_io = 0x40000000, - .boot_params = 0xa0220100, - .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, - .timer = &pxa_timer, - .map_io = pxa_map_io, - .init_irq = pxa25x_init_irq, - .init_machine = mp900c_init, -MACHINE_END -