mfd: twl4030-power: drop dead machine_is_*() macros

[PATCH] mfd: twl4030-power: drop dead machine_is_*() macros

Posted by Sascha Hauer 4 days, 18 hours ago

OMAP LDP and 3430SDP are converted to dt in [1] and [2], the
corresponding machine_is_*() macros always expand to 0. Drop them and
with it the now unnecessary inclusion of mach-types.h.

[1] e92fc4f04a34a ("ARM: OMAP2+: Drop legacy board file for LDP")
[2] 1b383f44aabc8 ("ARM: OMAP2+: Drop board file for 3430sdp")

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 drivers/mfd/twl4030-power.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/mfd/twl4030-power.c b/drivers/mfd/twl4030-power.c
index 0bca948ab6bae..b6251a2a3078c 100644
--- a/drivers/mfd/twl4030-power.c
+++ b/drivers/mfd/twl4030-power.c
@@ -30,8 +30,6 @@
 #include <linux/property.h>
 #include <linux/of.h>
 
-#include <asm/mach-types.h>
-
 static u8 twl4030_start_script_address = 0x2b;
 
 /* Register bits for P1, P2 and P3_SW_EVENTS */
@@ -294,8 +292,7 @@ twl4030_config_wakeup12_sequence(const struct twl4030_power_data *pdata,
 	if (err)
 		goto out;
 
-	if (pdata->ac_charger_quirk || machine_is_omap_3430sdp() ||
-	    machine_is_omap_ldp()) {
+	if (pdata->ac_charger_quirk) {
 		/* Disabling AC charger effect on sleep-active transitions */
 		err = twl_i2c_read_u8(TWL_MODULE_PM_MASTER, &data,
 				      R_CFG_P1_TRANSITION);

---
base-commit: ba3e43a9e601636f5edb54e259a74f96ca3b8fd8
change-id: 20260603-mfd-remove-mach-types-h-bab96314bd7d

Best regards,
-- 
Sascha Hauer <s.hauer@pengutronix.de>

Re: [PATCH] mfd: twl4030-power: drop dead machine_is_*() macros

Posted by Andreas Kemnade 4 days, 18 hours ago

On Wed, 03 Jun 2026 14:52:34 +0200
Sascha Hauer <s.hauer@pengutronix.de> wrote:

> OMAP LDP and 3430SDP are converted to dt in [1] and [2], the
> corresponding machine_is_*() macros always expand to 0. Drop them and
> with it the now unnecessary inclusion of mach-types.h.
> 
> [1] e92fc4f04a34a ("ARM: OMAP2+: Drop legacy board file for LDP")
> [2] 1b383f44aabc8 ("ARM: OMAP2+: Drop board file for 3430sdp")
> 
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

already in -next

Regards
Andreas

Re: [PATCH] mfd: twl4030-power: drop dead machine_is_*() macros

Posted by Sascha Hauer 4 days, 18 hours ago

On 2026-06-03 14:58, Andreas Kemnade wrote:
> On Wed, 03 Jun 2026 14:52:34 +0200
> Sascha Hauer <s.hauer@pengutronix.de> wrote:
> 
> > OMAP LDP and 3430SDP are converted to dt in [1] and [2], the
> > corresponding machine_is_*() macros always expand to 0. Drop them and
> > with it the now unnecessary inclusion of mach-types.h.
> > 
> > [1] e92fc4f04a34a ("ARM: OMAP2+: Drop legacy board file for LDP")
> > [2] 1b383f44aabc8 ("ARM: OMAP2+: Drop board file for 3430sdp")
> > 
> > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> 
> already in -next

I am impressed. After ten years this sits dead in the tree two people
manage to patch this at the same time ;)

Great, then disregard this patch.

Regards,
 Sascha

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |