register devices with spi controller

4 files changed, 39 insertions, 22 deletions

diff --git a/recipes/linux/linux-2.6.28/mtcdp/linux-2.6.28-mach-at91-20100405.patch b/recipes/linux/linux-2.6.28/mtcdp/linux-2.6.28-mach-at91.patch
index 6ca111a137..a311c7fee1 100644
--- a/recipes/linux/linux-2.6.28/mtcdp/linux-2.6.28-mach-at91-20100405.patch
+++ b/recipes/linux/linux-2.6.28/mtcdp/linux-2.6.28-mach-at91.patch
@@ -16,7 +16,7 @@ diff -uprN -X linux-2.6.28/Documentation/dontdiff linux-2.6.28-vanilla/arch/arm/
  	eth_data = *data;
 diff -uprN -X linux-2.6.28/Documentation/dontdiff linux-2.6.28-vanilla/arch/arm/mach-at91/board-sam9g20ek.c linux-2.6.28/arch/arm/mach-at91/board-sam9g20ek.c
 --- linux-2.6.28-vanilla/arch/arm/mach-at91/board-sam9g20ek.c	2008-12-24 17:26:37.000000000 -0600
-+++ linux-2.6.28/arch/arm/mach-at91/board-sam9g20ek.c	2010-04-05 15:25:29.000000000 -0500
++++ linux-2.6.28/arch/arm/mach-at91/board-sam9g20ek.c	2010-05-03 14:46:54.000000000 -0500
 @@ -57,6 +57,9 @@ static void __init ek_map_io(void)
  	/* USART1 on ttyS2. (Rx, Tx, RTS, CTS) */
  	at91_register_uart(AT91SAM9260_ID_US1, 2, ATMEL_UART_CTS | ATMEL_UART_RTS);
@@ -38,7 +38,24 @@ diff -uprN -X linux-2.6.28/Documentation/dontdiff linux-2.6.28-vanilla/arch/arm/
  };
  
  
-@@ -111,7 +114,7 @@ static struct spi_board_info ek_spi_devi
+@@ -103,6 +106,16 @@ static struct spi_board_info ek_spi_devi
+ 	},
+ #endif
+ #endif
++	{
++		.modalias	= "mts-io-sregout",
++		.chip_select	= 0,
++		.bus_num	= 1,
++	},
++	{
++		.modalias	= "mts-io-board-temp",
++		.chip_select	= 2,
++		.bus_num	= 1,
++	},
+ };
+ 
+ 
+@@ -111,7 +124,7 @@ static struct spi_board_info ek_spi_devi
   */
  static struct at91_eth_data __initdata ek_macb_data = {
  	.phy_irq_pin	= AT91_PIN_PA7,
@@ -47,7 +64,7 @@ diff -uprN -X linux-2.6.28/Documentation/dontdiff linux-2.6.28-vanilla/arch/arm/
  };
  
  
-@@ -120,22 +123,53 @@ static struct at91_eth_data __initdata e
+@@ -120,22 +133,53 @@ static struct at91_eth_data __initdata e
   */
  static struct mtd_partition __initdata ek_nand_partition[] = {
  	{
@@ -57,13 +74,18 @@ diff -uprN -X linux-2.6.28/Documentation/dontdiff linux-2.6.28-vanilla/arch/arm/
 +		.name	= "MTNCG-NANDFlash",
 +		.offset	= 0,
 +		.size	= 256*1024*1024,
-+	},
-+	{
+ 	},
+ 	{
+-		.name	= "Partition 1",
+-		.offset	= MTDPART_OFS_NXTBLK,
+-		.size	= 60 * SZ_1M,
 +		.name	= "AT91Bootstrap",
 +		.offset	= 0,
 +		.size	= 128*1024,
-+	},
-+	{
+ 	},
+ 	{
+-		.name	= "Partition 2",
+-		.offset	= MTDPART_OFS_NXTBLK,
 +		.name	= "UBoot",
 +		.offset	= 128*1024,
 +		.size	= 256*1024,
@@ -87,18 +109,13 @@ diff -uprN -X linux-2.6.28/Documentation/dontdiff linux-2.6.28-vanilla/arch/arm/
 +		.name	= "Config",
 +		.offset	= 64*128*1024,
 +		.size	= 64*128*1024,
- 	},
- 	{
--		.name	= "Partition 1",
--		.offset	= MTDPART_OFS_NXTBLK,
--		.size	= 60 * SZ_1M,
++	},
++	{
 +		.name	= "Oem Config",
 +		.offset	= 128*128*1024,
 +		.size	= 64*128*1024,
- 	},
- 	{
--		.name	= "Partition 2",
--		.offset	= MTDPART_OFS_NXTBLK,
++	},
++	{
 +		.name	= "Rootfs",
 +		.offset	= 192*128*1024,
  		.size	= MTDPART_SIZ_FULL,
@@ -109,7 +126,7 @@ diff -uprN -X linux-2.6.28/Documentation/dontdiff linux-2.6.28-vanilla/arch/arm/
  static struct mtd_partition * __init nand_partitions(int size, int *num_partitions)
  {
  	*num_partitions = ARRAY_SIZE(ek_nand_partition);
-@@ -159,11 +193,13 @@ static struct atmel_nand_data __initdata
+@@ -159,11 +203,13 @@ static struct atmel_nand_data __initdata
  
  /*
   * MCI (SD/MMC)
@@ -124,7 +141,7 @@ diff -uprN -X linux-2.6.28/Documentation/dontdiff linux-2.6.28-vanilla/arch/arm/
  };
  
  
-@@ -171,17 +207,12 @@ static struct at91_mmc_data __initdata e
+@@ -171,17 +217,12 @@ static struct at91_mmc_data __initdata e
   * LEDs
   */
  static struct gpio_led ek_leds[] = {
diff --git a/recipes/linux/linux-2.6.28/mtcdp/linux-2.6.28-option-20100405.patch b/recipes/linux/linux-2.6.28/mtcdp/linux-2.6.28-option.patch
index 8a06a1f04a..8a06a1f04a 100644
--- a/recipes/linux/linux-2.6.28/mtcdp/linux-2.6.28-option-20100405.patch
+++ b/recipes/linux/linux-2.6.28/mtcdp/linux-2.6.28-option.patch
diff --git a/recipes/linux/linux-2.6.28/mtcdp/linux-2.6.28-sierra-20100405.patch b/recipes/linux/linux-2.6.28/mtcdp/linux-2.6.28-sierra.patch
index 5d93c0edd3..5d93c0edd3 100644
--- a/recipes/linux/linux-2.6.28/mtcdp/linux-2.6.28-sierra-20100405.patch
+++ b/recipes/linux/linux-2.6.28/mtcdp/linux-2.6.28-sierra.patch
diff --git a/recipes/linux/linux_2.6.28.bb b/recipes/linux/linux_2.6.28.bb
index 978bfa6727..bf7fc32da3 100644
--- a/recipes/linux/linux_2.6.28.bb
+++ b/recipes/linux/linux_2.6.28.bb
@@ -1,6 +1,6 @@
 require linux.inc
 
-PR = "r14"
+PR = "r15"
 
 # Mark archs/machines that this kernel supports
 DEFAULT_PREFERENCE = "-1"
@@ -18,9 +18,9 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.28.tar.bz2 \
            file://defconfig"
 
 SRC_URI_append_mtcdp = " \
-    file://linux-2.6.28-mach-at91-20100405.patch;patch=1 \
-    file://linux-2.6.28-option-20100405.patch;patch=1 \
-    file://linux-2.6.28-sierra-20100405.patch;patch=1 \
+    file://linux-2.6.28-mach-at91.patch;patch=1 \
+    file://linux-2.6.28-option.patch;patch=1 \
+    file://linux-2.6.28-sierra.patch;patch=1 \
     "
 
 SRC_URI_append_at91sam9263ek = " \