diff options
| author | Wolfram Sang <w.sang@pengutronix.de> | 2011-04-29 09:06:43 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-02 14:08:55 -0400 |
| commit | 041f10d46f97c87f8ae1cdb4117682214732cc45 (patch) | |
| tree | 93a7357301ab6c244b270bbdf531d436e356f867 | |
| parent | f295dc6874bf271253f70cb75a483d4a23911117 (diff) | |
ARM: plat-stmp: remove plat
Now that both users of plat-stmp have been deleted in previous patches,
delete the platform, too.
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Acked-by: Shawn Guo <shawn.guo@freescale.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
30 files changed, 0 insertions, 3806 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 377a7a595b08..c9f69e0b1f55 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -378,16 +378,6 @@ config ARCH_MXS | |||
| 378 | help | 378 | help |
| 379 | Support for Freescale MXS-based family of processors | 379 | Support for Freescale MXS-based family of processors |
| 380 | 380 | ||
| 381 | config ARCH_STMP3XXX | ||
| 382 | bool "Freescale STMP3xxx" | ||
| 383 | select CPU_ARM926T | ||
| 384 | select CLKDEV_LOOKUP | ||
| 385 | select ARCH_REQUIRE_GPIOLIB | ||
| 386 | select GENERIC_CLOCKEVENTS | ||
| 387 | select USB_ARCH_HAS_EHCI | ||
| 388 | help | ||
| 389 | Support for systems based on the Freescale 3xxx CPUs. | ||
| 390 | |||
| 391 | config ARCH_NETX | 381 | config ARCH_NETX |
| 392 | bool "Hilscher NetX based" | 382 | bool "Hilscher NetX based" |
| 393 | select CPU_ARM926T | 383 | select CPU_ARM926T |
| @@ -1005,8 +995,6 @@ source "arch/arm/mach-exynos4/Kconfig" | |||
| 1005 | 995 | ||
| 1006 | source "arch/arm/mach-shmobile/Kconfig" | 996 | source "arch/arm/mach-shmobile/Kconfig" |
| 1007 | 997 | ||
| 1008 | source "arch/arm/plat-stmp3xxx/Kconfig" | ||
| 1009 | |||
| 1010 | source "arch/arm/mach-tegra/Kconfig" | 998 | source "arch/arm/mach-tegra/Kconfig" |
| 1011 | 999 | ||
| 1012 | source "arch/arm/mach-u300/Kconfig" | 1000 | source "arch/arm/mach-u300/Kconfig" |
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index ca473b1669a3..692c481196bd 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
| @@ -205,7 +205,6 @@ machine-$(CONFIG_MACH_SPEAR600) := spear6xx | |||
| 205 | plat-$(CONFIG_ARCH_MXC) := mxc | 205 | plat-$(CONFIG_ARCH_MXC) := mxc |
| 206 | plat-$(CONFIG_ARCH_OMAP) := omap | 206 | plat-$(CONFIG_ARCH_OMAP) := omap |
| 207 | plat-$(CONFIG_ARCH_S3C64XX) := samsung | 207 | plat-$(CONFIG_ARCH_S3C64XX) := samsung |
| 208 | plat-$(CONFIG_ARCH_STMP3XXX) := stmp3xxx | ||
| 209 | plat-$(CONFIG_ARCH_TCC_926) := tcc | 208 | plat-$(CONFIG_ARCH_TCC_926) := tcc |
| 210 | plat-$(CONFIG_PLAT_IOP) := iop | 209 | plat-$(CONFIG_PLAT_IOP) := iop |
| 211 | plat-$(CONFIG_PLAT_NOMADIK) := nomadik | 210 | plat-$(CONFIG_PLAT_NOMADIK) := nomadik |
diff --git a/arch/arm/plat-stmp3xxx/Kconfig b/arch/arm/plat-stmp3xxx/Kconfig deleted file mode 100644 index e6e312b6bdb5..000000000000 --- a/arch/arm/plat-stmp3xxx/Kconfig +++ /dev/null | |||
| @@ -1,7 +0,0 @@ | |||
| 1 | if ARCH_STMP3XXX | ||
| 2 | |||
| 3 | menu "Freescale STMP3xxx implementations" | ||
| 4 | |||
| 5 | endmenu | ||
| 6 | |||
| 7 | endif | ||
diff --git a/arch/arm/plat-stmp3xxx/Makefile b/arch/arm/plat-stmp3xxx/Makefile deleted file mode 100644 index 31dd518f37a5..000000000000 --- a/arch/arm/plat-stmp3xxx/Makefile +++ /dev/null | |||
| @@ -1,5 +0,0 @@ | |||
| 1 | # | ||
| 2 | # Makefile for the linux kernel. | ||
| 3 | # | ||
| 4 | # Object file lists. | ||
| 5 | obj-y += core.o timer.o irq.o dma.o clock.o pinmux.o devices.o | ||
diff --git a/arch/arm/plat-stmp3xxx/clock.c b/arch/arm/plat-stmp3xxx/clock.c deleted file mode 100644 index 2e712e17ce72..000000000000 --- a/arch/arm/plat-stmp3xxx/clock.c +++ /dev/null | |||
| @@ -1,1134 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * Clock manipulation routines for Freescale STMP37XX/STMP378X | ||
| 3 | * | ||
| 4 | * Author: Vitaly Wool <vital@embeddedalley.com> | ||
| 5 | * | ||
| 6 | * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved. | ||
| 7 | * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved. | ||
| 8 | */ | ||
| 9 | |||
| 10 | /* | ||
| 11 | * The code contained herein is licensed under the GNU General Public | ||
| 12 | * License. You may obtain a copy of the GNU General Public License | ||
| 13 | * Version 2 or later at the following locations: | ||
| 14 | * | ||
| 15 | * http://www.opensource.org/licenses/gpl-license.html | ||
| 16 | * http://www.gnu.org/copyleft/gpl.html | ||
| 17 | */ | ||
| 18 | #define DEBUG | ||
| 19 | #include <linux/kernel.h> | ||
| 20 | #include <linux/module.h> | ||
| 21 | #include <linux/init.h> | ||
| 22 | #include <linux/clk.h> | ||
| 23 | #include <linux/spinlock.h> | ||
| 24 | #include <linux/errno.h> | ||
| 25 | #include <linux/err.h> | ||
| 26 | #include <linux/delay.h> | ||
| 27 | #include <linux/io.h> | ||
| 28 | #include <linux/clkdev.h> | ||
| 29 | |||
| 30 | #include <asm/mach-types.h> | ||
| 31 | #include <mach/platform.h> | ||
| 32 | #include <mach/regs-clkctrl.h> | ||
| 33 | |||
| 34 | #include "clock.h" | ||
| 35 | |||
| 36 | static DEFINE_SPINLOCK(clocks_lock); | ||
| 37 | |||
| 38 | static struct clk osc_24M; | ||
| 39 | static struct clk pll_clk; | ||
| 40 | static struct clk cpu_clk; | ||
| 41 | static struct clk hclk; | ||
| 42 | |||
| 43 | static int propagate_rate(struct clk *); | ||
| 44 | |||
| 45 | static inline int clk_is_busy(struct clk *clk) | ||
| 46 | { | ||
| 47 | return __raw_readl(clk->busy_reg) & (1 << clk->busy_bit); | ||
| 48 | } | ||
| 49 | |||
| 50 | static inline int clk_good(struct clk *clk) | ||
| 51 | { | ||
| 52 | return clk && !IS_ERR(clk) && clk->ops; | ||
| 53 | } | ||
| 54 | |||
| 55 | static int std_clk_enable(struct clk *clk) | ||
| 56 | { | ||
| 57 | if (clk->enable_reg) { | ||
| 58 | u32 clk_reg = __raw_readl(clk->enable_reg); | ||
| 59 | if (clk->enable_negate) | ||
| 60 | clk_reg &= ~(1 << clk->enable_shift); | ||
| 61 | else | ||
| 62 | clk_reg |= (1 << clk->enable_shift); | ||
| 63 | __raw_writel(clk_reg, clk->enable_reg); | ||
| 64 | if (clk->enable_wait) | ||
| 65 | udelay(clk->enable_wait); | ||
| 66 | return 0; | ||
| 67 | } else | ||
| 68 | return -EINVAL; | ||
| 69 | } | ||
| 70 | |||
| 71 | static int std_clk_disable(struct clk *clk) | ||
| 72 | { | ||
| 73 | if (clk->enable_reg) { | ||
| 74 | u32 clk_reg = __raw_readl(clk->enable_reg); | ||
| 75 | if (clk->enable_negate) | ||
| 76 | clk_reg |= (1 << clk->enable_shift); | ||
| 77 | else | ||
| 78 | clk_reg &= ~(1 << clk->enable_shift); | ||
| 79 | __raw_writel(clk_reg, clk->enable_reg); | ||
| 80 | return 0; | ||
| 81 | } else | ||
| 82 | return -EINVAL; | ||
| 83 | } | ||
| 84 | |||
| 85 | static int io_set_rate(struct clk *clk, u32 rate) | ||
| 86 | { | ||
| 87 | u32 reg_frac, clkctrl_frac; | ||
| 88 | int i, ret = 0, mask = 0x1f; | ||
| 89 | |||
