diff options
| author | Emanuele Ghidoli <emanuele.ghidoli@toradex.com> | 2023-08-29 18:41:37 +0200 |
|---|---|---|
| committer | Emanuele Ghidoli <emanuele.ghidoli@toradex.com> | 2023-08-29 18:41:37 +0200 |
| commit | 1e1f348380cca14d1da1e8107d2074df54ed30e4 (patch) | |
| tree | cf29c1a51fbf00b61f34373da8bdf2caede4dbb0 /drivers/regulator | |
| parent | 68e51760bef9933fed5779ae49d98dbf9b321e54 (diff) | |
| parent | f48aeeaaa64c628519273f6007a745cf55b68d95 (diff) | |
Merge tag 'v5.15.109' into 5.15-2.2.x-imx
This is the 5.15.109 stable release
Conflicts:
arch/arm64/boot/dts/freescale/imx8mm-evk.dtsi
Signed-off-by: Emanuele Ghidoli <emanuele.ghidoli@toradex.com>
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/fan53555.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/regulator/fan53555.c b/drivers/regulator/fan53555.c index dac1fb584fa3..ecd5a50c6166 100644 --- a/drivers/regulator/fan53555.c +++ b/drivers/regulator/fan53555.c @@ -8,18 +8,19 @@ // Copyright (c) 2012 Marvell Technology Ltd. // Yunfan Zhang <yfzhang@marvell.com> +#include <linux/bits.h> +#include <linux/err.h> +#include <linux/i2c.h> #include <linux/module.h> +#include <linux/of_device.h> #include <linux/param.h> -#include <linux/err.h> #include <linux/platform_device.h> +#include <linux/regmap.h> #include <linux/regulator/driver.h> +#include <linux/regulator/fan53555.h> #include <linux/regulator/machine.h> #include <linux/regulator/of_regulator.h> -#include <linux/of_device.h> -#include <linux/i2c.h> #include <linux/slab.h> -#include <linux/regmap.h> -#include <linux/regulator/fan53555.h> /* Voltage setting */ #define FAN53555_VSEL0 0x00 @@ -60,7 +61,7 @@ #define TCS_VSEL1_MODE (1 << 6) #define TCS_SLEW_SHIFT 3 -#define TCS_SLEW_MASK (0x3 < 3) +#define TCS_SLEW_MASK GENMASK(4, 3) enum fan53555_vendor { FAN53526_VENDOR_FAIRCHILD = 0, |