Skip to content

Commit 7e24cf4

Browse files
gregkhgregkh
committed
Merge 3.0-rc2 + Linus's latest into usb-linus
This is needed to get the following MAINTAINERS patch to apply properly. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2 parents a26d31c + 33726bf commit 7e24cf4

File tree

161 files changed

+1950
-1469
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

161 files changed

+1950
-1469
lines changed

‎CREDITS

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -518,6 +518,14 @@ N: Zach Brown
518518
E: zab@zabbo.net
519519
D: maestro pci sound
520520

521+
M: David Brownell
522+
D: Kernel engineer, mentor, and friend. Maintained USB EHCI and
523+
D: gadget layers, SPI subsystem, GPIO subsystem, and more than a few
524+
D: device drivers. His encouragement also helped many engineers get
525+
D: started working on the Linux kernel. David passed away in early
526+
D: 2011, and will be greatly missed.
527+
W: https://lkml.org/lkml/2011/4/5/36
528+
521529
N: Gary Brubaker
522530
E: xavyer@ix.netcom.com
523531
D: USB Serial Empeg Empeg-car Mark I/II Driver

‎MAINTAINERS

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4252,8 +4252,7 @@ F: drivers/mmc/
42524252
F: include/linux/mmc/
42534253

42544254
MULTIMEDIA CARD (MMC) ETC. OVER SPI
4255-
M: David Brownell <dbrownell@users.sourceforge.net>
4256-
S: Odd Fixes
4255+
S: Orphan
42574256
F: drivers/mmc/host/mmc_spi.c
42584257
F: include/linux/spi/mmc_spi.h
42594258

@@ -4603,7 +4602,6 @@ F: drivers/media/video/omap3isp/*
46034602

46044603
OMAP USB SUPPORT
46054604
M: Felipe Balbi <balbi@ti.com>
4606-
M: David Brownell <dbrownell@users.sourceforge.net>
46074605
L: linux-usb@vger.kernel.org
46084606
L: linux-omap@vger.kernel.org
46094607
T: git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
@@ -5984,7 +5982,6 @@ F: Documentation/serial/specialix.txt
59845982
F: drivers/staging/tty/specialix*
59855983

59865984
SPI SUBSYSTEM
5987-
M: David Brownell <dbrownell@users.sourceforge.net>
59885985
M: Grant Likely <grant.likely@secretlab.ca>
59895986
L: spi-devel-general@lists.sourceforge.net
59905987
Q: http://patchwork.kernel.org/project/spi-devel-general/list/
@@ -6432,9 +6429,8 @@ S: Maintained
64326429
F: drivers/usb/misc/rio500*
64336430

64346431
USB EHCI DRIVER
6435-
M: David Brownell <dbrownell@users.sourceforge.net>
64366432
L: linux-usb@vger.kernel.org
6437-
S: Odd Fixes
6433+
S: Orphan
64386434
F: Documentation/usb/ehci.txt
64396435
F: drivers/usb/host/ehci*
64406436

@@ -6448,10 +6444,9 @@ S: Maintained
64486444
F: drivers/media/video/et61x251/
64496445

64506446
USB GADGET/PERIPHERAL SUBSYSTEM
6451-
M: David Brownell <dbrownell@users.sourceforge.net>
64526447
L: linux-usb@vger.kernel.org
64536448
W: http://www.linux-usb.org/gadget
6454-
S: Maintained
6449+
S: Orphan
64556450
F: drivers/usb/gadget/
64566451
F: include/linux/usb/gadget*
64576452

@@ -6492,9 +6487,8 @@ S: Maintained
64926487
F: sound/usb/midi.*
64936488

64946489
USB OHCI DRIVER
6495-
M: David Brownell <dbrownell@users.sourceforge.net>
64966490
L: linux-usb@vger.kernel.org
6497-
S: Odd Fixes
6491+
S: Orphan
64986492
F: Documentation/usb/ohci.txt
64996493
F: drivers/usb/host/ohci*
65006494

‎arch/arm/mach-omap1/dma.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -284,22 +284,23 @@ static int __init omap1_system_dma_init(void)
284284
dma_base = ioremap(res[0].start, resource_size(&res[0]));
285285
if (!dma_base) {
286286
pr_err("%s: Unable to ioremap\n", __func__);
287-
return -ENODEV;
287+
ret = -ENODEV;
288+
goto exit_device_put;
288289
}
289290

290291
ret = platform_device_add_resources(pdev, res, ARRAY_SIZE(res));
291292
if (ret) {
292293
dev_err(&pdev->dev, "%s: Unable to add resources for %s%d\n",
293294
__func__, pdev->name, pdev->id);
294-
goto exit_device_del;
295+
goto exit_device_put;
295296
}
296297

297298
p = kzalloc(sizeof(struct omap_system_dma_plat_info), GFP_KERNEL);
298299
if (!p) {
299300
dev_err(&pdev->dev, "%s: Unable to allocate 'p' for %s\n",
300301
__func__, pdev->name);
301302
ret = -ENOMEM;
302-
goto exit_device_put;
303+
goto exit_device_del;
303304
}
304305

305306
d = kzalloc(sizeof(struct omap_dma_dev_attr), GFP_KERNEL);
@@ -380,10 +381,10 @@ static int __init omap1_system_dma_init(void)
380381
kfree(d);
381382
exit_release_p:
382383
kfree(p);
383-
exit_device_put:
384-
platform_device_put(pdev);
385384
exit_device_del:
386385
platform_device_del(pdev);
386+
exit_device_put:
387+
platform_device_put(pdev);
387388

388389
return ret;
389390
}

‎arch/arm/mach-omap2/board-2430sdp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@
2626
#include <linux/err.h>
2727
#include <linux/clk.h>
2828
#include <linux/io.h>
29+
#include <linux/gpio.h>
2930

3031
#include <mach/hardware.h>
3132
#include <asm/mach-types.h>
3233
#include <asm/mach/arch.h>
3334
#include <asm/mach/map.h>
3435

35-
#include <mach/gpio.h>
3636
#include <plat/board.h>
3737
#include <plat/common.h>
3838
#include <plat/gpmc.h>

‎arch/arm/mach-omap2/board-3430sdp.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -622,19 +622,19 @@ static struct omap_device_pad serial3_pads[] __initdata = {
622622
OMAP_MUX_MODE0),
623623
};
624624

625-
static struct omap_board_data serial1_data = {
625+
static struct omap_board_data serial1_data __initdata = {
626626
.id = 0,
627627
.pads = serial1_pads,
628628
.pads_cnt = ARRAY_SIZE(serial1_pads),
629629
};
630630

631-
static struct omap_board_data serial2_data = {
631+
static struct omap_board_data serial2_data __initdata = {
632632
.id = 1,
633633
.pads = serial2_pads,
634634
.pads_cnt = ARRAY_SIZE(serial2_pads),
635635
};
636636

637-
static struct omap_board_data serial3_data = {
637+
static struct omap_board_data serial3_data __initdata = {
638638
.id = 2,
639639
.pads = serial3_pads,
640640
.pads_cnt = ARRAY_SIZE(serial3_pads),

‎arch/arm/mach-omap2/board-4430sdp.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ static struct gpio sdp4430_eth_gpios[] __initdata = {
258258
{ ETH_KS8851_IRQ, GPIOF_IN, "eth_irq" },
259259
};
260260

261-
static int omap_ethernet_init(void)
261+
static int __init omap_ethernet_init(void)
262262
{
263263
int status;
264264

@@ -322,6 +322,7 @@ static struct omap2_hsmmc_info mmc[] = {
322322
.gpio_wp = -EINVAL,
323323
.nonremovable = true,
324324
.ocr_mask = MMC_VDD_29_30,
325+
.no_off_init = true,
325326
},
326327
{
327328
.mmc = 1,
@@ -681,19 +682,19 @@ static struct omap_device_pad serial4_pads[] __initdata = {
681682
OMAP_PIN_OUTPUT | OMAP_MUX_MODE0),
682683
};
683684

684-
static struct omap_board_data serial2_data = {
685+
static struct omap_board_data serial2_data __initdata = {
685686
.id = 1,
686687
.pads = serial2_pads,
687688
.pads_cnt = ARRAY_SIZE(serial2_pads),
688689
};
689690

690-
static struct omap_board_data serial3_data = {
691+
static struct omap_board_data serial3_data __initdata = {
691692
.id = 2,
692693
.pads = serial3_pads,
693694
.pads_cnt = ARRAY_SIZE(serial3_pads),
694695
};
695696

696-
static struct omap_board_data serial4_data = {
697+
static struct omap_board_data serial4_data __initdata = {
697698
.id = 3,
698699
.pads = serial4_pads,
699700
.pads_cnt = ARRAY_SIZE(serial4_pads),
@@ -729,7 +730,7 @@ static void __init omap_4430sdp_init(void)
729730

730731
if (omap_rev() == OMAP4430_REV_ES1_0)
731732
package = OMAP_PACKAGE_CBL;
732-
omap4_mux_init(board_mux, package);
733+
omap4_mux_init(board_mux, NULL, package);
733734

734735
omap_board_config = sdp4430_config;
735736
omap_board_config_size = ARRAY_SIZE(sdp4430_config);

‎arch/arm/mach-omap2/board-apollon.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@
2727
#include <linux/err.h>
2828
#include <linux/clk.h>
2929
#include <linux/smc91x.h>
30+
#include <linux/gpio.h>
3031

3132
#include <mach/hardware.h>
3233
#include <asm/mach-types.h>
3334
#include <asm/mach/arch.h>
3435
#include <asm/mach/flash.h>
3536

36-
#include <mach/gpio.h>
3737
#include <plat/led.h>
3838
#include <plat/usb.h>
3939
#include <plat/board.h>

‎arch/arm/mach-omap2/board-cm-t35.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,6 @@
6363
#define SB_T35_SMSC911X_CS 4
6464
#define SB_T35_SMSC911X_GPIO 65
6565

66-
#define NAND_BLOCK_SIZE SZ_128K
67-
6866
#if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE)
6967
#include <linux/smsc911x.h>
7068
#include <plat/gpmc-smsc911x.h>

‎arch/arm/mach-omap2/board-cm-t3517.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848

4949
#include "mux.h"
5050
#include "control.h"
51+
#include "common-board-devices.h"
5152

5253
#if defined(CONFIG_LEDS_GPIO) || defined(CONFIG_LEDS_GPIO_MODULE)
5354
static struct gpio_led cm_t3517_leds[] = {
@@ -177,7 +178,7 @@ static struct usbhs_omap_board_data cm_t3517_ehci_pdata __initdata = {
177178
.reset_gpio_port[2] = -EINVAL,
178179
};
179180

180-
static int cm_t3517_init_usbh(void)
181+
static int __init cm_t3517_init_usbh(void)
181182
{
182183
int err;
183184

@@ -203,8 +204,6 @@ static inline int cm_t3517_init_usbh(void)
203204
#endif
204205

205206
#if defined(CONFIG_MTD_NAND_OMAP2) || defined(CONFIG_MTD_NAND_OMAP2_MODULE)
206-
#define NAND_BLOCK_SIZE SZ_128K
207-
208207
static struct mtd_partition cm_t3517_nand_partitions[] = {
209208
{
210209
.name = "xloader",

‎arch/arm/mach-omap2/board-devkit8000.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,6 @@
6161
#include "timer-gp.h"
6262
#include "common-board-devices.h"
6363

64-
#define NAND_BLOCK_SIZE SZ_128K
65-
6664
#define OMAP_DM9000_GPIO_IRQ 25
6765
#define OMAP3_DEVKIT_TS_GPIO 27
6866

‎arch/arm/mach-omap2/board-omap3beagle.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,6 @@
5454
#include "pm.h"
5555
#include "common-board-devices.h"
5656

57-
#define NAND_BLOCK_SIZE SZ_128K
58-
5957
/*
6058
* OMAP3 Beagle revision
6159
* Run time detection of Beagle revision is done by reading GPIO.
@@ -106,6 +104,9 @@ static void __init omap3_beagle_init_rev(void)
106104
beagle_rev = gpio_get_value(171) | (gpio_get_value(172) << 1)
107105
| (gpio_get_value(173) << 2);
108106

107+
gpio_free_array(omap3_beagle_rev_gpios,
108+
ARRAY_SIZE(omap3_beagle_rev_gpios));
109+
109110
switch (beagle_rev) {
110111
case 7:
111112
printk(KERN_INFO "OMAP3 Beagle Rev: Ax/Bx\n");
@@ -579,6 +580,9 @@ static void __init omap3_beagle_init(void)
579580
omap_nand_flash_init(NAND_BUSWIDTH_16, omap3beagle_nand_partitions,
580581
ARRAY_SIZE(omap3beagle_nand_partitions));
581582

583+
/* Ensure msecure is mux'd to be able to set the RTC. */
584+
omap_mux_init_signal("sys_drm_msecure", OMAP_PIN_OFF_OUTPUT_HIGH);
585+
582586
/* Ensure SDRC pins are mux'd for self-refresh */
583587
omap_mux_init_signal("sdrc_cke0", OMAP_PIN_OUTPUT);
584588
omap_mux_init_signal("sdrc_cke1", OMAP_PIN_OUTPUT);

‎arch/arm/mach-omap2/board-omap3pandora.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
#include <linux/leds.h>
3131
#include <linux/input.h>
3232
#include <linux/input/matrix_keypad.h>
33+
#include <linux/gpio.h>
3334
#include <linux/gpio_keys.h>
3435
#include <linux/mmc/host.h>
3536
#include <linux/mmc/card.h>
@@ -41,7 +42,6 @@
4142

4243
#include <plat/board.h>
4344
#include <plat/common.h>
44-
#include <mach/gpio.h>
4545
#include <mach/hardware.h>
4646
#include <plat/mcspi.h>
4747
#include <plat/usb.h>
@@ -57,8 +57,6 @@
5757
#define PANDORA_WIFI_NRESET_GPIO 23
5858
#define OMAP3_PANDORA_TS_GPIO 94
5959

60-
#define NAND_BLOCK_SIZE SZ_128K
61-
6260
static struct mtd_partition omap3pandora_nand_partitions[] = {
6361
{
6462
.name = "xloader",

‎arch/arm/mach-omap2/board-omap3touchbook.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,6 @@
5656

5757
#include <asm/setup.h>
5858

59-
#define NAND_BLOCK_SIZE SZ_128K
60-
6159
#define OMAP3_AC_GPIO 136
6260
#define OMAP3_TS_GPIO 162
6361
#define TB_BL_PWM_TIMER 9

‎arch/arm/mach-omap2/board-omap4panda.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -526,19 +526,19 @@ static struct omap_device_pad serial4_pads[] __initdata = {
526526
OMAP_PIN_OUTPUT | OMAP_MUX_MODE0),
527527
};
528528

529-
static struct omap_board_data serial2_data = {
529+
static struct omap_board_data serial2_data __initdata = {
530530
.id = 1,
531531
.pads = serial2_pads,
532532
.pads_cnt = ARRAY_SIZE(serial2_pads),
533533
};
534534

535-
static struct omap_board_data serial3_data = {
535+
static struct omap_board_data serial3_data __initdata = {
536536
.id = 2,
537537
.pads = serial3_pads,
538538
.pads_cnt = ARRAY_SIZE(serial3_pads),
539539
};
540540

541-
static struct omap_board_data serial4_data = {
541+
static struct omap_board_data serial4_data __initdata = {
542542
.id = 3,
543543
.pads = serial4_pads,
544544
.pads_cnt = ARRAY_SIZE(serial4_pads),
@@ -687,7 +687,7 @@ static void __init omap4_panda_init(void)
687687

688688
if (omap_rev() == OMAP4430_REV_ES1_0)
689689
package = OMAP_PACKAGE_CBL;
690-
omap4_mux_init(board_mux, package);
690+
omap4_mux_init(board_mux, NULL, package);
691691

692692
if (wl12xx_set_platform_data(&omap_panda_wlan_data))
693693
pr_err("error setting wl12xx data\n");

‎arch/arm/mach-omap2/board-overo.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#include <linux/err.h>
2525
#include <linux/init.h>
2626
#include <linux/io.h>
27+
#include <linux/gpio.h>
2728
#include <linux/kernel.h>
2829
#include <linux/platform_device.h>
2930
#include <linux/i2c/twl.h>
@@ -45,7 +46,6 @@
4546
#include <plat/common.h>
4647
#include <video/omapdss.h>
4748
#include <video/omap-panel-generic-dpi.h>
48-
#include <mach/gpio.h>
4949
#include <plat/gpmc.h>
5050
#include <mach/hardware.h>
5151
#include <plat/nand.h>
@@ -65,8 +65,6 @@
6565
#define OVERO_GPIO_USBH_CPEN 168
6666
#define OVERO_GPIO_USBH_NRESET 183
6767

68-
#define NAND_BLOCK_SIZE SZ_128K
69-
7068
#define OVERO_SMSC911X_CS 5
7169
#define OVERO_SMSC911X_GPIO 176
7270
#define OVERO_SMSC911X2_CS 4

‎arch/arm/mach-omap2/board-rx51-peripherals.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -488,6 +488,7 @@ static struct regulator_init_data rx51_vmmc2 = {
488488
.name = "V28_A",
489489
.min_uV = 2800000,
490490
.max_uV = 3000000,
491+
.always_on = true, /* due VIO leak to AIC34 VDDs */
491492
.apply_uV = true,
492493
.valid_modes_mask = REGULATOR_MODE_NORMAL
493494
| REGULATOR_MODE_STANDBY,
@@ -582,7 +583,7 @@ static int rx51_twlgpio_setup(struct device *dev, unsigned gpio, unsigned n)
582583
{
583584
/* FIXME this gpio setup is just a placeholder for now */
584585
gpio_request_one(gpio + 6, GPIOF_OUT_INIT_LOW, "backlight_pwm");
585-
gpio_request_one(gpio + 7, GPIOF_OUT_INIT_HIGH, "speaker_en");
586+
gpio_request_one(gpio + 7, GPIOF_OUT_INIT_LOW, "speaker_en");
586587

587588
return 0;
588589
}

0 commit comments

Comments
 (0)