mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 05:48:40 +00:00
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: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
commit
0a224c514f
9 changed files with 29 additions and 12 deletions
|
@ -41,9 +41,13 @@ led-level {
|
||||||
};
|
};
|
||||||
power-blue {
|
power-blue {
|
||||||
label = "power:blue";
|
label = "power:blue";
|
||||||
gpios = <&gpio1 11 0>;
|
gpios = <&gpio1 10 0>;
|
||||||
linux,default-trigger = "timer";
|
linux,default-trigger = "timer";
|
||||||
};
|
};
|
||||||
|
power-red {
|
||||||
|
label = "power:red";
|
||||||
|
gpios = <&gpio1 11 0>;
|
||||||
|
};
|
||||||
usb1 {
|
usb1 {
|
||||||
label = "usb1:blue";
|
label = "usb1:blue";
|
||||||
gpios = <&gpio1 12 0>;
|
gpios = <&gpio1 12 0>;
|
||||||
|
|
|
@ -102,7 +102,8 @@ void __init dove_ehci1_init(void)
|
||||||
void __init dove_ge00_init(struct mv643xx_eth_platform_data *eth_data)
|
void __init dove_ge00_init(struct mv643xx_eth_platform_data *eth_data)
|
||||||
{
|
{
|
||||||
orion_ge00_init(eth_data, DOVE_GE00_PHYS_BASE,
|
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);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
|
|
|
@ -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_DLINK_KIRKWOOD_DT) += kirkwood-dns325.dtb
|
||||||
dtb-$(CONFIG_MACH_ICONNECT_DT) += kirkwood-iconnect.dtb
|
dtb-$(CONFIG_MACH_ICONNECT_DT) += kirkwood-iconnect.dtb
|
||||||
dtb-$(CONFIG_MACH_IB62X0_DT) += kirkwood-ib62x0.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_GOFLEXNET_DT) += kirkwood-goflexnet.dtb
|
||||||
dtb-$(CONFIG_MACH_LSXL_DT) += kirkwood-lschlv2.dtb
|
dtb-$(CONFIG_MACH_LSXL_DT) += kirkwood-lschlv2.dtb
|
||||||
dtb-$(CONFIG_MACH_LSXL_DT) += kirkwood-lsxhl.dtb
|
dtb-$(CONFIG_MACH_LSXL_DT) += kirkwood-lsxhl.dtb
|
||||||
|
|
|
@ -301,7 +301,7 @@ void __init kirkwood_ge00_init(struct mv643xx_eth_platform_data *eth_data)
|
||||||
{
|
{
|
||||||
orion_ge00_init(eth_data,
|
orion_ge00_init(eth_data,
|
||||||
GE00_PHYS_BASE, IRQ_KIRKWOOD_GE00_SUM,
|
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 interface forgets the MAC address assigned by u-boot if
|
||||||
the clock is turned off, so claim the clk now. */
|
the clock is turned off, so claim the clk now. */
|
||||||
clk_prepare_enable(ge0);
|
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,
|
orion_ge01_init(eth_data,
|
||||||
GE01_PHYS_BASE, IRQ_KIRKWOOD_GE01_SUM,
|
GE01_PHYS_BASE, IRQ_KIRKWOOD_GE01_SUM,
|
||||||
IRQ_KIRKWOOD_GE01_ERR);
|
IRQ_KIRKWOOD_GE01_ERR, 1600);
|
||||||
clk_prepare_enable(ge1);
|
clk_prepare_enable(ge1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -213,7 +213,8 @@ void __init mv78xx0_ge00_init(struct mv643xx_eth_platform_data *eth_data)
|
||||||
{
|
{
|
||||||
orion_ge00_init(eth_data,
|
orion_ge00_init(eth_data,
|
||||||
GE00_PHYS_BASE, IRQ_MV78XX0_GE00_SUM,
|
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,
|
orion_ge01_init(eth_data,
|
||||||
GE01_PHYS_BASE, IRQ_MV78XX0_GE01_SUM,
|
GE01_PHYS_BASE, IRQ_MV78XX0_GE01_SUM,
|
||||||
NO_IRQ);
|
NO_IRQ,
|
||||||
|
MV643XX_TX_CSUM_DEFAULT_LIMIT);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -109,7 +109,8 @@ void __init orion5x_eth_init(struct mv643xx_eth_platform_data *eth_data)
|
||||||
{
|
{
|
||||||
orion_ge00_init(eth_data,
|
orion_ge00_init(eth_data,
|
||||||
ORION5X_ETH_PHYS_BASE, IRQ_ORION5X_ETH_SUM,
|
ORION5X_ETH_PHYS_BASE, IRQ_ORION5X_ETH_SUM,
|
||||||
IRQ_ORION5X_ETH_ERR);
|
IRQ_ORION5X_ETH_ERR,
|
||||||
|
MV643XX_TX_CSUM_DEFAULT_LIMIT);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -291,10 +291,12 @@ static struct platform_device orion_ge00 = {
|
||||||
void __init orion_ge00_init(struct mv643xx_eth_platform_data *eth_data,
|
void __init orion_ge00_init(struct mv643xx_eth_platform_data *eth_data,
|
||||||
unsigned long mapbase,
|
unsigned long mapbase,
|
||||||
unsigned long irq,
|
unsigned long irq,
|
||||||
unsigned long irq_err)
|
unsigned long irq_err,
|
||||||
|
unsigned int tx_csum_limit)
|
||||||
{
|
{
|
||||||
fill_resources(&orion_ge00_shared, orion_ge00_shared_resources,
|
fill_resources(&orion_ge00_shared, orion_ge00_shared_resources,
|
||||||
mapbase + 0x2000, SZ_16K - 1, irq_err);
|
mapbase + 0x2000, SZ_16K - 1, irq_err);
|
||||||
|
orion_ge00_shared_data.tx_csum_limit = tx_csum_limit;
|
||||||
ge_complete(&orion_ge00_shared_data,
|
ge_complete(&orion_ge00_shared_data,
|
||||||
orion_ge00_resources, irq, &orion_ge00_shared,
|
orion_ge00_resources, irq, &orion_ge00_shared,
|
||||||
eth_data, &orion_ge00);
|
eth_data, &orion_ge00);
|
||||||
|
@ -343,10 +345,12 @@ static struct platform_device orion_ge01 = {
|
||||||
void __init orion_ge01_init(struct mv643xx_eth_platform_data *eth_data,
|
void __init orion_ge01_init(struct mv643xx_eth_platform_data *eth_data,
|
||||||
unsigned long mapbase,
|
unsigned long mapbase,
|
||||||
unsigned long irq,
|
unsigned long irq,
|
||||||
unsigned long irq_err)
|
unsigned long irq_err,
|
||||||
|
unsigned int tx_csum_limit)
|
||||||
{
|
{
|
||||||
fill_resources(&orion_ge01_shared, orion_ge01_shared_resources,
|
fill_resources(&orion_ge01_shared, orion_ge01_shared_resources,
|
||||||
mapbase + 0x2000, SZ_16K - 1, irq_err);
|
mapbase + 0x2000, SZ_16K - 1, irq_err);
|
||||||
|
orion_ge01_shared_data.tx_csum_limit = tx_csum_limit;
|
||||||
ge_complete(&orion_ge01_shared_data,
|
ge_complete(&orion_ge01_shared_data,
|
||||||
orion_ge01_resources, irq, &orion_ge01_shared,
|
orion_ge01_resources, irq, &orion_ge01_shared,
|
||||||
eth_data, &orion_ge01);
|
eth_data, &orion_ge01);
|
||||||
|
|
|
@ -39,12 +39,14 @@ void __init orion_rtc_init(unsigned long mapbase,
|
||||||
void __init orion_ge00_init(struct mv643xx_eth_platform_data *eth_data,
|
void __init orion_ge00_init(struct mv643xx_eth_platform_data *eth_data,
|
||||||
unsigned long mapbase,
|
unsigned long mapbase,
|
||||||
unsigned long irq,
|
unsigned long irq,
|
||||||
unsigned long irq_err);
|
unsigned long irq_err,
|
||||||
|
unsigned int tx_csum_limit);
|
||||||
|
|
||||||
void __init orion_ge01_init(struct mv643xx_eth_platform_data *eth_data,
|
void __init orion_ge01_init(struct mv643xx_eth_platform_data *eth_data,
|
||||||
unsigned long mapbase,
|
unsigned long mapbase,
|
||||||
unsigned long irq,
|
unsigned long irq,
|
||||||
unsigned long irq_err);
|
unsigned long irq_err,
|
||||||
|
unsigned int tx_csum_limit);
|
||||||
|
|
||||||
void __init orion_ge10_init(struct mv643xx_eth_platform_data *eth_data,
|
void __init orion_ge10_init(struct mv643xx_eth_platform_data *eth_data,
|
||||||
unsigned long mapbase,
|
unsigned long mapbase,
|
||||||
|
|
|
@ -15,6 +15,8 @@
|
||||||
#define MV643XX_ETH_SIZE_REG_4 0x2224
|
#define MV643XX_ETH_SIZE_REG_4 0x2224
|
||||||
#define MV643XX_ETH_BASE_ADDR_ENABLE_REG 0x2290
|
#define MV643XX_ETH_BASE_ADDR_ENABLE_REG 0x2290
|
||||||
|
|
||||||
|
#define MV643XX_TX_CSUM_DEFAULT_LIMIT 0
|
||||||
|
|
||||||
struct mv643xx_eth_shared_platform_data {
|
struct mv643xx_eth_shared_platform_data {
|
||||||
struct mbus_dram_target_info *dram;
|
struct mbus_dram_target_info *dram;
|
||||||
struct platform_device *shared_smi;
|
struct platform_device *shared_smi;
|
||||||
|
|
Loading…
Reference in a new issue