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

Commit 0a224c51 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'fixes-for-v3.6' of git://git.infradead.org/users/jcooper/linux into fixes 

From Jason Cooper <jason@lakedaemon.net>:

Small fixes for the orion platforms including kirkwood.

* 'fixes-for-v3.6' of git://git.infradead.org/users/jcooper/linux

:
  ARM: Kirkwood: fix Makefile.boot
  ARM: Kirkwood: Fix iconnect leds
  ARM: Orion: Set eth packet size csum offload limit

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents c6041d4a b74ffd85

arch/arm/boot/dts/kirkwood-iconnect.dts

+5 −1
Original line number Diff line number Diff line
@@ -41,9 +41,13 @@ 
		};

		power-blue {

			label = "power:blue";

			gpios = <&gpio1 11 0>;

			gpios = <&gpio1 10 0>;

			linux,default-trigger = "timer";

		};

		power-red {

			label = "power:red";

			gpios = <&gpio1 11 0>;

		};

		usb1 {

			label = "usb1:blue";

			gpios = <&gpio1 12 0>;

arch/arm/mach-dove/common.c

+2 −1
Original line number Diff line number Diff line
@@ -102,7 +102,8 @@ void __init dove_ehci1_init(void) 
void __init dove_ge00_init(struct mv643xx_eth_platform_data *eth_data)

{

	orion_ge00_init(eth_data, DOVE_GE00_PHYS_BASE,

			IRQ_DOVE_GE00_SUM, IRQ_DOVE_GE00_ERR);

			IRQ_DOVE_GE00_SUM, IRQ_DOVE_GE00_ERR,

			1600);

}



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

arch/arm/mach-kirkwood/Makefile.boot

+2 −1
Original line number Diff line number Diff line
@@ -7,7 +7,8 @@ dtb-$(CONFIG_MACH_DLINK_KIRKWOOD_DT) += kirkwood-dns320.dtb 
dtb-$(CONFIG_MACH_DLINK_KIRKWOOD_DT) += kirkwood-dns325.dtb

dtb-$(CONFIG_MACH_ICONNECT_DT) += kirkwood-iconnect.dtb

dtb-$(CONFIG_MACH_IB62X0_DT) += kirkwood-ib62x0.dtb

dtb-$(CONFIG_MACH_TS219_DT)	+= kirkwood-qnap-ts219.dtb

dtb-$(CONFIG_MACH_TS219_DT)	+= kirkwood-ts219-6281.dtb

dtb-$(CONFIG_MACH_TS219_DT)	+= kirkwood-ts219-6282.dtb

dtb-$(CONFIG_MACH_GOFLEXNET_DT) += kirkwood-goflexnet.dtb

dtb-$(CONFIG_MACH_LSXL_DT) += kirkwood-lschlv2.dtb

dtb-$(CONFIG_MACH_LSXL_DT) += kirkwood-lsxhl.dtb

arch/arm/mach-kirkwood/common.c

+2 −2
Original line number Diff line number Diff line
@@ -301,7 +301,7 @@ void __init kirkwood_ge00_init(struct mv643xx_eth_platform_data *eth_data) 
{

	orion_ge00_init(eth_data,

			GE00_PHYS_BASE, IRQ_KIRKWOOD_GE00_SUM,

			IRQ_KIRKWOOD_GE00_ERR);

			IRQ_KIRKWOOD_GE00_ERR, 1600);

	/* The interface forgets the MAC address assigned by u-boot if

	the clock is turned off, so claim the clk now. */

	clk_prepare_enable(ge0);
@@ -315,7 +315,7 @@ void __init kirkwood_ge01_init(struct mv643xx_eth_platform_data *eth_data) 
{

	orion_ge01_init(eth_data,

			GE01_PHYS_BASE, IRQ_KIRKWOOD_GE01_SUM,

			IRQ_KIRKWOOD_GE01_ERR);

			IRQ_KIRKWOOD_GE01_ERR, 1600);

	clk_prepare_enable(ge1);

}

arch/arm/mach-mv78xx0/common.c

+4 −2
Original line number Diff line number Diff line
@@ -213,7 +213,8 @@ void __init mv78xx0_ge00_init(struct mv643xx_eth_platform_data *eth_data) 
{

	orion_ge00_init(eth_data,

			GE00_PHYS_BASE, IRQ_MV78XX0_GE00_SUM,

			IRQ_MV78XX0_GE_ERR);

			IRQ_MV78XX0_GE_ERR,

			MV643XX_TX_CSUM_DEFAULT_LIMIT);

}
@@ -224,7 +225,8 @@ void __init mv78xx0_ge01_init(struct mv643xx_eth_platform_data *eth_data) 
{

	orion_ge01_init(eth_data,

			GE01_PHYS_BASE, IRQ_MV78XX0_GE01_SUM,

			NO_IRQ);

			NO_IRQ,

			MV643XX_TX_CSUM_DEFAULT_LIMIT);

}