Commit 9138f89e authored by Suman Anna's avatar Suman Anna Committed by Tony Lindgren
Browse files

ARM: OMAP: Move plat/i2c.h into mach-omap1 folder 



The current contents of plat/i2c.h are only relevant for OMAP1
platforms, as all the equivalent functions for OMAP2 has been
dropped in commit 65fa3e71 ("ARM: OMAP2+: Remove legacy i2c.c
platform init code"), and which has also moved the left-over code
from plat-omap into mach-omap1. The hwmod is a concept only
applicable for OMAP2 platforms, and the omap_i2c_reset() is
already declared in mach-omap2/i2c.h. So, move the current
plat/i2c.h header file into the mach-omap1 folder, and adjust
the header usage accordingly.

Signed-off-by: default avatarSuman Anna <s-anna@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 0693036c

arch/arm/mach-omap1/common.h

+1 −2
Original line number Diff line number Diff line
@@ -32,11 +32,10 @@ 


#include <asm/exception.h>



#include <plat/i2c.h>



#include <mach/irqs.h>



#include "soc.h"

#include "i2c.h"



#if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850)

void omap7xx_map_io(void);

arch/arm/mach-omap1/i2c.c

+0 −2
Original line number Diff line number Diff line
@@ -24,8 +24,6 @@ 
#include <mach/mux.h>

#include "soc.h"



#include <plat/i2c.h>



#define OMAP_I2C_SIZE		0x3f

#define OMAP1_I2C_BASE		0xfffb3800

arch/arm/plat-omap/include/plat/i2c.h→arch/arm/mach-omap1/i2c.h

+3 −6
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ 
 *

 */



#ifndef __PLAT_OMAP_I2C_H

#define __PLAT_OMAP_I2C_H

#ifndef __ARCH_ARM_MACH_OMAP1_I2C_H

#define __ARCH_ARM_MACH_OMAP1_I2C_H



struct i2c_board_info;

struct omap_i2c_bus_platform_data;
@@ -47,7 +47,4 @@ static inline int omap_register_i2c_bus_cmdline(void) 
}

#endif



struct omap_hwmod;

int omap_i2c_reset(struct omap_hwmod *oh);



#endif /* __PLAT_OMAP_I2C_H */
 
#endif /* __ARCH_ARM_MACH_OMAP1_I2C_H */

arch/arm/mach-omap2/i2c.h

+2 −2
Original line number Diff line number Diff line
@@ -19,11 +19,11 @@ 
 *

 */



#include <plat/i2c.h>



#ifndef __MACH_OMAP2_I2C_H

#define __MACH_OMAP2_I2C_H



struct omap_hwmod;



int omap_i2c_reset(struct omap_hwmod *oh);



#endif	/* __MACH_OMAP2_I2C_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE