linux-omap: cleanup and wl1271 build fix
cover linux-omap: cleanup and wl1271 build fix
This adds two patches cleaning up whitespace and fixing a build issue with the iwl12xx expansionboard initialization. These do not apply to the linux-omap tree directly, and need to be pushed along with the rest of the patches currently residing in the linux-omap directory.
The following changes since commit cb3d37c30fa71afeda8127e963965542f0171471:
linux-omap4: sync with OE .dev (2011-05-09 11:57:55 +0200)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib dvhart/beagleboard
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=dvhart/beagleboard
Darren Hart (1):
beagleboard: cleanup board-omap3beagle.c and allow for building
without wl1271
...0001-board-omap3beagle-whitespace-cleanup.patch | 91 ++++++++++++++++++++ ...3beagle-allow-for-building-without-wl1271.patch | 42 +++++++++ recipes-bsp/linux/linux-omap_2.6.37.bb | 2 + 3 files changed, 135 insertions(+), 0 deletions(-) create mode 100644 recipes-bsp/linux/linux-omap/0001-board-omap3beagle-whitespace-cleanup.patch create mode 100644 recipes-bsp/linux/linux-omap/0002-board-omap3beagle-allow-for-building-without-wl1271.patch
PATCH 1/1 beagleboard: cleanup board-omap3beagle.c and allow for building without wl1271
Add two patches to the linux-omap_2.6.37.bb recipe. The first corrects some whitespace usage. The second adds an ifdef arround the usage of symbols from the wl1271 driver, allowing the beagleboard kernel to be built without that driver configured.
Signed-off-by Darren Hart <[email protected]>
Cc Koen Kooi <[email protected]>
--- ...0001-board-omap3beagle-whitespace-cleanup.patch | 91 ++++++++++++++++++++ ...3beagle-allow-for-building-without-wl1271.patch | 42 +++++++++ recipes-bsp/linux/linux-omap_2.6.37.bb | 2 + 3 files changed, 135 insertions(+), 0 deletions(-) create mode 100644 recipes-bsp/linux/linux-omap/0001-board-omap3beagle-whitespace-cleanup.patch create mode 100644 recipes-bsp/linux/linux-omap/0002-board-omap3beagle-allow-for-building-without-wl1271.patch
recipes-bsp/linux/linux-omap/0001-board-omap3beagle-whitespace-cleanup.patch new file +91 -0
@@ -0,0 +1,91 @@ +From e5e52482147151aaaafbd388d1e5978268e51d24 Mon Sep 17 00:00:00 2001 +Message-Id: <e5e52482147151aaaafbd388d1e5978268e51d24.1307392642.git.dvhart@linux.intel.com> +From: Darren Hart <[email protected]> +Date: Mon, 6 Jun 2011 10:17:56 -0700 +Subject: [PATCH 1/2] board-omap3beagle: whitespace cleanup + +Eliminate leading and trailing whitespace. +Indent with tabs. + +Signed-off-by: Darren Hart <[email protected]> +--- + arch/arm/mach-omap2/board-omap3beagle.c | 28 ++++++++++++++-------------- + 1 files changed, 14 insertions(+), 14 deletions(-) + +diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c +index b035bb5..b618cb6 100644 +--- a/arch/arm/mach-omap2/board-omap3beagle.c ++++ b/arch/arm/mach-omap2/board-omap3beagle.c +@@ -167,12 +167,12 @@ struct wl12xx_platform_data omap_beagle_wlan_data __initdata = { + .board_ref_clock = 2, /* 38.4 MHz */ + }; + +- static struct omap2_hsmmc_info mmcbbt[] = { +- { +- .mmc = 1, +- .caps = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA, +- .gpio_wp = 29, +- }, ++static struct omap2_hsmmc_info mmcbbt[] = { ++ { ++ .mmc = 1, ++ .caps = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA, ++ .gpio_wp = 29, ++ }, + { + .name = "wl1271", + .mmc = 2, +@@ -181,8 +181,8 @@ struct wl12xx_platform_data omap_beagle_wlan_data __initdata = { + .gpio_cd = -EINVAL, + .nonremovable = true, + }, +- {} /* Terminator */ +- }; ++ {} /* Terminator */ ++}; + + static struct regulator_consumer_supply beagle_vmmc2_supply = { + .supply = "vmmc", +@@ -455,7 +455,7 @@ static int beagle_twl_gpio_setup(struct device *dev, + /* gpio + 0 is "mmc0_cd" (input/IRQ) */ + mmc[0].gpio_cd = gpio + 0; + #if defined(CONFIG_WL1271) || defined(CONFIG_WL1271_MODULE) +- if(!strcmp(expansionboard_name, "bbtoys-wifi")) { ++ if(!strcmp(expansionboard_name, "bbtoys-wifi")) { + omap2_hsmmc_init(mmcbbt); + /* link regulators to MMC adapters */ + beagle_vmmc1_supply.dev = mmcbbt[0].dev; +@@ -648,9 +648,9 @@ static struct i2c_board_info __initdata beagle_i2c1_boardinfo[] = { + }; + + static struct i2c_board_info __initdata beagle_i2c_eeprom[] = { +- { +- I2C_BOARD_INFO("eeprom", 0x50), +- }, ++ { ++ I2C_BOARD_INFO("eeprom", 0x50), ++ }, + }; + + #if defined(CONFIG_RTC_DRV_DS1307) || \ +@@ -888,7 +888,7 @@ static void __init omap3_beagle_init(void) + /* REVISIT leave DVI powered down until it's needed ... */ + gpio_direction_output(170, true); + +- if(!strcmp(expansionboard_name, "zippy")) ++ if(!strcmp(expansionboard_name, "zippy")) + { + printk(KERN_INFO "Beagle expansionboard: initializing enc28j60\n"); + omap3beagle_enc28j60_init(); +@@ -897,7 +897,7 @@ static void __init omap3_beagle_init(void) + mmc[1].gpio_cd = 162; + } + +- if(!strcmp(expansionboard_name, "zippy2")) ++ if(!strcmp(expansionboard_name, "zippy2")) + { + printk(KERN_INFO "Beagle expansionboard: initializing ks_8851\n"); + omap3beagle_ks8851_init(); +-- +1.7.1 +
recipes-bsp/linux/linux-omap/0002-board-omap3beagle-allow-for-building-without-wl1271.patch new file +42 -0
42 lines not on this page · raw message
recipes-bsp/linux/linux-omap_2.6.37.bb +2 -0
@@ -197,6 +197,8 @@ SRC_URI_append = " \ file://0001-xM-audio-fix-from-Ashok.patch \ file://0001-omap3-allow-1GHz-mpurates.patch \ file://0001-BeagleBoard-Adjust-USER-button-pin-for-xM.patch \ + file://0001-board-omap3beagle-whitespace-cleanup.patch \ + file://0002-board-omap3beagle-allow-for-building-without-wl1271.patch \ " SRC_URI_append_usrp-e1xx = "\
Signature · 1 line
1.7.1