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

Commit b127c6fb 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: S5PV210: Fix sysdev related warning messages
  ARM: S3C24XX: Fix UART3 submask on S3C2416 and S3C2443
  ARM: S3C24XX: Fix Demux error in UART3 irqs on S3C2443 and S3C2416
  ARM: S3C64XX: fix uart clock setup for mini6410/real6410
  ARM: S3C24XX: Fix wrong s3c_gpio_cfgpull
  ARM: S3C2410: Adapt h1940-bluetooth to gpiolib changes
parents 0a66a596 9adf262a

arch/arm/mach-s3c2410/h1940-bluetooth.c

+4 −4
Original line number Diff line number Diff line
@@ -77,13 +77,13 @@ static int __devinit h1940bt_probe(struct platform_device *pdev) 


	/* Configures BT serial port GPIOs */

	s3c_gpio_cfgpin(S3C2410_GPH(0), S3C2410_GPH0_nCTS0);

	s3c_gpio_cfgpull(S3C2410_GPH(0), S3C_GPIO_PULL_NONE);

	s3c_gpio_setpull(S3C2410_GPH(0), S3C_GPIO_PULL_NONE);

	s3c_gpio_cfgpin(S3C2410_GPH(1), S3C2410_GPIO_OUTPUT);

	s3c_gpio_cfgpull(S3C2410_GPH(1), S3C_GPIO_PULL_NONE);

	s3c_gpio_setpull(S3C2410_GPH(1), S3C_GPIO_PULL_NONE);

	s3c_gpio_cfgpin(S3C2410_GPH(2), S3C2410_GPH2_TXD0);

	s3c_gpio_cfgpull(S3C2410_GPH(2), S3C_GPIO_PULL_NONE);

	s3c_gpio_setpull(S3C2410_GPH(2), S3C_GPIO_PULL_NONE);

	s3c_gpio_cfgpin(S3C2410_GPH(3), S3C2410_GPH3_RXD0);

	s3c_gpio_cfgpull(S3C2410_GPH(3), S3C_GPIO_PULL_NONE);

	s3c_gpio_setpull(S3C2410_GPH(3), S3C_GPIO_PULL_NONE);





	rfk = rfkill_alloc(DRV_NAME, &pdev->dev, RFKILL_TYPE_BLUETOOTH,

arch/arm/mach-s3c2416/irq.c

+2 −3
Original line number Diff line number Diff line
@@ -168,12 +168,11 @@ static struct irq_chip s3c2416_irq_dma = { 


static void s3c2416_irq_demux_uart3(unsigned int irq, struct irq_desc *desc)

{

	s3c2416_irq_demux(IRQ_S3C2443_UART3, 3);

	s3c2416_irq_demux(IRQ_S3C2443_RX3, 3);

}



#define INTMSK_UART3	(1UL << (IRQ_S3C2443_UART3 - IRQ_EINT0))

#define SUBMSK_UART3	(0xf << (IRQ_S3C2443_RX3 - S3C2410_IRQSUB(0)))



#define SUBMSK_UART3	(0x7 << (IRQ_S3C2443_RX3 - S3C2410_IRQSUB(0)))



static void s3c2416_irq_uart3_mask(unsigned int irqno)

{

arch/arm/mach-s3c2443/irq.c

+2 −3
Original line number Diff line number Diff line
@@ -166,12 +166,11 @@ static struct irq_chip s3c2443_irq_dma = { 


static void s3c2443_irq_demux_uart3(unsigned int irq, struct irq_desc *desc)

{

	s3c2443_irq_demux(IRQ_S3C2443_UART3, 3);

	s3c2443_irq_demux(IRQ_S3C2443_RX3, 3);

}



#define INTMSK_UART3	(1UL << (IRQ_S3C2443_UART3 - IRQ_EINT0))

#define SUBMSK_UART3	(0xf << (IRQ_S3C2443_RX3 - S3C2410_IRQSUB(0)))



#define SUBMSK_UART3	(0x7 << (IRQ_S3C2443_RX3 - S3C2410_IRQSUB(0)))



static void s3c2443_irq_uart3_mask(unsigned int irqno)

{

arch/arm/mach-s3c64xx/mach-mini6410.c

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 


#include <video/platform_lcd.h>



#define UCON (S3C2410_UCON_DEFAULT | S3C2410_UCON_UCLK)

#define UCON S3C2410_UCON_DEFAULT

#define ULCON (S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB)

#define UFCON (S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE)

arch/arm/mach-s3c64xx/mach-real6410.c

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ 


#include <video/platform_lcd.h>



#define UCON (S3C2410_UCON_DEFAULT | S3C2410_UCON_UCLK)

#define UCON S3C2410_UCON_DEFAULT

#define ULCON (S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB)

#define UFCON (S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE)