Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e25d64f1 authored by Lennert Buytenhek's avatar Lennert Buytenhek Committed by Russell King
Browse files

[ARM] 3819/1: iop3xx: factor out shared i2c code 



Move the i2c bits shared between iop32x and iop33x to plat-iop/i2c.c
and include/asm-arm/hardware/iop3xx.h.

Signed-off-by: default avatarLennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 7ae1f7ec

arch/arm/mach-iop32x/common.c

+9 −8
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 


#include <linux/delay.h>

#include <asm/hardware.h>

#include <asm/hardware/iop3xx.h>



/*

 * Shared variables
@@ -39,23 +40,23 @@ void ep80219_power_off(void) 
     */



	/* Send the Address byte w/ the start condition */

	*IOP321_IDBR1 = 0x60;

	*IOP321_ICR1 = 0xE9;

	*IOP3XX_IDBR1 = 0x60;

	*IOP3XX_ICR1 = 0xE9;

    mdelay(1);



	/* Send the START_MSG byte w/ no start or stop condition */

	*IOP321_IDBR1 = 0x0F;

	*IOP321_ICR1 = 0xE8;

	*IOP3XX_IDBR1 = 0x0F;

	*IOP3XX_ICR1 = 0xE8;

    mdelay(1);



	/* Send the SHUTDOWN_COMPLETE Message ID byte w/ no start or stop condition */

	*IOP321_IDBR1 = 0x03;

	*IOP321_ICR1 = 0xE8;

	*IOP3XX_IDBR1 = 0x03;

	*IOP3XX_ICR1 = 0xE8;

    mdelay(1);



	/* Send an ignored byte w/ stop condition */

	*IOP321_IDBR1 = 0x00;

	*IOP321_ICR1 = 0xEA;

	*IOP3XX_IDBR1 = 0x00;

	*IOP3XX_ICR1 = 0xEA;



	while (1) ;

}

arch/arm/mach-iop32x/setup.c

+3 −50
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <asm/hardware.h>

#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <asm/hardware/iop3xx.h>



#define IOP321_UART_XTAL 1843200
@@ -57,58 +58,10 @@ static struct uart_port iop321_serial_ports[] = { 
	}

};



static struct resource iop32x_i2c_0_resources[] = {

	[0] = {

		.start = 0xfffff680,

		.end = 0xfffff698,

		.flags = IORESOURCE_MEM,

	},

	[1] = {

		.start = IRQ_IOP321_I2C_0,

		.end = IRQ_IOP321_I2C_0,

		.flags = IORESOURCE_IRQ

	}

};



static struct resource iop32x_i2c_1_resources[] = {

	[0] = {

		.start = 0xfffff6a0,

		.end = 0xfffff6b8,

		.flags = IORESOURCE_MEM,

	},

	[1] = {

		.start = IRQ_IOP321_I2C_1,

		.end = IRQ_IOP321_I2C_1,

		.flags = IORESOURCE_IRQ

	}

};



static struct platform_device iop32x_i2c_0_controller = {

	.name = "IOP3xx-I2C",

	.id = 0,

	.num_resources = 2,

	.resource = iop32x_i2c_0_resources

};



static struct platform_device iop32x_i2c_1_controller = {

	.name = "IOP3xx-I2C",

	.id = 1,

	.num_resources = 2,

	.resource = iop32x_i2c_1_resources

};



static struct platform_device *iop32x_devices[] __initdata = {

	&iop32x_i2c_0_controller,

	&iop32x_i2c_1_controller

};



void __init iop32x_init(void)

{

	if(iop_is_321())

	{

		platform_add_devices(iop32x_devices,

				ARRAY_SIZE(iop32x_devices));

	}

	platform_device_register(&iop3xx_i2c0_device);

	platform_device_register(&iop3xx_i2c1_device);

	early_serial_setup(&iop321_serial_ports[0]);

}

arch/arm/mach-iop33x/setup.c

+2 −42
Original line number Diff line number Diff line
@@ -100,51 +100,9 @@ static struct platform_device iop33x_uart1 = { 
       .resource = iop33x_uart1_resources,

};



static struct resource iop33x_i2c_0_resources[] = {

	[0] = {

		.start = 0xfffff680,

		.end = 0xfffff698,

		.flags = IORESOURCE_MEM,

	},

	[1] = {

		.start = IRQ_IOP331_I2C_0,

		.end = IRQ_IOP331_I2C_0,

		.flags = IORESOURCE_IRQ

	}

};



static struct resource iop33x_i2c_1_resources[] = {

	[0] = {

		.start = 0xfffff6a0,

		.end = 0xfffff6b8,

		.flags = IORESOURCE_MEM,

	},

	[1] = {

		.start = IRQ_IOP331_I2C_1,

		.end = IRQ_IOP331_I2C_1,

		.flags = IORESOURCE_IRQ

	}

};



static struct platform_device iop33x_i2c_0_controller = {

	.name = "IOP3xx-I2C",

	.id = 0,

	.num_resources = 2,

	.resource = iop33x_i2c_0_resources

};



static struct platform_device iop33x_i2c_1_controller = {

	.name = "IOP3xx-I2C",

	.id = 1,

	.num_resources = 2,

	.resource = iop33x_i2c_1_resources

};



static struct platform_device *iop33x_devices[] __initdata = {

	&iop33x_uart0,

	&iop33x_uart1,

	&iop33x_i2c_0_controller,

	&iop33x_i2c_1_controller

};



void __init iop33x_init(void)
@@ -154,6 +112,8 @@ void __init iop33x_init(void) 
		platform_add_devices(iop33x_devices,

				ARRAY_SIZE(iop33x_devices));

	}

	platform_device_register(&iop3xx_i2c0_device);

	platform_device_register(&iop3xx_i2c1_device);

}



#ifdef CONFIG_ARCH_IOP33X

arch/arm/plat-iop/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
# Makefile for the linux kernel.

#



obj-y			:= setup.o

obj-y			:= i2c.o setup.o

obj-m			:=

obj-n			:=

obj-			:=

arch/arm/plat-iop/i2c.c

0 → 100644
+81 −0
Original line number Diff line number Diff line 
/*

 * arch/arm/plat-iop/i2c.c

 *

 * Author: Nicolas Pitre <nico@cam.org>

 * Copyright (C) 2001 MontaVista Software, Inc.

 * Copyright (C) 2004 Intel Corporation.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#include <linux/mm.h>

#include <linux/init.h>

#include <linux/major.h>

#include <linux/fs.h>

#include <linux/platform_device.h>

#include <linux/serial.h>

#include <linux/tty.h>

#include <linux/serial_core.h>

#include <asm/io.h>

#include <asm/pgtable.h>

#include <asm/page.h>

#include <asm/mach/map.h>

#include <asm/setup.h>

#include <asm/system.h>

#include <asm/memory.h>

#include <asm/hardware.h>

#include <asm/hardware/iop3xx.h>

#include <asm/mach-types.h>

#include <asm/mach/arch.h>



#ifdef CONFIG_ARCH_IOP32X

#define IRQ_IOP3XX_I2C_0	IRQ_IOP321_I2C_0

#define IRQ_IOP3XX_I2C_1	IRQ_IOP321_I2C_1

#endif

#ifdef CONFIG_ARCH_IOP33X

#define IRQ_IOP3XX_I2C_0	IRQ_IOP331_I2C_0

#define IRQ_IOP3XX_I2C_1	IRQ_IOP331_I2C_1

#endif



static struct resource iop3xx_i2c0_resources[] = {

	[0] = {

		.start	= 0xfffff680,

		.end	= 0xfffff697,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= IRQ_IOP3XX_I2C_0,

		.end	= IRQ_IOP3XX_I2C_0,

		.flags	= IORESOURCE_IRQ,

	},

};



struct platform_device iop3xx_i2c0_device = {

	.name		= "IOP3xx-I2C",

	.id		= 0,

	.num_resources	= 2,

	.resource	= iop3xx_i2c0_resources,

};





static struct resource iop3xx_i2c1_resources[] = {

	[0] = {

		.start	= 0xfffff6a0,

		.end	= 0xfffff6b7,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= IRQ_IOP3XX_I2C_1,

		.end	= IRQ_IOP3XX_I2C_1,

		.flags	= IORESOURCE_IRQ,

	}

};



struct platform_device iop3xx_i2c1_device = {

	.name		= "IOP3xx-I2C",

	.id		= 1,

	.num_resources	= 2,

	.resource	= iop3xx_i2c1_resources,

};