Commit 22292218 authored by Jason Cooper's avatar Jason Cooper
Browse files

Merge tag 'tags/drivers_for_v3.9' into mvebu/boards 

mvebu drivers for v3.9
 - use rtc-mv in mvebu armv7 SoCs
 - add pci-e hotplug for kirkwood

Depends on:
 - tags/mvebu_fixes_for_v3.8-rc6
parents de7c007f 9cfc94eb

arch/arm/configs/kirkwood_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ CONFIG_AEABI=y 
CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_CPU_IDLE=y

CONFIG_CPU_IDLE_KIRKWOOD=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

arch/arm/mach-kirkwood/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ obj-$(CONFIG_MACH_NET2BIG_V2) += netxbig_v2-setup.o lacie_v2-common.o 
obj-$(CONFIG_MACH_NET5BIG_V2)		+= netxbig_v2-setup.o lacie_v2-common.o

obj-$(CONFIG_MACH_T5325)		+= t5325-setup.o



obj-$(CONFIG_CPU_IDLE)			+= cpuidle.o

obj-$(CONFIG_ARCH_KIRKWOOD_DT)		+= board-dt.o

obj-$(CONFIG_MACH_DREAMPLUG_DT)		+= board-dreamplug.o

obj-$(CONFIG_MACH_ICONNECT_DT)		+= board-iconnect.o

arch/arm/mach-kirkwood/board-dt.c

+2 −0
Original line number Diff line number Diff line
@@ -98,6 +98,8 @@ static void __init kirkwood_dt_init(void) 
	/* Setup root of clk tree */

	kirkwood_of_clk_init();



	kirkwood_cpuidle_init();



#ifdef CONFIG_KEXEC

	kexec_reinit = kirkwood_enable_pcie;

#endif

arch/arm/mach-kirkwood/common.c

+23 −0
Original line number Diff line number Diff line
@@ -499,6 +499,28 @@ void __init kirkwood_wdt_init(void) 
	orion_wdt_init();

}



/*****************************************************************************

 * CPU idle

 ****************************************************************************/

static struct resource kirkwood_cpuidle_resource[] = {

	{

		.flags	= IORESOURCE_MEM,

		.start	= DDR_OPERATION_BASE,

		.end	= DDR_OPERATION_BASE + 3,

	},

};



static struct platform_device kirkwood_cpuidle = {

	.name		= "kirkwood_cpuidle",

	.id		= -1,

	.resource	= kirkwood_cpuidle_resource,

	.num_resources	= 1,

};



void __init kirkwood_cpuidle_init(void)

{

	platform_device_register(&kirkwood_cpuidle);

}



/*****************************************************************************

 * Time handling
@@ -671,6 +693,7 @@ void __init kirkwood_init(void) 
	kirkwood_xor1_init();

	kirkwood_crypto_init();



	kirkwood_cpuidle_init();

#ifdef CONFIG_KEXEC

	kexec_reinit = kirkwood_enable_pcie;

#endif

arch/arm/mach-kirkwood/common.h

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ void kirkwood_nand_init(struct mtd_partition *parts, int nr_parts, int delay); 
void kirkwood_nand_init_rnb(struct mtd_partition *parts, int nr_parts,

			    int (*dev_ready)(struct mtd_info *));

void kirkwood_audio_init(void);

void kirkwood_cpuidle_init(void);

void kirkwood_restart(char, const char *);

void kirkwood_clk_init(void);

CRA Git | Maintained and supported by SUSTech CRA and CCSE