Merge remote-tracking branches 'regulator/topic/sky81452' and... (176488fb) · Commits · 戴 / test

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

+6 −4

Original line number	Diff line number	Diff line
		SKY81452 voltage regulator

		Required properties:
		- regulator node named lout.
		- any required generic properties defined in regulator.txt

		Optional properties:
		@@ -9,8 +10,9 @@ Optional properties:
		Example:

		regulator {
		/* generic regulator properties */
		regulator-name = "touch_en";
		lout {
		regulator-name = "sky81452-lout";
		regulator-min-microvolt = <4500000>;
		regulator-max-microvolt = <8000000>;
		};
		};

drivers/regulator/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -555,7 +555,7 @@ config REGULATOR_S5M8767

		config REGULATOR_SKY81452
		tristate "Skyworks Solutions SKY81452 voltage regulator"
		depends on SKY81452
		depends on MFD_SKY81452
		help
		This driver supports Skyworks SKY81452 voltage output regulator
		via I2C bus. SKY81452 has one voltage linear regulator can be

drivers/regulator/sky81452-regulator.c

+9 −37

Original line number	Diff line number	Diff line
		@@ -5,9 +5,8 @@
		* Author : Gyungoh Yoo <jack.yoo@skyworksinc.com>
		*
		* This program is free software; you can redistribute it and/or modify it
		* under the terms of the GNU General Public License as published by the
		* Free Software Foundation; either version 2, or (at your option) any
		* later version.
		* under the terms of the GNU General Public License version 2
		* as published by the Free Software Foundation.
		*
		* This program is distributed in the hope that it will be useful, but
		* WITHOUT ANY WARRANTY; without even the implied warranty of
		@@ -52,6 +51,8 @@ static const struct regulator_linear_range sky81452_reg_ranges[] = {

		static const struct regulator_desc sky81452_reg = {
		.name = "LOUT",
		.of_match = of_match_ptr("lout"),
		.regulators_node = of_match_ptr("regulator"),
		.ops = &sky81452_reg_ops,
		.type = REGULATOR_VOLTAGE,
		.owner = THIS_MODULE,
		@@ -64,30 +65,6 @@ static const struct regulator_desc sky81452_reg = {
		.enable_mask = SKY81452_LEN,
		};

		#ifdef CONFIG_OF
		static struct regulator_init_data sky81452_reg_parse_dt(struct device dev)
		{
		struct regulator_init_data *init_data;
		struct device_node *np;

		np = of_get_child_by_name(dev->parent->of_node, "regulator");
		if (unlikely(!np)) {
		dev_err(dev, "regulator node not found");
		return NULL;
		}

		init_data = of_get_regulator_init_data(dev, np, &sky81452_reg);

		of_node_put(np);
		return init_data;
		}
		#else
		static struct regulator_init_data sky81452_reg_parse_dt(struct device dev)
		{
		return ERR_PTR(-EINVAL);
		}
		#endif

		static int sky81452_reg_probe(struct platform_device *pdev)
		{
		struct device *dev = &pdev->dev;
		@@ -95,20 +72,16 @@ static int sky81452_reg_probe(struct platform_device *pdev)
		struct regulator_config config = { };
		struct regulator_dev *rdev;

		if (!init_data) {
		init_data = sky81452_reg_parse_dt(dev);
		if (IS_ERR(init_data))
		return PTR_ERR(init_data);
		}

		config.dev = dev;
		config.dev = dev->parent;
		config.init_data = init_data;
		config.of_node = dev->of_node;
		config.regmap = dev_get_drvdata(dev->parent);

		rdev = devm_regulator_register(dev, &sky81452_reg, &config);
		if (IS_ERR(rdev))
		if (IS_ERR(rdev)) {
		dev_err(dev, "failed to register. err=%ld\n", PTR_ERR(rdev));
		return PTR_ERR(rdev);
		}

		platform_set_drvdata(pdev, rdev);

		@@ -126,5 +99,4 @@ module_platform_driver(sky81452_reg_driver);

		MODULE_DESCRIPTION("Skyworks SKY81452 Regulator driver");
		MODULE_AUTHOR("Gyungoh Yoo <jack.yoo@skyworksinc.com>");
		MODULE_LICENSE("GPL");
		MODULE_VERSION("1.0");
		MODULE_LICENSE("GPL v2");

include/linux/regulator/consumer.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -288,7 +288,7 @@ devm_regulator_get(struct device dev, const char id)
		static inline struct regulator *__must_check
		regulator_get_exclusive(struct device dev, const char id)
		{
		return NULL;
		return ERR_PTR(-ENODEV);
		}

		static inline struct regulator *__must_check

Admin message