projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARM: rockchip: rk3228: add grf definition
[firefly-linux-kernel-4.4.55.git]
/
include
/
linux
/
mv643xx.h
diff --git
a/include/linux/mv643xx.h
b/include/linux/mv643xx.h
index d2ae6185f03be619ff8d21021cc7cee789956816..69327b7b4ce46e6601c128b46cdd0a3d81c400d4 100644
(file)
--- a/
include/linux/mv643xx.h
+++ b/
include/linux/mv643xx.h
@@
-15,6
+15,7
@@
#include <asm/types.h>
#include <linux/mv643xx_eth.h>
#include <asm/types.h>
#include <linux/mv643xx_eth.h>
+#include <linux/mv643xx_i2c.h>
/****************************************/
/* Processor Address Space */
/****************************************/
/* Processor Address Space */
@@
-863,7
+864,6
@@
/* I2C Registers */
/****************************************/
/* I2C Registers */
/****************************************/
-#define MV64XXX_I2C_CTLR_NAME "mv64xxx_i2c"
#define MV64XXX_I2C_OFFSET 0xc000
#define MV64XXX_I2C_REG_BLOCK_SIZE 0x0020
#define MV64XXX_I2C_OFFSET 0xc000
#define MV64XXX_I2C_REG_BLOCK_SIZE 0x0020
@@
-968,14
+968,6
@@
struct mpsc_pdata {
u32 brg_clk_freq;
};
u32 brg_clk_freq;
};
-/* i2c Platform Device, Driver Data */
-struct mv64xxx_i2c_pdata {
- u32 freq_m;
- u32 freq_n;
- u32 timeout; /* In milliseconds */
- u32 retries;
-};
-
/* Watchdog Platform Device, Driver Data */
#define MV64x60_WDT_NAME "mv64x60_wdt"
/* Watchdog Platform Device, Driver Data */
#define MV64x60_WDT_NAME "mv64x60_wdt"