Merge remote-tracking branches 'regulator/topic/isl9305',... (f3ba7299) · Commits · 戴 / test

Documentation/devicetree/bindings/mfd/max77686.txt

+14 −0

Original line number	Diff line number	Diff line
		@@ -39,6 +39,12 @@ to get matched with their hardware counterparts as follow:
		-BUCKn : 1-4.
		Use standard regulator bindings for it ('regulator-off-in-suspend').

		LDO20, LDO21, LDO22, BUCK8 and BUCK9 can be configured to GPIO enable
		control. To turn this feature on this property must be added to the regulator
		sub-node:
		- maxim,ena-gpios : one GPIO specifier enable control (the gpio
		flags are actually ignored and always
		ACTIVE_HIGH is used)

		Example:

		@@ -65,4 +71,12 @@ Example:
		regulator-always-on;
		regulator-boot-on;
		};

		buck9_reg {
		regulator-compatible = "BUCK9";
		regulator-name = "CAM_ISP_CORE_1.2V";
		regulator-min-microvolt = <1000000>;
		regulator-max-microvolt = <1200000>;
		maxim,ena-gpios = <&gpm0 3 GPIO_ACTIVE_HIGH>;
		};
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@ Intersil ISL9305/ISL9305H voltage regulator

		Required properties:

		- compatible: "isl,isl9305" or "isl,isl9305h"
		- compatible: "isil,isl9305" or "isil,isl9305h"
		- reg: I2C slave address, usually 0x68.
		- regulators: A node that houses a sub-node for each regulator within the
		device. Each sub-node is identified using the node's name, with valid
		@@ -19,7 +19,7 @@ Optional properties:
		Example

		pmic: isl9305@68 {
		compatible = "isl,isl9305";
		compatible = "isil,isl9305";
		reg = <0x68>;

		VINDCD1-supply = <&system_power>;

+8 −0

Original line number	Diff line number	Diff line
		@@ -414,6 +414,14 @@ config REGULATOR_MAX77802
		Exynos5420/Exynos5800 SoCs to control various voltages.
		It includes support for control of voltage and ramp speed.

		config REGULATOR_MAX77843
		tristate "Maxim 77843 regulator"
		depends on MFD_MAX77843
		help
		This driver controls a Maxim 77843 regulator.
		The regulator include two 'SAFEOUT' for USB(Universal Serial Bus)
		This is suitable for Exynos5433 SoC chips.

		config REGULATOR_MC13XXX_CORE
		tristate

+1 −0

Original line number	Diff line number	Diff line
		@@ -55,6 +55,7 @@ obj-$(CONFIG_REGULATOR_MAX8998) += max8998.o
		obj-$(CONFIG_REGULATOR_MAX77686) += max77686.o
		obj-$(CONFIG_REGULATOR_MAX77693) += max77693.o
		obj-$(CONFIG_REGULATOR_MAX77802) += max77802.o
		obj-$(CONFIG_REGULATOR_MAX77843) += max77843.o
		obj-$(CONFIG_REGULATOR_MC13783) += mc13783-regulator.o
		obj-$(CONFIG_REGULATOR_MC13892) += mc13892-regulator.o
		obj-$(CONFIG_REGULATOR_MC13XXX_CORE) += mc13xxx-regulator-core.o

+4 −2

Original line number	Diff line number	Diff line
		@@ -177,8 +177,10 @@ static int isl9305_i2c_probe(struct i2c_client *i2c,

		#ifdef CONFIG_OF
		static const struct of_device_id isl9305_dt_ids[] = {
		{ .compatible = "isl,isl9305" },
		{ .compatible = "isl,isl9305h" },
		{ .compatible = "isl,isl9305" }, /* for backward compat., don't use */
		{ .compatible = "isil,isl9305" },
		{ .compatible = "isl,isl9305h" }, /* for backward compat., don't use */
		{ .compatible = "isil,isl9305h" },
		{},
		};
		#endif