summaryrefslogtreecommitdiff
path: root/arch/mips/include/asm/octeon/octeon.h
diff options
context:
space:
mode:
authorDavid Daney <david.daney@cavium.com>2012-07-05 18:12:39 +0200
committerRalf Baechle <ralf@linux-mips.org>2012-07-23 13:54:53 +0100
commitf353a218de6393fb43a5e81c3adbe1aac1a871ab (patch)
tree2b005cd034b91c66f452b3a030373049edacce08 /arch/mips/include/asm/octeon/octeon.h
parenta0c16582b5b50792b0fd3e07d23c537936fafcb7 (diff)
i2c: Convert i2c-octeon.c to use device tree.
There are three parts to this: 1) Remove the definitions of OCTEON_IRQ_TWSI and OCTEON_IRQ_TWSI2. The interrupts are specified by the device tree and these hard coded irq numbers block the used of the irq lines by the irq_domain code. 2) Remove platform device setup code from octeon-platform.c, it is now unused. 3) Convert i2c-octeon.c to use device tree. Part of this includes using the devm_* functions instead of the raw counterparts, thus simplifying error handling. No functionality is changed. Signed-off-by: David Daney <david.daney@cavium.com> Acked-by: Rob Herring <rob.herring@calxeda.com> Acked-by: Wolfram Sang <w.sang@pengutronix.de> Cc: linux-mips@linux-mips.org Cc: devicetree-discuss@lists.ozlabs.org Cc: Grant Likely <grant.likely@secretlab.ca> Cc: linux-kernel@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/3939/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/include/asm/octeon/octeon.h')
-rw-r--r--arch/mips/include/asm/octeon/octeon.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/mips/include/asm/octeon/octeon.h b/arch/mips/include/asm/octeon/octeon.h
index f72f768cd3a4..1e2486e23573 100644
--- a/arch/mips/include/asm/octeon/octeon.h
+++ b/arch/mips/include/asm/octeon/octeon.h
@@ -215,11 +215,6 @@ struct octeon_cf_data {
int dma_engine; /* -1 for no DMA */
};
-struct octeon_i2c_data {
- unsigned int sys_freq;
- unsigned int i2c_freq;
-};
-
extern void octeon_write_lcd(const char *s);
extern void octeon_check_cpu_bist(void);
extern int octeon_get_boot_debug_flag(void);