diff mbox series

[1/2] mfd: stpmic1: fixup main control register and bits naming

Message ID 20230428112847.2146348-1-sean@geanix.com
State New
Headers
Series [1/2] mfd: stpmic1: fixup main control register and bits naming |

Commit Message

Sean Nyekjaer April 28, 2023, 11:28 a.m. UTC 
  Fixup main control register and bits naming so the match the naming from
the datasheet.

https://www.st.com/resource/en/datasheet/stpmic1.pdf

Signed-off-by: Sean Nyekjaer <sean@geanix.com>
---
 drivers/mfd/stpmic1.c       |  4 ++--
 include/linux/mfd/stpmic1.h | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

Comments

Lee Jones May 15, 2023, 12:43 p.m. UTC | #1 
On Fri, 28 Apr 2023, Sean Nyekjaer wrote:

> Fixup main control register and bits naming so the match the naming from
> the datasheet.
 
I'm in two minds about this.

On one hand using the names from the datasheet in the right thing to
do, however, on the other hand, the current nomenclature appears clearer.

> https://www.st.com/resource/en/datasheet/stpmic1.pdf
> 
> Signed-off-by: Sean Nyekjaer <sean@geanix.com>
> ---
>  drivers/mfd/stpmic1.c       |  4 ++--
>  include/linux/mfd/stpmic1.h | 12 ++++++------
>  2 files changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/mfd/stpmic1.c b/drivers/mfd/stpmic1.c
> index 8db1530d9bac..4c9b18d9dec8 100644
> --- a/drivers/mfd/stpmic1.c
> +++ b/drivers/mfd/stpmic1.c
> @@ -19,7 +19,7 @@
>  
>  static const struct regmap_range stpmic1_readable_ranges[] = {
>  	regmap_reg_range(TURN_ON_SR, VERSION_SR),
> -	regmap_reg_range(SWOFF_PWRCTRL_CR, LDO6_STDBY_CR),
> +	regmap_reg_range(MAIN_CR, LDO6_STDBY_CR),
>  	regmap_reg_range(BST_SW_CR, BST_SW_CR),
>  	regmap_reg_range(INT_PENDING_R1, INT_PENDING_R4),
>  	regmap_reg_range(INT_CLEAR_R1, INT_CLEAR_R4),
> @@ -30,7 +30,7 @@ static const struct regmap_range stpmic1_readable_ranges[] = {
>  };
>  
>  static const struct regmap_range stpmic1_writeable_ranges[] = {
> -	regmap_reg_range(SWOFF_PWRCTRL_CR, LDO6_STDBY_CR),
> +	regmap_reg_range(MAIN_CR, LDO6_STDBY_CR),
>  	regmap_reg_range(BST_SW_CR, BST_SW_CR),
>  	regmap_reg_range(INT_CLEAR_R1, INT_CLEAR_R4),
>  	regmap_reg_range(INT_SET_MASK_R1, INT_SET_MASK_R4),
> diff --git a/include/linux/mfd/stpmic1.h b/include/linux/mfd/stpmic1.h
> index fa3f99f7e9a1..dc00bac24f5a 100644
> --- a/include/linux/mfd/stpmic1.h
> +++ b/include/linux/mfd/stpmic1.h
> @@ -15,7 +15,7 @@
>  #define RREQ_STATE_SR		0x5
>  #define VERSION_SR		0x6
>  
> -#define SWOFF_PWRCTRL_CR	0x10
> +#define MAIN_CR			0x10
>  #define PADS_PULL_CR		0x11
>  #define BUCKS_PD_CR		0x12
>  #define LDO14_PD_CR		0x13
> @@ -148,14 +148,14 @@
>  #define LDO_BYPASS_MASK			BIT(7)
>  
>  /* Main PMIC Control Register
> - * SWOFF_PWRCTRL_CR
> + * MAIN_CR
>   * Address : 0x10
>   */
> -#define ICC_EVENT_ENABLED		BIT(4)
> +#define OCP_OFF_DBG			BIT(4)
>  #define PWRCTRL_POLARITY_HIGH		BIT(3)
> -#define PWRCTRL_PIN_VALID		BIT(2)
> -#define RESTART_REQUEST_ENABLED		BIT(1)
> -#define SOFTWARE_SWITCH_OFF_ENABLED	BIT(0)
> +#define PWRCTRL_ENABLE			BIT(2)
> +#define RESTART_REQUEST_ENABLE		BIT(1)
> +#define SOFTWARE_SWITCH_OFF		BIT(0)
>  
>  /* Main PMIC PADS Control Register
>   * PADS_PULL_CR
> -- 
> 2.40.0
>
Sean Nyekjaer May 16, 2023, 6:52 a.m. UTC | #2 
Hi Lee,

> On 15 May 2023, at 14.43, Lee Jones <lee@kernel.org> wrote:
> 
> On Fri, 28 Apr 2023, Sean Nyekjaer wrote:
> 
>> Fixup main control register and bits naming so the match the naming from
>> the datasheet.
> 
> I'm in two minds about this.
> 
> On one hand using the names from the datasheet in the right thing to
> do, however, on the other hand, the current nomenclature appears clearer.

If you like me, tries to understand what’s happening inside the PMIC. It’s really nice to have the same naming in the software as in the datasheet.

It looks like the naming was updated in the datasheet version 9.

> 
>> https://www.st.com/resource/en/datasheet/stpmic1.pdf
>> 
>> 

[ … ]

>> 
> 
> -- 
> Lee Jones [李琼斯]


/Sean
diff mbox series

Patch

diff --git a/drivers/mfd/stpmic1.c b/drivers/mfd/stpmic1.c
index 8db1530d9bac..4c9b18d9dec8 100644
--- a/drivers/mfd/stpmic1.c
+++ b/drivers/mfd/stpmic1.c
@@ -19,7 +19,7 @@ 
 
 static const struct regmap_range stpmic1_readable_ranges[] = {
 	regmap_reg_range(TURN_ON_SR, VERSION_SR),
-	regmap_reg_range(SWOFF_PWRCTRL_CR, LDO6_STDBY_CR),
+	regmap_reg_range(MAIN_CR, LDO6_STDBY_CR),
 	regmap_reg_range(BST_SW_CR, BST_SW_CR),
 	regmap_reg_range(INT_PENDING_R1, INT_PENDING_R4),
 	regmap_reg_range(INT_CLEAR_R1, INT_CLEAR_R4),
@@ -30,7 +30,7 @@  static const struct regmap_range stpmic1_readable_ranges[] = {
 };
 
 static const struct regmap_range stpmic1_writeable_ranges[] = {
-	regmap_reg_range(SWOFF_PWRCTRL_CR, LDO6_STDBY_CR),
+	regmap_reg_range(MAIN_CR, LDO6_STDBY_CR),
 	regmap_reg_range(BST_SW_CR, BST_SW_CR),
 	regmap_reg_range(INT_CLEAR_R1, INT_CLEAR_R4),
 	regmap_reg_range(INT_SET_MASK_R1, INT_SET_MASK_R4),
diff --git a/include/linux/mfd/stpmic1.h b/include/linux/mfd/stpmic1.h
index fa3f99f7e9a1..dc00bac24f5a 100644
--- a/include/linux/mfd/stpmic1.h
+++ b/include/linux/mfd/stpmic1.h
@@ -15,7 +15,7 @@ 
 #define RREQ_STATE_SR		0x5
 #define VERSION_SR		0x6
 
-#define SWOFF_PWRCTRL_CR	0x10
+#define MAIN_CR			0x10
 #define PADS_PULL_CR		0x11
 #define BUCKS_PD_CR		0x12
 #define LDO14_PD_CR		0x13
@@ -148,14 +148,14 @@ 
 #define LDO_BYPASS_MASK			BIT(7)
 
 /* Main PMIC Control Register
- * SWOFF_PWRCTRL_CR
+ * MAIN_CR
  * Address : 0x10
  */
-#define ICC_EVENT_ENABLED		BIT(4)
+#define OCP_OFF_DBG			BIT(4)
 #define PWRCTRL_POLARITY_HIGH		BIT(3)
-#define PWRCTRL_PIN_VALID		BIT(2)
-#define RESTART_REQUEST_ENABLED		BIT(1)
-#define SOFTWARE_SWITCH_OFF_ENABLED	BIT(0)
+#define PWRCTRL_ENABLE			BIT(2)
+#define RESTART_REQUEST_ENABLE		BIT(1)
+#define SOFTWARE_SWITCH_OFF		BIT(0)
 
 /* Main PMIC PADS Control Register
  * PADS_PULL_CR