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

Commit 3eae03da authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'pxa-fixes-v4.2-rc2' of https://github.com/rjarzmik/linux into fixesD 

Merge "pxa fixes for v4.2" from Robert Jarzmik:

ARM: pxa: fixes for v4.2-rc2

This single fix reenables ethernet cards for several pxa boards,
broken by regulator addition to dm9000 driver.

* tag 'pxa-fixes-v4.2-rc2' of https://github.com/rjarzmik/linux:
  ARM: pxa: fix dm9000 platform data regression
parents 47295aa4 a927ef89

arch/arm/mach-pxa/capc7117.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <linux/ata_platform.h>

#include <linux/ata_platform.h>

#include <linux/serial_8250.h>

#include <linux/serial_8250.h>

#include <linux/gpio.h>

#include <linux/gpio.h>

#include <linux/regulator/machine.h>





#include <asm/mach-types.h>

#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <asm/mach/arch.h>
@@ -144,6 +145,8 @@ static void __init capc7117_init(void) 




	capc7117_uarts_init();

	capc7117_uarts_init();

	capc7117_ide_init();

	capc7117_ide_init();



	regulator_has_full_constraints();

}

}





MACHINE_START(CAPC7117,

MACHINE_START(CAPC7117,

arch/arm/mach-pxa/cm-x2xx.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/syscore_ops.h>

#include <linux/syscore_ops.h>

#include <linux/irq.h>

#include <linux/irq.h>

#include <linux/gpio.h>

#include <linux/gpio.h>

#include <linux/regulator/machine.h>





#include <linux/dm9000.h>

#include <linux/dm9000.h>

#include <linux/leds.h>

#include <linux/leds.h>
@@ -466,6 +467,8 @@ static void __init cmx2xx_init(void) 
	cmx2xx_init_ac97();

	cmx2xx_init_ac97();

	cmx2xx_init_touchscreen();

	cmx2xx_init_touchscreen();

	cmx2xx_init_leds();

	cmx2xx_init_leds();



	regulator_has_full_constraints();

}

}





static void __init cmx2xx_init_irq(void)

static void __init cmx2xx_init_irq(void)

arch/arm/mach-pxa/cm-x300.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -835,6 +835,8 @@ static void __init cm_x300_init(void) 
	cm_x300_init_ac97();

	cm_x300_init_ac97();

	cm_x300_init_wi2wi();

	cm_x300_init_wi2wi();

	cm_x300_init_bl();

	cm_x300_init_bl();



	regulator_has_full_constraints();

}

}





static void __init cm_x300_fixup(struct tag *tags, char **cmdline)

static void __init cm_x300_fixup(struct tag *tags, char **cmdline)

arch/arm/mach-pxa/colibri-pxa270.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/mtd/partitions.h>

#include <linux/mtd/partitions.h>

#include <linux/mtd/physmap.h>

#include <linux/mtd/physmap.h>

#include <linux/platform_device.h>

#include <linux/platform_device.h>

#include <linux/regulator/machine.h>

#include <linux/ucb1400.h>

#include <linux/ucb1400.h>





#include <asm/mach/arch.h>

#include <asm/mach/arch.h>
@@ -294,6 +295,8 @@ static void __init colibri_pxa270_init(void) 
		printk(KERN_ERR "Illegal colibri_pxa270_baseboard type %d\n",

		printk(KERN_ERR "Illegal colibri_pxa270_baseboard type %d\n",

				colibri_pxa270_baseboard);

				colibri_pxa270_baseboard);

	}

	}



	regulator_has_full_constraints();

}

}





/* The "Income s.r.o. SH-Dmaster PXA270 SBC" board can be booted either

/* The "Income s.r.o. SH-Dmaster PXA270 SBC" board can be booted either

arch/arm/mach-pxa/em-x270.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -1306,6 +1306,8 @@ static void __init em_x270_init(void) 
	em_x270_init_i2c();

	em_x270_init_i2c();

	em_x270_init_camera();

	em_x270_init_camera();

	em_x270_userspace_consumers_init();

	em_x270_userspace_consumers_init();



	regulator_has_full_constraints();

}

}





MACHINE_START(EM_X270, "Compulab EM-X270")

MACHINE_START(EM_X270, "Compulab EM-X270")