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

Commit 26625dda authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'next/devel-samsung' of... 

Merge branch 'next/devel-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc2

* 'next/devel-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung

:
  ARM: EXYNOS: Support Suspend/Resume for EXYNOS4412
  ARM: EXYNOS: To use common config for EXYNOS4 and EXYNOS5 SPI
  ARM: EXYNOS: Support DMA for EXYNOS5250 SoC
  ARM: EXYNOS: Add platform resource definitions for FIMC-LITE
  ARM: EXYNOS: add platform device for core DRM subsystem
  ARM: EXYNOS: add dts files to dtbs target
  spi/s3c64xx: Allow usage for ARCH_S3C24XX
  ARM: S3C24XX: Add HSSPI setup callback for s3c64xx-spi driver
  ARM: S3C24XX: Add clock-lookup entries required by s3c64xx-spi
  ARM: S3C24XX: Add map entries needed by the s3c64xx-spi devices
  ARM: S3C24XX: claim spi channels for hsspi in dma-s3c2443
  ARM: S3C24XX: Add forgotten clock lookup table to S3C2443

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 3d0c872a 5ddfa842

arch/arm/mach-exynos/Kconfig

+10 −4
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ config SOC_EXYNOS5250 
	bool "SAMSUNG EXYNOS5250"

	default y

	depends on ARCH_EXYNOS5

	select SAMSUNG_DMADEV

	help

	  Enable EXYNOS5250 SoC support
@@ -70,7 +71,7 @@ config EXYNOS4_MCT 
	help

	  Use MCT (Multi Core Timer) as kernel timers



config EXYNOS4_DEV_DMA

config EXYNOS_DEV_DMA

	bool

	help

	  Compile in amba device definitions for DMA controller
@@ -80,6 +81,11 @@ config EXYNOS4_DEV_AHCI 
	help

	  Compile in platform device definitions for AHCI



config EXYNOS_DEV_DRM

	bool

	help

	  Compile in platform device definitions for core DRM device



config EXYNOS4_SETUP_FIMD0

	bool

	help
@@ -161,7 +167,7 @@ config EXYNOS4_SETUP_USB_PHY 
	help

	  Common setup code for USB PHY controller



config EXYNOS4_SETUP_SPI

config EXYNOS_SETUP_SPI

	bool

	help

	  Common setup code for SPI GPIO configurations.
@@ -223,7 +229,7 @@ config MACH_ARMLEX4210 
	select S3C_DEV_HSMMC2

	select S3C_DEV_HSMMC3

	select EXYNOS4_DEV_AHCI

	select EXYNOS4_DEV_DMA

	select EXYNOS_DEV_DMA

	select EXYNOS4_SETUP_SDHCI

	help

	  Machine support for Samsung ARMLEX4210 based on EXYNOS4210
@@ -350,7 +356,7 @@ config MACH_SMDK4212 
	select SAMSUNG_DEV_KEYPAD

	select SAMSUNG_DEV_PWM

	select EXYNOS_DEV_SYSMMU

	select EXYNOS4_DEV_DMA

	select EXYNOS_DEV_DMA

	select EXYNOS4_SETUP_I2C1

	select EXYNOS4_SETUP_I2C3

	select EXYNOS4_SETUP_I2C7

arch/arm/mach-exynos/Makefile

+4 −3
Original line number Diff line number Diff line
@@ -50,10 +50,11 @@ obj-$(CONFIG_MACH_EXYNOS5_DT) += mach-exynos5-dt.o 
obj-y					+= dev-uart.o

obj-$(CONFIG_ARCH_EXYNOS4)		+= dev-audio.o

obj-$(CONFIG_EXYNOS4_DEV_AHCI)		+= dev-ahci.o

obj-$(CONFIG_EXYNOS_DEV_SYSMMU)		+= dev-sysmmu.o

obj-$(CONFIG_EXYNOS4_DEV_DWMCI)		+= dev-dwmci.o

obj-$(CONFIG_EXYNOS4_DEV_DMA)		+= dma.o

obj-$(CONFIG_EXYNOS_DEV_DMA)		+= dma.o

obj-$(CONFIG_EXYNOS4_DEV_USB_OHCI)	+= dev-ohci.o

obj-$(CONFIG_EXYNOS_DEV_DRM)		+= dev-drm.o

obj-$(CONFIG_EXYNOS_DEV_SYSMMU)		+= dev-sysmmu.o



obj-$(CONFIG_ARCH_EXYNOS)		+= setup-i2c0.o

obj-$(CONFIG_EXYNOS4_SETUP_FIMC)	+= setup-fimc.o
@@ -68,4 +69,4 @@ obj-$(CONFIG_EXYNOS4_SETUP_I2C7) += setup-i2c7.o 
obj-$(CONFIG_EXYNOS4_SETUP_KEYPAD)	+= setup-keypad.o

obj-$(CONFIG_EXYNOS4_SETUP_SDHCI_GPIO)	+= setup-sdhci-gpio.o

obj-$(CONFIG_EXYNOS4_SETUP_USB_PHY)	+= setup-usb-phy.o

obj-$(CONFIG_EXYNOS4_SETUP_SPI)		+= setup-spi.o
 
obj-$(CONFIG_EXYNOS_SETUP_SPI)		+= setup-spi.o

arch/arm/mach-exynos/Makefile.boot

+3 −0
Original line number Diff line number Diff line 
   zreladdr-y	+= 0x40008000

params_phys-y	:= 0x40000100



dtb-$(CONFIG_MACH_EXYNOS4_DT) += exynos4210-origen.dtb exynos4210-smdkv310.dtb

dtb-$(CONFIG_MACH_EXYNOS5_DT) += exynos5250-smdk5250.dtb

arch/arm/mach-exynos/clock-exynos4212.c

+10 −0
Original line number Diff line number Diff line
@@ -92,6 +92,16 @@ static struct clk init_clocks_off[] = { 
		.devname	= SYSMMU_CLOCK_DEVNAME(isp, 9),

		.enable		= exynos4212_clk_ip_isp1_ctrl,

		.ctrlbit	= (1 << 4),

	}, {

		.name		= "flite",

		.devname	= "exynos-fimc-lite.0",

		.enable		= exynos4212_clk_ip_isp0_ctrl,

		.ctrlbit	= (1 << 4),

	}, {

		.name		= "flite",

		.devname	= "exynos-fimc-lite.1",

		.enable		= exynos4212_clk_ip_isp0_ctrl,

		.ctrlbit	= (1 << 3),

	}

};

arch/arm/mach-exynos/dev-drm.c

0 → 100644
+29 −0
Original line number Diff line number Diff line 
/*

 * linux/arch/arm/mach-exynos/dev-drm.c

 *

 * Copyright (c) 2012 Samsung Electronics Co., Ltd.

 *		http://www.samsung.com

 *

 * EXYNOS - core DRM device

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 */



#include <linux/kernel.h>

#include <linux/dma-mapping.h>

#include <linux/platform_device.h>



#include <plat/devs.h>



static u64 exynos_drm_dma_mask = DMA_BIT_MASK(32);



struct platform_device exynos_device_drm = {

	.name	= "exynos-drm",

	.dev	= {

		.dma_mask		= &exynos_drm_dma_mask,

		.coherent_dma_mask	= DMA_BIT_MASK(32),

	}

};