Commit 786ad21f authored by Dr. David Alan Gilbert's avatar Dr. David Alan Gilbert Committed by Lee Jones
Browse files

mfd: pcf50633: Remove unused platform IRQ code 



As part of the pcf50633 removal, take out it's irq code
(which includes one bit still called from the core, but it'll
go soon).

Signed-off-by: default avatar"Dr. David Alan Gilbert" <linux@treblig.org>
Link: https://lore.kernel.org/r/20250311014959.743322-9-linux@treblig.org


Signed-off-by: default avatarLee Jones <lee@kernel.org>
parent 85596022

drivers/mfd/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ obj-$(CONFIG_MFD_MT6370) += mt6370.o 
mt6397-objs			:= mt6397-core.o mt6397-irq.o mt6358-irq.o

obj-$(CONFIG_MFD_MT6397)	+= mt6397.o



pcf50633-objs			:= pcf50633-core.o pcf50633-irq.o

pcf50633-objs			:= pcf50633-core.o

obj-$(CONFIG_MFD_PCF50633)	+= pcf50633.o

obj-$(CONFIG_RZ_MTU3)		+= rz-mtu3.o

obj-$(CONFIG_ABX500_CORE)	+= abx500-core.o

drivers/mfd/pcf50633-core.c

+1 −4
Original line number Diff line number Diff line
@@ -204,8 +204,6 @@ static int pcf50633_probe(struct i2c_client *client) 
	dev_info(pcf->dev, "Probed device version %d variant %d\n",

							version, variant);



	pcf50633_irq_init(pcf, client->irq);



	/* Create sub devices */

	pcf50633_client_dev_register(pcf, "pcf50633-input", &pcf->input_pdev);

	pcf50633_client_dev_register(pcf, "pcf50633-rtc", &pcf->rtc_pdev);
@@ -258,7 +256,6 @@ static void pcf50633_remove(struct i2c_client *client) 
	int i;



	sysfs_remove_group(&client->dev.kobj, &pcf_attr_group);

	pcf50633_irq_free(pcf);



	platform_device_unregister(pcf->input_pdev);

	platform_device_unregister(pcf->rtc_pdev);
@@ -279,7 +276,7 @@ MODULE_DEVICE_TABLE(i2c, pcf50633_id_table); 
static struct i2c_driver pcf50633_driver = {

	.driver = {

		.name	= "pcf50633",

		.pm	= pm_sleep_ptr(&pcf50633_pm),

		/* going.... .pm	= pm_sleep_ptr(&pcf50633_pm), */

	},

	.id_table = pcf50633_id_table,

	.probe = pcf50633_probe,

drivers/mfd/pcf50633-irq.c

deleted100644 → 0
+0 −312
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-or-later

/* NXP PCF50633 Power Management Unit (PMU) driver

 *

 * (C) 2006-2008 by Openmoko, Inc.

 * Author: Harald Welte <laforge@openmoko.org>

 * 	   Balaji Rao <balajirrao@openmoko.org>

 * All rights reserved.

 */



#include <linux/i2c.h>

#include <linux/interrupt.h>

#include <linux/kernel.h>

#include <linux/mutex.h>

#include <linux/export.h>

#include <linux/slab.h>



#include <linux/mfd/pcf50633/core.h>

#include <linux/mfd/pcf50633/mbc.h>



int pcf50633_register_irq(struct pcf50633 *pcf, int irq,

			void (*handler) (int, void *), void *data)

{

	if (irq < 0 || irq >= PCF50633_NUM_IRQ || !handler)

		return -EINVAL;



	if (WARN_ON(pcf->irq_handler[irq].handler))

		return -EBUSY;



	mutex_lock(&pcf->lock);

	pcf->irq_handler[irq].handler = handler;

	pcf->irq_handler[irq].data = data;

	mutex_unlock(&pcf->lock);



	return 0;

}

EXPORT_SYMBOL_GPL(pcf50633_register_irq);



int pcf50633_free_irq(struct pcf50633 *pcf, int irq)

{

	if (irq < 0 || irq >= PCF50633_NUM_IRQ)

		return -EINVAL;



	mutex_lock(&pcf->lock);

	pcf->irq_handler[irq].handler = NULL;

	mutex_unlock(&pcf->lock);



	return 0;

}

EXPORT_SYMBOL_GPL(pcf50633_free_irq);



static int __pcf50633_irq_mask_set(struct pcf50633 *pcf, int irq, u8 mask)

{

	u8 reg, bit;

	int idx;



	idx = irq >> 3;

	reg = PCF50633_REG_INT1M + idx;

	bit = 1 << (irq & 0x07);



	pcf50633_reg_set_bit_mask(pcf, reg, bit, mask ? bit : 0);



	mutex_lock(&pcf->lock);



	if (mask)

		pcf->mask_regs[idx] |= bit;

	else

		pcf->mask_regs[idx] &= ~bit;



	mutex_unlock(&pcf->lock);



	return 0;

}



int pcf50633_irq_mask(struct pcf50633 *pcf, int irq)

{

	dev_dbg(pcf->dev, "Masking IRQ %d\n", irq);



	return __pcf50633_irq_mask_set(pcf, irq, 1);

}

EXPORT_SYMBOL_GPL(pcf50633_irq_mask);



int pcf50633_irq_unmask(struct pcf50633 *pcf, int irq)

{

	dev_dbg(pcf->dev, "Unmasking IRQ %d\n", irq);



	return __pcf50633_irq_mask_set(pcf, irq, 0);

}

EXPORT_SYMBOL_GPL(pcf50633_irq_unmask);



int pcf50633_irq_mask_get(struct pcf50633 *pcf, int irq)

{

	u8 reg, bits;



	reg =  irq >> 3;

	bits = 1 << (irq & 0x07);



	return pcf->mask_regs[reg] & bits;

}

EXPORT_SYMBOL_GPL(pcf50633_irq_mask_get);



static void pcf50633_irq_call_handler(struct pcf50633 *pcf, int irq)

{

	if (pcf->irq_handler[irq].handler)

		pcf->irq_handler[irq].handler(irq, pcf->irq_handler[irq].data);

}



/* Maximum amount of time ONKEY is held before emergency action is taken */

#define PCF50633_ONKEY1S_TIMEOUT 8



static irqreturn_t pcf50633_irq(int irq, void *data)

{

	struct pcf50633 *pcf = data;

	int ret, i, j;

	u8 pcf_int[5], chgstat;



	/* Read the 5 INT regs in one transaction */

	ret = pcf50633_read_block(pcf, PCF50633_REG_INT1,

						ARRAY_SIZE(pcf_int), pcf_int);

	if (ret != ARRAY_SIZE(pcf_int)) {

		dev_err(pcf->dev, "Error reading INT registers\n");



		/*

		 * If this doesn't ACK the interrupt to the chip, we'll be

		 * called once again as we're level triggered.

		 */

		goto out;

	}



	/* defeat 8s death from lowsys on A5 */

	pcf50633_reg_write(pcf, PCF50633_REG_OOCSHDWN,  0x04);



	/* We immediately read the usb and adapter status. We thus make sure

	 * only of USBINS/USBREM IRQ handlers are called */

	if (pcf_int[0] & (PCF50633_INT1_USBINS | PCF50633_INT1_USBREM)) {

		chgstat = pcf50633_reg_read(pcf, PCF50633_REG_MBCS2);

		if (chgstat & (0x3 << 4))

			pcf_int[0] &= ~PCF50633_INT1_USBREM;

		else

			pcf_int[0] &= ~PCF50633_INT1_USBINS;

	}



	/* Make sure only one of ADPINS or ADPREM is set */

	if (pcf_int[0] & (PCF50633_INT1_ADPINS | PCF50633_INT1_ADPREM)) {

		chgstat = pcf50633_reg_read(pcf, PCF50633_REG_MBCS2);

		if (chgstat & (0x3 << 4))

			pcf_int[0] &= ~PCF50633_INT1_ADPREM;

		else

			pcf_int[0] &= ~PCF50633_INT1_ADPINS;

	}



	dev_dbg(pcf->dev, "INT1=0x%02x INT2=0x%02x INT3=0x%02x "

			"INT4=0x%02x INT5=0x%02x\n", pcf_int[0],

			pcf_int[1], pcf_int[2], pcf_int[3], pcf_int[4]);



	/* Some revisions of the chip don't have a 8s standby mode on

	 * ONKEY1S press. We try to manually do it in such cases. */

	if ((pcf_int[0] & PCF50633_INT1_SECOND) && pcf->onkey1s_held) {

		dev_info(pcf->dev, "ONKEY1S held for %d secs\n",

							pcf->onkey1s_held);

		if (pcf->onkey1s_held++ == PCF50633_ONKEY1S_TIMEOUT)

			if (pcf->pdata->force_shutdown)

				pcf->pdata->force_shutdown(pcf);

	}



	if (pcf_int[2] & PCF50633_INT3_ONKEY1S) {

		dev_info(pcf->dev, "ONKEY1S held\n");

		pcf->onkey1s_held = 1 ;



		/* Unmask IRQ_SECOND */

		pcf50633_reg_clear_bits(pcf, PCF50633_REG_INT1M,

						PCF50633_INT1_SECOND);



		/* Unmask IRQ_ONKEYR */

		pcf50633_reg_clear_bits(pcf, PCF50633_REG_INT2M,

						PCF50633_INT2_ONKEYR);

	}



	if ((pcf_int[1] & PCF50633_INT2_ONKEYR) && pcf->onkey1s_held) {

		pcf->onkey1s_held = 0;



		/* Mask SECOND and ONKEYR interrupts */

		if (pcf->mask_regs[0] & PCF50633_INT1_SECOND)

			pcf50633_reg_set_bit_mask(pcf,

					PCF50633_REG_INT1M,

					PCF50633_INT1_SECOND,

					PCF50633_INT1_SECOND);



		if (pcf->mask_regs[1] & PCF50633_INT2_ONKEYR)

			pcf50633_reg_set_bit_mask(pcf,

					PCF50633_REG_INT2M,

					PCF50633_INT2_ONKEYR,

					PCF50633_INT2_ONKEYR);

	}



	/* Have we just resumed ? */

	if (pcf->is_suspended) {

		pcf->is_suspended = 0;



		/* Set the resume reason filtering out non resumers */

		for (i = 0; i < ARRAY_SIZE(pcf_int); i++)

			pcf->resume_reason[i] = pcf_int[i] &

						pcf->pdata->resumers[i];



		/* Make sure we don't pass on any ONKEY events to

		 * userspace now */

		pcf_int[1] &= ~(PCF50633_INT2_ONKEYR | PCF50633_INT2_ONKEYF);

	}



	for (i = 0; i < ARRAY_SIZE(pcf_int); i++) {

		/* Unset masked interrupts */

		pcf_int[i] &= ~pcf->mask_regs[i];



		for (j = 0; j < 8 ; j++)

			if (pcf_int[i] & (1 << j))

				pcf50633_irq_call_handler(pcf, (i * 8) + j);

	}



out:

	return IRQ_HANDLED;

}



static int pcf50633_suspend(struct device *dev)

{

	struct i2c_client *client = to_i2c_client(dev);

	struct pcf50633 *pcf = i2c_get_clientdata(client);

	int ret;

	int i;

	u8 res[5];





	/* Make sure our interrupt handlers are not called

	 * henceforth */

	disable_irq(pcf->irq);



	/* Save the masks */

	ret = pcf50633_read_block(pcf, PCF50633_REG_INT1M,

				ARRAY_SIZE(pcf->suspend_irq_masks),

					pcf->suspend_irq_masks);

	if (ret < 0) {

		dev_err(pcf->dev, "error saving irq masks\n");

		goto out;

	}



	/* Write wakeup irq masks */

	for (i = 0; i < ARRAY_SIZE(res); i++)

		res[i] = ~pcf->pdata->resumers[i];



	ret = pcf50633_write_block(pcf, PCF50633_REG_INT1M,

					ARRAY_SIZE(res), &res[0]);

	if (ret < 0) {

		dev_err(pcf->dev, "error writing wakeup irq masks\n");

		goto out;

	}



	pcf->is_suspended = 1;



out:

	return ret;

}



static int pcf50633_resume(struct device *dev)

{

	struct i2c_client *client = to_i2c_client(dev);

	struct pcf50633 *pcf = i2c_get_clientdata(client);

	int ret;



	/* Write the saved mask registers */

	ret = pcf50633_write_block(pcf, PCF50633_REG_INT1M,

				ARRAY_SIZE(pcf->suspend_irq_masks),

					pcf->suspend_irq_masks);

	if (ret < 0)

		dev_err(pcf->dev, "Error restoring saved suspend masks\n");



	enable_irq(pcf->irq);



	return ret;

}



EXPORT_GPL_SIMPLE_DEV_PM_OPS(pcf50633_pm, pcf50633_suspend, pcf50633_resume);



int pcf50633_irq_init(struct pcf50633 *pcf, int irq)

{

	int ret;



	pcf->irq = irq;



	/* Enable all interrupts except RTC SECOND */

	pcf->mask_regs[0] = 0x80;

	pcf50633_reg_write(pcf, PCF50633_REG_INT1M, pcf->mask_regs[0]);

	pcf50633_reg_write(pcf, PCF50633_REG_INT2M, 0x00);

	pcf50633_reg_write(pcf, PCF50633_REG_INT3M, 0x00);

	pcf50633_reg_write(pcf, PCF50633_REG_INT4M, 0x00);

	pcf50633_reg_write(pcf, PCF50633_REG_INT5M, 0x00);



	ret = request_threaded_irq(irq, NULL, pcf50633_irq,

					IRQF_TRIGGER_LOW | IRQF_ONESHOT,

					"pcf50633", pcf);



	if (ret)

		dev_err(pcf->dev, "Failed to request IRQ %d\n", ret);



	if (enable_irq_wake(irq) < 0)

		dev_err(pcf->dev, "IRQ %u cannot be enabled as wake-up source"

			"in this hardware revision", irq);



	return ret;

}



void pcf50633_irq_free(struct pcf50633 *pcf)

{

	free_irq(pcf->irq, pcf);

}