Skip to contentSkip to conversation

mfd: mt6360: Fix MFD cell names and compatibles

PATCH In review [email protected] 3 participants 3 messages Jan 11, 2021

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mfd: mt6360: Fix MFD cell names and compatibles

From: Matthias Brugger <[email protected]>

MFD cell names and compatibles use '_' instead of '-', which is common practice for names and the standard for DT compatibles. This will also fix the probing for the drivers already implemented (mt6360-adc and mt6360-tcpc).

Fixes 7edd363421da ("mfd: Add support for PMIC MT6360")
Fixes 1f4877218f7e ("iio: adc: mt6360: Add ADC driver for MT6360")
Fixes e1aefcdd394f ("usb typec: mt6360: Add support for mt6360 Type-C driver")

---

 drivers/mfd/mt6360-core.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)
drivers/mfd/mt6360-core.c +12 -12
index 4661c1b29a72..14e649ffe50f 100644
@@ -292,18 +292,18 @@ static const struct resource mt6360_ldo_resources[] = {
 };
 
 static const struct mfd_cell mt6360_devs[] = {
-	OF_MFD_CELL("mt6360_adc", mt6360_adc_resources,
-		    NULL, 0, 0, "mediatek,mt6360_adc"),
-	OF_MFD_CELL("mt6360_chg", mt6360_chg_resources,
-		    NULL, 0, 0, "mediatek,mt6360_chg"),
-	OF_MFD_CELL("mt6360_led", mt6360_led_resources,
-		    NULL, 0, 0, "mediatek,mt6360_led"),
-	OF_MFD_CELL("mt6360_pmic", mt6360_pmic_resources,
-		    NULL, 0, 0, "mediatek,mt6360_pmic"),
-	OF_MFD_CELL("mt6360_ldo", mt6360_ldo_resources,
-		    NULL, 0, 0, "mediatek,mt6360_ldo"),
-	OF_MFD_CELL("mt6360_tcpc", NULL,
-		    NULL, 0, 0, "mediatek,mt6360_tcpc"),
+	OF_MFD_CELL("mt6360-adc", mt6360_adc_resources,
+		    NULL, 0, 0, "mediatek,mt6360-adc"),
+	OF_MFD_CELL("mt6360-chg", mt6360_chg_resources,
+		    NULL, 0, 0, "mediatek,mt6360-chg"),
+	OF_MFD_CELL("mt6360-led", mt6360_led_resources,
+		    NULL, 0, 0, "mediatek,mt6360-led"),
+	OF_MFD_CELL("mt6360-pmic", mt6360_pmic_resources,
+		    NULL, 0, 0, "mediatek,mt6360-pmic"),
+	OF_MFD_CELL("mt6360-ldo", mt6360_ldo_resources,
+		    NULL, 0, 0, "mediatek,mt6360-ldo"),
+	OF_MFD_CELL("mt6360-tcpc", NULL,
+		    NULL, 0, 0, "mediatek,mt6360-tcpc"),
 };
 
 static const unsigned short mt6360_slave_addr[MT6360_SLAVE_MAX] = {
Signature · 7 lines
2.29.2


_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
#1 lore raw

Hi Lee,

This change exists in [PATCH v7 03/11] mfd: mt6360: Indicate sub-dev compatible name by using "-".
Does patch v7 also merge together to mfd-next?

<[email protected]> 於 2021年1月11日 週一 下午8:35寫道:

Quoted 54 lines

From: Matthias Brugger <[email protected]>

MFD cell names and compatibles use '_' instead of '-', which is common practice for names and the standard for DT compatibles. This will also fix the probing for the drivers already implemented (mt6360-adc and mt6360-tcpc).

Fixes 7edd363421da ("mfd: Add support for PMIC MT6360")
Fixes 1f4877218f7e ("iio: adc: mt6360: Add ADC driver for MT6360")
Fixes e1aefcdd394f ("usb typec: mt6360: Add support for mt6360 Type-C driver")

---

 drivers/mfd/mt6360-core.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)
drivers/mfd/mt6360-core.c +12 -13
index 4661c1b29a72..14e649ffe50f 100644
@@ -292,18 +292,18 @@ static const struct resource mt6360_ldo_resources[] = {
 };
 
 static const struct mfd_cell mt6360_devs[] = {
-       OF_MFD_CELL("mt6360_adc", mt6360_adc_resources,
-                   NULL, 0, 0, "mediatek,mt6360_adc"),
-       OF_MFD_CELL("mt6360_chg", mt6360_chg_resources,
-                   NULL, 0, 0, "mediatek,mt6360_chg"),
-       OF_MFD_CELL("mt6360_led", mt6360_led_resources,
-                   NULL, 0, 0, "mediatek,mt6360_led"),
-       OF_MFD_CELL("mt6360_pmic", mt6360_pmic_resources,
-                   NULL, 0, 0, "mediatek,mt6360_pmic"),
-       OF_MFD_CELL("mt6360_ldo", mt6360_ldo_resources,
-                   NULL, 0, 0, "mediatek,mt6360_ldo"),
-       OF_MFD_CELL("mt6360_tcpc", NULL,
-                   NULL, 0, 0, "mediatek,mt6360_tcpc"),
+       OF_MFD_CELL("mt6360-adc", mt6360_adc_resources,
+                   NULL, 0, 0, "mediatek,mt6360-adc"),
+       OF_MFD_CELL("mt6360-chg", mt6360_chg_resources,
+                   NULL, 0, 0, "mediatek,mt6360-chg"),
+       OF_MFD_CELL("mt6360-led", mt6360_led_resources,
+                   NULL, 0, 0, "mediatek,mt6360-led"),
+       OF_MFD_CELL("mt6360-pmic", mt6360_pmic_resources,
+                   NULL, 0, 0, "mediatek,mt6360-pmic"),
+       OF_MFD_CELL("mt6360-ldo", mt6360_ldo_resources,
+                   NULL, 0, 0, "mediatek,mt6360-ldo"),
+       OF_MFD_CELL("mt6360-tcpc", NULL,
+                   NULL, 0, 0, "mediatek,mt6360-tcpc"),
 };
 
 static const unsigned short mt6360_slave_addr[MT6360_SLAVE_MAX] = {
--
Quoted 2 lines

2.29.2

_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek

#2 lore raw
Quoted 6 lines · Gene Chen

Hi Lee,

This change exists in [PATCH v7 03/11] mfd: mt6360: Indicate sub-dev compatible name by using "-".
Does patch v7 also merge together to mfd-next?

once again, please don't top-post.

Sorry I didn't saw this patch. Looks good to me, so please ignore this patch mine.

Regards,
Matthias

Quoted 53 lines

<[email protected]> 於 2021年1月11日 週一 下午8:35寫道:

Quoted 52 lines

From: Matthias Brugger <[email protected]>

MFD cell names and compatibles use '_' instead of '-', which is common practice for names and the standard for DT compatibles. This will also fix the probing for the drivers already implemented (mt6360-adc and mt6360-tcpc).

Fixes 7edd363421da ("mfd: Add support for PMIC MT6360")
Fixes 1f4877218f7e ("iio: adc: mt6360: Add ADC driver for MT6360")
Fixes e1aefcdd394f ("usb typec: mt6360: Add support for mt6360 Type-C driver")

---

 drivers/mfd/mt6360-core.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)
drivers/mfd/mt6360-core.c +12 -12
index 4661c1b29a72..14e649ffe50f 100644
@@ -292,18 +292,18 @@ static const struct resource mt6360_ldo_resources[] = {
 };
 
 static const struct mfd_cell mt6360_devs[] = {
-       OF_MFD_CELL("mt6360_adc", mt6360_adc_resources,
-                   NULL, 0, 0, "mediatek,mt6360_adc"),
-       OF_MFD_CELL("mt6360_chg", mt6360_chg_resources,
-                   NULL, 0, 0, "mediatek,mt6360_chg"),
-       OF_MFD_CELL("mt6360_led", mt6360_led_resources,
-                   NULL, 0, 0, "mediatek,mt6360_led"),
-       OF_MFD_CELL("mt6360_pmic", mt6360_pmic_resources,
-                   NULL, 0, 0, "mediatek,mt6360_pmic"),
-       OF_MFD_CELL("mt6360_ldo", mt6360_ldo_resources,
-                   NULL, 0, 0, "mediatek,mt6360_ldo"),
-       OF_MFD_CELL("mt6360_tcpc", NULL,
-                   NULL, 0, 0, "mediatek,mt6360_tcpc"),
+       OF_MFD_CELL("mt6360-adc", mt6360_adc_resources,
+                   NULL, 0, 0, "mediatek,mt6360-adc"),
+       OF_MFD_CELL("mt6360-chg", mt6360_chg_resources,
+                   NULL, 0, 0, "mediatek,mt6360-chg"),
+       OF_MFD_CELL("mt6360-led", mt6360_led_resources,
+                   NULL, 0, 0, "mediatek,mt6360-led"),
+       OF_MFD_CELL("mt6360-pmic", mt6360_pmic_resources,
+                   NULL, 0, 0, "mediatek,mt6360-pmic"),
+       OF_MFD_CELL("mt6360-ldo", mt6360_ldo_resources,
+                   NULL, 0, 0, "mediatek,mt6360-ldo"),
+       OF_MFD_CELL("mt6360-tcpc", NULL,
+                   NULL, 0, 0, "mediatek,mt6360-tcpc"),
 };
 
Quoted 5 lines
Quoted 4 lines
drivers/mfd/mt6360-core.c +0 -1
 static const unsigned short mt6360_slave_addr[MT6360_SLAVE_MAX] = {
--

2.29.2

_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek