From fafcfdf3a086177f0acc55ac06c95861e8157191 Mon Sep 17 00:00:00 2001 From: Jesse Gilles Date: Wed, 18 Dec 2013 10:14:47 -0600 Subject: linux-2.6.35: mtcdp: add spidev devices --- .../recipes/linux/linux-2.6.35/mtcdp/defconfig | 2 +- .../mtcdp/linux-2.6.35.14-mach-at91.patch | 45 ++++++++++++++-------- 2 files changed, 31 insertions(+), 16 deletions(-) diff --git a/multitech/recipes/linux/linux-2.6.35/mtcdp/defconfig b/multitech/recipes/linux/linux-2.6.35/mtcdp/defconfig index 68eaf6d..1664307 100644 --- a/multitech/recipes/linux/linux-2.6.35/mtcdp/defconfig +++ b/multitech/recipes/linux/linux-2.6.35/mtcdp/defconfig @@ -1131,7 +1131,7 @@ CONFIG_SPI_ATMEL=y # # SPI Protocol Masters # -# CONFIG_SPI_SPIDEV is not set +CONFIG_SPI_SPIDEV=m # CONFIG_SPI_TLE62X0 is not set # diff --git a/multitech/recipes/linux/linux-2.6.35/mtcdp/linux-2.6.35.14-mach-at91.patch b/multitech/recipes/linux/linux-2.6.35/mtcdp/linux-2.6.35.14-mach-at91.patch index 30b4712..696b04d 100644 --- a/multitech/recipes/linux/linux-2.6.35/mtcdp/linux-2.6.35.14-mach-at91.patch +++ b/multitech/recipes/linux/linux-2.6.35/mtcdp/linux-2.6.35.14-mach-at91.patch @@ -1,7 +1,7 @@ Index: linux-2.6.35/arch/arm/mach-at91/at91sam9260_devices.c =================================================================== ---- linux-2.6.35.orig/arch/arm/mach-at91/at91sam9260_devices.c 2011-08-12 14:37:24.056904132 -0500 -+++ linux-2.6.35/arch/arm/mach-at91/at91sam9260_devices.c 2011-08-12 14:39:25.459149746 -0500 +--- linux-2.6.35.orig/arch/arm/mach-at91/at91sam9260_devices.c 2010-08-01 17:11:14.000000000 -0500 ++++ linux-2.6.35/arch/arm/mach-at91/at91sam9260_devices.c 2013-11-12 13:28:25.629356536 -0600 @@ -183,9 +183,9 @@ at91_set_B_periph(AT91_PIN_PA25, 0); /* ERX2 */ at91_set_B_periph(AT91_PIN_PA26, 0); /* ERX3 */ @@ -34,8 +34,8 @@ Index: linux-2.6.35/arch/arm/mach-at91/at91sam9260_devices.c { Index: linux-2.6.35/arch/arm/mach-at91/board-sam9g20ek.c =================================================================== ---- linux-2.6.35.orig/arch/arm/mach-at91/board-sam9g20ek.c 2011-08-12 14:37:05.596941320 -0500 -+++ linux-2.6.35/arch/arm/mach-at91/board-sam9g20ek.c 2011-08-12 14:48:20.617283739 -0500 +--- linux-2.6.35.orig/arch/arm/mach-at91/board-sam9g20ek.c 2010-08-01 17:11:14.000000000 -0500 ++++ linux-2.6.35/arch/arm/mach-at91/board-sam9g20ek.c 2013-12-17 15:05:27.464450574 -0600 @@ -27,6 +27,11 @@ #include #include @@ -135,9 +135,9 @@ Index: linux-2.6.35/arch/arm/mach-at91/board-sam9g20ek.c + .name = "at25040b", + .page_size = 8, + .flags = EE_ADDR1, -+}; + }; +#endif -+ + +#define MTS_EXT_STT25_TEST 0 +#if MTS_EXT_STT25_TEST +static struct mtd_partition m25_partitions[] = { @@ -146,8 +146,8 @@ Index: linux-2.6.35/arch/arm/mach-at91/board-sam9g20ek.c + .offset = 0x00000000, + .size = MTDPART_SIZ_FULL, + }, - }; - ++}; ++ +static struct flash_platform_data m25_spi_flash_data = { + .type = "sst25vf080b", + .nr_parts = ARRAY_SIZE(m25_partitions), @@ -157,7 +157,7 @@ Index: linux-2.6.35/arch/arm/mach-at91/board-sam9g20ek.c /* * SPI devices. -@@ -107,6 +185,54 @@ +@@ -107,6 +185,69 @@ }, #endif #endif @@ -181,6 +181,21 @@ Index: linux-2.6.35/arch/arm/mach-at91/board-sam9g20ek.c + .chip_select = 4, + .bus_num = 1, + }, ++ /* max_speed_hz = 0 means as slow as possible ++ * for OCG, this means approx 520kHz ++ */ ++ { /* SPI1_NCS5 to external connector */ ++ .modalias = "spidev", ++ .chip_select = 5, ++ .bus_num = 1, ++ .max_speed_hz = 0, ++ }, ++ { /* SPI1_NCS6 to external connector */ ++ .modalias = "spidev", ++ .chip_select = 6, ++ .bus_num = 1, ++ .max_speed_hz = 0, ++ }, +#if MTS_EXT_AT25_TEST + { + .modalias = "at25", @@ -212,7 +227,7 @@ Index: linux-2.6.35/arch/arm/mach-at91/board-sam9g20ek.c }; -@@ -115,7 +241,7 @@ +@@ -115,7 +256,7 @@ */ static struct at91_eth_data __initdata ek_macb_data = { .phy_irq_pin = AT91_PIN_PA7, @@ -221,7 +236,7 @@ Index: linux-2.6.35/arch/arm/mach-at91/board-sam9g20ek.c }; -@@ -124,18 +250,48 @@ +@@ -124,18 +265,48 @@ */ static struct mtd_partition __initdata ek_nand_partition[] = { { @@ -278,7 +293,7 @@ Index: linux-2.6.35/arch/arm/mach-at91/board-sam9g20ek.c .size = MTDPART_SIZ_FULL, }, }; -@@ -195,11 +351,13 @@ +@@ -195,11 +366,13 @@ /* * MCI (SD/MMC) @@ -293,7 +308,7 @@ Index: linux-2.6.35/arch/arm/mach-at91/board-sam9g20ek.c }; -@@ -207,15 +365,10 @@ +@@ -207,15 +380,10 @@ * LEDs */ static struct gpio_led ek_leds[] = { @@ -312,7 +327,7 @@ Index: linux-2.6.35/arch/arm/mach-at91/board-sam9g20ek.c .default_trigger = "heartbeat", } }; -@@ -269,14 +422,36 @@ +@@ -269,14 +437,36 @@ static void __init ek_add_device_buttons(void) {} #endif @@ -355,7 +370,7 @@ Index: linux-2.6.35/arch/arm/mach-at91/board-sam9g20ek.c }; -@@ -305,7 +480,7 @@ +@@ -305,7 +495,7 @@ /* PCK0 provides MCLK to the WM8731 */ at91_set_B_periph(AT91_PIN_PC1, 0); /* SSC (for WM8731) */ -- cgit v1.2.3