Эх сурвалжийг харах

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: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Javier Martinez Canillas <javier@dowhile0.org>
Acked-by: Rob Herring <robh@kernel.org>
Acked-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Acked-by: Tony Lindgren <tony@atomide.com>
Reviewed-by: Wolfram Sang <wsa@the-dreams.de>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Javier Martinez Canillas 8 жил өмнө
parent
commit
408bc03bb1

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

@@ -15,8 +15,8 @@
 				>;
 				>;
 			#address-cells = <1>;
 			#address-cells = <1>;
 			#size-cells = <0>;
 			#size-cells = <0>;
-			retu_mfd: retu@1 {
-				compatible = "retu-mfd";
+			retu: retu@1 {
+				compatible = "retu";
 				interrupt-parent = <&gpio4>;
 				interrupt-parent = <&gpio4>;
 				interrupts = <12 IRQ_TYPE_EDGE_RISING>;
 				interrupts = <12 IRQ_TYPE_EDGE_RISING>;
 				reg = <0x1>;
 				reg = <0x1>;

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

@@ -233,10 +233,10 @@ static struct platform_device nokia770_cbus_device = {
 
 
 static struct i2c_board_info nokia770_i2c_board_info_2[] __initdata = {
 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),
 	},
 	},
 };
 };
 
 

+ 2 - 2
drivers/mfd/retu-mfd.c

@@ -302,8 +302,8 @@ static int retu_remove(struct i2c_client *i2c)
 }
 }
 
 
 static const struct i2c_device_id retu_id[] = {
 static const struct i2c_device_id retu_id[] = {
-	{ "retu-mfd", 0 },
-	{ "tahvo-mfd", 0 },
+	{ "retu", 0 },
+	{ "tahvo", 0 },
 	{ }
 	{ }
 };
 };
 MODULE_DEVICE_TABLE(i2c, retu_id);
 MODULE_DEVICE_TABLE(i2c, retu_id);