From 5ca62d28e7bbdab9dac47a0919d4ce803e5faaac Mon Sep 17 00:00:00 2001 From: David-John Willis Date: Tue, 1 Dec 2009 18:21:35 +0000 Subject: [PATCH] omap3-pandora-kernel: Rebase patches for latest GIT head. --- ...-to-put-some-card-into-into-platform-dev.patch | 15 ++++++++------- ...asic-platform-driver-module-to-bring-up-.patch | 4 ++-- ...sm_wifi-hack-as-the-temp-platform-driver.patch | 8 ++++---- ...-in-80us-delay-into-the-WiFi-module-init.patch | 6 +++--- recipes/linux/omap3-pandora-kernel/defconfig | 1 + .../linux/omap3-pandora-kernel_2.6.27-pandora.bb | 2 +- 6 files changed, 19 insertions(+), 17 deletions(-) diff --git a/recipes/linux/omap3-pandora-kernel/0001-SDIO-patches-to-put-some-card-into-into-platform-dev.patch b/recipes/linux/omap3-pandora-kernel/0001-SDIO-patches-to-put-some-card-into-into-platform-dev.patch index af2c689..0c2c404 100755 --- a/recipes/linux/omap3-pandora-kernel/0001-SDIO-patches-to-put-some-card-into-into-platform-dev.patch +++ b/recipes/linux/omap3-pandora-kernel/0001-SDIO-patches-to-put-some-card-into-into-platform-dev.patch @@ -1,7 +1,7 @@ -From 6531593a263a254edcf1effbf132ead1aa5e4654 Mon Sep 17 00:00:00 2001 +From 5800973aa82858036239b232e16d63796ba0de95 Mon Sep 17 00:00:00 2001 From: David-John Willis Date: Mon, 22 Jun 2009 20:49:31 +0100 -Subject: [PATCH] SDIO patches to put some card into into platform devices (hack) to match WL1251 driver. +Subject: [PATCH 1/4] SDIO patches to put some card into into platform devices (hack) to match WL1251 driver. --- arch/arm/include/asm/mach/mmc.h | 10 ++++++ @@ -51,10 +51,10 @@ index 4da332b..4df7955 diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c old mode 100644 new mode 100755 -index 6e4b207..031ad2d +index 88bc884..6585a15 --- a/arch/arm/mach-omap2/board-omap3pandora.c +++ b/arch/arm/mach-omap2/board-omap3pandora.c -@@ -35,6 +35,8 @@ +@@ -36,6 +36,8 @@ #include #include @@ -63,7 +63,7 @@ index 6e4b207..031ad2d #include #include #include -@@ -58,6 +60,10 @@ +@@ -59,6 +61,10 @@ #define GPMC_CS0_BASE 0x60 #define GPMC_CS_SIZE 0x30 @@ -74,7 +74,7 @@ index 6e4b207..031ad2d static struct mtd_partition omap3pandora_nand_partitions[] = { { .name = "xloader", -@@ -446,12 +452,56 @@ static struct platform_device bt_device = { +@@ -489,6 +495,49 @@ static struct platform_device bt_device = { }, }; @@ -124,9 +124,10 @@ index 6e4b207..031ad2d static struct platform_device *omap3pandora_devices[] __initdata = { &omap3pandora_lcd_device, &omap3pandora_leds_gpio, - &bt_device, +@@ -496,6 +545,7 @@ static struct platform_device *omap3pandora_devices[] __initdata = { &omap3pandora_bl, &omap3pandora_dss_device, + &pandora_leds_pwm, + &pandora_wifi, }; diff --git a/recipes/linux/omap3-pandora-kernel/0002-Add-a-very-basic-platform-driver-module-to-bring-up-.patch b/recipes/linux/omap3-pandora-kernel/0002-Add-a-very-basic-platform-driver-module-to-bring-up-.patch index 14042dc..147163d 100755 --- a/recipes/linux/omap3-pandora-kernel/0002-Add-a-very-basic-platform-driver-module-to-bring-up-.patch +++ b/recipes/linux/omap3-pandora-kernel/0002-Add-a-very-basic-platform-driver-module-to-bring-up-.patch @@ -1,7 +1,7 @@ -From d0e67607c9eba9423b65875da2c732ed690a2292 Mon Sep 17 00:00:00 2001 +From b245ef5af21a973bda2f8496fd493fac0a771455 Mon Sep 17 00:00:00 2001 From: David-John Willis Date: Sun, 30 Aug 2009 19:31:31 +0100 -Subject: [PATCH 2/2] Add a very basic platform driver module to bring up the SDIO WiFi so that the platform stuff is no longer hacked into the WL1251 driver (TODO: Clean up and move somewhere more mainline friendly). +Subject: [PATCH 2/4] Add a very basic platform driver module to bring up the SDIO WiFi so that the platform stuff is no longer hacked into the WL1251 driver (TODO: Clean up and move somewhere more mainline friendly). --- arch/arm/mach-omap2/Kconfig | 5 ++ diff --git a/recipes/linux/omap3-pandora-kernel/0003-Remove-old-msm_wifi-hack-as-the-temp-platform-driver.patch b/recipes/linux/omap3-pandora-kernel/0003-Remove-old-msm_wifi-hack-as-the-temp-platform-driver.patch index 295352f..81daee1 100755 --- a/recipes/linux/omap3-pandora-kernel/0003-Remove-old-msm_wifi-hack-as-the-temp-platform-driver.patch +++ b/recipes/linux/omap3-pandora-kernel/0003-Remove-old-msm_wifi-hack-as-the-temp-platform-driver.patch @@ -1,17 +1,17 @@ -From a699035527e66a280267cbfefa0498b6fd628dee Mon Sep 17 00:00:00 2001 +From e435c10737f7bb5033721927ecff290b2f0b1ab3 Mon Sep 17 00:00:00 2001 From: David-John Willis Date: Mon, 31 Aug 2009 12:06:17 +0100 -Subject: [PATCH 3/3] Remove old msm_wifi hack as the temp platform driver now abstracts this from wl1251. +Subject: [PATCH 3/4] Remove old msm_wifi hack as the temp platform driver now abstracts this from wl1251. --- arch/arm/mach-omap2/board-omap3pandora.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c -index 031ad2d..da35a62 100755 +index 6585a15..1d95fae 100755 --- a/arch/arm/mach-omap2/board-omap3pandora.c +++ b/arch/arm/mach-omap2/board-omap3pandora.c -@@ -486,7 +486,7 @@ struct wifi_platform_data pandora_wifi_control = { +@@ -529,7 +529,7 @@ struct wifi_platform_data pandora_wifi_control = { }; static struct platform_device pandora_wifi = { diff --git a/recipes/linux/omap3-pandora-kernel/0004-Add-back-in-80us-delay-into-the-WiFi-module-init.patch b/recipes/linux/omap3-pandora-kernel/0004-Add-back-in-80us-delay-into-the-WiFi-module-init.patch index 0e4b405..ce4cc1d 100755 --- a/recipes/linux/omap3-pandora-kernel/0004-Add-back-in-80us-delay-into-the-WiFi-module-init.patch +++ b/recipes/linux/omap3-pandora-kernel/0004-Add-back-in-80us-delay-into-the-WiFi-module-init.patch @@ -1,4 +1,4 @@ -From 7d5ae8daa2289378ba9c9321f6c9659cae20bcdd Mon Sep 17 00:00:00 2001 +From a070a7c121ae1885a6c0354598efc12b3d98beab Mon Sep 17 00:00:00 2001 From: David-John Willis Date: Tue, 1 Sep 2009 18:24:15 +0100 Subject: [PATCH 4/4] Add back in 80us delay into the WiFi module init. @@ -78,10 +78,10 @@ index 2968340..591cc6c 100755 } diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c -index da35a62..3fe3447 100755 +index 1d95fae..aec5fec 100755 --- a/arch/arm/mach-omap2/board-omap3pandora.c +++ b/arch/arm/mach-omap2/board-omap3pandora.c -@@ -460,10 +460,8 @@ int pandora_wifi_power(int on) +@@ -503,10 +503,8 @@ int pandora_wifi_power(int on) if (on) { gpio_set_value(PANDORA_WIFI_GPIO, 1); diff --git a/recipes/linux/omap3-pandora-kernel/defconfig b/recipes/linux/omap3-pandora-kernel/defconfig index 5e2b95d..6689380 100755 --- a/recipes/linux/omap3-pandora-kernel/defconfig +++ b/recipes/linux/omap3-pandora-kernel/defconfig @@ -1633,6 +1633,7 @@ CONFIG_LEDS_CLASS=y # CONFIG_LEDS_PCA9532 is not set CONFIG_LEDS_GPIO=y # CONFIG_LEDS_PCA955X is not set +CONFIG_LEDS_TWL4030_PWM=y # # LED Triggers diff --git a/recipes/linux/omap3-pandora-kernel_2.6.27-pandora.bb b/recipes/linux/omap3-pandora-kernel_2.6.27-pandora.bb index 258a856..f41924c 100755 --- a/recipes/linux/omap3-pandora-kernel_2.6.27-pandora.bb +++ b/recipes/linux/omap3-pandora-kernel_2.6.27-pandora.bb @@ -5,7 +5,7 @@ KERNEL_IMAGETYPE = "uImage" COMPATIBLE_MACHINE = "omap3-pandora" -SRCREV = "0887623ea5736f6d438f5ac0c1ca8f33cdcd6988" +SRCREV = "abd422d7c820719eb12123ba08fab925e6f9b40c" SRC_URI = " \ git://git.openpandora.org/pandora-kernel.git;protocol=git;branch=pandora-27-omap1 \ -- 2.39.2