From 78d159e0e18a8aa32776b134490aa802514d6f4c Mon Sep 17 00:00:00 2001 From: Jesse Gilles Date: Fri, 19 Apr 2013 17:39:41 -0500 Subject: linux-2.6.39.4: mt100eocg-pcie-dk: force SD detect, remove detect pin, disalbe at91_mci autoload --- .../linux-2.6.39.4-at91-mci-force-detect.patch | 19 +++++++++++++++++++ .../linux-2.6.39.4-at91-mci-remove-module-alias.patch | 11 +++++++++++ .../linux-2.6.39.4-mach-at91-mt100eocg-pcie-dk.patch | 13 ++++++------- multitech/recipes/linux/linux_2.6.39.4.bb | 2 ++ 4 files changed, 38 insertions(+), 7 deletions(-) create mode 100644 multitech/recipes/linux/linux-2.6.39.4/mt100eocg-pcie-dk/linux-2.6.39.4-at91-mci-force-detect.patch create mode 100644 multitech/recipes/linux/linux-2.6.39.4/mt100eocg-pcie-dk/linux-2.6.39.4-at91-mci-remove-module-alias.patch (limited to 'multitech/recipes') diff --git a/multitech/recipes/linux/linux-2.6.39.4/mt100eocg-pcie-dk/linux-2.6.39.4-at91-mci-force-detect.patch b/multitech/recipes/linux/linux-2.6.39.4/mt100eocg-pcie-dk/linux-2.6.39.4-at91-mci-force-detect.patch new file mode 100644 index 0000000..f14e4e1 --- /dev/null +++ b/multitech/recipes/linux/linux-2.6.39.4/mt100eocg-pcie-dk/linux-2.6.39.4-at91-mci-force-detect.patch @@ -0,0 +1,19 @@ +Index: linux-2.6.39.4/drivers/mmc/host/at91_mci.c +=================================================================== +--- linux-2.6.39.4.orig/drivers/mmc/host/at91_mci.c 2013-04-19 16:42:50.023307647 -0500 ++++ linux-2.6.39.4/drivers/mmc/host/at91_mci.c 2013-04-19 16:45:50.023307173 -0500 +@@ -1056,8 +1056,12 @@ + if (host->board->det_pin) { + host->present = !gpio_get_value(host->board->det_pin); + } +- else +- host->present = -1; ++ else { ++ /* jjg - assume card is present if detect pin is unset ++ * and mark it non-removable */ ++ host->present = 1; ++ mmc->caps |= MMC_CAP_NONREMOVABLE; ++ } + + mmc_add_host(mmc); + diff --git a/multitech/recipes/linux/linux-2.6.39.4/mt100eocg-pcie-dk/linux-2.6.39.4-at91-mci-remove-module-alias.patch b/multitech/recipes/linux/linux-2.6.39.4/mt100eocg-pcie-dk/linux-2.6.39.4-at91-mci-remove-module-alias.patch new file mode 100644 index 0000000..3e29b5c --- /dev/null +++ b/multitech/recipes/linux/linux-2.6.39.4/mt100eocg-pcie-dk/linux-2.6.39.4-at91-mci-remove-module-alias.patch @@ -0,0 +1,11 @@ +Index: linux-2.6.39.4/drivers/mmc/host/at91_mci.c +=================================================================== +--- linux-2.6.39.4.orig/drivers/mmc/host/at91_mci.c 2013-04-19 16:45:50.023307173 -0500 ++++ linux-2.6.39.4/drivers/mmc/host/at91_mci.c 2013-04-19 16:48:21.083306775 -0500 +@@ -1217,4 +1217,6 @@ + MODULE_DESCRIPTION("AT91 Multimedia Card Interface driver"); + MODULE_AUTHOR("Nick Randell"); + MODULE_LICENSE("GPL"); ++/* jjg - prevent module from loading automatically + MODULE_ALIAS("platform:at91_mci"); ++*/ diff --git a/multitech/recipes/linux/linux-2.6.39.4/mt100eocg-pcie-dk/linux-2.6.39.4-mach-at91-mt100eocg-pcie-dk.patch b/multitech/recipes/linux/linux-2.6.39.4/mt100eocg-pcie-dk/linux-2.6.39.4-mach-at91-mt100eocg-pcie-dk.patch index 36da1a2..470c5be 100644 --- a/multitech/recipes/linux/linux-2.6.39.4/mt100eocg-pcie-dk/linux-2.6.39.4-mach-at91-mt100eocg-pcie-dk.patch +++ b/multitech/recipes/linux/linux-2.6.39.4/mt100eocg-pcie-dk/linux-2.6.39.4-mach-at91-mt100eocg-pcie-dk.patch @@ -1,7 +1,7 @@ Index: linux-2.6.39.4/arch/arm/mach-at91/at91sam9260_devices.c =================================================================== --- linux-2.6.39.4.orig/arch/arm/mach-at91/at91sam9260_devices.c 2011-08-03 14:43:28.000000000 -0500 -+++ linux-2.6.39.4/arch/arm/mach-at91/at91sam9260_devices.c 2012-09-10 12:33:08.656010481 -0500 ++++ linux-2.6.39.4/arch/arm/mach-at91/at91sam9260_devices.c 2013-04-19 14:31:55.273588327 -0500 @@ -183,9 +183,9 @@ at91_set_B_periph(AT91_PIN_PA25, 0); /* ERX2 */ at91_set_B_periph(AT91_PIN_PA26, 0); /* ERX3 */ @@ -35,7 +35,7 @@ Index: linux-2.6.39.4/arch/arm/mach-at91/at91sam9260_devices.c Index: linux-2.6.39.4/arch/arm/mach-at91/board-sam9g20ek.c =================================================================== --- linux-2.6.39.4.orig/arch/arm/mach-at91/board-sam9g20ek.c 2011-08-03 14:43:28.000000000 -0500 -+++ linux-2.6.39.4/arch/arm/mach-at91/board-sam9g20ek.c 2012-09-10 12:37:02.306005503 -0500 ++++ linux-2.6.39.4/arch/arm/mach-at91/board-sam9g20ek.c 2013-04-19 16:49:59.147306517 -0500 @@ -30,6 +30,12 @@ #include #include @@ -281,7 +281,7 @@ Index: linux-2.6.39.4/arch/arm/mach-at91/board-sam9g20ek.c .size = MTDPART_SIZ_FULL, }, }; -@@ -228,10 +387,11 @@ +@@ -228,10 +387,10 @@ }; #else @@ -290,11 +290,10 @@ Index: linux-2.6.39.4/arch/arm/mach-at91/board-sam9g20ek.c .slot_b = 1, /* Only one slot so use slot B */ .wire4 = 1, - .det_pin = AT91_PIN_PC9, -+ .det_pin = AT91_PIN_PB20, }; #endif -@@ -252,15 +412,10 @@ +@@ -252,15 +411,10 @@ * LEDs */ static struct gpio_led ek_leds[] = { @@ -313,7 +312,7 @@ Index: linux-2.6.39.4/arch/arm/mach-at91/board-sam9g20ek.c .default_trigger = "heartbeat", } }; -@@ -363,16 +518,60 @@ +@@ -363,16 +517,60 @@ static void __init ek_add_regulators(void) {} #endif @@ -380,7 +379,7 @@ Index: linux-2.6.39.4/arch/arm/mach-at91/board-sam9g20ek.c static void __init ek_board_init(void) { -@@ -401,7 +600,22 @@ +@@ -401,7 +599,22 @@ /* PCK0 provides MCLK to the WM8731 */ at91_set_B_periph(AT91_PIN_PC1, 0); /* SSC (for WM8731) */ diff --git a/multitech/recipes/linux/linux_2.6.39.4.bb b/multitech/recipes/linux/linux_2.6.39.4.bb index 0bb15e2..d4710ae 100644 --- a/multitech/recipes/linux/linux_2.6.39.4.bb +++ b/multitech/recipes/linux/linux_2.6.39.4.bb @@ -168,6 +168,8 @@ SRC_URI_append_mt100eocg-pcie-dk = "file://defconfig \ file://linux-2.6.32.3-option-telit.patch \ file://linux-2.6.39.4-mmc-core-maxclock.patch \ file://linux-2.6.39.4-at91-mci-clock-debug.patch \ + file://linux-2.6.39.4-at91-mci-force-detect.patch \ + file://linux-2.6.39.4-at91-mci-remove-module-alias.patch \ " SRC_URI[kernel.md5sum] = "a17c748c2070168f1e784e9605ca043d" -- cgit v1.2.3