"GOIO" should be "GPIO" here.
Signed-off-by: Luca Ceresoli <[email protected]>
---
drivers/gpio/gpio-lp87565.c | 6 +++---
include/linux/mfd/lp87565.h | 28 ++++++++++++++--------------
2 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/drivers/gpio/gpio-lp87565.c b/drivers/gpio/gpio-lp87565.c
index e1244520cf7d..fcde6708b5df 100644
--- a/drivers/gpio/gpio-lp87565.c
+++ b/drivers/gpio/gpio-lp87565.c
@@ -123,14 +123,14 @@ static int lp87565_gpio_set_config(struct gpio_chip *gc, unsigned int offset,
return regmap_update_bits(gpio->map,
LP87565_REG_GPIO_CONFIG,
BIT(offset +
- __ffs(LP87565_GOIO1_OD)),
+ __ffs(LP87565_GPIO1_OD)),
BIT(offset +
- __ffs(LP87565_GOIO1_OD)));
+ __ffs(LP87565_GPIO1_OD)));
case PIN_CONFIG_DRIVE_PUSH_PULL:
return regmap_update_bits(gpio->map,
LP87565_REG_GPIO_CONFIG,
BIT(offset +
- __ffs(LP87565_GOIO1_OD)), 0);
+ __ffs(LP87565_GPIO1_OD)), 0);
default:
return -ENOTSUPP;
}
diff --git a/include/linux/mfd/lp87565.h b/include/linux/mfd/lp87565.h
index d44ddfb6bb63..2620554f357a 100644
--- a/include/linux/mfd/lp87565.h
+++ b/include/linux/mfd/lp87565.h
@@ -222,20 +222,20 @@ enum lp87565_device_type {
#define LP87565_GPIO2_SEL BIT(1)
#define LP87565_GPIO1_SEL BIT(0)
-#define LP87565_GOIO3_OD BIT(6)
-#define LP87565_GOIO2_OD BIT(5)
-#define LP87565_GOIO1_OD BIT(4)
-#define LP87565_GOIO3_DIR BIT(2)
-#define LP87565_GOIO2_DIR BIT(1)
-#define LP87565_GOIO1_DIR BIT(0)
-
-#define LP87565_GOIO3_IN BIT(2)
-#define LP87565_GOIO2_IN BIT(1)
-#define LP87565_GOIO1_IN BIT(0)
-
-#define LP87565_GOIO3_OUT BIT(2)
-#define LP87565_GOIO2_OUT BIT(1)
-#define LP87565_GOIO1_OUT BIT(0)
+#define LP87565_GPIO3_OD BIT(6)
+#define LP87565_GPIO2_OD BIT(5)
+#define LP87565_GPIO1_OD BIT(4)
+#define LP87565_GPIO3_DIR BIT(2)
+#define LP87565_GPIO2_DIR BIT(1)
+#define LP87565_GPIO1_DIR BIT(0)
+
+#define LP87565_GPIO3_IN BIT(2)
+#define LP87565_GPIO2_IN BIT(1)
+#define LP87565_GPIO1_IN BIT(0)
+
+#define LP87565_GPIO3_OUT BIT(2)
+#define LP87565_GPIO2_OUT BIT(1)
+#define LP87565_GPIO1_OUT BIT(0)
/* Number of step-down converters available */
#define LP87565_NUM_BUCK 6
--
2.30.0
This enum is used only internally to the regulator driver for buck indexes.
Signed-off-by: Luca Ceresoli <[email protected]>
---
drivers/regulator/lp87565-regulator.c | 11 +++++++++++
include/linux/mfd/lp87565.h | 11 -----------
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/regulator/lp87565-regulator.c b/drivers/regulator/lp87565-regulator.c
index eeab9d3c824b..d059ae85047a 100644
--- a/drivers/regulator/lp87565-regulator.c
+++ b/drivers/regulator/lp87565-regulator.c
@@ -11,6 +11,17 @@
#include <linux/mfd/lp87565.h>
+enum LP87565_regulator_id {
+ /* BUCK's */
+ LP87565_BUCK_0,
+ LP87565_BUCK_1,
+ LP87565_BUCK_2,
+ LP87565_BUCK_3,
+ LP87565_BUCK_10,
+ LP87565_BUCK_23,
+ LP87565_BUCK_3210,
+};
+
#define LP87565_REGULATOR(_name, _id, _of, _ops, _n, _vr, _vm, \
_er, _em, _ev, _delay, _lr, _cr) \
[_id] = { \
diff --git a/include/linux/mfd/lp87565.h b/include/linux/mfd/lp87565.h
index a8799ae50dcf..94cb581af34b 100644
--- a/include/linux/mfd/lp87565.h
+++ b/include/linux/mfd/lp87565.h
@@ -237,17 +237,6 @@ enum lp87565_device_type {
#define LP87565_GPIO2_OUT BIT(1)
#define LP87565_GPIO1_OUT BIT(0)
-enum LP87565_regulator_id {
- /* BUCK's */
- LP87565_BUCK_0,
- LP87565_BUCK_1,
- LP87565_BUCK_2,
- LP87565_BUCK_3,
- LP87565_BUCK_10,
- LP87565_BUCK_23,
- LP87565_BUCK_3210,
-};
-
/**
* struct LP87565 - state holder for the LP87565 driver
* @dev: struct device pointer for MFD device
--
2.30.0
On Fri, 19 Feb 2021, Luca Ceresoli wrote:
> "GOIO" should be "GPIO" here.
>
> Signed-off-by: Luca Ceresoli <[email protected]>
> ---
> drivers/gpio/gpio-lp87565.c | 6 +++---
> include/linux/mfd/lp87565.h | 28 ++++++++++++++--------------
> 2 files changed, 17 insertions(+), 17 deletions(-)
For my own reference (apply this as-is to your sign-off block):
Acked-for-MFD-by: Lee Jones <[email protected]>
--
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog
On Fri, 19 Feb 2021, Luca Ceresoli wrote:
> This enum is used only internally to the regulator driver for buck indexes.
>
> Signed-off-by: Luca Ceresoli <[email protected]>
> ---
> drivers/regulator/lp87565-regulator.c | 11 +++++++++++
> include/linux/mfd/lp87565.h | 11 -----------
> 2 files changed, 11 insertions(+), 11 deletions(-)
For my own reference (apply this as-is to your sign-off block):
Acked-for-MFD-by: Lee Jones <[email protected]>
--
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog
On Fri, Feb 19, 2021 at 11:39 PM Luca Ceresoli <[email protected]> wrote:
>
> "GOIO" should be "GPIO" here.
>
> Signed-off-by: Luca Ceresoli <[email protected]>
> ---
For GPIO part:
Acked-by: Bartosz Golaszewski <[email protected]>
Hi,
On 08/03/21 15:04, Lee Jones wrote:
> On Fri, 19 Feb 2021, Luca Ceresoli wrote:
>
>> "GOIO" should be "GPIO" here.
>>
>> Signed-off-by: Luca Ceresoli <[email protected]>
>> ---
>> drivers/gpio/gpio-lp87565.c | 6 +++---
>> include/linux/mfd/lp87565.h | 28 ++++++++++++++--------------
>> 2 files changed, 17 insertions(+), 17 deletions(-)
>
> For my own reference (apply this as-is to your sign-off block):
>
> Acked-for-MFD-by: Lee Jones <[email protected]>
Gentle ping on patches 1 and 3. Both have at least an ack and are fairly
trivial. Both apply cleanly on current master.
Thanks.
--
Luca
On Wed, 12 May 2021, Luca Ceresoli wrote:
> Hi,
>
> On 08/03/21 15:04, Lee Jones wrote:
> > On Fri, 19 Feb 2021, Luca Ceresoli wrote:
> >
> >> "GOIO" should be "GPIO" here.
> >>
> >> Signed-off-by: Luca Ceresoli <[email protected]>
> >> ---
> >> drivers/gpio/gpio-lp87565.c | 6 +++---
> >> include/linux/mfd/lp87565.h | 28 ++++++++++++++--------------
> >> 2 files changed, 17 insertions(+), 17 deletions(-)
> >
> > For my own reference (apply this as-is to your sign-off block):
> >
> > Acked-for-MFD-by: Lee Jones <[email protected]>
>
> Gentle ping on patches 1 and 3. Both have at least an ack and are fairly
> trivial. Both apply cleanly on current master.
I'll take care of these this time, but in future, if you don't receive
further responses for ~2 weeks, you should collect all of the Acks and
submit a [RESEND].
--
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog
On Mon, 08 Mar 2021, Bartosz Golaszewski wrote:
> On Fri, Feb 19, 2021 at 11:39 PM Luca Ceresoli <[email protected]> wrote:
> >
> > "GOIO" should be "GPIO" here.
> >
> > Signed-off-by: Luca Ceresoli <[email protected]>
> > ---
>
> For GPIO part:
>
> Acked-by: Bartosz Golaszewski <[email protected]>
Do you require a pull-request from an immutable branch?
Or can I just take these as-is?
--
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog
Hi Lee,
On 12/05/21 11:59, Lee Jones wrote:
> On Wed, 12 May 2021, Luca Ceresoli wrote:
>
>> Hi,
>>
>> On 08/03/21 15:04, Lee Jones wrote:
>>> On Fri, 19 Feb 2021, Luca Ceresoli wrote:
>>>
>>>> "GOIO" should be "GPIO" here.
>>>>
>>>> Signed-off-by: Luca Ceresoli <[email protected]>
>>>> ---
>>>> drivers/gpio/gpio-lp87565.c | 6 +++---
>>>> include/linux/mfd/lp87565.h | 28 ++++++++++++++--------------
>>>> 2 files changed, 17 insertions(+), 17 deletions(-)
>>>
>>> For my own reference (apply this as-is to your sign-off block):
>>>
>>> Acked-for-MFD-by: Lee Jones <[email protected]>
>>
>> Gentle ping on patches 1 and 3. Both have at least an ack and are fairly
>> trivial. Both apply cleanly on current master.
>
> I'll take care of these this time, but in future, if you don't receive
> further responses for ~2 weeks, you should collect all of the Acks and
> submit a [RESEND].
Apologies, I'll try to remember next time. Thanks for taking care of them.
--
Luca
Enjoy!
The following changes since commit 6efb943b8616ec53a5e444193dccf1af9ad627b5:
Linux 5.13-rc1 (2021-05-09 14:17:44 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git tb-mfd-gpio-regulator-v5.14
for you to fetch changes up to 5258f7eed42f4565d065726fd82d3430dd618a68:
mfd: lp87565: Move LP87565_regulator_id to .c file (2021-05-19 13:34:00 +0100)
----------------------------------------------------------------
Immutable branch between MFD, GPIO and Regulator due for the v5.14 merge window
----------------------------------------------------------------
Luca Ceresoli (2):
mfd: lp87565: Fix typo in define names
mfd: lp87565: Move LP87565_regulator_id to .c file
drivers/gpio/gpio-lp87565.c | 6 +++---
drivers/regulator/lp87565-regulator.c | 11 ++++++++++
include/linux/mfd/lp87565.h | 39 +++++++++++++----------------------
3 files changed, 28 insertions(+), 28 deletions(-)
--
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog