Merge branch 'for-rmk' of git://git.marvell.com/orion (29081571) · Commits · e / devices / android_kernel_fairphone_FP5

arch/arm/mach-kirkwood/common.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -144,6 +144,9 @@ static struct platform_device kirkwood_ge00 = {
		.id = 0,
		.num_resources = 1,
		.resource = kirkwood_ge00_resources,
		.dev = {
		.coherent_dma_mask = 0xffffffff,
		},
		};

		void __init kirkwood_ge00_init(struct mv643xx_eth_platform_data *eth_data)
		@@ -202,6 +205,9 @@ static struct platform_device kirkwood_ge01 = {
		.id = 1,
		.num_resources = 1,
		.resource = kirkwood_ge01_resources,
		.dev = {
		.coherent_dma_mask = 0xffffffff,
		},
		};

		void __init kirkwood_ge01_init(struct mv643xx_eth_platform_data *eth_data)
		@@ -386,12 +392,10 @@ static struct mv64xxx_i2c_pdata kirkwood_i2c_pdata = {

		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,

arch/arm/mach-kirkwood/ts219-setup.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -142,6 +142,8 @@ static unsigned int qnap_ts219_mpp_config[] __initdata = {
		MPP1_SPI_MOSI,
		MPP2_SPI_SCK,
		MPP3_SPI_MISO,
		MPP4_SATA1_ACTn,
		MPP5_SATA0_ACTn,
		MPP8_TW_SDA,
		MPP9_TW_SCK,
		MPP10_UART0_TXD,
		@@ -150,10 +152,6 @@ static unsigned int qnap_ts219_mpp_config[] __initdata = {
		MPP14_UART1_RXD, /* PIC controller */
		MPP15_GPIO, /* USB Copy button */
		MPP16_GPIO, /* Reset button */
		MPP20_SATA1_ACTn,
		MPP21_SATA0_ACTn,
		MPP22_SATA1_PRESENTn,
		MPP23_SATA0_PRESENTn,
		0
		};

arch/arm/mach-loki/common.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -82,6 +82,9 @@ static struct platform_device loki_ge0 = {
		.id = 0,
		.num_resources = 1,
		.resource = loki_ge0_resources,
		.dev = {
		.coherent_dma_mask = 0xffffffff,
		},
		};

		void __init loki_ge0_init(struct mv643xx_eth_platform_data *eth_data)
		@@ -136,6 +139,9 @@ static struct platform_device loki_ge1 = {
		.id = 1,
		.num_resources = 1,
		.resource = loki_ge1_resources,
		.dev = {
		.coherent_dma_mask = 0xffffffff,
		},
		};

		void __init loki_ge1_init(struct mv643xx_eth_platform_data *eth_data)

arch/arm/mach-mv78xx0/common.c

+12 −4

Original line number	Diff line number	Diff line
		@@ -321,6 +321,9 @@ static struct platform_device mv78xx0_ge00 = {
		.id = 0,
		.num_resources = 1,
		.resource = mv78xx0_ge00_resources,
		.dev = {
		.coherent_dma_mask = 0xffffffff,
		},
		};

		void __init mv78xx0_ge00_init(struct mv643xx_eth_platform_data *eth_data)
		@@ -375,6 +378,9 @@ static struct platform_device mv78xx0_ge01 = {
		.id = 1,
		.num_resources = 1,
		.resource = mv78xx0_ge01_resources,
		.dev = {
		.coherent_dma_mask = 0xffffffff,
		},
		};

		void __init mv78xx0_ge01_init(struct mv643xx_eth_platform_data *eth_data)
		@@ -429,6 +435,9 @@ static struct platform_device mv78xx0_ge10 = {
		.id = 2,
		.num_resources = 1,
		.resource = mv78xx0_ge10_resources,
		.dev = {
		.coherent_dma_mask = 0xffffffff,
		},
		};

		void __init mv78xx0_ge10_init(struct mv643xx_eth_platform_data *eth_data)
		@@ -496,6 +505,9 @@ static struct platform_device mv78xx0_ge11 = {
		.id = 3,
		.num_resources = 1,
		.resource = mv78xx0_ge11_resources,
		.dev = {
		.coherent_dma_mask = 0xffffffff,
		},
		};

		void __init mv78xx0_ge11_init(struct mv643xx_eth_platform_data *eth_data)
		@@ -532,12 +544,10 @@ static struct mv64xxx_i2c_pdata mv78xx0_i2c_0_pdata = {

		static struct resource mv78xx0_i2c_0_resources[] = {
		{
		.name = "i2c 0 base",
		.start = I2C_0_PHYS_BASE,
		.end = I2C_0_PHYS_BASE + 0x1f,
		.flags = IORESOURCE_MEM,
		}, {
		.name = "i2c 0 irq",
		.start = IRQ_MV78XX0_I2C_0,
		.end = IRQ_MV78XX0_I2C_0,
		.flags = IORESOURCE_IRQ,
		@@ -567,12 +577,10 @@ static struct mv64xxx_i2c_pdata mv78xx0_i2c_1_pdata = {

		static struct resource mv78xx0_i2c_1_resources[] = {
		{
		.name = "i2c 1 base",
		.start = I2C_1_PHYS_BASE,
		.end = I2C_1_PHYS_BASE + 0x1f,
		.flags = IORESOURCE_MEM,
		}, {
		.name = "i2c 1 irq",
		.start = IRQ_MV78XX0_I2C_1,
		.end = IRQ_MV78XX0_I2C_1,
		.flags = IORESOURCE_IRQ,

arch/arm/mach-orion5x/common.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -188,6 +188,9 @@ static struct platform_device orion5x_eth = {
		.id = 0,
		.num_resources = 1,
		.resource = orion5x_eth_resources,
		.dev = {
		.coherent_dma_mask = 0xffffffff,
		},
		};

		void __init orion5x_eth_init(struct mv643xx_eth_platform_data *eth_data)
		@@ -248,12 +251,10 @@ static struct mv64xxx_i2c_pdata orion5x_i2c_pdata = {

		static struct resource orion5x_i2c_resources[] = {
		{
		.name = "i2c base",
		.start = I2C_PHYS_BASE,
		.end = I2C_PHYS_BASE + 0x1f,
		.flags = IORESOURCE_MEM,
		}, {
		.name = "i2c irq",
		.start = IRQ_ORION5X_I2C,
		.end = IRQ_ORION5X_I2C,
		.flags = IORESOURCE_IRQ,