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

Commit 4e657946 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Linus Walleij
Browse files

mfd: db8500 stop passing around platform data 



Except for the constant DB8500_PRCMU_FW_VERSION_OFFSET number, nothing
is ever passed through the platform data and used in a driver, so we
can simply stop passing it around.

Acked-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent cf4129ea

arch/arm/mach-ux500/cpu-db8500.c

+2 −15
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 
#include <linux/irq.h>

#include <linux/platform_device.h>

#include <linux/io.h>

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

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

#include <linux/of.h>

#include <linux/of_platform.h>

#include <linux/perf/arm_pmu.h>
@@ -32,15 +30,6 @@ 
#include "db8500-regs.h"

#include "id.h"



static struct ab8500_platform_data ab8500_platdata = {

};



static struct prcmu_pdata db8500_prcmu_pdata = {

	.ab_platdata	= &ab8500_platdata,

	.version_offset	= DB8500_PRCMU_FW_VERSION_OFFSET,

	.legacy_offset	= DB8500_PRCMU_LEGACY_OFFSET,

};



static void __init u8500_map_io(void)

{

	debug_ll_io_init();
@@ -109,8 +98,7 @@ static struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = { 
	OF_DEV_AUXDATA("stericsson,ux500-msp-i2s", 0x80125000,

		       "ux500-msp-i2s.3", &msp3_platform_data),

	/* Requires non-DT:able platform data. */

	OF_DEV_AUXDATA("stericsson,db8500-prcmu", 0x80157000, "db8500-prcmu",

			&db8500_prcmu_pdata),

	OF_DEV_AUXDATA("stericsson,db8500-prcmu", 0x80157000, "db8500-prcmu", NULL),

	OF_DEV_AUXDATA("stericsson,ux500-cryp", 0xa03cb000, "cryp1", NULL),

	OF_DEV_AUXDATA("stericsson,ux500-hash", 0xa03c2000, "hash1", NULL),

	OF_DEV_AUXDATA("stericsson,snd-soc-mop500", 0, "snd-soc-mop500.0",
@@ -119,8 +107,7 @@ static struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = { 
};



static struct of_dev_auxdata u8540_auxdata_lookup[] __initdata = {

	OF_DEV_AUXDATA("stericsson,db8500-prcmu", 0x80157000, "db8500-prcmu",

			&db8500_prcmu_pdata),

	OF_DEV_AUXDATA("stericsson,db8500-prcmu", 0x80157000, "db8500-prcmu", NULL),

	{},

};

arch/arm/mach-ux500/setup.h

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 


#include <asm/mach/arch.h>

#include <linux/init.h>

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



void ux500_restart(enum reboot_mode mode, const char *cmd);

drivers/mfd/ab8500-core.c

+0 −4
Original line number Diff line number Diff line
@@ -1087,7 +1087,6 @@ static int ab8500_probe(struct platform_device *pdev) 
		"Vbus Detect (USB)",

		"USB ID Detect",

		"UART Factory Mode Detect"};

	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 = AB8500_VERSION_UNDEFINED;

	struct device_node *np = pdev->dev.of_node;
@@ -1219,9 +1218,6 @@ static int ab8500_probe(struct platform_device *pdev) 
		pr_cont("None\n");

	}



	if (plat && plat->init)

		plat->init(ab8500);



	if (is_ab9540(ab8500)) {

		ret = get_register_interruptible(ab8500, AB8500_CHARGER,

			AB8500_CH_USBCH_STAT1_REG, &value);

drivers/mfd/ab8500-sysctrl.c

+0 −34
Original line number Diff line number Diff line
@@ -127,45 +127,11 @@ EXPORT_SYMBOL(ab8500_sysctrl_write); 


static int ab8500_sysctrl_probe(struct platform_device *pdev)

{

	struct ab8500 *ab8500 = dev_get_drvdata(pdev->dev.parent);

	struct ab8500_platform_data *plat;

	struct ab8500_sysctrl_platform_data *pdata;



	plat = dev_get_platdata(pdev->dev.parent);



	if (!plat)

		return -EINVAL;



	sysctrl_dev = &pdev->dev;



	if (!pm_power_off)

		pm_power_off = ab8500_power_off;



	pdata = plat->sysctrl;

	if (pdata) {

		int last, ret, i, j;



		if (is_ab8505(ab8500))

			last = AB8500_SYSCLKREQ4RFCLKBUF;

		else

			last = AB8500_SYSCLKREQ8RFCLKBUF;



		for (i = AB8500_SYSCLKREQ1RFCLKBUF; i <= last; i++) {

			j = i - AB8500_SYSCLKREQ1RFCLKBUF;

			ret = ab8500_sysctrl_write(i, 0xff,

					pdata->initial_req_buf_config[j]);

			dev_dbg(&pdev->dev,

					"Setting SysClkReq%dRfClkBuf 0x%X\n",

					j + 1,

					pdata->initial_req_buf_config[j]);

			if (ret < 0) {

				dev_err(&pdev->dev,

					"Can't set sysClkReq%dRfClkBuf: %d\n",

					j + 1, ret);

			}

		}

	}



	return 0;

}

drivers/mfd/db8500-prcmu.c

+3 −7
Original line number Diff line number Diff line
@@ -3094,8 +3094,7 @@ static void db8500_prcmu_update_cpufreq(void) 
	}

}



static int db8500_prcmu_register_ab8500(struct device *parent,

					struct ab8500_platform_data *pdata)

static int db8500_prcmu_register_ab8500(struct device *parent)

{

	struct device_node *np;

	struct resource ab8500_resource;
@@ -3103,8 +3102,6 @@ static int db8500_prcmu_register_ab8500(struct device *parent, 
		.name = "ab8500-core",

		.of_compatible = "stericsson,ab8500",

		.id = AB8500_VERSION_AB8500,

		.platform_data = pdata,

		.pdata_size = sizeof(struct ab8500_platform_data),

		.resources = &ab8500_resource,

		.num_resources = 1,

	};
@@ -3133,7 +3130,6 @@ static int db8500_prcmu_register_ab8500(struct device *parent, 
static int db8500_prcmu_probe(struct platform_device *pdev)

{

	struct device_node *np = pdev->dev.of_node;

	struct prcmu_pdata *pdata = dev_get_platdata(&pdev->dev);

	int irq = 0, err = 0;

	struct resource *res;
@@ -3149,7 +3145,7 @@ static int db8500_prcmu_probe(struct platform_device *pdev) 
		return -ENOMEM;

	}

	init_prcm_registers();

	dbx500_fw_version_init(pdev, pdata->version_offset);

	dbx500_fw_version_init(pdev, DB8500_PRCMU_FW_VERSION_OFFSET);

	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "prcmu-tcdm");

	if (!res) {

		dev_err(&pdev->dev, "no prcmu tcdm region provided\n");
@@ -3204,7 +3200,7 @@ static int db8500_prcmu_probe(struct platform_device *pdev) 
		}

	}



	err = db8500_prcmu_register_ab8500(&pdev->dev, pdata->ab_platdata);

	err = db8500_prcmu_register_ab8500(&pdev->dev);

	if (err) {

		mfd_remove_devices(&pdev->dev);

		pr_err("prcmu: Failed to add ab8500 subdevice\n");