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

Commit 110720fe authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'pwm_pxa_for_v3.14' of... 

Merge tag 'pwm_pxa_for_v3.14' of https://git.kernel.org/pub/scm/linux/kernel/git/hzhuang1/linux into fixes

* tag 'pwm_pxa_for_v3.14' of https://git.kernel.org/pub/scm/linux/kernel/git/hzhuang1/linux

:
  ARM: pxa: Add dummy backlight power supply on Mitac Mio A701

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 6d0abeca 902e6a0c

arch/arm/mach-pxa/mioa701.c

+9 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
#include <linux/mtd/physmap.h>

#include <linux/usb/gpio_vbus.h>

#include <linux/reboot.h>

#include <linux/regulator/fixed.h>

#include <linux/regulator/max1586.h>

#include <linux/slab.h>

#include <linux/i2c/pxa-i2c.h>
@@ -714,6 +715,10 @@ static struct gpio global_gpios[] = { 
	{ GPIO56_MT9M111_nOE, GPIOF_OUT_INIT_LOW, "Camera nOE" },

};



static struct regulator_consumer_supply fixed_5v0_consumers[] = {

	REGULATOR_SUPPLY("power", "pwm-backlight"),

};



static void __init mioa701_machine_init(void)

{

	int rc;
@@ -753,6 +758,10 @@ static void __init mioa701_machine_init(void) 
	pxa_set_i2c_info(&i2c_pdata);

	pxa27x_set_i2c_power_info(NULL);

	pxa_set_camera_info(&mioa701_pxacamera_platform_data);



	regulator_register_always_on(0, "fixed-5.0V", fixed_5v0_consumers,

				     ARRAY_SIZE(fixed_5v0_consumers),

				     5000000);

}



static void mioa701_machine_exit(void)