Commit 18766f09 authored by Anton Vorontsov's avatar Anton Vorontsov
Browse files

Merge with upstream to accommodate with MFD changes 



commit 0848c94f ("mfd: core: Push irqdomain mapping out into devices")
that appeared in v3.6-rc6 adds another argument to the mfd_add_devices()
call, and that makes commit a830d28b ("power_supply: Enable
battery-charger for 88pm860x", which is battery tree) no longer compatible
with the latest kernels.

This commit is used to merge upstream back into battery tree and
accommodate 88pm860x driver for the latest changes in MFD core.

Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Reported-by: default avatarFengguang Wu <fengguang.wu@intel.com>
Reported-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
Signed-off-by: default avatarAnton Vorontsov <anton.vorontsov@linaro.org>
parents c10a002a 0848c94f

drivers/mfd/88pm800.c

+3 −2
Original line number Diff line number Diff line
@@ -470,7 +470,8 @@ static int __devinit device_800_init(struct pm80x_chip *chip, 


	ret =

	    mfd_add_devices(chip->dev, 0, &onkey_devs[0],

			    ARRAY_SIZE(onkey_devs), &onkey_resources[0], 0);

			    ARRAY_SIZE(onkey_devs), &onkey_resources[0], 0,

			    NULL);

	if (ret < 0) {

		dev_err(chip->dev, "Failed to add onkey subdev\n");

		goto out_dev;
@@ -481,7 +482,7 @@ static int __devinit device_800_init(struct pm80x_chip *chip, 
		rtc_devs[0].platform_data = pdata->rtc;

		rtc_devs[0].pdata_size = sizeof(struct pm80x_rtc_pdata);

		ret = mfd_add_devices(chip->dev, 0, &rtc_devs[0],

				      ARRAY_SIZE(rtc_devs), NULL, 0);

				      ARRAY_SIZE(rtc_devs), NULL, 0, NULL);

		if (ret < 0) {

			dev_err(chip->dev, "Failed to add rtc subdev\n");

			goto out_dev;

drivers/mfd/88pm805.c

+2 −1
Original line number Diff line number Diff line
@@ -216,7 +216,8 @@ static int __devinit device_805_init(struct pm80x_chip *chip) 
	}



	ret = mfd_add_devices(chip->dev, 0, &codec_devs[0],

			      ARRAY_SIZE(codec_devs), &codec_resources[0], 0);

			      ARRAY_SIZE(codec_devs), &codec_resources[0], 0,

			      NULL);

	if (ret < 0) {

		dev_err(chip->dev, "Failed to add codec subdev\n");

		goto out_codec;

drivers/mfd/88pm860x-core.c

+12 −11
Original line number Diff line number Diff line
@@ -644,7 +644,7 @@ static void __devinit device_bk_init(struct pm860x_chip *chip, 
			bk_devs[i].resources = &bk_resources[j];

			ret = mfd_add_devices(chip->dev, 0,

					      &bk_devs[i], 1,

					      &bk_resources[j], 0);

					      &bk_resources[j], 0, NULL);

			if (ret < 0) {

				dev_err(chip->dev, "Failed to add "

					"backlight subdev\n");
@@ -679,7 +679,7 @@ static void __devinit device_led_init(struct pm860x_chip *chip, 
			led_devs[i].resources = &led_resources[j],

			ret = mfd_add_devices(chip->dev, 0,

					      &led_devs[i], 1,

					      &led_resources[j], 0);

					      &led_resources[j], 0, NULL);

			if (ret < 0) {

				dev_err(chip->dev, "Failed to add "

					"led subdev\n");
@@ -716,7 +716,7 @@ static void __devinit device_regulator_init(struct pm860x_chip *chip, 
		regulator_devs[i].resources = &regulator_resources[seq];



		ret = mfd_add_devices(chip->dev, 0, &regulator_devs[i], 1,

				      &regulator_resources[seq], 0);

				      &regulator_resources[seq], 0, NULL);

		if (ret < 0) {

			dev_err(chip->dev, "Failed to add regulator subdev\n");

			goto out;
@@ -740,7 +740,7 @@ static void __devinit device_rtc_init(struct pm860x_chip *chip, 
	rtc_devs[0].resources = &rtc_resources[0];

	ret = mfd_add_devices(chip->dev, 0, &rtc_devs[0],

			      ARRAY_SIZE(rtc_devs), &rtc_resources[0],

			      chip->irq_base);

			      chip->irq_base, NULL);

	if (ret < 0)

		dev_err(chip->dev, "Failed to add rtc subdev\n");

}
@@ -759,7 +759,7 @@ static void __devinit device_touch_init(struct pm860x_chip *chip, 
	touch_devs[0].resources = &touch_resources[0];

	ret = mfd_add_devices(chip->dev, 0, &touch_devs[0],

			      ARRAY_SIZE(touch_devs), &touch_resources[0],

			      chip->irq_base);

			      chip->irq_base, NULL);

	if (ret < 0)

		dev_err(chip->dev, "Failed to add touch subdev\n");

}
@@ -777,7 +777,7 @@ static void __devinit device_power_init(struct pm860x_chip *chip, 
	power_devs[0].num_resources = ARRAY_SIZE(battery_resources);

	power_devs[0].resources = &battery_resources[0],

	ret = mfd_add_devices(chip->dev, 0, &power_devs[0], 1,

			      &battery_resources[0], chip->irq_base);

			      &battery_resources[0], chip->irq_base, NULL);

	if (ret < 0)

		dev_err(chip->dev, "Failed to add battery subdev\n");
@@ -786,7 +786,7 @@ static void __devinit device_power_init(struct pm860x_chip *chip, 
	power_devs[1].num_resources = ARRAY_SIZE(charger_resources);

	power_devs[1].resources = &charger_resources[0],

	ret = mfd_add_devices(chip->dev, 0, &power_devs[1], 1,

			      &charger_resources[0], chip->irq_base);

			      &charger_resources[0], chip->irq_base, NULL);

	if (ret < 0)

		dev_err(chip->dev, "Failed to add charger subdev\n");
@@ -795,7 +795,7 @@ static void __devinit device_power_init(struct pm860x_chip *chip, 
	power_devs[2].num_resources = ARRAY_SIZE(preg_resources);

	power_devs[2].resources = &preg_resources[0],

	ret = mfd_add_devices(chip->dev, 0, &power_devs[2], 1,

			      &preg_resources[0], chip->irq_base);

			      &preg_resources[0], chip->irq_base, NULL);

	if (ret < 0)

		dev_err(chip->dev, "Failed to add preg subdev\n");
@@ -807,7 +807,7 @@ static void __devinit device_power_init(struct pm860x_chip *chip, 
		power_devs[3].platform_data = pdata->chg_desc;

		power_devs[3].pdata_size = sizeof(*pdata->chg_desc);

		ret = mfd_add_devices(chip->dev, 0, &power_devs[3], 1,

				      NULL, chip->irq_base);

				      NULL, chip->irq_base, NULL);

		if (ret < 0)

			dev_err(chip->dev, "Failed to add chg-manager subdev\n");

	}
@@ -822,7 +822,7 @@ static void __devinit device_onkey_init(struct pm860x_chip *chip, 
	onkey_devs[0].resources = &onkey_resources[0],

	ret = mfd_add_devices(chip->dev, 0, &onkey_devs[0],

			      ARRAY_SIZE(onkey_devs), &onkey_resources[0],

			      chip->irq_base);

			      chip->irq_base, NULL);

	if (ret < 0)

		dev_err(chip->dev, "Failed to add onkey subdev\n");

}
@@ -835,7 +835,8 @@ static void __devinit device_codec_init(struct pm860x_chip *chip, 
	codec_devs[0].num_resources = ARRAY_SIZE(codec_resources);

	codec_devs[0].resources = &codec_resources[0],

	ret = mfd_add_devices(chip->dev, 0, &codec_devs[0],

			      ARRAY_SIZE(codec_devs), &codec_resources[0], 0);

			      ARRAY_SIZE(codec_devs), &codec_resources[0], 0,

			      NULL);

	if (ret < 0)

		dev_err(chip->dev, "Failed to add codec subdev\n");

}

drivers/mfd/aat2870-core.c

+1 −1
Original line number Diff line number Diff line
@@ -424,7 +424,7 @@ static int aat2870_i2c_probe(struct i2c_client *client, 
	}



	ret = mfd_add_devices(aat2870->dev, 0, aat2870_devs,

			      ARRAY_SIZE(aat2870_devs), NULL, 0);

			      ARRAY_SIZE(aat2870_devs), NULL, 0, NULL);

	if (ret != 0) {

		dev_err(aat2870->dev, "Failed to add subdev: %d\n", ret);

		goto out_disable;

drivers/mfd/ab3100-core.c

+1 −1
Original line number Diff line number Diff line
@@ -946,7 +946,7 @@ static int __devinit ab3100_probe(struct i2c_client *client, 
	}



	err = mfd_add_devices(&client->dev, 0, ab3100_devs,

		ARRAY_SIZE(ab3100_devs), NULL, 0);

			      ARRAY_SIZE(ab3100_devs), NULL, 0, NULL);



	ab3100_setup_debugfs(ab3100);

CRA Git | Maintained and supported by SUSTech CRA and CCSE