mfd: dm355evm_msp: Move header file out of I2C realm

include/linux/i2c is not for client devices. Move the header file to a
more appropriate location.

Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

diff --git a/drivers/input/misc/dm355evm_keys.c b/drivers/input/misc/dm355evm_keys.c
index bab256ef32b9b3f367bdcd4b4283ba7d034a5847..c803db64a3760ddac74175220c454b17e5c5fada 100644 (file)
--- a/drivers/input/misc/dm355evm_keys.c
+++ b/drivers/input/misc/dm355evm_keys.c
@@ -15,7 +15,7 @@
 #include <linux/platform_device.h>
 #include <linux/interrupt.h>
 
-#include <linux/i2c/dm355evm_msp.h>
+#include <linux/mfd/dm355evm_msp.h>
 #include <linux/module.h>
 
 

diff --git a/drivers/mfd/dm355evm_msp.c b/drivers/mfd/dm355evm_msp.c
index 86eca614507bd8b9e128e81f55fd8be5d958e301..2a2756709f22f022789c3629b795b1a2002fa07e 100644 (file)
--- a/drivers/mfd/dm355evm_msp.c
+++ b/drivers/mfd/dm355evm_msp.c
@@ -18,7 +18,7 @@
 #include <linux/gpio.h>
 #include <linux/leds.h>
 #include <linux/i2c.h>
-#include <linux/i2c/dm355evm_msp.h>
+#include <linux/mfd/dm355evm_msp.h>
 
 
 /*

diff --git a/drivers/rtc/rtc-dm355evm.c b/drivers/rtc/rtc-dm355evm.c
index f225cd873ff6c29be6636b82a6506d77c6088b76..97d8259b94940f20b9a11193ba2bd038c1ba5878 100644 (file)
--- a/drivers/rtc/rtc-dm355evm.c
+++ b/drivers/rtc/rtc-dm355evm.c
@@ -13,7 +13,7 @@
 #include <linux/rtc.h>
 #include <linux/platform_device.h>
 
-#include <linux/i2c/dm355evm_msp.h>
+#include <linux/mfd/dm355evm_msp.h>
 #include <linux/module.h>
 
 

diff --git a/include/linux/i2c/dm355evm_msp.h b/include/linux/i2c/dm355evm_msp.h
deleted file mode 100644 (file)
index 3724703..0000000
--- a/include/linux/i2c/dm355evm_msp.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * dm355evm_msp.h - support MSP430 microcontroller on DM355EVM board
- */
-#ifndef __LINUX_I2C_DM355EVM_MSP
-#define __LINUX_I2C_DM355EVM_MSP
-
-/*
- * Written against Spectrum's writeup for the A4 firmware revision,
- * and tweaked to match source and rev D2 schematics by removing CPLD
- * and NOR flash hooks (which were last appropriate in rev B boards).
- *
- * Note that the firmware supports a flavor of write posting ... to be
- * sure a write completes, issue another read or write.
- */
-
-/* utilities to access "registers" emulated by msp430 firmware */
-extern int dm355evm_msp_write(u8 value, u8 reg);
-extern int dm355evm_msp_read(u8 reg);
-
-
-/* command/control registers */
-#define DM355EVM_MSP_COMMAND           0x00
-#      define MSP_COMMAND_NULL         0
-#      define MSP_COMMAND_RESET_COLD   1
-#      define MSP_COMMAND_RESET_WARM   2
-#      define MSP_COMMAND_RESET_WARM_I 3
-#      define MSP_COMMAND_POWEROFF     4
-#      define MSP_COMMAND_IR_REINIT    5
-#define DM355EVM_MSP_STATUS            0x01
-#      define MSP_STATUS_BAD_OFFSET    BIT(0)
-#      define MSP_STATUS_BAD_COMMAND   BIT(1)
-#      define MSP_STATUS_POWER_ERROR   BIT(2)
-#      define MSP_STATUS_RXBUF_OVERRUN BIT(3)
-#define DM355EVM_MSP_RESET             0x02    /* 0 bits == in reset */
-#      define MSP_RESET_DC5            BIT(0)
-#      define MSP_RESET_TVP5154        BIT(2)
-#      define MSP_RESET_IMAGER         BIT(3)
-#      define MSP_RESET_ETHERNET       BIT(4)
-#      define MSP_RESET_SYS            BIT(5)
-#      define MSP_RESET_AIC33          BIT(7)
-
-/* GPIO registers ... bit patterns mostly match the source MSP ports */
-#define DM355EVM_MSP_LED               0x03    /* active low (MSP P4) */
-#define DM355EVM_MSP_SWITCH1           0x04    /* (MSP P5, masked) */
-#      define MSP_SWITCH1_SW6_1        BIT(0)
-#      define MSP_SWITCH1_SW6_2        BIT(1)
-#      define MSP_SWITCH1_SW6_3        BIT(2)
-#      define MSP_SWITCH1_SW6_4        BIT(3)
-#      define MSP_SWITCH1_J1           BIT(4)  /* NTSC/PAL */
-#      define MSP_SWITCH1_MSP_INT      BIT(5)  /* active low */
-#define DM355EVM_MSP_SWITCH2           0x05    /* (MSP P6, masked) */
-#      define MSP_SWITCH2_SW10         BIT(3)
-#      define MSP_SWITCH2_SW11         BIT(4)
-#      define MSP_SWITCH2_SW12         BIT(5)
-#      define MSP_SWITCH2_SW13         BIT(6)
-#      define MSP_SWITCH2_SW14         BIT(7)
-#define DM355EVM_MSP_SDMMC             0x06    /* (MSP P2, masked) */
-#      define MSP_SDMMC_0_WP           BIT(1)
-#      define MSP_SDMMC_0_CD           BIT(2)  /* active low */
-#      define MSP_SDMMC_1_WP           BIT(3)
-#      define MSP_SDMMC_1_CD           BIT(4)  /* active low */
-#define DM355EVM_MSP_FIRMREV           0x07    /* not a GPIO (out of order) */
-#define DM355EVM_MSP_VIDEO_IN          0x08    /* (MSP P3, masked) */
-#      define MSP_VIDEO_IMAGER         BIT(7)  /* low == tvp5146 */
-
-/* power supply registers are currently omitted */
-
-/* RTC registers */
-#define DM355EVM_MSP_RTC_0             0x12    /* LSB */
-#define DM355EVM_MSP_RTC_1             0x13
-#define DM355EVM_MSP_RTC_2             0x14
-#define DM355EVM_MSP_RTC_3             0x15    /* MSB */
-
-/* input event queue registers; code == ((HIGH << 8) | LOW) */
-#define DM355EVM_MSP_INPUT_COUNT       0x16    /* decrement by reading LOW */
-#define DM355EVM_MSP_INPUT_HIGH                0x17
-#define DM355EVM_MSP_INPUT_LOW         0x18
-
-#endif /* __LINUX_I2C_DM355EVM_MSP */

diff --git a/include/linux/mfd/dm355evm_msp.h b/include/linux/mfd/dm355evm_msp.h
new file mode 100644 (file)
index 0000000..3724703
--- /dev/null
+++ b/include/linux/mfd/dm355evm_msp.h
@@ -0,0 +1,79 @@
+/*
+ * dm355evm_msp.h - support MSP430 microcontroller on DM355EVM board
+ */
+#ifndef __LINUX_I2C_DM355EVM_MSP
+#define __LINUX_I2C_DM355EVM_MSP
+
+/*
+ * Written against Spectrum's writeup for the A4 firmware revision,
+ * and tweaked to match source and rev D2 schematics by removing CPLD
+ * and NOR flash hooks (which were last appropriate in rev B boards).
+ *
+ * Note that the firmware supports a flavor of write posting ... to be
+ * sure a write completes, issue another read or write.
+ */
+
+/* utilities to access "registers" emulated by msp430 firmware */
+extern int dm355evm_msp_write(u8 value, u8 reg);
+extern int dm355evm_msp_read(u8 reg);
+
+
+/* command/control registers */
+#define DM355EVM_MSP_COMMAND           0x00
+#      define MSP_COMMAND_NULL         0
+#      define MSP_COMMAND_RESET_COLD   1
+#      define MSP_COMMAND_RESET_WARM   2
+#      define MSP_COMMAND_RESET_WARM_I 3
+#      define MSP_COMMAND_POWEROFF     4
+#      define MSP_COMMAND_IR_REINIT    5
+#define DM355EVM_MSP_STATUS            0x01
+#      define MSP_STATUS_BAD_OFFSET    BIT(0)
+#      define MSP_STATUS_BAD_COMMAND   BIT(1)
+#      define MSP_STATUS_POWER_ERROR   BIT(2)
+#      define MSP_STATUS_RXBUF_OVERRUN BIT(3)
+#define DM355EVM_MSP_RESET             0x02    /* 0 bits == in reset */
+#      define MSP_RESET_DC5            BIT(0)
+#      define MSP_RESET_TVP5154        BIT(2)
+#      define MSP_RESET_IMAGER         BIT(3)
+#      define MSP_RESET_ETHERNET       BIT(4)
+#      define MSP_RESET_SYS            BIT(5)
+#      define MSP_RESET_AIC33          BIT(7)
+
+/* GPIO registers ... bit patterns mostly match the source MSP ports */
+#define DM355EVM_MSP_LED               0x03    /* active low (MSP P4) */
+#define DM355EVM_MSP_SWITCH1           0x04    /* (MSP P5, masked) */
+#      define MSP_SWITCH1_SW6_1        BIT(0)
+#      define MSP_SWITCH1_SW6_2        BIT(1)
+#      define MSP_SWITCH1_SW6_3        BIT(2)
+#      define MSP_SWITCH1_SW6_4        BIT(3)
+#      define MSP_SWITCH1_J1           BIT(4)  /* NTSC/PAL */
+#      define MSP_SWITCH1_MSP_INT      BIT(5)  /* active low */
+#define DM355EVM_MSP_SWITCH2           0x05    /* (MSP P6, masked) */
+#      define MSP_SWITCH2_SW10         BIT(3)
+#      define MSP_SWITCH2_SW11         BIT(4)
+#      define MSP_SWITCH2_SW12         BIT(5)
+#      define MSP_SWITCH2_SW13         BIT(6)
+#      define MSP_SWITCH2_SW14         BIT(7)
+#define DM355EVM_MSP_SDMMC             0x06    /* (MSP P2, masked) */
+#      define MSP_SDMMC_0_WP           BIT(1)
+#      define MSP_SDMMC_0_CD           BIT(2)  /* active low */
+#      define MSP_SDMMC_1_WP           BIT(3)
+#      define MSP_SDMMC_1_CD           BIT(4)  /* active low */
+#define DM355EVM_MSP_FIRMREV           0x07    /* not a GPIO (out of order) */
+#define DM355EVM_MSP_VIDEO_IN          0x08    /* (MSP P3, masked) */
+#      define MSP_VIDEO_IMAGER         BIT(7)  /* low == tvp5146 */
+
+/* power supply registers are currently omitted */
+
+/* RTC registers */
+#define DM355EVM_MSP_RTC_0             0x12    /* LSB */
+#define DM355EVM_MSP_RTC_1             0x13
+#define DM355EVM_MSP_RTC_2             0x14
+#define DM355EVM_MSP_RTC_3             0x15    /* MSB */
+
+/* input event queue registers; code == ((HIGH << 8) | LOW) */
+#define DM355EVM_MSP_INPUT_COUNT       0x16    /* decrement by reading LOW */
+#define DM355EVM_MSP_INPUT_HIGH                0x17
+#define DM355EVM_MSP_INPUT_LOW         0x18
+
+#endif /* __LINUX_I2C_DM355EVM_MSP */