From 03e09cd8902717b66f940357257d8ad76114d9f2 Mon Sep 17 00:00:00 2001 From: Uwe Kleine-König Date: Mon, 15 Feb 2010 17:10:42 +0100 Subject: arm/imx: let ARCH_MXC select COMMON_CLKDEV instead of each subfamily MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Uwe Kleine-König --- arch/arm/Kconfig | 1 + 1 file changed, 1 insertion(+) (limited to 'arch/arm/Kconfig') diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 233a222752c0..39baa60fb432 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -312,6 +312,7 @@ config ARCH_MXC select GENERIC_GPIO select ARCH_REQUIRE_GPIOLIB select HAVE_CLK + select COMMON_CLKDEV help Support for Freescale MXC/iMX-based family of processors -- cgit v1.2.3 From 9f69fdb36da31672b0e40712fed494182530c887 Mon Sep 17 00:00:00 2001 From: Uwe Kleine-König Date: Fri, 19 Feb 2010 16:16:09 +0100 Subject: arm/imx: don't explicitly select GENERIC_GPIO MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ARCH_REQUIRE_GPIOLIB selects GPIOLIB which in turn selects GENERIC_GPIO Signed-off-by: Uwe Kleine-König --- arch/arm/Kconfig | 1 - 1 file changed, 1 deletion(-) (limited to 'arch/arm/Kconfig') diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 39baa60fb432..9c78cfbed8c0 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -309,7 +309,6 @@ config ARCH_MXC select GENERIC_TIME select GENERIC_CLOCKEVENTS select ARCH_MTD_XIP - select GENERIC_GPIO select ARCH_REQUIRE_GPIOLIB select HAVE_CLK select COMMON_CLKDEV -- cgit v1.2.3 From 44fb5d1945fe87f3299de5e2e0581f092e8dd455 Mon Sep 17 00:00:00 2001 From: Uwe Kleine-König Date: Fri, 19 Feb 2010 17:08:42 +0100 Subject: arm/imx: remove MTD_XIP support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is broken since at least one year when ec996ba (mxc timer: make compile time independent) removed the symbol MXC_TCN. Signed-off-by: Uwe Kleine-König --- arch/arm/Kconfig | 1 - arch/arm/plat-mxc/include/mach/mtd-xip.h | 34 -------------------------------- 2 files changed, 35 deletions(-) delete mode 100644 arch/arm/plat-mxc/include/mach/mtd-xip.h (limited to 'arch/arm/Kconfig') diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 9c78cfbed8c0..3bf3d48ddbf0 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -308,7 +308,6 @@ config ARCH_MXC bool "Freescale MXC/iMX-based" select GENERIC_TIME select GENERIC_CLOCKEVENTS - select ARCH_MTD_XIP select ARCH_REQUIRE_GPIOLIB select HAVE_CLK select COMMON_CLKDEV diff --git a/arch/arm/plat-mxc/include/mach/mtd-xip.h b/arch/arm/plat-mxc/include/mach/mtd-xip.h deleted file mode 100644 index 1ab1bba5688d..000000000000 --- a/arch/arm/plat-mxc/include/mach/mtd-xip.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - * MTD primitives for XIP support. Architecture specific functions - * - * Do not include this file directly. It's included from linux/mtd/xip.h - * - * Copyright (C) 2008 Darius Augulis , Teltonika, Inc. - * - * 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 - -#ifndef __ARCH_IMX_MTD_XIP_H__ -#define __ARCH_IMX_MTD_XIP_H__ - -#ifdef CONFIG_ARCH_MX1 -/* AITC registers */ -#define AITC_BASE IO_ADDRESS(AVIC_BASE_ADDR) -#define NIPNDH (AITC_BASE + 0x58) -#define NIPNDL (AITC_BASE + 0x5C) -#define INTENABLEH (AITC_BASE + 0x10) -#define INTENABLEL (AITC_BASE + 0x14) -/* MTD macros */ -#define xip_irqpending() ((__raw_readl(INTENABLEH) & __raw_readl(NIPNDH)) \ - || (__raw_readl(INTENABLEL) & __raw_readl(NIPNDL))) -#define xip_currtime() (__raw_readl(TIMER_BASE + MXC_TCN)) -#define xip_elapsed_since(x) (signed)((__raw_readl(TIMER_BASE + MXC_TCN) - (x)) / 96) -#define xip_cpu_idle() asm volatile ("mcr p15, 0, %0, c7, c0, 4" :: "r" (0)) -#endif /* CONFIG_ARCH_MX1 */ - -#endif /* __ARCH_IMX_MTD_XIP_H__ */ -- cgit v1.2.3