@ -165,7 +165,7 @@ static int GetI2CSDA(void)
{
{
struct s3c24x0_gpio * gpio = s3c24x0_get_base_gpio ( ) ;
struct s3c24x0_gpio * gpio = s3c24x0_get_base_gpio ( ) ;
# ifdef CONFIG_S3C2410
# if defined(CONFIG_S3C2410) || defined(CONFIG_S3C2440)
return ( readl ( & gpio - > gpedat ) & 0x8000 ) > > 15 ;
return ( readl ( & gpio - > gpedat ) & 0x8000 ) > > 15 ;
# endif
# endif
# ifdef CONFIG_S3C2400
# ifdef CONFIG_S3C2400
@ -177,7 +177,7 @@ static void SetI2CSCL(int x)
{
{
struct s3c24x0_gpio * gpio = s3c24x0_get_base_gpio ( ) ;
struct s3c24x0_gpio * gpio = s3c24x0_get_base_gpio ( ) ;
# ifdef CONFIG_S3C2410
# if defined(CONFIG_S3C2410) || defined(CONFIG_S3C2440)
writel ( ( readl ( & gpio - > gpedat ) & ~ 0x4000 ) |
writel ( ( readl ( & gpio - > gpedat ) & ~ 0x4000 ) |
( x & 1 ) < < 14 , & gpio - > gpedat ) ;
( x & 1 ) < < 14 , & gpio - > gpedat ) ;
# endif
# endif
@ -443,7 +443,7 @@ static void s3c24x0_i2c_init(struct i2c_adapter *adap, int speed, int slaveadd)
int i ;
int i ;
if ( ( readl ( & i2c - > iicstat ) & I2CSTAT_BSY ) | | GetI2CSDA ( ) = = 0 ) {
if ( ( readl ( & i2c - > iicstat ) & I2CSTAT_BSY ) | | GetI2CSDA ( ) = = 0 ) {
# ifdef CONFIG_S3C2410
# if defined(CONFIG_S3C2410) || defined(CONFIG_S3C2440)
ulong old_gpecon = readl ( & gpio - > gpecon ) ;
ulong old_gpecon = readl ( & gpio - > gpecon ) ;
# endif
# endif
# ifdef CONFIG_S3C2400
# ifdef CONFIG_S3C2400
@ -452,7 +452,7 @@ static void s3c24x0_i2c_init(struct i2c_adapter *adap, int speed, int slaveadd)
/* bus still busy probably by (most) previously interrupted
/* bus still busy probably by (most) previously interrupted
transfer */
transfer */
# ifdef CONFIG_S3C2410
# if defined(CONFIG_S3C2410) || defined(CONFIG_S3C2440)
/* set I2CSDA and I2CSCL (GPE15, GPE14) to GPIO */
/* set I2CSDA and I2CSCL (GPE15, GPE14) to GPIO */
writel ( ( readl ( & gpio - > gpecon ) & ~ 0xF0000000 ) | 0x10000000 ,
writel ( ( readl ( & gpio - > gpecon ) & ~ 0xF0000000 ) | 0x10000000 ,
& gpio - > gpecon ) ;
& gpio - > gpecon ) ;
@ -478,7 +478,7 @@ static void s3c24x0_i2c_init(struct i2c_adapter *adap, int speed, int slaveadd)
udelay ( 1000 ) ;
udelay ( 1000 ) ;
/* restore pin functions */
/* restore pin functions */
# ifdef CONFIG_S3C2410
# if defined(CONFIG_S3C2410) || defined(CONFIG_S3C2440)
writel ( old_gpecon , & gpio - > gpecon ) ;
writel ( old_gpecon , & gpio - > gpecon ) ;
# endif
# endif
# ifdef CONFIG_S3C2400
# ifdef CONFIG_S3C2400