Merge "regulator: fan53555: add support for Halo HL7509 buck converter" into msm-4.8 (d9d8e17f) · Commits · e / devices / android_kernel_fairphone_FP3

Documentation/devicetree/bindings/regulator/fan53555.txt

+10 −1

Original line number	Diff line number	Diff line
		Binding for Fairchild FAN53555 regulators

		Required properties:
		- compatible: one of "fcs,fan53555", "silergy,syr827", "silergy,syr828"
		- compatible: one of "fcs,fan53555", "silergy,syr827", "silergy,syr828" or
		"halo,hl7509"
		- reg: I2C address

		Optional properties:
		@@ -21,3 +22,11 @@ Example:
		vin-supply = <&parent_reg>;
		fcs,suspend-voltage-selector = <1>;
		};

		regulator@60 {
		compatible = "halo,hl7509";
		regulator-name = "hl7509";
		regulator-min-microvolt = <600000>;
		regulator-max-microvolt = <1230000>;
		fcs,suspend-voltage-selector = <1>;
		};

+1 −0

Original line number	Diff line number	Diff line
		@@ -116,6 +116,7 @@ google Google, Inc.
		grinn Grinn
		gumstix Gumstix, Inc.
		gw Gateworks Corporation
		halo Halo Microelectronics Co., Ltd.
		hannstar HannStar Display Corporation
		haoyu Haoyu Microelectronic Co. Ltd.
		hardkernel Hardkernel Co., Ltd

+10 −0

Original line number	Diff line number	Diff line
		@@ -55,6 +55,7 @@
		enum fan53555_vendor {
		FAN53555_VENDOR_FAIRCHILD = 0,
		FAN53555_VENDOR_SILERGY,
		HALO_HL7509,
		};

		/* IC Type */
		@@ -309,6 +310,9 @@ static int fan53555_device_setup(struct fan53555_device_info *di,
		case FAN53555_VENDOR_SILERGY:
		ret = fan53555_voltages_setup_silergy(di);
		break;
		case HALO_HL7509:
		ret = fan53555_voltages_setup_fairchild(di);
		break;
		default:
		dev_err(di->dev, "vendor %d not supported!\n", di->vendor);
		return -EINVAL;
		@@ -377,6 +381,9 @@ static const struct of_device_id fan53555_dt_ids[] = {
		}, {
		.compatible = "silergy,syr828",
		.data = (void *)FAN53555_VENDOR_SILERGY,
		}, {
		.compatible = "halo,hl7509",
		.data = (void *)HALO_HL7509,
		},
		{ }
		};
		@@ -480,6 +487,9 @@ static const struct i2c_device_id fan53555_id[] = {
		}, {
		.name = "syr82x",
		.driver_data = FAN53555_VENDOR_SILERGY
		}, {
		.name = "hl7509",
		.driver_data = HALO_HL7509
		},
		{ },
		};