Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 981adacd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mfd-fixes-3.14-1' of git://git.linaro.org/people/lee.jones/mfd 

Pull MFD fixes from Lee Jones:
 "Couple of small issues solved:
   - Suspend/Resume call-backs require CONFIG_PM_SLEEP
   - Some drivers written for 32bit architectures fail when compiled
     with a 64bit compiler.  The fixes will future proof the drivers"

* tag 'mfd-fixes-3.14-1' of git://git.linaro.org/people/lee.jones/mfd:
  mfd: sec-core: sec_pmic_{suspend,resume}() should depend on CONFIG_PM_SLEEP
  mfd: max14577: max14577_{suspend,resume}() should depend on CONFIG_PM_SLEEP
  mfd: tps65217: Naturalise cross-architecture discrepancies
  mfd: wm8994-core: Naturalise cross-architecture discrepancies
  mfd: max8998: Naturalise cross-architecture discrepancies
  mfd: max8997: Naturalise cross-architecture discrepancies
parents 960dfc4e 8321bbf8

drivers/mfd/max14577.c

+2 −0
Original line number Diff line number Diff line
@@ -173,6 +173,7 @@ static const struct i2c_device_id max14577_i2c_id[] = { 
};

MODULE_DEVICE_TABLE(i2c, max14577_i2c_id);



#ifdef CONFIG_PM_SLEEP

static int max14577_suspend(struct device *dev)

{

	struct i2c_client *i2c = container_of(dev, struct i2c_client, dev);
@@ -208,6 +209,7 @@ static int max14577_resume(struct device *dev) 


	return 0;

}

#endif /* CONFIG_PM_SLEEP */



static struct of_device_id max14577_dt_match[] = {

	{ .compatible = "maxim,max14577", },

drivers/mfd/max8997.c

+3 −3
Original line number Diff line number Diff line
@@ -164,15 +164,15 @@ static struct max8997_platform_data *max8997_i2c_parse_dt_pdata( 
	return pd;

}



static inline int max8997_i2c_get_driver_data(struct i2c_client *i2c,

static inline unsigned long max8997_i2c_get_driver_data(struct i2c_client *i2c,

						const struct i2c_device_id *id)

{

	if (IS_ENABLED(CONFIG_OF) && i2c->dev.of_node) {

		const struct of_device_id *match;

		match = of_match_node(max8997_pmic_dt_match, i2c->dev.of_node);

		return (int)match->data;

		return (unsigned long)match->data;

	}

	return (int)id->driver_data;

	return id->driver_data;

}



static int max8997_i2c_probe(struct i2c_client *i2c,

drivers/mfd/max8998.c

+3 −3
Original line number Diff line number Diff line
@@ -169,16 +169,16 @@ static struct max8998_platform_data *max8998_i2c_parse_dt_pdata( 
	return pd;

}



static inline int max8998_i2c_get_driver_data(struct i2c_client *i2c,

static inline unsigned long max8998_i2c_get_driver_data(struct i2c_client *i2c,

						const struct i2c_device_id *id)

{

	if (IS_ENABLED(CONFIG_OF) && i2c->dev.of_node) {

		const struct of_device_id *match;

		match = of_match_node(max8998_dt_match, i2c->dev.of_node);

		return (int)(long)match->data;

		return (unsigned long)match->data;

	}



	return (int)id->driver_data;

	return id->driver_data;

}



static int max8998_i2c_probe(struct i2c_client *i2c,

drivers/mfd/sec-core.c

+2 −0
Original line number Diff line number Diff line
@@ -315,6 +315,7 @@ static int sec_pmic_remove(struct i2c_client *i2c) 
	return 0;

}



#ifdef CONFIG_PM_SLEEP

static int sec_pmic_suspend(struct device *dev)

{

	struct i2c_client *i2c = container_of(dev, struct i2c_client, dev);
@@ -349,6 +350,7 @@ static int sec_pmic_resume(struct device *dev) 


	return 0;

}

#endif /* CONFIG_PM_SLEEP */



static SIMPLE_DEV_PM_OPS(sec_pmic_pm_ops, sec_pmic_suspend, sec_pmic_resume);

drivers/mfd/tps65217.c

+2 −2
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ static int tps65217_probe(struct i2c_client *client, 
{

	struct tps65217 *tps;

	unsigned int version;

	unsigned int chip_id = ids->driver_data;

	unsigned long chip_id = ids->driver_data;

	const struct of_device_id *match;

	bool status_off = false;

	int ret;
@@ -170,7 +170,7 @@ static int tps65217_probe(struct i2c_client *client, 
				"Failed to find matching dt id\n");

			return -EINVAL;

		}

		chip_id = (unsigned int)(unsigned long)match->data;

		chip_id = (unsigned long)match->data;

		status_off = of_property_read_bool(client->dev.of_node,

					"ti,pmic-shutdown-controller");

	}