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

Commit 412bb1c1 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'picoxcell-next' of git://github.com/jamieiles/linux-2.6-ji into next/cleanup 

From Jamie Iles:

* 'picoxcell-next' of git://github.com/jamieiles/linux-2.6-ji

:
  ARM: picoxcell: Remove init_irq declaration in machine description
  picoxcell: remove redundant common.h

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 359d786b 4b83f75a

arch/arm/mach-picoxcell/common.c

+0 −7
Original line number Original line Diff line number Diff line
@@ -8,20 +8,14 @@ 
 * All enquiries to support@picochip.com

 * All enquiries to support@picochip.com

 */

 */

#include <linux/delay.h>

#include <linux/delay.h>

#include <linux/irq.h>

#include <linux/irqchip.h>

#include <linux/irqdomain.h>

#include <linux/of.h>

#include <linux/of.h>

#include <linux/of_address.h>

#include <linux/of_address.h>

#include <linux/of_irq.h>

#include <linux/of_platform.h>

#include <linux/of_platform.h>

#include <linux/dw_apb_timer.h>

#include <linux/dw_apb_timer.h>





#include <asm/mach/arch.h>

#include <asm/mach/arch.h>

#include <asm/mach/map.h>

#include <asm/mach/map.h>





#include "common.h"



#define PHYS_TO_IO(x)			(((x) & 0x00ffffff) | 0xfe000000)

#define PHYS_TO_IO(x)			(((x) & 0x00ffffff) | 0xfe000000)

#define PICOXCELL_PERIPH_BASE		0x80000000

#define PICOXCELL_PERIPH_BASE		0x80000000

#define PICOXCELL_PERIPH_LENGTH		SZ_4M

#define PICOXCELL_PERIPH_LENGTH		SZ_4M
@@ -87,7 +81,6 @@ static void picoxcell_wdt_restart(char mode, const char *cmd) 
DT_MACHINE_START(PICOXCELL, "Picochip picoXcell")

DT_MACHINE_START(PICOXCELL, "Picochip picoXcell")

	.map_io		= picoxcell_map_io,

	.map_io		= picoxcell_map_io,

	.nr_irqs	= NR_IRQS_LEGACY,

	.nr_irqs	= NR_IRQS_LEGACY,

	.init_irq	= irqchip_init,

	.init_time	= dw_apb_timer_init,

	.init_time	= dw_apb_timer_init,

	.init_machine	= picoxcell_init_machine,

	.init_machine	= picoxcell_init_machine,

	.dt_compat	= picoxcell_dt_match,

	.dt_compat	= picoxcell_dt_match,

arch/arm/mach-picoxcell/common.h

deleted100644 → 0
+0 −17
Original line number Original line Diff line number Diff line 
/*

 * Copyright (c) 2011 Picochip Ltd., Jamie Iles

 *

 * 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.

 *

 * All enquiries to support@picochip.com

 */

#ifndef __PICOXCELL_COMMON_H__

#define __PICOXCELL_COMMON_H__



#include <asm/mach/time.h>



extern void dw_apb_timer_init(void);



#endif /* __PICOXCELL_COMMON_H__ */