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

Commit 725278e0 authored by Russell King's avatar Russell King
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion

parents c947f69f 7350f419

arch/arm/mach-kirkwood/common.c

+3 −4
Original line number Diff line number Diff line
@@ -854,9 +854,8 @@ int __init kirkwood_find_tclk(void) 


	kirkwood_pcie_id(&dev, &rev);



	if ((dev == MV88F6281_DEV_ID && (rev == MV88F6281_REV_A0 ||

					rev == MV88F6281_REV_A1)) ||

	    (dev == MV88F6282_DEV_ID))

	if (dev == MV88F6281_DEV_ID || dev == MV88F6282_DEV_ID)

		if (((readl(SAMPLE_AT_RESET) >> 21) & 1) == 0)

			return 200000000;



	return 166666667;

arch/arm/mach-kirkwood/d2net_v2-setup.c

+1 −1
Original line number Diff line number Diff line
@@ -225,5 +225,5 @@ MACHINE_START(D2NET_V2, "LaCie d2 Network v2") 
	.init_machine	= d2net_v2_init,

	.map_io		= kirkwood_map_io,

	.init_irq	= kirkwood_init_irq,

	.timer		= &lacie_v2_timer,

	.timer		= &kirkwood_timer,

MACHINE_END

arch/arm/mach-kirkwood/lacie_v2-common.c

+0 −14
Original line number Diff line number Diff line
@@ -111,17 +111,3 @@ void __init lacie_v2_hdd_power_init(int hdd_num) 
			pr_err("Failed to power up HDD%d\n", i + 1);

	}

}
 


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

 * Timer

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



static void lacie_v2_timer_init(void)

{

	kirkwood_tclk = 166666667;

	orion_time_init(IRQ_KIRKWOOD_BRIDGE, kirkwood_tclk);

}



struct sys_timer lacie_v2_timer = {

	.init = lacie_v2_timer_init,

};

arch/arm/mach-kirkwood/lacie_v2-common.h

+0 −2
Original line number Diff line number Diff line
@@ -13,6 +13,4 @@ void lacie_v2_register_flash(void); 
void lacie_v2_register_i2c_devices(void);

void lacie_v2_hdd_power_init(int hdd_num);



extern struct sys_timer lacie_v2_timer;



#endif

arch/arm/mach-kirkwood/mpp.c

+1 −3
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ void __init kirkwood_mpp_conf(unsigned int *mpp_list) 
	}

	printk("\n");



	while (*mpp_list) {

	for ( ; *mpp_list; mpp_list++) {

		unsigned int num = MPP_NUM(*mpp_list);

		unsigned int sel = MPP_SEL(*mpp_list);

		int shift, gpio_mode;
@@ -88,8 +88,6 @@ void __init kirkwood_mpp_conf(unsigned int *mpp_list) 
		if (sel != 0)

			gpio_mode = 0;

		orion_gpio_set_valid(num, gpio_mode);



		mpp_list++;

	}



	printk(KERN_DEBUG "  final MPP regs:");