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

Commit d28f1db8 authored by Lee Jones's avatar Lee Jones Committed by Samuel Ortiz
Browse files

mfd: Remove confusing ab8500-i2c file and merge into ab8500-core 



ab8500-i2c is used as core code to register the ab8500 device.
After allocating ab8500 memory, it immediately calls into
ab8500-core where the real initialisation takes place. This
patch moves all core registration and memory allocation into
the true ab8500-core file and removes ab8500-i2c completely.

Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 1cb3642a

arch/arm/mach-ux500/board-mop500.c

+1 −1
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ static struct resource ab8500_resources[] = { 
};



struct platform_device ab8500_device = {

	.name = "ab8500-i2c",

	.name = "ab8500-core",

	.id = 0,

	.dev = {

		.platform_data = &ab8500_platdata,

drivers/mfd/Makefile

+2 −3
Original line number Diff line number Diff line
@@ -93,12 +93,11 @@ obj-$(CONFIG_AB3100_CORE) += ab3100-core.o 
obj-$(CONFIG_AB3100_OTP)	+= ab3100-otp.o

obj-$(CONFIG_AB5500_CORE)	+= ab5500-core.o

obj-$(CONFIG_AB5500_DEBUG)	+= ab5500-debugfs.o

obj-$(CONFIG_AB8500_CORE)	+= ab8500-core.o ab8500-sysctrl.o

obj-$(CONFIG_AB8500_DEBUG)	+= ab8500-debugfs.o

obj-$(CONFIG_AB8500_GPADC)	+= ab8500-gpadc.o

obj-$(CONFIG_MFD_DB8500_PRCMU)	+= db8500-prcmu.o

# ab8500-i2c need to come after db8500-prcmu (which provides the channel)

obj-$(CONFIG_AB8500_I2C_CORE)	+= ab8500-i2c.o

# ab8500-core need to come after db8500-prcmu (which provides the channel)

obj-$(CONFIG_AB8500_CORE)	+= ab8500-core.o ab8500-sysctrl.o

obj-$(CONFIG_MFD_DB5500_PRCMU)	+= db5500-prcmu.o

obj-$(CONFIG_MFD_TIMBERDALE)    += timberdale.o

obj-$(CONFIG_PMIC_ADP5520)	+= adp5520.o

drivers/mfd/ab8500-core.c

+100 −5
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/mfd/core.h>

#include <linux/mfd/abx500.h>

#include <linux/mfd/abx500/ab8500.h>

#include <linux/mfd/dbx500-prcmu.h>

#include <linux/regulator/ab8500.h>



/*
@@ -137,6 +138,41 @@ static const char ab8500_version_str[][7] = { 
	[AB8500_VERSION_AB8540] = "AB8540",

};



static int ab8500_i2c_write(struct ab8500 *ab8500, u16 addr, u8 data)

{

	int ret;



	ret = prcmu_abb_write((u8)(addr >> 8), (u8)(addr & 0xFF), &data, 1);

	if (ret < 0)

		dev_err(ab8500->dev, "prcmu i2c error %d\n", ret);

	return ret;

}



static int ab8500_i2c_write_masked(struct ab8500 *ab8500, u16 addr, u8 mask,

	u8 data)

{

	int ret;



	ret = prcmu_abb_write_masked((u8)(addr >> 8), (u8)(addr & 0xFF), &data,

		&mask, 1);

	if (ret < 0)

		dev_err(ab8500->dev, "prcmu i2c error %d\n", ret);

	return ret;

}



static int ab8500_i2c_read(struct ab8500 *ab8500, u16 addr)

{

	int ret;

	u8 data;



	ret = prcmu_abb_read((u8)(addr >> 8), (u8)(addr & 0xFF), &data, 1);

	if (ret < 0) {

		dev_err(ab8500->dev, "prcmu i2c error %d\n", ret);

		return ret;

	}

	return (int)data;

}



static int ab8500_get_chip_id(struct device *dev)

{

	struct ab8500 *ab8500;
@@ -1169,27 +1205,51 @@ static struct attribute_group ab9540_attr_group = { 
	.attrs	= ab9540_sysfs_entries,

};



int __devinit ab8500_init(struct ab8500 *ab8500, enum ab8500_version version)

static int __devinit ab8500_probe(struct platform_device *pdev)

{

	struct ab8500_platform_data *plat = dev_get_platdata(ab8500->dev);

	struct ab8500_platform_data *plat = dev_get_platdata(&pdev->dev);

	const struct platform_device_id *platid = platform_get_device_id(pdev);

	enum ab8500_version version = platid->driver_data;

	struct ab8500 *ab8500;

	struct resource *resource;

	int ret;

	int i;

	u8 value;



	ab8500 = kzalloc(sizeof *ab8500, GFP_KERNEL);

	if (!ab8500)

		return -ENOMEM;



	if (plat)

		ab8500->irq_base = plat->irq_base;



	ab8500->dev = &pdev->dev;



	resource = platform_get_resource(pdev, IORESOURCE_IRQ, 0);

	if (!resource) {

		ret = -ENODEV;

		goto out_free_ab8500;

	}



	ab8500->irq = resource->start;



	ab8500->read = ab8500_i2c_read;

	ab8500->write = ab8500_i2c_write;

	ab8500->write_masked = ab8500_i2c_write_masked;



	mutex_init(&ab8500->lock);

	mutex_init(&ab8500->irq_lock);

	atomic_set(&ab8500->transfer_ongoing, 0);



	platform_set_drvdata(pdev, ab8500);



	if (version != AB8500_VERSION_UNDEFINED)

		ab8500->version = version;

	else {

		ret = get_register_interruptible(ab8500, AB8500_MISC,

			AB8500_IC_NAME_REG, &value);

		if (ret < 0)

			return ret;

			goto out_free_ab8500;



		ab8500->version = value;

	}
@@ -1197,7 +1257,7 @@ int __devinit ab8500_init(struct ab8500 *ab8500, enum ab8500_version version) 
	ret = get_register_interruptible(ab8500, AB8500_MISC,

		AB8500_REV_REG, &value);

	if (ret < 0)

		return ret;

		goto out_free_ab8500;



	ab8500->chip_id = value;
@@ -1342,12 +1402,16 @@ int __devinit ab8500_init(struct ab8500 *ab8500, enum ab8500_version version) 
	kfree(ab8500->oldmask);

out_freemask:

	kfree(ab8500->mask);

out_free_ab8500:

	kfree(ab8500);



	return ret;

}



int __devexit ab8500_exit(struct ab8500 *ab8500)

static int __devexit ab8500_remove(struct platform_device *pdev)

{

	struct ab8500 *ab8500 = platform_get_drvdata(pdev);



	if (is_ab9540(ab8500))

		sysfs_remove_group(&ab8500->dev->kobj, &ab9540_attr_group);

	else
@@ -1359,10 +1423,41 @@ int __devexit ab8500_exit(struct ab8500 *ab8500) 
	}

	kfree(ab8500->oldmask);

	kfree(ab8500->mask);

	kfree(ab8500);



	return 0;

}



static const struct platform_device_id ab8500_id[] = {

	{ "ab8500-core", AB8500_VERSION_AB8500 },

	{ "ab8505-i2c", AB8500_VERSION_AB8505 },

	{ "ab9540-i2c", AB8500_VERSION_AB9540 },

	{ "ab8540-i2c", AB8500_VERSION_AB8540 },

	{ }

};



static struct platform_driver ab8500_core_driver = {

	.driver = {

		.name = "ab8500-core",

		.owner = THIS_MODULE,

	},

	.probe	= ab8500_probe,

	.remove	= __devexit_p(ab8500_remove),

	.id_table = ab8500_id,

};



static int __init ab8500_core_init(void)

{

	return platform_driver_register(&ab8500_core_driver);

}



static void __exit ab8500_core_exit(void)

{

	platform_driver_unregister(&ab8500_core_driver);

}

arch_initcall(ab8500_core_init);

module_exit(ab8500_core_exit);



MODULE_AUTHOR("Mattias Wallin, Srinidhi Kasagar, Rabin Vincent");

MODULE_DESCRIPTION("AB8500 MFD core");

MODULE_LICENSE("GPL v2");

drivers/mfd/ab8500-i2c.c

deleted100644 → 0
+0 −160
Original line number Diff line number Diff line 
/*

 * Copyright (C) ST-Ericsson SA 2010

 * Author: Mattias Wallin <mattias.wallin@stericsson.com> for ST-Ericsson.

 * License Terms: GNU General Public License v2

 * This file was based on drivers/mfd/ab8500-spi.c

 */



#include <linux/kernel.h>

#include <linux/slab.h>

#include <linux/init.h>

#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/mfd/abx500/ab8500.h>

#include <linux/mfd/dbx500-prcmu.h>



static int ab8500_i2c_write(struct ab8500 *ab8500, u16 addr, u8 data)

{

	int ret;



	ret = prcmu_abb_write((u8)(addr >> 8), (u8)(addr & 0xFF), &data, 1);

	if (ret < 0)

		dev_err(ab8500->dev, "prcmu i2c error %d\n", ret);

	return ret;

}



static int ab8500_i2c_write_masked(struct ab8500 *ab8500, u16 addr, u8 mask,

	u8 data)

{

	int ret;



	ret = prcmu_abb_write_masked((u8)(addr >> 8), (u8)(addr & 0xFF), &data,

		&mask, 1);

	if (ret < 0)

		dev_err(ab8500->dev, "prcmu i2c error %d\n", ret);

	return ret;

}



static int ab8500_i2c_read(struct ab8500 *ab8500, u16 addr)

{

	int ret;

	u8 data;



	ret = prcmu_abb_read((u8)(addr >> 8), (u8)(addr & 0xFF), &data, 1);

	if (ret < 0) {

		dev_err(ab8500->dev, "prcmu i2c error %d\n", ret);

		return ret;

	}

	return (int)data;

}



static int __devinit ab8500_i2c_probe(struct platform_device *plf)

{

	const struct platform_device_id *platid = platform_get_device_id(plf);

	struct ab8500 *ab8500;

	struct resource *resource;

	int ret;



	ab8500 = kzalloc(sizeof *ab8500, GFP_KERNEL);

	if (!ab8500)

		return -ENOMEM;



	ab8500->dev = &plf->dev;



	resource = platform_get_resource(plf, IORESOURCE_IRQ, 0);

	if (!resource) {

		kfree(ab8500);

		return -ENODEV;

	}



	ab8500->irq = resource->start;



	ab8500->read = ab8500_i2c_read;

	ab8500->write = ab8500_i2c_write;

	ab8500->write_masked = ab8500_i2c_write_masked;



	platform_set_drvdata(plf, ab8500);



	ret = ab8500_init(ab8500, platid->driver_data);

	if (ret)

		kfree(ab8500);





	return ret;

}



static int __devexit ab8500_i2c_remove(struct platform_device *plf)

{

	struct ab8500 *ab8500 = platform_get_drvdata(plf);



	ab8500_exit(ab8500);

	kfree(ab8500);



	return 0;

}



static const struct platform_device_id ab8500_id[] = {

	{ "ab8500-i2c", AB8500_VERSION_AB8500 },

	{ "ab8505-i2c", AB8500_VERSION_AB8505 },

	{ "ab9540-i2c", AB8500_VERSION_AB9540 },

	{ "ab8540-i2c", AB8500_VERSION_AB8540 },

	{ }

};



#ifdef CONFIG_PM

static int ab8500_i2c_suspend(struct device *dev)

{

	struct ab8500 *ab = dev_get_drvdata(dev);



	disable_irq(ab->irq);

	enable_irq_wake(ab->irq);



	return 0;

}



static int ab8500_i2c_resume(struct device *dev)

{

	struct ab8500 *ab = dev_get_drvdata(dev);



	disable_irq_wake(ab->irq);

	enable_irq(ab->irq);



	return 0;

}



static const struct dev_pm_ops ab8500_i2c_pm_ops = {

	.suspend	= ab8500_i2c_suspend,

	.resume		= ab8500_i2c_resume,

};



#define AB8500_I2C_PM_OPS	(&ab8500_i2c_pm_ops)

#else

#define AB8500_I2C_PM_OPS	NULL

#endif



static struct platform_driver ab8500_i2c_driver = {

	.driver = {

		.name = "ab8500-i2c",

		.owner = THIS_MODULE,

		.pm	= AB8500_I2C_PM_OPS,

	},

	.probe	= ab8500_i2c_probe,

	.remove	= __devexit_p(ab8500_i2c_remove),

	.id_table = ab8500_id,

};



static int __init ab8500_i2c_init(void)

{

	return platform_driver_register(&ab8500_i2c_driver);

}



static void __exit ab8500_i2c_exit(void)

{

	platform_driver_unregister(&ab8500_i2c_driver);

}

arch_initcall(ab8500_i2c_init);

module_exit(ab8500_i2c_exit);



MODULE_AUTHOR("Mattias WALLIN <mattias.wallin@stericsson.com");

MODULE_DESCRIPTION("AB8500 Core access via PRCMU I2C");

MODULE_LICENSE("GPL v2");