Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 359a3d38 authored by Linus Walleij's avatar Linus Walleij
Browse files

ARM: integrator: cut down on static maps 



This removes all the unused static maps on the Integrator/AP
and Integrator/CP and also take this opportunity to strip down
a big list of unused #includes from each boardfile.

Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 33aa62b9

arch/arm/mach-integrator/integrator_ap.c

+0 −30
Original line number Diff line number Diff line
@@ -17,33 +17,19 @@ 
 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 */

#include <linux/types.h>

#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/list.h>

#include <linux/platform_device.h>

#include <linux/slab.h>

#include <linux/string.h>

#include <linux/syscore_ops.h>

#include <linux/amba/bus.h>

#include <linux/amba/kmi.h>

#include <linux/io.h>

#include <linux/irqchip.h>

#include <linux/platform_data/clk-integrator.h>

#include <linux/of_irq.h>

#include <linux/of_address.h>

#include <linux/of_platform.h>

#include <linux/stat.h>

#include <linux/termios.h>



#include <asm/setup.h>

#include <asm/param.h>		/* HZ */

#include <asm/mach-types.h>



#include <asm/mach/arch.h>

#include <asm/mach/irq.h>

#include <asm/mach/map.h>

#include <asm/mach/time.h>



#include "hardware.h"

#include "cm.h"
@@ -68,14 +54,8 @@ static void __iomem *ebi_base; 


/*

 * Logical      Physical

 * ef000000			Cache flush

 * f1100000	11000000	System controller registers

 * f1300000	13000000	Counter/Timer

 * f1400000	14000000	Interrupt controller

 * f1600000	16000000	UART 0

 * f1700000	17000000	UART 1

 * f1a00000	1a000000	Debug LEDs

 * f1b00000	1b000000	GPIO

 */



static struct map_desc ap_io_desc[] __initdata __maybe_unused = {
@@ -89,16 +69,6 @@ static struct map_desc ap_io_desc[] __initdata __maybe_unused = { 
		.pfn		= __phys_to_pfn(INTEGRATOR_UART0_BASE),

		.length		= SZ_4K,

		.type		= MT_DEVICE

	}, {

		.virtual	= IO_ADDRESS(INTEGRATOR_DBG_BASE),

		.pfn		= __phys_to_pfn(INTEGRATOR_DBG_BASE),

		.length		= SZ_4K,

		.type		= MT_DEVICE

	}, {

		.virtual	= IO_ADDRESS(INTEGRATOR_AP_GPIO_BASE),

		.pfn		= __phys_to_pfn(INTEGRATOR_AP_GPIO_BASE),

		.length		= SZ_4K,

		.type		= MT_DEVICE

	}

};

arch/arm/mach-integrator/integrator_cp.c

+0 −33
Original line number Diff line number Diff line
@@ -7,31 +7,17 @@ 
 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License.

 */

#include <linux/types.h>

#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/list.h>

#include <linux/platform_device.h>

#include <linux/dma-mapping.h>

#include <linux/string.h>

#include <linux/device.h>

#include <linux/amba/bus.h>

#include <linux/amba/kmi.h>

#include <linux/amba/mmci.h>

#include <linux/io.h>

#include <linux/irqchip.h>

#include <linux/gfp.h>

#include <linux/of_irq.h>

#include <linux/of_address.h>

#include <linux/of_platform.h>

#include <linux/sched_clock.h>



#include <asm/setup.h>

#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <asm/mach/irq.h>

#include <asm/mach/map.h>

#include <asm/mach/time.h>



#include "hardware.h"

#include "cm.h"
@@ -43,12 +29,8 @@ static void __iomem *intcp_con_base; 
/*

 * Logical      Physical

 * f1000000	10000000	Core module registers

 * f1300000	13000000	Counter/Timer

 * f1400000	14000000	Interrupt controller

 * f1600000	16000000	UART 0

 * f1700000	17000000	UART 1

 * f1a00000	1a000000	Debug LEDs

 * fc900000	c9000000	GPIO

 * fca00000	ca000000	SIC

 */
@@ -58,11 +40,6 @@ static struct map_desc intcp_io_desc[] __initdata __maybe_unused = { 
		.pfn		= __phys_to_pfn(INTEGRATOR_HDR_BASE),

		.length		= SZ_4K,

		.type		= MT_DEVICE

	}, {

		.virtual	= IO_ADDRESS(INTEGRATOR_CT_BASE),

		.pfn		= __phys_to_pfn(INTEGRATOR_CT_BASE),

		.length		= SZ_4K,

		.type		= MT_DEVICE

	}, {

		.virtual	= IO_ADDRESS(INTEGRATOR_IC_BASE),

		.pfn		= __phys_to_pfn(INTEGRATOR_IC_BASE),
@@ -73,16 +50,6 @@ static struct map_desc intcp_io_desc[] __initdata __maybe_unused = { 
		.pfn		= __phys_to_pfn(INTEGRATOR_UART0_BASE),

		.length		= SZ_4K,

		.type		= MT_DEVICE

	}, {

		.virtual	= IO_ADDRESS(INTEGRATOR_DBG_BASE),

		.pfn		= __phys_to_pfn(INTEGRATOR_DBG_BASE),

		.length		= SZ_4K,

		.type		= MT_DEVICE

	}, {

		.virtual	= IO_ADDRESS(INTEGRATOR_CP_GPIO_BASE),

		.pfn		= __phys_to_pfn(INTEGRATOR_CP_GPIO_BASE),

		.length		= SZ_4K,

		.type		= MT_DEVICE

	}, {

		.virtual	= IO_ADDRESS(INTEGRATOR_CP_SIC_BASE),

		.pfn		= __phys_to_pfn(INTEGRATOR_CP_SIC_BASE),