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

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

i2c: sh_mobile: require setup callback 



Require the setup callback and move the frequency calculation into it.
This is in preparation for supporting multiple formulas.

Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent 12742b6a

drivers/i2c/busses/i2c-sh_mobile.c

+6 −9
Original line number Diff line number Diff line
@@ -771,15 +771,17 @@ static int sh_mobile_i2c_r8a7740_workaround(struct sh_mobile_i2c_data *pd) 
	iic_wr(pd, ICCR, ICCR_TRS);

	udelay(10);



	return 0;

	return sh_mobile_i2c_init(pd);

}



static const struct sh_mobile_dt_config default_dt_config = {

	.clks_per_count = 1,

	.setup = sh_mobile_i2c_init,

};



static const struct sh_mobile_dt_config fast_clock_dt_config = {

	.clks_per_count = 2,

	.setup = sh_mobile_i2c_init,

};



static const struct sh_mobile_dt_config r8a7740_dt_config = {
@@ -882,15 +884,10 @@ static int sh_mobile_i2c_probe(struct platform_device *dev) 
	config = of_device_get_match_data(&dev->dev);

	if (config) {

		pd->clks_per_count = config->clks_per_count;



		if (config->setup) {

		ret = config->setup(pd);

			if (ret)

				return ret;

		}

	}



	} else {

		ret = sh_mobile_i2c_init(pd);

	}

	if (ret)

		return ret;