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

Commit 48b9bf09 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'marvell_cleanup_for_v3.5' of... 

Merge branch 'marvell_cleanup_for_v3.5' of git://git.infradead.org/users/jcooper/linux into next/cleanup

* 'marvell_cleanup_for_v3.5' of git://git.infradead.org/users/jcooper/linux

:
  Dove: Fix Section mismatch warnings
  ARM: orion5x: ts78xx debugging changes
  ARM: orion5x: remove PM dependency from ts78xx
  ARM: orion5x: ts78xx fix NAND resource off by one
  ARM: orion5x: ts78xx whitespace cleanups
  Orion5x: Fix Section mismatch warnings
  Orion5x: Fix warning: struct pci_dev declared inside paramter list

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 985f03c2 ca2ac5cc

arch/arm/mach-dove/common.c

+1 −1
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ static int get_tclk(void) 
	return 166666667;

}



static void dove_timer_init(void)

static void __init dove_timer_init(void)

{

	orion_time_init(BRIDGE_VIRT_BASE, BRIDGE_INT_TIMER1_CLR,

			IRQ_DOVE_BRIDGE, get_tclk());

arch/arm/mach-dove/mpp.c

+4 −4
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ static void dove_mpp_gpio_mode(int start, int end, int gpio_mode) 


/* Dump all the extra MPP registers. The platform code will dump the

   registers for pins 0-23. */

static void dove_mpp_dump_regs(void)

static void __init dove_mpp_dump_regs(void)

{

	pr_debug("PMU_CTRL4_CTRL: %08x\n",

		 readl(DOVE_MPP_CTRL4_VIRT_BASE));
@@ -67,7 +67,7 @@ static void dove_mpp_dump_regs(void) 
	pr_debug("MPP_GENERAL: %08x\n", readl(DOVE_MPP_GENERAL_VIRT_BASE));

}



static void dove_mpp_cfg_nfc(int sel)

static void __init dove_mpp_cfg_nfc(int sel)

{

	u32 mpp_gen_cfg = readl(DOVE_MPP_GENERAL_VIRT_BASE);
@@ -78,7 +78,7 @@ static void dove_mpp_cfg_nfc(int sel) 
	dove_mpp_gpio_mode(64, 71, GPIO_OUTPUT_OK);

}



static void dove_mpp_cfg_au1(int sel)

static void __init dove_mpp_cfg_au1(int sel)

{

	u32 mpp_ctrl4 = readl(DOVE_MPP_CTRL4_VIRT_BASE);

	u32 ssp_ctrl1 = readl(DOVE_SSP_CTRL_STATUS_1);
@@ -118,7 +118,7 @@ static void dove_mpp_cfg_au1(int sel) 


/* Configure the group registers, enabling GPIO if sel indicates the

   pin is to be used for GPIO */

static void dove_mpp_conf_grp(unsigned int *mpp_grp_list)

static void __init dove_mpp_conf_grp(unsigned int *mpp_grp_list)

{

	u32 mpp_ctrl4 = readl(DOVE_MPP_CTRL4_VIRT_BASE);

	int gpio_mode;

arch/arm/mach-orion5x/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -86,7 +86,6 @@ config MACH_WRT350N_V2 


config MACH_TS78XX

	bool "Technologic Systems TS-78xx"

	select PM

	help

	  Say 'Y' here if you want your kernel to support the

	  Technologic Systems TS-78xx platform.

arch/arm/mach-orion5x/addr-map.c

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ static int __init cpu_win_can_remap(const struct orion_addr_map_cfg *cfg, 
/*

 * Description of the windows needed by the platform code

 */

static struct __initdata orion_addr_map_cfg addr_map_cfg = {

static struct orion_addr_map_cfg addr_map_cfg __initdata = {

	.num_wins = 8,

	.cpu_win_can_remap = cpu_win_can_remap,

	.bridge_virt_base = ORION5X_BRIDGE_VIRT_BASE,

arch/arm/mach-orion5x/common.c

+1 −1
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ int __init orion5x_find_tclk(void) 
	return 166666667;

}



static void orion5x_timer_init(void)

static void __init orion5x_timer_init(void)

{

	orion5x_tclk = orion5x_find_tclk();