Commit 511f1cb6 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'regulator-3.4' of... 

Merge tag 'regulator-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator

 into next/drivers

The pxa regulator branch removes the bq24022 driver, while a lot of
other regulator drivers got added in the regulator tree. This
resolves the trivial conflicts by merging in the regulator patches
that are already merged into v3.4.

Conflicts:
	drivers/regulator/Kconfig
	drivers/regulator/Makefile

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents f907ab06 4992fa1f

Documentation/devicetree/bindings/regulator/twl-regulator.txt

0 → 100644
+68 −0
Original line number Diff line number Diff line 
TWL family of regulators



Required properties:

For twl6030 regulators/LDOs

- compatible:

  - "ti,twl6030-vaux1" for VAUX1 LDO

  - "ti,twl6030-vaux2" for VAUX2 LDO

  - "ti,twl6030-vaux3" for VAUX3 LDO

  - "ti,twl6030-vmmc" for VMMC LDO

  - "ti,twl6030-vpp" for VPP LDO

  - "ti,twl6030-vusim" for VUSIM LDO

  - "ti,twl6030-vana" for VANA LDO

  - "ti,twl6030-vcxio" for VCXIO LDO

  - "ti,twl6030-vdac" for VDAC LDO

  - "ti,twl6030-vusb" for VUSB LDO

  - "ti,twl6030-v1v8" for V1V8 LDO

  - "ti,twl6030-v2v1" for V2V1 LDO

  - "ti,twl6030-clk32kg" for CLK32KG RESOURCE

  - "ti,twl6030-vdd1" for VDD1 SMPS

  - "ti,twl6030-vdd2" for VDD2 SMPS

  - "ti,twl6030-vdd3" for VDD3 SMPS

For twl6025 regulators/LDOs

- compatible:

  - "ti,twl6025-ldo1" for LDO1 LDO

  - "ti,twl6025-ldo2" for LDO2 LDO

  - "ti,twl6025-ldo3" for LDO3 LDO

  - "ti,twl6025-ldo4" for LDO4 LDO

  - "ti,twl6025-ldo5" for LDO5 LDO

  - "ti,twl6025-ldo6" for LDO6 LDO

  - "ti,twl6025-ldo7" for LDO7 LDO

  - "ti,twl6025-ldoln" for LDOLN LDO

  - "ti,twl6025-ldousb" for LDOUSB LDO

  - "ti,twl6025-smps3" for SMPS3 SMPS

  - "ti,twl6025-smps4" for SMPS4 SMPS

  - "ti,twl6025-vio" for VIO SMPS

For twl4030 regulators/LDOs

- compatible:

  - "ti,twl4030-vaux1" for VAUX1 LDO

  - "ti,twl4030-vaux2" for VAUX2 LDO

  - "ti,twl5030-vaux2" for VAUX2 LDO

  - "ti,twl4030-vaux3" for VAUX3 LDO

  - "ti,twl4030-vaux4" for VAUX4 LDO

  - "ti,twl4030-vmmc1" for VMMC1 LDO

  - "ti,twl4030-vmmc2" for VMMC2 LDO

  - "ti,twl4030-vpll1" for VPLL1 LDO

  - "ti,twl4030-vpll2" for VPLL2 LDO

  - "ti,twl4030-vsim" for VSIM LDO

  - "ti,twl4030-vdac" for VDAC LDO

  - "ti,twl4030-vintana2" for VINTANA2 LDO

  - "ti,twl4030-vio" for VIO LDO

  - "ti,twl4030-vdd1" for VDD1 SMPS

  - "ti,twl4030-vdd2" for VDD2 SMPS

  - "ti,twl4030-vintana1" for VINTANA1 LDO

  - "ti,twl4030-vintdig" for VINTDIG LDO

  - "ti,twl4030-vusb1v5" for VUSB1V5 LDO

  - "ti,twl4030-vusb1v8" for VUSB1V8 LDO

  - "ti,twl4030-vusb3v1" for VUSB3V1 LDO



Optional properties:

- Any optional property defined in bindings/regulator/regulator.txt



Example:



	xyz: regulator@0 {

		compatible = "ti,twl6030-vaux1";

		regulator-min-microvolt  = <1000000>;

		regulator-max-microvolt  = <3000000>;

	};

Documentation/driver-model/devres.txt

+5 −0
Original line number Diff line number Diff line
@@ -271,3 +271,8 @@ IOMAP 
  pcim_iounmap()

  pcim_iomap_table()	: array of mapped addresses indexed by BAR

  pcim_iomap_regions()	: do request_region() and iomap() on multiple BARs



REGULATOR

  devm_regulator_get()

  devm_regulator_put()

  devm_regulator_bulk_get()

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

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

#include <linux/gfp.h>

#include <linux/memblock.h>

#include <linux/regulator/machine.h>

#include <linux/regulator/fixed.h>



#include <media/soc_camera.h>
@@ -570,6 +572,11 @@ static int __init pcm037_otg_mode(char *options) 
}

__setup("otg_mode=", pcm037_otg_mode);



static struct regulator_consumer_supply dummy_supplies[] = {

	REGULATOR_SUPPLY("vdd33a", "smsc911x"),

	REGULATOR_SUPPLY("vddvario", "smsc911x"),

};



/*

 * Board specific initialization.

 */
@@ -579,6 +586,8 @@ static void __init pcm037_init(void) 


	imx31_soc_init();



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



	mxc_iomux_set_gpr(MUX_PGP_UH2, 1);



	mxc_iomux_setup_multiple_pins(pcm037_pins, ARRAY_SIZE(pcm037_pins),

arch/arm/mach-u300/i2c.c

+0 −2
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ static struct regulator_consumer_supply supply_ldo_c[] = { 
 */

static struct regulator_consumer_supply supply_ldo_d[] = {

	{

		.dev = NULL,

		.supply = "vana15", /* Powers the SoC (CPU etc) */

	},

};
@@ -92,7 +91,6 @@ static struct regulator_consumer_supply supply_ldo_k[] = { 
 */

static struct regulator_consumer_supply supply_ldo_ext[] = {

	{

		.dev = NULL,

		.supply = "vext", /* External power */

	},

};

arch/arm/plat-mxc/3ds_debugboard.c

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

#include <linux/gpio.h>

#include <linux/smsc911x.h>

#include <linux/regulator/machine.h>

#include <linux/regulator/fixed.h>



#include <mach/hardware.h>
@@ -148,6 +150,11 @@ static struct irq_chip expio_irq_chip = { 
	.irq_unmask = expio_unmask_irq,

};



static struct regulator_consumer_supply dummy_supplies[] = {

	REGULATOR_SUPPLY("vdd33a", "smsc911x"),

	REGULATOR_SUPPLY("vddvario", "smsc911x"),

};



int __init mxc_expio_init(u32 base, u32 p_irq)

{

	int i;
@@ -188,6 +195,8 @@ int __init mxc_expio_init(u32 base, u32 p_irq) 
	irq_set_chained_handler(p_irq, mxc_expio_irq_handler);



	/* Register Lan device on the debugboard */

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



	smsc911x_resources[0].start = LAN9217_BASE_ADDR(base);

	smsc911x_resources[0].end = LAN9217_BASE_ADDR(base) + 0x100 - 1;

	platform_device_register(&smsc_lan9217_device);

CRA Git | Maintained and supported by SUSTech CRA and CCSE