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

Commit 408bc03b authored by Javier Martinez Canillas's avatar Javier Martinez Canillas Committed by Lee Jones
Browse files

mfd: retu: Drop -mfd suffix from I2C device ID name 



It's not correct to encode the subsystem in the I2C device name, so
drop the -mfd suffix. To maintain bisect-ability, change driver and
platform code / DTS users in the same patch.

Suggested-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarJavier Martinez Canillas <javier@dowhile0.org>
Acked-by: default avatarRob Herring <robh@kernel.org>
Acked-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Reviewed-by: default avatarWolfram Sang <wsa@the-dreams.de>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent dddfd098

arch/arm/boot/dts/omap2420-n8x0-common.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -15,8 +15,8 @@ 
				>;

			#address-cells = <1>;

			#size-cells = <0>;

			retu_mfd: retu@1 {

				compatible = "retu-mfd";

			retu: retu@1 {

				compatible = "retu";

				interrupt-parent = <&gpio4>;

				interrupts = <12 IRQ_TYPE_EDGE_RISING>;

				reg = <0x1>;

arch/arm/mach-omap1/board-nokia770.c

+2 −2
Original line number Diff line number Diff line
@@ -233,10 +233,10 @@ static struct platform_device nokia770_cbus_device = { 


static struct i2c_board_info nokia770_i2c_board_info_2[] __initdata = {

	{

		I2C_BOARD_INFO("retu-mfd", 0x01),

		I2C_BOARD_INFO("retu", 0x01),

	},

	{

		I2C_BOARD_INFO("tahvo-mfd", 0x02),

		I2C_BOARD_INFO("tahvo", 0x02),

	},

};

drivers/mfd/retu-mfd.c

+2 −2
Original line number Diff line number Diff line
@@ -302,8 +302,8 @@ static int retu_remove(struct i2c_client *i2c) 
}



static const struct i2c_device_id retu_id[] = {

	{ "retu-mfd", 0 },

	{ "tahvo-mfd", 0 },

	{ "retu", 0 },

	{ "tahvo", 0 },

	{ }

};

MODULE_DEVICE_TABLE(i2c, retu_id);