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

Commit cfe2da53 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'v3.4-rc1-imx-fixes' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes 

Linux-3.4-rc1 i.MX fixes

* tag 'v3.4-rc1-imx-fixes' of git://git.pengutronix.de/git/imx/linux-2.6:
  ARM: armadillo5x0: Fix smsc911x driver probe
  ARM: kzm_arm11_01: Fix smsc911x driver probe
  ARM: mx31lilly: Fix smsc911x driver probe
  ARM: mx31lite: Fix smsc911x driver probe
  ARM: mx53ard: Fix smsc911x driver probe
  ARM: mx35: Fix registration of camera clock
  ARM: 3ds_debugboard: Fix smsc911x driver probe
  MX2: Fix mx2_camera clock regression.
  ARM: mach-mx35_3ds: Fix build warning due to the lack of 'const' annotation
parents beca98c9 7a4302a6

arch/arm/mach-imx/clock-imx27.c

+1 −0
Original line number Diff line number Diff line
@@ -662,6 +662,7 @@ static struct clk_lookup lookups[] = { 
	_REGISTER_CLOCK(NULL, "dma", dma_clk)

	_REGISTER_CLOCK(NULL, "rtic", rtic_clk)

	_REGISTER_CLOCK(NULL, "brom", brom_clk)

	_REGISTER_CLOCK(NULL, "emma", emma_clk)

	_REGISTER_CLOCK("m2m-emmaprp.0", NULL, emma_clk)

	_REGISTER_CLOCK(NULL, "slcdc", slcdc_clk)

	_REGISTER_CLOCK("imx27-fec.0", NULL, fec_clk)

arch/arm/mach-imx/clock-imx35.c

+1 −1
Original line number Diff line number Diff line
@@ -483,7 +483,7 @@ static struct clk_lookup lookups[] = { 
	_REGISTER_CLOCK("imx2-wdt.0", NULL, wdog_clk)

	_REGISTER_CLOCK(NULL, "max", max_clk)

	_REGISTER_CLOCK(NULL, "audmux", audmux_clk)

	_REGISTER_CLOCK(NULL, "csi", csi_clk)

	_REGISTER_CLOCK("mx3-camera.0", NULL, csi_clk)

	_REGISTER_CLOCK(NULL, "iim", iim_clk)

	_REGISTER_CLOCK(NULL, "gpu2d", gpu2d_clk)

	_REGISTER_CLOCK("mxc_nand.0", NULL, nfc_clk)

arch/arm/mach-imx/mach-armadillo5x0.c

+9 −0
Original line number Diff line number Diff line
@@ -38,6 +38,8 @@ 
#include <linux/usb/otg.h>

#include <linux/usb/ulpi.h>

#include <linux/delay.h>

#include <linux/regulator/machine.h>

#include <linux/regulator/fixed.h>



#include <mach/hardware.h>

#include <asm/mach-types.h>
@@ -479,6 +481,11 @@ static struct platform_device *devices[] __initdata = { 
	&armadillo5x0_smc911x_device,

};



static struct regulator_consumer_supply dummy_supplies[] = {

	REGULATOR_SUPPLY("vdd33a", "smsc911x"),

	REGULATOR_SUPPLY("vddvario", "smsc911x"),

};



/*

 * Perform board specific initializations

 */
@@ -489,6 +496,8 @@ static void __init armadillo5x0_init(void) 
	mxc_iomux_setup_multiple_pins(armadillo5x0_pins,

			ARRAY_SIZE(armadillo5x0_pins), "armadillo5x0");



	regulator_register_fixed(0, dummy_supplies, ARRAY_SIZE(dummy_supplies));



	platform_add_devices(devices, ARRAY_SIZE(devices));

	imx_add_gpio_keys(&armadillo5x0_button_data);

	imx31_add_imx_i2c1(NULL);

arch/arm/mach-imx/mach-kzm_arm11_01.c

+9 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ 
#include <linux/serial_8250.h>

#include <linux/smsc911x.h>

#include <linux/types.h>

#include <linux/regulator/machine.h>

#include <linux/regulator/fixed.h>



#include <asm/irq.h>

#include <asm/mach-types.h>
@@ -166,6 +168,11 @@ static struct platform_device kzm_smsc9118_device = { 
			  },

};



static struct regulator_consumer_supply dummy_supplies[] = {

	REGULATOR_SUPPLY("vdd33a", "smsc911x"),

	REGULATOR_SUPPLY("vddvario", "smsc911x"),

};



static int __init kzm_init_smsc9118(void)

{

	/*
@@ -175,6 +182,8 @@ static int __init kzm_init_smsc9118(void) 
	gpio_request(IOMUX_TO_GPIO(MX31_PIN_GPIO1_2), "smsc9118-int");

	gpio_direction_input(IOMUX_TO_GPIO(MX31_PIN_GPIO1_2));



	regulator_register_fixed(0, dummy_supplies, ARRAY_SIZE(dummy_supplies));



	return platform_device_register(&kzm_smsc9118_device);

}

#else

arch/arm/mach-imx/mach-mx31lilly.c

+9 −0
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ 
#include <linux/mfd/mc13783.h>

#include <linux/usb/otg.h>

#include <linux/usb/ulpi.h>

#include <linux/regulator/machine.h>

#include <linux/regulator/fixed.h>



#include <asm/mach-types.h>

#include <asm/mach/arch.h>
@@ -242,6 +244,11 @@ static struct platform_device *devices[] __initdata = { 
static int mx31lilly_baseboard;

core_param(mx31lilly_baseboard, mx31lilly_baseboard, int, 0444);



static struct regulator_consumer_supply dummy_supplies[] = {

	REGULATOR_SUPPLY("vdd33a", "smsc911x"),

	REGULATOR_SUPPLY("vddvario", "smsc911x"),

};



static void __init mx31lilly_board_init(void)

{

	imx31_soc_init();
@@ -280,6 +287,8 @@ static void __init mx31lilly_board_init(void) 
	imx31_add_spi_imx1(&spi1_pdata);

	spi_register_board_info(&mc13783_dev, 1);



	regulator_register_fixed(0, dummy_supplies, ARRAY_SIZE(dummy_supplies));



	platform_add_devices(devices, ARRAY_SIZE(devices));



	/* USB */