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

Commit 604542b8 authored by Joerg Roedel's avatar Joerg Roedel
Browse files

Merge branches 'core', 'arm/omap', 'iommu/fixes', 'arm/tegra', 'arm/shmobile',... 

Merge branches 'core', 'arm/omap', 'iommu/fixes', 'arm/tegra', 'arm/shmobile', 'arm/exynos', 'x86/vt-d' and 'x86/amd' into next
parents 19f949f5 69356712 0af125ca 573f4145 f671e022 77e38350 37a40710 91457df7

arch/arm/mach-exynos/Kconfig

+0 −5
Original line number Diff line number Diff line
@@ -105,11 +105,6 @@ config EXYNOS4_SETUP_FIMD0 
	help

	  Common setup code for FIMD0.



config EXYNOS_DEV_SYSMMU

	bool

	help

	  Common setup code for SYSTEM MMU in EXYNOS platforms



config EXYNOS4_DEV_USB_OHCI

	bool

	help

arch/arm/mach-exynos/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ obj-$(CONFIG_ARCH_EXYNOS4) += dev-audio.o 
obj-$(CONFIG_EXYNOS4_DEV_AHCI)		+= dev-ahci.o

obj-$(CONFIG_EXYNOS_DEV_DMA)		+= dma.o

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

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



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

obj-$(CONFIG_EXYNOS4_SETUP_FIMC)	+= setup-fimc.o

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

+20 −21
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 


#include <mach/map.h>

#include <mach/regs-clock.h>

#include <mach/sysmmu.h>



#include "common.h"

#include "clock-exynos4.h"
@@ -709,53 +708,53 @@ static struct clk exynos4_init_clocks_off[] = { 
		.enable		= exynos4_clk_ip_peril_ctrl,

		.ctrlbit	= (1 << 14),

	}, {

		.name		= SYSMMU_CLOCK_NAME,

		.devname	= SYSMMU_CLOCK_DEVNAME(mfc_l, 0),

		.name		= "sysmmu",

		.devname	= "exynos-sysmmu.0",

		.enable		= exynos4_clk_ip_mfc_ctrl,

		.ctrlbit	= (1 << 1),

	}, {

		.name		= SYSMMU_CLOCK_NAME,

		.devname	= SYSMMU_CLOCK_DEVNAME(mfc_r, 1),

		.name		= "sysmmu",

		.devname	= "exynos-sysmmu.1",

		.enable		= exynos4_clk_ip_mfc_ctrl,

		.ctrlbit	= (1 << 2),

	}, {

		.name		= SYSMMU_CLOCK_NAME,

		.devname	= SYSMMU_CLOCK_DEVNAME(tv, 2),

		.name		= "sysmmu",

		.devname	= "exynos-sysmmu.2",

		.enable		= exynos4_clk_ip_tv_ctrl,

		.ctrlbit	= (1 << 4),

	}, {

		.name		= SYSMMU_CLOCK_NAME,

		.devname	= SYSMMU_CLOCK_DEVNAME(jpeg, 3),

		.name		= "sysmmu",

		.devname	= "exynos-sysmmu.3",

		.enable		= exynos4_clk_ip_cam_ctrl,

		.ctrlbit	= (1 << 11),

	}, {

		.name		= SYSMMU_CLOCK_NAME,

		.devname	= SYSMMU_CLOCK_DEVNAME(rot, 4),

		.name		= "sysmmu",

		.devname	= "exynos-sysmmu.4",

		.enable		= exynos4_clk_ip_image_ctrl,

		.ctrlbit	= (1 << 4),

	}, {

		.name		= SYSMMU_CLOCK_NAME,

		.devname	= SYSMMU_CLOCK_DEVNAME(fimc0, 5),

		.name		= "sysmmu",

		.devname	= "exynos-sysmmu.5",

		.enable		= exynos4_clk_ip_cam_ctrl,

		.ctrlbit	= (1 << 7),

	}, {

		.name		= SYSMMU_CLOCK_NAME,

		.devname	= SYSMMU_CLOCK_DEVNAME(fimc1, 6),

		.name		= "sysmmu",

		.devname	= "exynos-sysmmu.6",

		.enable		= exynos4_clk_ip_cam_ctrl,

		.ctrlbit	= (1 << 8),

	}, {

		.name		= SYSMMU_CLOCK_NAME,

		.devname	= SYSMMU_CLOCK_DEVNAME(fimc2, 7),

		.name		= "sysmmu",

		.devname	= "exynos-sysmmu.7",

		.enable		= exynos4_clk_ip_cam_ctrl,

		.ctrlbit	= (1 << 9),

	}, {

		.name		= SYSMMU_CLOCK_NAME,

		.devname	= SYSMMU_CLOCK_DEVNAME(fimc3, 8),

		.name		= "sysmmu",

		.devname	= "exynos-sysmmu.8",

		.enable		= exynos4_clk_ip_cam_ctrl,

		.ctrlbit	= (1 << 10),

	}, {

		.name		= SYSMMU_CLOCK_NAME,

		.devname	= SYSMMU_CLOCK_DEVNAME(fimd0, 10),

		.name		= "sysmmu",

		.devname	= "exynos-sysmmu.10",

		.enable		= exynos4_clk_ip_lcd0_ctrl,

		.ctrlbit	= (1 << 4),

	}

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

+4 −5
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include <mach/hardware.h>

#include <mach/map.h>

#include <mach/regs-clock.h>

#include <mach/sysmmu.h>



#include "common.h"

#include "clock-exynos4.h"
@@ -129,13 +128,13 @@ static struct clk init_clocks_off[] = { 
		.enable		= exynos4_clk_ip_lcd1_ctrl,

		.ctrlbit	= (1 << 0),

	}, {

		.name		= SYSMMU_CLOCK_NAME,

		.devname	= SYSMMU_CLOCK_DEVNAME(2d, 14),

		.name		= "sysmmu",

		.devname	= "exynos-sysmmu.9",

		.enable		= exynos4_clk_ip_image_ctrl,

		.ctrlbit	= (1 << 3),

	}, {

		.name		= SYSMMU_CLOCK_NAME,

		.devname	= SYSMMU_CLOCK_DEVNAME(fimd1, 11),

		.name		= "sysmmu",

		.devname	= "exynos-sysmmu.11",

		.enable		= exynos4_clk_ip_lcd1_ctrl,

		.ctrlbit	= (1 << 4),

	}, {

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

+16 −7
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include <mach/hardware.h>

#include <mach/map.h>

#include <mach/regs-clock.h>

#include <mach/sysmmu.h>



#include "common.h"

#include "clock-exynos4.h"
@@ -111,20 +110,30 @@ static struct clksrc_clk clksrcs[] = { 


static struct clk init_clocks_off[] = {

	{

		.name		= SYSMMU_CLOCK_NAME,

		.devname	= SYSMMU_CLOCK_DEVNAME(2d, 14),

		.name		= "sysmmu",

		.devname	= "exynos-sysmmu.9",

		.enable		= exynos4_clk_ip_dmc_ctrl,

		.ctrlbit	= (1 << 24),

	}, {

		.name		= SYSMMU_CLOCK_NAME,

		.devname	= SYSMMU_CLOCK_DEVNAME(isp, 9),

		.name		= "sysmmu",

		.devname	= "exynos-sysmmu.12",

		.enable		= exynos4212_clk_ip_isp0_ctrl,

		.ctrlbit	= (7 << 8),

	}, {

		.name		= SYSMMU_CLOCK_NAME2,

		.devname	= SYSMMU_CLOCK_DEVNAME(isp, 9),

		.name		= "sysmmu",

		.devname	= "exynos-sysmmu.13",

		.enable		= exynos4212_clk_ip_isp1_ctrl,

		.ctrlbit	= (1 << 4),

	}, {

		.name		= "sysmmu",

		.devname	= "exynos-sysmmu.14",

		.enable		= exynos4212_clk_ip_isp0_ctrl,

		.ctrlbit	= (1 << 11),

	}, {

		.name		= "sysmmu",

		.devname	= "exynos-sysmmu.15",

		.enable		= exynos4212_clk_ip_isp0_ctrl,

		.ctrlbit	= (1 << 12),

	}, {

		.name		= "flite",

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