tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung

* 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: S3C64XX: Update regulator names for debugfs compatiblity on SMDK6410
ARM: S3C64XX: Fix build with WM1190 disabled and WM1192 enabled on SMDK6410
ARM: S3C64XX: Reduce output of s3c64xx_dma_init1()
ARM: S3C64XX: Tone down SDHCI debugging
ARM: S3C64XX: Add clock for i2c1
ARM: S3C64XX: Staticise non-exported GPIO to interrupt functions
ARM: SAMSUNG: Include devs.h in dev-uart.c to prototype devices
ARM: S3C64XX: Fix keypad setup to configure correct number of rows
ARM: S3C2440: Fix usage gpio bank j pin definitions on GTA02
ARM: S5P64X0: Fix number of GPIO lines in Bank F
ARM: S3C2440: Select missing S3C_DEV_USB_HOST on GTA02

Linus Torvalds 715695ca 34d4ade7

+41 -30
+1
arch/arm/mach-s3c2440/Kconfig
··· 99 99 select POWER_SUPPLY 100 100 select MACH_NEO1973 101 101 select S3C2410_PWM 102 + select S3C_DEV_USB_HOST 102 103 help 103 104 Say Y here if you are using the Openmoko GTA02 / Freerunner GSM Phone 104 105
+13 -13
arch/arm/mach-s3c2440/include/mach/gta02.h
··· 44 44 #define GTA02v3_GPIO_nUSB_FLT S3C2410_GPG(10) /* v3 + v4 only */ 45 45 #define GTA02v3_GPIO_nGSM_OC S3C2410_GPG(11) /* v3 + v4 only */ 46 46 47 - #define GTA02_GPIO_AMP_SHUT S3C2440_GPJ1 /* v2 + v3 + v4 only */ 48 - #define GTA02v1_GPIO_WLAN_GPIO10 S3C2440_GPJ2 49 - #define GTA02_GPIO_HP_IN S3C2440_GPJ2 /* v2 + v3 + v4 only */ 50 - #define GTA02_GPIO_INT0 S3C2440_GPJ3 /* v2 + v3 + v4 only */ 51 - #define GTA02_GPIO_nGSM_EN S3C2440_GPJ4 52 - #define GTA02_GPIO_3D_RESET S3C2440_GPJ5 53 - #define GTA02_GPIO_nDL_GSM S3C2440_GPJ6 /* v4 + v5 only */ 54 - #define GTA02_GPIO_WLAN_GPIO0 S3C2440_GPJ7 55 - #define GTA02v1_GPIO_BAT_ID S3C2440_GPJ8 56 - #define GTA02_GPIO_KEEPACT S3C2440_GPJ8 57 - #define GTA02v1_GPIO_HP_IN S3C2440_GPJ10 58 - #define GTA02_CHIP_PWD S3C2440_GPJ11 /* v2 + v3 + v4 only */ 59 - #define GTA02_GPIO_nWLAN_RESET S3C2440_GPJ12 /* v2 + v3 + v4 only */ 47 + #define GTA02_GPIO_AMP_SHUT S3C2410_GPJ(1) /* v2 + v3 + v4 only */ 48 + #define GTA02v1_GPIO_WLAN_GPIO10 S3C2410_GPJ(2) 49 + #define GTA02_GPIO_HP_IN S3C2410_GPJ(2) /* v2 + v3 + v4 only */ 50 + #define GTA02_GPIO_INT0 S3C2410_GPJ(3) /* v2 + v3 + v4 only */ 51 + #define GTA02_GPIO_nGSM_EN S3C2410_GPJ(4) 52 + #define GTA02_GPIO_3D_RESET S3C2410_GPJ(5) 53 + #define GTA02_GPIO_nDL_GSM S3C2410_GPJ(6) /* v4 + v5 only */ 54 + #define GTA02_GPIO_WLAN_GPIO0 S3C2410_GPJ(7) 55 + #define GTA02v1_GPIO_BAT_ID S3C2410_GPJ(8) 56 + #define GTA02_GPIO_KEEPACT S3C2410_GPJ(8) 57 + #define GTA02v1_GPIO_HP_IN S3C2410_GPJ(10) 58 + #define GTA02_CHIP_PWD S3C2410_GPJ(11) /* v2 + v3 + v4 only */ 59 + #define GTA02_GPIO_nWLAN_RESET S3C2410_GPJ(12) /* v2 + v3 + v4 only */ 60 60 61 61 #define GTA02_IRQ_GSENSOR_1 IRQ_EINT0 62 62 #define GTA02_IRQ_MODEM IRQ_EINT1
+6
arch/arm/mach-s3c64xx/clock.c
··· 151 151 .enable = s3c64xx_pclk_ctrl, 152 152 .ctrlbit = S3C_CLKCON_PCLK_IIC, 153 153 }, { 154 + .name = "i2c", 155 + .id = 1, 156 + .parent = &clk_p, 157 + .enable = s3c64xx_pclk_ctrl, 158 + .ctrlbit = S3C6410_CLKCON_PCLK_I2C1, 159 + }, { 154 160 .name = "iis", 155 161 .id = 0, 156 162 .parent = &clk_p,
+6 -5
arch/arm/mach-s3c64xx/dma.c
··· 690 690 691 691 regptr = regs + PL080_Cx_BASE(0); 692 692 693 - for (ch = 0; ch < 8; ch++, chno++, chptr++) { 694 - printk(KERN_INFO "%s: registering DMA %d (%p)\n", 695 - __func__, chno, regptr); 693 + for (ch = 0; ch < 8; ch++, chptr++) { 694 + pr_debug("%s: registering DMA %d (%p)\n", 695 + __func__, chno + ch, regptr); 696 696 697 697 chptr->bit = 1 << ch; 698 - chptr->number = chno; 698 + chptr->number = chno + ch; 699 699 chptr->dmac = dmac; 700 700 chptr->regs = regptr; 701 701 regptr += PL080_Cx_STRIDE; ··· 704 704 /* for the moment, permanently enable the controller */ 705 705 writel(PL080_CONFIG_ENABLE, regs + PL080_CONFIG); 706 706 707 - printk(KERN_INFO "PL080: IRQ %d, at %p\n", irq, regs); 707 + printk(KERN_INFO "PL080: IRQ %d, at %p, channels %d..%d\n", 708 + irq, regs, chno, chno+8); 708 709 709 710 return 0; 710 711
+2 -2
arch/arm/mach-s3c64xx/gpiolib.c
··· 72 72 .get_pull = s3c_gpio_getpull_updown, 73 73 }; 74 74 75 - int s3c64xx_gpio2int_gpm(struct gpio_chip *chip, unsigned pin) 75 + static int s3c64xx_gpio2int_gpm(struct gpio_chip *chip, unsigned pin) 76 76 { 77 77 return pin < 5 ? IRQ_EINT(23) + pin : -ENXIO; 78 78 } ··· 138 138 }, 139 139 }; 140 140 141 - int s3c64xx_gpio2int_gpl(struct gpio_chip *chip, unsigned pin) 141 + static int s3c64xx_gpio2int_gpl(struct gpio_chip *chip, unsigned pin) 142 142 { 143 143 return pin >= 8 ? IRQ_EINT(16) + pin - 8 : -ENXIO; 144 144 }
+7 -6
arch/arm/mach-s3c64xx/mach-smdk6410.c
··· 28 28 #include <linux/delay.h> 29 29 #include <linux/smsc911x.h> 30 30 #include <linux/regulator/fixed.h> 31 + #include <linux/regulator/machine.h> 31 32 32 33 #ifdef CONFIG_SMDK6410_WM1190_EV1 33 34 #include <linux/mfd/wm8350/core.h> ··· 352 351 /* VDD_UH_MMC, LDO5 on J5 */ 353 352 static struct regulator_init_data smdk6410_vdduh_mmc = { 354 353 .constraints = { 355 - .name = "PVDD_UH/PVDD_MMC", 354 + .name = "PVDD_UH+PVDD_MMC", 356 355 .always_on = 1, 357 356 }, 358 357 }; ··· 418 417 /* S3C64xx internal logic & PLL */ 419 418 static struct regulator_init_data wm8350_dcdc1_data = { 420 419 .constraints = { 421 - .name = "PVDD_INT/PVDD_PLL", 420 + .name = "PVDD_INT+PVDD_PLL", 422 421 .min_uV = 1200000, 423 422 .max_uV = 1200000, 424 423 .always_on = 1, ··· 453 452 454 453 static struct regulator_init_data wm8350_dcdc4_data = { 455 454 .constraints = { 456 - .name = "PVDD_HI/PVDD_EXT/PVDD_SYS/PVCCM2MTV", 455 + .name = "PVDD_HI+PVDD_EXT+PVDD_SYS+PVCCM2MTV", 457 456 .min_uV = 3000000, 458 457 .max_uV = 3000000, 459 458 .always_on = 1, ··· 465 464 /* OTGi/1190-EV1 HPVDD & AVDD */ 466 465 static struct regulator_init_data wm8350_ldo4_data = { 467 466 .constraints = { 468 - .name = "PVDD_OTGI/HPVDD/AVDD", 467 + .name = "PVDD_OTGI+HPVDD+AVDD", 469 468 .min_uV = 1200000, 470 469 .max_uV = 1200000, 471 470 .apply_uV = 1, ··· 553 552 554 553 static struct regulator_init_data wm1192_dcdc3 = { 555 554 .constraints = { 556 - .name = "PVDD_MEM/PVDD_GPS", 555 + .name = "PVDD_MEM+PVDD_GPS", 557 556 .always_on = 1, 558 557 }, 559 558 }; ··· 564 563 565 564 static struct regulator_init_data wm1192_ldo1 = { 566 565 .constraints = { 567 - .name = "PVDD_LCD/PVDD_EXT", 566 + .name = "PVDD_LCD+PVDD_EXT", 568 567 .always_on = 1, 569 568 }, 570 569 .consumer_supplies = wm1192_ldo1_consumers,
+1 -1
arch/arm/mach-s3c64xx/setup-keypad.c
··· 17 17 void samsung_keypad_cfg_gpio(unsigned int rows, unsigned int cols) 18 18 { 19 19 /* Set all the necessary GPK pins to special-function 3: KP_ROW[x] */ 20 - s3c_gpio_cfgrange_nopull(S3C64XX_GPK(8), 8 + rows, S3C_GPIO_SFN(3)); 20 + s3c_gpio_cfgrange_nopull(S3C64XX_GPK(8), rows, S3C_GPIO_SFN(3)); 21 21 22 22 /* Set all the necessary GPL pins to special-function 3: KP_COL[x] */ 23 23 s3c_gpio_cfgrange_nopull(S3C64XX_GPL(0), cols, S3C_GPIO_SFN(3));
+1 -1
arch/arm/mach-s3c64xx/setup-sdhci.c
··· 56 56 else 57 57 ctrl3 = (S3C_SDHCI_CTRL3_FCSEL1 | S3C_SDHCI_CTRL3_FCSEL0); 58 58 59 - printk(KERN_INFO "%s: CTRL 2=%08x, 3=%08x\n", __func__, ctrl2, ctrl3); 59 + pr_debug("%s: CTRL 2=%08x, 3=%08x\n", __func__, ctrl2, ctrl3); 60 60 writel(ctrl2, r + S3C_SDHCI_CONTROL2); 61 61 writel(ctrl3, r + S3C_SDHCI_CONTROL3); 62 62 }
+2 -2
arch/arm/mach-s5p64x0/include/mach/gpio.h
··· 23 23 #define S5P6440_GPIO_A_NR (6) 24 24 #define S5P6440_GPIO_B_NR (7) 25 25 #define S5P6440_GPIO_C_NR (8) 26 - #define S5P6440_GPIO_F_NR (2) 26 + #define S5P6440_GPIO_F_NR (16) 27 27 #define S5P6440_GPIO_G_NR (7) 28 28 #define S5P6440_GPIO_H_NR (10) 29 29 #define S5P6440_GPIO_I_NR (16) ··· 36 36 #define S5P6450_GPIO_B_NR (7) 37 37 #define S5P6450_GPIO_C_NR (8) 38 38 #define S5P6450_GPIO_D_NR (8) 39 - #define S5P6450_GPIO_F_NR (2) 39 + #define S5P6450_GPIO_F_NR (16) 40 40 #define S5P6450_GPIO_G_NR (14) 41 41 #define S5P6450_GPIO_H_NR (10) 42 42 #define S5P6450_GPIO_I_NR (16)
+2
arch/arm/plat-samsung/dev-uart.c
··· 15 15 #include <linux/kernel.h> 16 16 #include <linux/platform_device.h> 17 17 18 + #include <plat/devs.h> 19 + 18 20 /* uart devices */ 19 21 20 22 static struct platform_device s3c24xx_uart_device0 = {