Commit 72af5a4b authored by Philip Rakity's avatar Philip Rakity Committed by Anton Vorontsov
Browse files

max8925_power: Remove support for irq bits that do not exist 



The max8925 cannot return usb status.  The bits

       [MAX8925_IRQ_VCHG_USB_OVP] = {
               .reg            = MAX8925_CHG_IRQ1,
               .mask_reg       = MAX8925_CHG_IRQ1_MASK,
               .offs           = 1 << 3,
       },
       [MAX8925_IRQ_VCHG_USB_F] =  {
               .reg            = MAX8925_CHG_IRQ1,
               .mask_reg       = MAX8925_CHG_IRQ1_MASK,
               .offs           = 1 << 4,
       },
       [MAX8925_IRQ_VCHG_USB_R] = {
               .reg            = MAX8925_CHG_IRQ1,
               .mask_reg       = MAX8925_CHG_IRQ1_MASK,
               .offs           = 1 << 5,
       },

do not exist in the irq register.

Signed-off-by: default avatarPhilip Rakity <prakity@marvell.com>
Signed-off-by: default avatarAnton Vorontsov <cbouatmailru@gmail.com>
parent 5ba1fa0a

drivers/mfd/max8925-core.c

+0 −15
Original line number Diff line number Diff line
@@ -210,21 +210,6 @@ static struct max8925_irq_data max8925_irqs[] = { 
		.mask_reg	= MAX8925_CHG_IRQ1_MASK,

		.offs		= 1 << 2,

	},

	[MAX8925_IRQ_VCHG_USB_OVP] = {

		.reg		= MAX8925_CHG_IRQ1,

		.mask_reg	= MAX8925_CHG_IRQ1_MASK,

		.offs		= 1 << 3,

	},

	[MAX8925_IRQ_VCHG_USB_F] =  {

		.reg		= MAX8925_CHG_IRQ1,

		.mask_reg	= MAX8925_CHG_IRQ1_MASK,

		.offs		= 1 << 4,

	},

	[MAX8925_IRQ_VCHG_USB_R] = {

		.reg		= MAX8925_CHG_IRQ1,

		.mask_reg	= MAX8925_CHG_IRQ1_MASK,

		.offs		= 1 << 5,

	},

	[MAX8925_IRQ_VCHG_THM_OK_R] = {

		.reg		= MAX8925_CHG_IRQ2,

		.mask_reg	= MAX8925_CHG_IRQ2_MASK,

drivers/power/max8925_power.c

+0 −13
Original line number Diff line number Diff line
@@ -120,16 +120,6 @@ static irqreturn_t max8925_charger_handler(int irq, void *data) 
		__set_charger(info, 0);

		dev_dbg(chip->dev, "Adapter removed\n");

		break;

	case MAX8925_IRQ_VCHG_USB_R:

		info->usb_online = 1;

		__set_charger(info, 1);

		dev_dbg(chip->dev, "USB inserted\n");

		break;

	case MAX8925_IRQ_VCHG_USB_F:

		info->usb_online = 0;

		__set_charger(info, 0);

		dev_dbg(chip->dev, "USB removed\n");

		break;

	case MAX8925_IRQ_VCHG_THM_OK_F:

		/* Battery is not ready yet */

		dev_dbg(chip->dev, "Battery temperature is out of range\n");
@@ -370,9 +360,6 @@ static __devinit int max8925_init_charger(struct max8925_chip *chip, 
		REQUEST_IRQ(MAX8925_IRQ_VCHG_DC_F, "ac-remove");

		REQUEST_IRQ(MAX8925_IRQ_VCHG_DC_R, "ac-insert");

	}

	REQUEST_IRQ(MAX8925_IRQ_VCHG_USB_OVP, "usb-ovp");

	REQUEST_IRQ(MAX8925_IRQ_VCHG_USB_F, "usb-remove");

	REQUEST_IRQ(MAX8925_IRQ_VCHG_USB_R, "usb-insert");

	if (!info->no_temp_support) {

		REQUEST_IRQ(MAX8925_IRQ_VCHG_THM_OK_R, "batt-temp-in-range");

		REQUEST_IRQ(MAX8925_IRQ_VCHG_THM_OK_F, "batt-temp-out-range");

include/linux/mfd/max8925.h

+0 −3
Original line number Diff line number Diff line
@@ -167,9 +167,6 @@ enum { 
	MAX8925_IRQ_VCHG_DC_OVP,

	MAX8925_IRQ_VCHG_DC_F,

	MAX8925_IRQ_VCHG_DC_R,

	MAX8925_IRQ_VCHG_USB_OVP,

	MAX8925_IRQ_VCHG_USB_F,

	MAX8925_IRQ_VCHG_USB_R,

	MAX8925_IRQ_VCHG_THM_OK_R,

	MAX8925_IRQ_VCHG_THM_OK_F,

	MAX8925_IRQ_VCHG_SYSLOW_F,

CRA Git | Maintained and supported by SUSTech CRA and CCSE