Skip to content

Commit

Permalink
regulator: isl9305: deprecate use of isl in compatible string for isil
Browse files Browse the repository at this point in the history
"isil" and "isl" prefixes are used at various locations inside the kernel
to reference Intersil corporation. This patch is part of a series fixing
those locations were "isl" is used in compatible strings to use the now
expected "isil" prefix instead (NASDAQ symbol for Intersil and most used
version). The old compatible string is kept for backward compatibility.

Signed-off-by: Arnaud Ebalard <arno@natisbad.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Arnaud Ebalard authored and Mark Brown committed Dec 22, 2014
1 parent 97bf6af commit 6fd7535
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Documentation/devicetree/bindings/regulator/isl9305.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -19,7 +19,7 @@ Optional properties:
Example

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

VINDCD1-supply = <&system_power>;
Expand Down
6 changes: 4 additions & 2 deletions drivers/regulator/isl9305.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 6fd7535

Please sign in to comment.