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

Commit d2f31c49 authored by Wolfram Sang's avatar Wolfram Sang Committed by Wolfram Sang
Browse files

i2c: sh_mobile: remove platform_data 



No platform currently upstream makes use of this platform_data anymore.
The ones that did are converted to DT meanwhile. So, remove it. The old
platforms likely don't have the 'clks_per_cnt' feature, otherwise it
would have been implemented by now. And in the unlikely case they need
to setup a different bus speed, we should rather go for a generic i2c
platform data just for that.

Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent 6c427787

drivers/i2c/busses/i2c-sh_mobile.c

+0 −8
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
#include <linux/dma-mapping.h>

#include <linux/err.h>

#include <linux/i2c.h>

#include <linux/i2c/i2c-sh_mobile.h>

#include <linux/init.h>

#include <linux/interrupt.h>

#include <linux/io.h>
@@ -879,7 +878,6 @@ static int sh_mobile_i2c_hook_irqs(struct platform_device *dev, struct sh_mobile 


static int sh_mobile_i2c_probe(struct platform_device *dev)

{

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

	struct sh_mobile_i2c_data *pd;

	struct i2c_adapter *adap;

	struct resource *res;
@@ -910,7 +908,6 @@ static int sh_mobile_i2c_probe(struct platform_device *dev) 
	if (IS_ERR(pd->reg))

		return PTR_ERR(pd->reg);



	/* Use platform data bus speed or STANDARD_MODE */

	ret = of_property_read_u32(dev->dev.of_node, "clock-frequency", &bus_speed);

	pd->bus_speed = ret ? STANDARD_MODE : bus_speed;
@@ -929,11 +926,6 @@ static int sh_mobile_i2c_probe(struct platform_device *dev) 
			if (config->setup)

				config->setup(pd);

		}

	} else {

		if (pdata && pdata->bus_speed)

			pd->bus_speed = pdata->bus_speed;

		if (pdata && pdata->clks_per_count)

			pd->clks_per_count = pdata->clks_per_count;

	}



	/* The IIC blocks on SH-Mobile ARM processors

include/linux/i2c/i2c-sh_mobile.h

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line 
#ifndef __I2C_SH_MOBILE_H__

#define __I2C_SH_MOBILE_H__



#include <linux/platform_device.h>



struct i2c_sh_mobile_platform_data {

	unsigned long bus_speed;

	unsigned int clks_per_count;

};



#endif /* __I2C_SH_MOBILE_H__ */