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

Commit fcef24d3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes-s3c-2632-rc5' of git://git.fluff.org/bjdooks/linux 

* 'fixes-s3c-2632-rc5' of git://git.fluff.org/bjdooks/linux:
  ARM: S3C2410: Fix sparse warnings in arch/arm/mach-s3c2410/gpio.c
  ARM: S3C2440: mini2440: Fix spare warnings
  ARM: S3C24XX: Fix warnings in arch/arm/plat-s3c24xx/gpio.c
  ARM: S3C2440: mini2440: Fix missing CONFIG_S3C_DEV_USB_HOST
  ARM: S3C24XX: arch/arm/plat-s3c24xx: Move dereference after NULL test
  ARM: S3C: Fix adc function exports
  ARM: S3C2410: Fix link if CONFIG_S3C2410_IOTIMING is not set
  ARM: S3C24XX: Introduce S3C2442B CPU
  ARM: S3C24XX: Define a macro to avoid compilation error
  ARM: S3C: Add info for supporting circular DMA buffers
  ARM: S3C64XX: Set rate of crystal mux
  ARM: S3C64XX: Fix S3C64XX_CLKDIV0_ARM_MASK value
parents 78e1e340 620abe28

arch/arm/mach-s3c2410/gpio.c

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <linux/io.h>



#include <mach/hardware.h>

#include <mach/gpio-fns.h>

#include <asm/irq.h>



#include <mach/regs-gpio.h>

arch/arm/mach-s3c2410/include/mach/dma.h

+7 −0
Original line number Diff line number Diff line
@@ -110,6 +110,8 @@ enum s3c2410_dma_loadst { 
					    * waiting for reloads */

#define S3C2410_DMAF_AUTOSTART    (1<<1)   /* auto-start if buffer queued */



#define S3C2410_DMAF_CIRCULAR	(1 << 2)	/* no circular dma support */



/* dma buffer */



struct s3c2410_dma_buf;
@@ -194,4 +196,9 @@ struct s3c2410_dma_chan { 


typedef unsigned long dma_device_t;



static inline bool s3c_dma_has_circular(void)

{

	return false;

}



#endif /* __ASM_ARCH_DMA_H */

arch/arm/mach-s3c2440/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ config MACH_MINI2440 
	select LEDS_TRIGGER_BACKLIGHT

	select SND_S3C24XX_SOC_S3C24XX_UDA134X

	select S3C_DEV_NAND

	select S3C_DEV_USB_HOST

	help

	  Say Y here to select support for the MINI2440. Is a 10cm x 10cm board

	  available via various sources. It can come with a 3.5" or 7" touch LCD.

arch/arm/mach-s3c2440/mach-mini2440.c

+2 −2
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ static struct s3c2410_udc_mach_info mini2440_udc_cfg __initdata = { 
	.type		= (S3C2410_LCDCON1_TFT16BPP |\

			   S3C2410_LCDCON1_TFT)



struct s3c2410fb_display mini2440_lcd_cfg[] __initdata = {

static struct s3c2410fb_display mini2440_lcd_cfg[] __initdata = {

	[0] = {	/* mini2440 + 3.5" TFT + touchscreen */

		_LCD_DECLARE(

			7,			/* The 3.5 is quite fast */
@@ -191,7 +191,7 @@ struct s3c2410fb_display mini2440_lcd_cfg[] __initdata = { 
#define S3C2410_GPCCON_MASK(x)	(3 << ((x) * 2))

#define S3C2410_GPDCON_MASK(x)	(3 << ((x) * 2))



struct s3c2410fb_mach_info mini2440_fb_info __initdata = {

static struct s3c2410fb_mach_info mini2440_fb_info __initdata = {

	.displays	 = &mini2440_lcd_cfg[0], /* not constant! see init */

	.num_displays	 = 1,

	.default_display = 0,

arch/arm/mach-s3c6400/include/mach/dma.h

+5 −0
Original line number Diff line number Diff line
@@ -68,6 +68,11 @@ static __inline__ int s3c_dma_has_circular(void) 


#define S3C2410_DMAF_CIRCULAR		(1 << 0)



static inline bool s3c_dma_has_circular(void)

{

	return false;

}



#include <plat/dma.h>



#endif /* __ASM_ARCH_IRQ_H */