Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 715695ca authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 's5p-fixes-for-linus' of... 

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
parents 34d4ade7 18b52ca5

arch/arm/mach-s3c2440/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -99,6 +99,7 @@ config MACH_NEO1973_GTA02 
	select POWER_SUPPLY

	select POWER_SUPPLY

	select MACH_NEO1973

	select MACH_NEO1973

	select S3C2410_PWM

	select S3C2410_PWM

	select S3C_DEV_USB_HOST

	help

	help

	   Say Y here if you are using the Openmoko GTA02 / Freerunner GSM Phone

	   Say Y here if you are using the Openmoko GTA02 / Freerunner GSM Phone

arch/arm/mach-s3c2440/include/mach/gta02.h

+13 −13
Original line number Original line Diff line number Diff line
@@ -44,19 +44,19 @@ 
#define GTA02v3_GPIO_nUSB_FLT	S3C2410_GPG(10)	/* v3 + v4 only */

#define GTA02v3_GPIO_nUSB_FLT	S3C2410_GPG(10)	/* v3 + v4 only */

#define GTA02v3_GPIO_nGSM_OC	S3C2410_GPG(11)	/* v3 + v4 only */

#define GTA02v3_GPIO_nGSM_OC	S3C2410_GPG(11)	/* v3 + v4 only */





#define GTA02_GPIO_AMP_SHUT	S3C2440_GPJ1	/* v2 + v3 + v4 only */

#define GTA02_GPIO_AMP_SHUT	S3C2410_GPJ(1)	/* v2 + v3 + v4 only */

#define GTA02v1_GPIO_WLAN_GPIO10	S3C2440_GPJ2

#define GTA02v1_GPIO_WLAN_GPIO10	S3C2410_GPJ(2)

#define GTA02_GPIO_HP_IN	S3C2440_GPJ2	/* v2 + v3 + v4 only */

#define GTA02_GPIO_HP_IN	S3C2410_GPJ(2)	/* v2 + v3 + v4 only */

#define GTA02_GPIO_INT0		S3C2440_GPJ3	/* v2 + v3 + v4 only */

#define GTA02_GPIO_INT0		S3C2410_GPJ(3)	/* v2 + v3 + v4 only */

#define GTA02_GPIO_nGSM_EN	S3C2440_GPJ4

#define GTA02_GPIO_nGSM_EN	S3C2410_GPJ(4)

#define GTA02_GPIO_3D_RESET	S3C2440_GPJ5

#define GTA02_GPIO_3D_RESET	S3C2410_GPJ(5)

#define GTA02_GPIO_nDL_GSM	S3C2440_GPJ6	/* v4 + v5 only */

#define GTA02_GPIO_nDL_GSM	S3C2410_GPJ(6)	/* v4 + v5 only */

#define GTA02_GPIO_WLAN_GPIO0	S3C2440_GPJ7

#define GTA02_GPIO_WLAN_GPIO0	S3C2410_GPJ(7)

#define GTA02v1_GPIO_BAT_ID	S3C2440_GPJ8

#define GTA02v1_GPIO_BAT_ID	S3C2410_GPJ(8)

#define GTA02_GPIO_KEEPACT	S3C2440_GPJ8

#define GTA02_GPIO_KEEPACT	S3C2410_GPJ(8)

#define GTA02v1_GPIO_HP_IN	S3C2440_GPJ10

#define GTA02v1_GPIO_HP_IN	S3C2410_GPJ(10)

#define GTA02_CHIP_PWD		S3C2440_GPJ11	/* v2 + v3 + v4 only */

#define GTA02_CHIP_PWD		S3C2410_GPJ(11)	/* v2 + v3 + v4 only */

#define GTA02_GPIO_nWLAN_RESET	S3C2440_GPJ12	/* v2 + v3 + v4 only */

#define GTA02_GPIO_nWLAN_RESET	S3C2410_GPJ(12)	/* v2 + v3 + v4 only */





#define GTA02_IRQ_GSENSOR_1	IRQ_EINT0

#define GTA02_IRQ_GSENSOR_1	IRQ_EINT0

#define GTA02_IRQ_MODEM		IRQ_EINT1

#define GTA02_IRQ_MODEM		IRQ_EINT1

arch/arm/mach-s3c64xx/clock.c

+6 −0
Original line number Original line Diff line number Diff line
@@ -150,6 +150,12 @@ static struct clk init_clocks_off[] = { 
		.parent		= &clk_p,

		.parent		= &clk_p,

		.enable		= s3c64xx_pclk_ctrl,

		.enable		= s3c64xx_pclk_ctrl,

		.ctrlbit	= S3C_CLKCON_PCLK_IIC,

		.ctrlbit	= S3C_CLKCON_PCLK_IIC,

	}, {

		.name		= "i2c",

		.id		= 1,

		.parent		= &clk_p,

		.enable		= s3c64xx_pclk_ctrl,

		.ctrlbit	= S3C6410_CLKCON_PCLK_I2C1,

	}, {

	}, {

		.name		= "iis",

		.name		= "iis",

		.id		= 0,

		.id		= 0,

arch/arm/mach-s3c64xx/dma.c

+6 −5
Original line number Original line Diff line number Diff line
@@ -690,12 +690,12 @@ static int s3c64xx_dma_init1(int chno, enum dma_ch chbase, 




	regptr = regs + PL080_Cx_BASE(0);

	regptr = regs + PL080_Cx_BASE(0);





	for (ch = 0; ch < 8; ch++, chno++, chptr++) {

	for (ch = 0; ch < 8; ch++, chptr++) {

		printk(KERN_INFO "%s: registering DMA %d (%p)\n",

		pr_debug("%s: registering DMA %d (%p)\n",

		       __func__, chno, regptr);

			 __func__, chno + ch, regptr);





		chptr->bit = 1 << ch;

		chptr->bit = 1 << ch;

		chptr->number = chno;

		chptr->number = chno + ch;

		chptr->dmac = dmac;

		chptr->dmac = dmac;

		chptr->regs = regptr;

		chptr->regs = regptr;

		regptr += PL080_Cx_STRIDE;

		regptr += PL080_Cx_STRIDE;
@@ -704,7 +704,8 @@ static int s3c64xx_dma_init1(int chno, enum dma_ch chbase, 
	/* for the moment, permanently enable the controller */

	/* for the moment, permanently enable the controller */

	writel(PL080_CONFIG_ENABLE, regs + PL080_CONFIG);

	writel(PL080_CONFIG_ENABLE, regs + PL080_CONFIG);





	printk(KERN_INFO "PL080: IRQ %d, at %p\n", irq, regs);

	printk(KERN_INFO "PL080: IRQ %d, at %p, channels %d..%d\n",

	       irq, regs, chno, chno+8);





	return 0;

	return 0;

arch/arm/mach-s3c64xx/gpiolib.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -72,7 +72,7 @@ static struct s3c_gpio_cfg gpio_4bit_cfg_eint0011 = { 
	.get_pull	= s3c_gpio_getpull_updown,

	.get_pull	= s3c_gpio_getpull_updown,

};

};





int s3c64xx_gpio2int_gpm(struct gpio_chip *chip, unsigned pin)

static int s3c64xx_gpio2int_gpm(struct gpio_chip *chip, unsigned pin)

{

{

	return pin < 5 ? IRQ_EINT(23) + pin : -ENXIO;

	return pin < 5 ? IRQ_EINT(23) + pin : -ENXIO;

}

}
@@ -138,7 +138,7 @@ static struct s3c_gpio_chip gpio_4bit[] = { 
	},

	},

};

};





int s3c64xx_gpio2int_gpl(struct gpio_chip *chip, unsigned pin)

static int s3c64xx_gpio2int_gpl(struct gpio_chip *chip, unsigned pin)

{

{

	return pin >= 8 ? IRQ_EINT(16) + pin - 8 : -ENXIO;

	return pin >= 8 ? IRQ_EINT(16) + pin - 8 : -ENXIO;

}

}