The patch titled
AVR32: spi/ethernet platform_device update
has been added to the -mm tree. Its filename is
avr32-spi-ethernet-platform_device-update.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: AVR32: spi/ethernet platform_device update
From: Haavard Skinnemoen <hskinnemoen@xxxxxxxxx>
Make the spi platform_device definitions match the driver and add definitions
for the second spi controller on at32ap7000. The driver expects the device
name to be "atmel_spi" and the main clock to be "pclk".
Also add platform_device definitions for the second ethernet controller on
at32ap7000.
Signed-off-by: Haavard Skinnemoen <hskinnemoen@xxxxxxxxx>
Cc: David Brownell <david-b@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/avr32/mach-at32ap/at32ap7000.c | 64 +++++++++++++++++++++++---
1 files changed, 57 insertions(+), 7 deletions(-)
diff -puN arch/avr32/mach-at32ap/at32ap7000.c~avr32-spi-ethernet-platform_device-update arch/avr32/mach-at32ap/at32ap7000.c
--- a/arch/avr32/mach-at32ap/at32ap7000.c~avr32-spi-ethernet-platform_device-update
+++ a/arch/avr32/mach-at32ap/at32ap7000.c
@@ -650,6 +650,15 @@ DEFINE_DEV_DATA(macb, 0);
DEV_CLK(hclk, macb0, hsb, 8);
DEV_CLK(pclk, macb0, pbb, 6);
+static struct eth_platform_data macb1_data;
+static struct resource macb1_resource[] = {
+ PBMEM(0xfff01c00),
+ IRQ(26),
+};
+DEFINE_DEV_DATA(macb, 1);
+DEV_CLK(hclk, macb1, hsb, 9);
+DEV_CLK(pclk, macb1, pbb, 7);
+
struct platform_device *__init
at32_add_device_eth(unsigned int id, struct eth_platform_data *data)
{
@@ -683,6 +692,33 @@ at32_add_device_eth(unsigned int id, str
}
break;
+ case 1:
+ pdev = &macb1_device;
+
+ select_peripheral(PD13, B); /* TXD0 */
+ select_peripheral(PD14, B); /* TXD1 */
+ select_peripheral(PD11, B); /* TXEN */
+ select_peripheral(PD12, B); /* TXCK */
+ select_peripheral(PD10, B); /* RXD0 */
+ select_peripheral(PD6, B); /* RXD1 */
+ select_peripheral(PD5, B); /* RXER */
+ select_peripheral(PD4, B); /* RXDV */
+ select_peripheral(PD3, B); /* MDC */
+ select_peripheral(PD2, B); /* MDIO */
+
+ if (!data->is_rmii) {
+ select_peripheral(PC19, B); /* COL */
+ select_peripheral(PC23, B); /* CRS */
+ select_peripheral(PC26, B); /* TXER */
+ select_peripheral(PC27, B); /* TXD2 */
+ select_peripheral(PC28, B); /* TXD3 */
+ select_peripheral(PC29, B); /* RXD2 */
+ select_peripheral(PC30, B); /* RXD3 */
+ select_peripheral(PC24, B); /* RXCK */
+ select_peripheral(PD15, B); /* SPD */
+ }
+ break;
+
default:
return NULL;
}
@@ -700,8 +736,15 @@ static struct resource atmel_spi0_resour
PBMEM(0xffe00000),
IRQ(3),
};
-DEFINE_DEV(spi, 0);
-DEV_CLK(mck, spi0, pba, 0);
+DEFINE_DEV(atmel_spi, 0);
+DEV_CLK(pclk, atmel_spi0, pba, 0);
+
+static struct resource atmel_spi1_resource[] = {
+ PBMEM(0xffe00400),
+ IRQ(4),
+};
+DEFINE_DEV(atmel_spi, 1);
+DEV_CLK(pclk, atmel_spi1, pba, 1);
struct platform_device *__init
at32_add_device_spi(unsigned int id)
@@ -711,13 +754,17 @@ at32_add_device_spi(unsigned int id)
switch (id) {
case 0:
- pdev = &spi0_device;
+ pdev = &atmel_spi0_device;
select_peripheral(PA0, A); /* MISO */
select_peripheral(PA1, A); /* MOSI */
select_peripheral(PA2, A); /* SCK */
- select_peripheral(PA3, A); /* NPCS0 */
- select_peripheral(PA4, A); /* NPCS1 */
- select_peripheral(PA5, A); /* NPCS2 */
+ break;
+
+ case 1:
+ pdev = &atmel_spi1_device;
+ select_peripheral(PB0, B); /* MISO */
+ select_peripheral(PB1, B); /* MOSI */
+ select_peripheral(PB5, B); /* SCK */
break;
default:
@@ -836,7 +883,10 @@ struct clk *at32_clock_list[] = {
&atmel_usart3_usart,
&macb0_hclk,
&macb0_pclk,
- &spi0_mck,
+ &macb1_hclk,
+ &macb1_pclk,
+ &atmel_spi0_pclk,
+ &atmel_spi1_pclk,
&lcdc0_hclk,
&lcdc0_pixclk,
};
_
Patches currently in -mm which might be from hskinnemoen@xxxxxxxxx are
origin.patch
fix-x86_64-mm-i386-reloc-kallsyms.patch
gpio-framework-for-avr32.patch
avr32-spi-ethernet-platform_device-update.patch
avr32-move-spi-device-definitions-into-main-board.patch
atmel-spi-driver.patch
atmel-spi-driver-maintainers-entry.patch
generic-ioremap_page_range-mips-conversion.patch
generic-ioremap_page_range-parisc-conversion.patch
generic-ioremap_page_range-s390-conversion.patch
generic-ioremap_page_range-sh-conversion.patch
generic-ioremap_page_range-sh64-conversion.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
