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

Commit cf281a99 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge git://git.marvell.com/orion into devel

parents fbf2b1f9 9d1d4f9e

arch/arm/configs/kirkwood_defconfig

+16 −4
Original line number Diff line number Diff line
@@ -180,6 +180,7 @@ CONFIG_MACH_DB88F6281_BP=y 
CONFIG_MACH_RD88F6192_NAS=y

CONFIG_MACH_RD88F6281=y

CONFIG_MACH_SHEEVAPLUG=y

CONFIG_MACH_TS219=y

CONFIG_PLAT_ORION=y



#
@@ -852,13 +853,20 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y 
CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024

CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768

# CONFIG_INPUT_JOYDEV is not set

# CONFIG_INPUT_EVDEV is not set

CONFIG_INPUT_EVDEV=y

# CONFIG_INPUT_EVBUG is not set



#

# Input Device Drivers

#

# CONFIG_INPUT_KEYBOARD is not set

CONFIG_INPUT_KEYBOARD=y

CONFIG_KEYBOARD_ATKBD=y

# CONFIG_KEYBOARD_SUNKBD is not set

# CONFIG_KEYBOARD_LKKBD is not set

# CONFIG_KEYBOARD_XTKBD is not set

# CONFIG_KEYBOARD_NEWTON is not set

# CONFIG_KEYBOARD_STOWAWAY is not set

CONFIG_KEYBOARD_GPIO=y

# CONFIG_INPUT_MOUSE is not set

# CONFIG_INPUT_JOYSTICK is not set

# CONFIG_INPUT_TABLET is not set
@@ -868,7 +876,11 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 
#

# Hardware I/O ports

#

# CONFIG_SERIO is not set

CONFIG_SERIO=y

CONFIG_SERIO_SERPORT=y

# CONFIG_SERIO_PCIPS2 is not set

CONFIG_SERIO_LIBPS2=y

# CONFIG_SERIO_RAW is not set

# CONFIG_GAMEPORT is not set



#
@@ -1271,7 +1283,7 @@ CONFIG_RTC_INTF_DEV=y 
# CONFIG_RTC_DRV_PCF8563 is not set

# CONFIG_RTC_DRV_PCF8583 is not set

# CONFIG_RTC_DRV_M41T80 is not set

# CONFIG_RTC_DRV_S35390A is not set

CONFIG_RTC_DRV_S35390A=y

# CONFIG_RTC_DRV_FM3130 is not set

# CONFIG_RTC_DRV_RX8581 is not set

arch/arm/mach-kirkwood/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -26,6 +26,12 @@ config MACH_SHEEVAPLUG 
	  Say 'Y' here if you want your kernel to support the

	  Marvell SheevaPlug Reference Board.



config MACH_TS219

	bool "QNAP TS-119 and TS-219 Turbo NAS"

	help

	  Say 'Y' here if you want your kernel to support the

	  QNAP TS-119 and TS-219 Turbo NAS devices.



endmenu



endif

arch/arm/mach-kirkwood/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -4,3 +4,4 @@ obj-$(CONFIG_MACH_DB88F6281_BP) += db88f6281-bp-setup.o 
obj-$(CONFIG_MACH_RD88F6192_NAS)	+= rd88f6192-nas-setup.o

obj-$(CONFIG_MACH_RD88F6281)		+= rd88f6281-setup.o

obj-$(CONFIG_MACH_SHEEVAPLUG)		+= sheevaplug-setup.o

obj-$(CONFIG_MACH_TS219)		+= ts219-setup.o

arch/arm/mach-kirkwood/common.c

+40 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/serial_8250.h>

#include <linux/mbus.h>

#include <linux/mv643xx_eth.h>

#include <linux/mv643xx_i2c.h>

#include <linux/ata_platform.h>

#include <linux/spi/orion_spi.h>

#include <net/dsa.h>
@@ -370,6 +371,45 @@ void __init kirkwood_spi_init() 
}





/*****************************************************************************

 * I2C

 ****************************************************************************/

static struct mv64xxx_i2c_pdata kirkwood_i2c_pdata = {

	.freq_m		= 8, /* assumes 166 MHz TCLK */

	.freq_n		= 3,

	.timeout	= 1000, /* Default timeout of 1 second */

};



static struct resource kirkwood_i2c_resources[] = {

	{

		.name	= "i2c",

		.start	= I2C_PHYS_BASE,

		.end	= I2C_PHYS_BASE + 0x1f,

		.flags	= IORESOURCE_MEM,

	}, {

		.name	= "i2c",

		.start	= IRQ_KIRKWOOD_TWSI,

		.end	= IRQ_KIRKWOOD_TWSI,

		.flags	= IORESOURCE_IRQ,

	},

};



static struct platform_device kirkwood_i2c = {

	.name		= MV64XXX_I2C_CTLR_NAME,

	.id		= 0,

	.num_resources	= ARRAY_SIZE(kirkwood_i2c_resources),

	.resource	= kirkwood_i2c_resources,

	.dev		= {

		.platform_data	= &kirkwood_i2c_pdata,

	},

};



void __init kirkwood_i2c_init(void)

{

	platform_device_register(&kirkwood_i2c);

}





/*****************************************************************************

 * UART0

 ****************************************************************************/

arch/arm/mach-kirkwood/common.h

+2 −0
Original line number Diff line number Diff line
@@ -37,9 +37,11 @@ void kirkwood_pcie_init(void); 
void kirkwood_sata_init(struct mv_sata_platform_data *sata_data);

void kirkwood_sdio_init(struct mvsdio_platform_data *mvsdio_data);

void kirkwood_spi_init(void);

void kirkwood_i2c_init(void);

void kirkwood_uart0_init(void);

void kirkwood_uart1_init(void);



extern int kirkwood_tclk;

extern struct sys_timer kirkwood_timer;