Skip to content

Commit 13f9a37

Browse files
author
H. Peter Anvin
committed
Merge commit 'v3.0' into x86/cpu
2 parents 17edf2d + 02f8c6a commit 13f9a37

File tree

153 files changed

+1358
-705
lines changed

Some content is hidden

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

153 files changed

+1358
-705
lines changed

‎Documentation/filesystems/nilfs2.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ Features which NILFS2 does not support yet:
4040
- POSIX ACLs
4141
- quotas
4242
- fsck
43-
- resize
4443
- defragmentation
4544

4645
Mount options

‎Documentation/networking/ip-sysctl.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ tcp_orphan_retries - INTEGER
346346
when RTO retransmissions remain unacknowledged.
347347
See tcp_retries2 for more details.
348348

349-
The default value is 7.
349+
The default value is 8.
350350
If your machine is a loaded WEB server,
351351
you should think about lowering this value, such sockets
352352
may consume significant resources. Cf. tcp_max_orphans.

‎Documentation/x86/boot.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -674,7 +674,7 @@ Protocol: 2.10+
674674

675675
Field name: init_size
676676
Type: read
677-
Offset/size: 0x25c/4
677+
Offset/size: 0x260/4
678678

679679
This field indicates the amount of linear contiguous memory starting
680680
at the kernel runtime start address that the kernel needs before it

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
VERSION = 3
22
PATCHLEVEL = 0
33
SUBLEVEL = 0
4-
EXTRAVERSION = -rc7
4+
EXTRAVERSION =
55
NAME = Sneaky Weasel
66

77
# *DOCUMENTATION*

‎arch/arm/mach-davinci/board-dm365-evm.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,7 @@ static void __init evm_init_cpld(void)
520520
*/
521521
if (have_imager()) {
522522
label = "HD imager";
523-
mux |= 1;
523+
mux |= 2;
524524

525525
/* externally mux MMC1/ENET/AIC33 to imager */
526526
mux |= BIT(6) | BIT(5) | BIT(3);
@@ -540,7 +540,7 @@ static void __init evm_init_cpld(void)
540540
resets &= ~BIT(1);
541541

542542
if (have_tvp7002()) {
543-
mux |= 2;
543+
mux |= 1;
544544
resets &= ~BIT(2);
545545
label = "tvp7002 HD";
546546
} else {

‎arch/arm/mach-davinci/gpio.c

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -254,8 +254,10 @@ gpio_irq_handler(unsigned irq, struct irq_desc *desc)
254254
{
255255
struct davinci_gpio_regs __iomem *g;
256256
u32 mask = 0xffff;
257+
struct davinci_gpio_controller *d;
257258

258-
g = (__force struct davinci_gpio_regs __iomem *) irq_desc_get_handler_data(desc);
259+
d = (struct davinci_gpio_controller *)irq_desc_get_handler_data(desc);
260+
g = (struct davinci_gpio_regs __iomem *)d->regs;
259261

260262
/* we only care about one bank */
261263
if (irq & 1)
@@ -274,11 +276,14 @@ gpio_irq_handler(unsigned irq, struct irq_desc *desc)
274276
if (!status)
275277
break;
276278
__raw_writel(status, &g->intstat);
277-
if (irq & 1)
278-
status >>= 16;
279279

280280
/* now demux them to the right lowlevel handler */
281-
n = (int)irq_get_handler_data(irq);
281+
n = d->irq_base;
282+
if (irq & 1) {
283+
n += 16;
284+
status >>= 16;
285+
}
286+
282287
while (status) {
283288
res = ffs(status);
284289
n += res;
@@ -424,7 +429,13 @@ static int __init davinci_gpio_irq_setup(void)
424429

425430
/* set up all irqs in this bank */
426431
irq_set_chained_handler(bank_irq, gpio_irq_handler);
427-
irq_set_handler_data(bank_irq, (__force void *)g);
432+
433+
/*
434+
* Each chip handles 32 gpios, and each irq bank consists of 16
435+
* gpio irqs. Pass the irq bank's corresponding controller to
436+
* the chained irq handler.
437+
*/
438+
irq_set_handler_data(bank_irq, &chips[gpio / 32]);
428439

429440
for (i = 0; i < 16 && gpio < ngpio; i++, irq++, gpio++) {
430441
irq_set_chip(irq, &gpio_irqchip);

‎arch/arm/mach-davinci/irq.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,14 @@ davinci_alloc_gc(void __iomem *base, unsigned int irq_start, unsigned int num)
5252
struct irq_chip_type *ct;
5353

5454
gc = irq_alloc_generic_chip("AINTC", 1, irq_start, base, handle_edge_irq);
55+
if (!gc) {
56+
pr_err("%s: irq_alloc_generic_chip for IRQ %u failed\n",
57+
__func__, irq_start);
58+
return;
59+
}
60+
5561
ct = gc->chip_types;
56-
ct->chip.irq_ack = irq_gc_ack;
62+
ct->chip.irq_ack = irq_gc_ack_set_bit;
5763
ct->chip.irq_mask = irq_gc_mask_clr_bit;
5864
ct->chip.irq_unmask = irq_gc_mask_set_bit;
5965

‎arch/arm/mach-ixp4xx/common.c

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -419,14 +419,20 @@ static void notrace ixp4xx_update_sched_clock(void)
419419
/*
420420
* clocksource
421421
*/
422+
423+
static cycle_t ixp4xx_clocksource_read(struct clocksource *c)
424+
{
425+
return *IXP4XX_OSTS;
426+
}
427+
422428
unsigned long ixp4xx_timer_freq = IXP4XX_TIMER_FREQ;
423429
EXPORT_SYMBOL(ixp4xx_timer_freq);
424430
static void __init ixp4xx_clocksource_init(void)
425431
{
426432
init_sched_clock(&cd, ixp4xx_update_sched_clock, 32, ixp4xx_timer_freq);
427433

428-
clocksource_mmio_init(&IXP4XX_OSTS, "OSTS", ixp4xx_timer_freq, 200, 32,
429-
clocksource_mmio_readl_up);
434+
clocksource_mmio_init(NULL, "OSTS", ixp4xx_timer_freq, 200, 32,
435+
ixp4xx_clocksource_read);
430436
}
431437

432438
/*

‎arch/arm/mach-mmp/pxa168.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ static APBC_CLK(ssp4, PXA168_SSP4, 4, 0);
7979
static APBC_CLK(ssp5, PXA168_SSP5, 4, 0);
8080
static APBC_CLK(keypad, PXA168_KPC, 0, 32000);
8181

82-
static APMU_CLK(nand, NAND, 0x01db, 208000000);
82+
static APMU_CLK(nand, NAND, 0x19b, 156000000);
8383
static APMU_CLK(lcd, LCD, 0x7f, 312000000);
8484

8585
/* device and clock bindings */

‎arch/arm/mach-mmp/pxa910.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ static APBC_CLK(pwm2, PXA910_PWM2, 1, 13000000);
110110
static APBC_CLK(pwm3, PXA910_PWM3, 1, 13000000);
111111
static APBC_CLK(pwm4, PXA910_PWM4, 1, 13000000);
112112

113-
static APMU_CLK(nand, NAND, 0x01db, 208000000);
113+
static APMU_CLK(nand, NAND, 0x19b, 156000000);
114114
static APMU_CLK(u2o, USB, 0x1b, 480000000);
115115

116116
/* device and clock bindings */

‎arch/arm/mach-pxa/mfp-pxa2xx.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -347,9 +347,9 @@ static int pxa2xx_mfp_suspend(void)
347347
if ((gpio_desc[i].config & MFP_LPM_KEEP_OUTPUT) &&
348348
(GPDR(i) & GPIO_bit(i))) {
349349
if (GPLR(i) & GPIO_bit(i))
350-
PGSR(i) |= GPIO_bit(i);
350+
PGSR(gpio_to_bank(i)) |= GPIO_bit(i);
351351
else
352-
PGSR(i) &= ~GPIO_bit(i);
352+
PGSR(gpio_to_bank(i)) &= ~GPIO_bit(i);
353353
}
354354
}
355355

‎arch/arm/mach-pxa/raumfeld.c

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -573,10 +573,10 @@ static struct pxafb_mode_info sharp_lq043t3dx02_mode = {
573573
.xres = 480,
574574
.yres = 272,
575575
.bpp = 16,
576-
.hsync_len = 4,
576+
.hsync_len = 41,
577577
.left_margin = 2,
578578
.right_margin = 1,
579-
.vsync_len = 1,
579+
.vsync_len = 10,
580580
.upper_margin = 3,
581581
.lower_margin = 1,
582582
.sync = 0,
@@ -596,29 +596,31 @@ static void __init raumfeld_lcd_init(void)
596596
{
597597
int ret;
598598

599-
pxa_set_fb_info(NULL, &raumfeld_sharp_lcd_info);
600-
601-
/* Earlier devices had the backlight regulator controlled
602-
* via PWM, later versions use another controller for that */
603-
if ((system_rev & 0xff) < 2) {
604-
mfp_cfg_t raumfeld_pwm_pin_config = GPIO17_PWM0_OUT;
605-
pxa3xx_mfp_config(&raumfeld_pwm_pin_config, 1);
606-
platform_device_register(&raumfeld_pwm_backlight_device);
607-
} else
608-
platform_device_register(&raumfeld_lt3593_device);
609-
610599
ret = gpio_request(GPIO_TFT_VA_EN, "display VA enable");
611600
if (ret < 0)
612601
pr_warning("Unable to request GPIO_TFT_VA_EN\n");
613602
else
614603
gpio_direction_output(GPIO_TFT_VA_EN, 1);
615604

605+
msleep(100);
606+
616607
ret = gpio_request(GPIO_DISPLAY_ENABLE, "display enable");
617608
if (ret < 0)
618609
pr_warning("Unable to request GPIO_DISPLAY_ENABLE\n");
619610
else
620611
gpio_direction_output(GPIO_DISPLAY_ENABLE, 1);
621612

613+
/* Hardware revision 2 has the backlight regulator controlled
614+
* by an LT3593, earlier and later devices use PWM for that. */
615+
if ((system_rev & 0xff) == 2) {
616+
platform_device_register(&raumfeld_lt3593_device);
617+
} else {
618+
mfp_cfg_t raumfeld_pwm_pin_config = GPIO17_PWM0_OUT;
619+
pxa3xx_mfp_config(&raumfeld_pwm_pin_config, 1);
620+
platform_device_register(&raumfeld_pwm_backlight_device);
621+
}
622+
623+
pxa_set_fb_info(NULL, &raumfeld_sharp_lcd_info);
622624
platform_device_register(&pxa3xx_device_gcu);
623625
}
624626

@@ -657,10 +659,10 @@ static struct lis3lv02d_platform_data lis3_pdata = {
657659

658660
#define SPI_AK4104 \
659661
{ \
660-
.modalias = "ak4104", \
661-
.max_speed_hz = 10000, \
662-
.bus_num = 0, \
663-
.chip_select = 0, \
662+
.modalias = "ak4104-codec", \
663+
.max_speed_hz = 10000, \
664+
.bus_num = 0, \
665+
.chip_select = 0, \
664666
.controller_data = (void *) GPIO_SPDIF_CS, \
665667
}
666668

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ static struct s3c2410_dma_chan *s3c64xx_dma_map_channel(unsigned int channel)
113113
return chan;
114114
}
115115

116-
int s3c2410_dma_config(unsigned int channel, int xferunit)
116+
int s3c2410_dma_config(enum dma_ch channel, int xferunit)
117117
{
118118
struct s3c2410_dma_chan *chan = s3c_dma_lookup_channel(channel);
119119

@@ -297,7 +297,7 @@ static int s3c64xx_dma_flush(struct s3c2410_dma_chan *chan)
297297
return 0;
298298
}
299299

300-
int s3c2410_dma_ctrl(unsigned int channel, enum s3c2410_chan_op op)
300+
int s3c2410_dma_ctrl(enum dma_ch channel, enum s3c2410_chan_op op)
301301
{
302302
struct s3c2410_dma_chan *chan = s3c_dma_lookup_channel(channel);
303303

@@ -331,7 +331,7 @@ EXPORT_SYMBOL(s3c2410_dma_ctrl);
331331
*
332332
*/
333333

334-
int s3c2410_dma_enqueue(unsigned int channel, void *id,
334+
int s3c2410_dma_enqueue(enum dma_ch channel, void *id,
335335
dma_addr_t data, int size)
336336
{
337337
struct s3c2410_dma_chan *chan = s3c_dma_lookup_channel(channel);
@@ -415,7 +415,7 @@ int s3c2410_dma_enqueue(unsigned int channel, void *id,
415415
EXPORT_SYMBOL(s3c2410_dma_enqueue);
416416

417417

418-
int s3c2410_dma_devconfig(unsigned int channel,
418+
int s3c2410_dma_devconfig(enum dma_ch channel,
419419
enum s3c2410_dmasrc source,
420420
unsigned long devaddr)
421421
{
@@ -463,7 +463,7 @@ int s3c2410_dma_devconfig(unsigned int channel,
463463
EXPORT_SYMBOL(s3c2410_dma_devconfig);
464464

465465

466-
int s3c2410_dma_getposition(unsigned int channel,
466+
int s3c2410_dma_getposition(enum dma_ch channel,
467467
dma_addr_t *src, dma_addr_t *dst)
468468
{
469469
struct s3c2410_dma_chan *chan = s3c_dma_lookup_channel(channel);
@@ -487,7 +487,7 @@ EXPORT_SYMBOL(s3c2410_dma_getposition);
487487
* get control of an dma channel
488488
*/
489489

490-
int s3c2410_dma_request(unsigned int channel,
490+
int s3c2410_dma_request(enum dma_ch channel,
491491
struct s3c2410_dma_client *client,
492492
void *dev)
493493
{
@@ -533,7 +533,7 @@ EXPORT_SYMBOL(s3c2410_dma_request);
533533
* allowed to go through.
534534
*/
535535

536-
int s3c2410_dma_free(unsigned int channel, struct s3c2410_dma_client *client)
536+
int s3c2410_dma_free(enum dma_ch channel, struct s3c2410_dma_client *client)
537537
{
538538
struct s3c2410_dma_chan *chan = s3c_dma_lookup_channel(channel);
539539
unsigned long flags;

‎arch/arm/plat-orion/gpio.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ void __init orion_gpio_init(int gpio_base, int ngpio,
432432
ct->regs.mask = ochip->mask_offset + GPIO_EDGE_MASK_OFF;
433433
ct->regs.ack = GPIO_EDGE_CAUSE_OFF;
434434
ct->type = IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING;
435-
ct->chip.irq_ack = irq_gc_ack;
435+
ct->chip.irq_ack = irq_gc_ack_clr_bit;
436436
ct->chip.irq_mask = irq_gc_mask_clr_bit;
437437
ct->chip.irq_unmask = irq_gc_mask_set_bit;
438438
ct->chip.irq_set_type = gpio_irq_set_type;

‎arch/arm/plat-pxa/gpio.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ static inline void __iomem *gpio_chip_base(struct gpio_chip *c)
5050
return container_of(c, struct pxa_gpio_chip, chip)->regbase;
5151
}
5252

53-
static inline struct pxa_gpio_chip *gpio_to_chip(unsigned gpio)
53+
static inline struct pxa_gpio_chip *gpio_to_pxachip(unsigned gpio)
5454
{
5555
return &pxa_gpio_chips[gpio_to_bank(gpio)];
5656
}
@@ -161,7 +161,7 @@ static int pxa_gpio_irq_type(struct irq_data *d, unsigned int type)
161161
int gpio = irq_to_gpio(d->irq);
162162
unsigned long gpdr, mask = GPIO_bit(gpio);
163163

164-
c = gpio_to_chip(gpio);
164+
c = gpio_to_pxachip(gpio);
165165

166166
if (type == IRQ_TYPE_PROBE) {
167167
/* Don't mess with enabled GPIOs using preconfigured edges or
@@ -230,15 +230,15 @@ static void pxa_gpio_demux_handler(unsigned int irq, struct irq_desc *desc)
230230
static void pxa_ack_muxed_gpio(struct irq_data *d)
231231
{
232232
int gpio = irq_to_gpio(d->irq);
233-
struct pxa_gpio_chip *c = gpio_to_chip(gpio);
233+
struct pxa_gpio_chip *c = gpio_to_pxachip(gpio);
234234

235235
__raw_writel(GPIO_bit(gpio), c->regbase + GEDR_OFFSET);
236236
}
237237

238238
static void pxa_mask_muxed_gpio(struct irq_data *d)
239239
{
240240
int gpio = irq_to_gpio(d->irq);
241-
struct pxa_gpio_chip *c = gpio_to_chip(gpio);
241+
struct pxa_gpio_chip *c = gpio_to_pxachip(gpio);
242242
uint32_t grer, gfer;
243243

244244
c->irq_mask &= ~GPIO_bit(gpio);
@@ -252,7 +252,7 @@ static void pxa_mask_muxed_gpio(struct irq_data *d)
252252
static void pxa_unmask_muxed_gpio(struct irq_data *d)
253253
{
254254
int gpio = irq_to_gpio(d->irq);
255-
struct pxa_gpio_chip *c = gpio_to_chip(gpio);
255+
struct pxa_gpio_chip *c = gpio_to_pxachip(gpio);
256256

257257
c->irq_mask |= GPIO_bit(gpio);
258258
update_edge_detect(c);

0 commit comments

Comments
 (0)