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

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

Merge branch 'for-linus/samsung-2635' of git://git.fluff.org/bjdooks/linux 

* 'for-linus/samsung-2635' of git://git.fluff.org/bjdooks/linux:
  DMAENGINE: correct PL080 register header file
  ARM: SAMSUNG: Fix on build warning about dependency in Kconfig
  ARM: SMDK6410: Make virtual screen twice depth of real
  ARM: S3C64XX: Update consistent DMA size to 8MiB
  ARM: S3C64XX: Add audio support to SmartQ
  ARM: S3C64XX: Framebuffer fix for SmartQ5
  ARM: S3C64XX: Set wifi and iNAND as permanently connected SD devices on SmartQ boards
  ARM: S3C64XX: Move SmartQ LCD control platform definition to shared file
  ARM: mach-real6410: add sdhc device support
  ARM: mach-real6410: add dm9000 ethernet support for mach-real6410
  ARM: S3C64XX: Support for Real6410

Fix up trivial conflicts in arch/arm/mach-s3c64xx/mach-smartq5.c
("remove pixclock" vs "Framebuffer fix for SmartQ5")
parents d0a0c28c a739260d

arch/arm/include/asm/hardware/pl080.h

+3 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 


/* Per channel configuration registers */



#define PL008_Cx_STRIDE				(0x20)

#define PL080_Cx_STRIDE				(0x20)

#define PL080_Cx_BASE(x)			((0x100 + (x * 0x20)))

#define PL080_Cx_SRC_ADDR(x)			((0x100 + (x * 0x20)))

#define PL080_Cx_DST_ADDR(x)			((0x104 + (x * 0x20)))
@@ -68,6 +68,8 @@ 
#define PL080_CONTROL_TC_IRQ_EN			(1 << 31)

#define PL080_CONTROL_PROT_MASK			(0x7 << 28)

#define PL080_CONTROL_PROT_SHIFT		(28)

#define PL080_CONTROL_PROT_CACHE		(1 << 30)

#define PL080_CONTROL_PROT_BUFF			(1 << 29)

#define PL080_CONTROL_PROT_SYS			(1 << 28)

#define PL080_CONTROL_DST_INCR			(1 << 27)

#define PL080_CONTROL_SRC_INCR			(1 << 26)

arch/arm/mach-s3c64xx/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -98,6 +98,15 @@ config MACH_ANW6410 
	help

	  Machine support for the A&W6410



config MACH_REAL6410

	bool "REAL6410"

	select CPU_S3C6410

	select S3C_DEV_HSMMC

	select S3C_DEV_HSMMC1

	select S3C64XX_SETUP_SDHCI

	help

	  Machine support for the CoreWind REAL6410



config MACH_SMDK6410

	bool "SMDK6410"

	select CPU_S3C6410

arch/arm/mach-s3c64xx/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ obj-$(CONFIG_PM) += irq-pm.o 
obj-$(CONFIG_MACH_ANW6410)	+= mach-anw6410.o

obj-$(CONFIG_MACH_SMDK6400)	+= mach-smdk6400.o

obj-$(CONFIG_MACH_SMDK6410)	+= mach-smdk6410.o

obj-$(CONFIG_MACH_REAL6410)     += mach-real6410.o

obj-$(CONFIG_MACH_NCP)		+= mach-ncp.o

obj-$(CONFIG_MACH_HMT)		+= mach-hmt.o

obj-$(CONFIG_MACH_SMARTQ)	+= mach-smartq.o

arch/arm/mach-s3c64xx/dma.c

+1 −1
Original line number Diff line number Diff line
@@ -697,7 +697,7 @@ static int s3c64xx_dma_init1(int chno, enum dma_ch chbase, 
		chptr->number = chno;

		chptr->dmac = dmac;

		chptr->regs = regptr;

		regptr += PL008_Cx_STRIDE;

		regptr += PL080_Cx_STRIDE;

	}



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

arch/arm/mach-s3c64xx/include/mach/memory.h

+2 −0
Original line number Diff line number Diff line
@@ -15,4 +15,6 @@ 


#define PHYS_OFFSET     UL(0x50000000)



#define CONSISTENT_DMA_SIZE	SZ_8M



#endif