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

Commit 537cd80c authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'samsung/devel-2' into late/soc 

From Kukjin Kim <kgene.kim@samsung.com>:

The updating cpufreq for 1.7GHz of exynos5250 has been included in samsung
tree because Rafael thought it was more related in samsung platform and
I agreed.  And others are adding G2D clock for exynos4x12 Socs.

* samsung/devel-2:
  ARM: S3C64XX: Add header file protection macros in pm-core.h
  [CPUFREQ] EXYNOS5250: Add support max 1.7GHz for EXYNOS5250
  ARM: EXYNOS: Add G2D related clock entries for SMDK4X12
  ARM: EXYNOS: Move G2D clock entries to clock-exynos4210.c file

Originally from
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git

 next/devel-samsung-2
but rebased to split out the defconfig changes.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 088eb2a8 42be66f8

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

+2 −39
Original line number Diff line number Diff line
@@ -619,10 +619,6 @@ static struct clk exynos4_init_clocks_off[] = { 
		.devname	= "samsung-ac97",

		.enable		= exynos4_clk_ip_peril_ctrl,

		.ctrlbit	= (1 << 27),

	}, {

		.name		= "fimg2d",

		.enable		= exynos4_clk_ip_image_ctrl,

		.ctrlbit	= (1 << 0),

	}, {

		.name		= "mfc",

		.devname	= "s5p-mfc",
@@ -819,47 +815,21 @@ static struct clk *exynos4_clkset_mout_g2d0_list[] = { 
	[1] = &exynos4_clk_sclk_apll.clk,

};



static struct clksrc_sources exynos4_clkset_mout_g2d0 = {

struct clksrc_sources exynos4_clkset_mout_g2d0 = {

	.sources	= exynos4_clkset_mout_g2d0_list,

	.nr_sources	= ARRAY_SIZE(exynos4_clkset_mout_g2d0_list),

};



static struct clksrc_clk exynos4_clk_mout_g2d0 = {

	.clk	= {

		.name		= "mout_g2d0",

	},

	.sources = &exynos4_clkset_mout_g2d0,

	.reg_src = { .reg = EXYNOS4_CLKSRC_IMAGE, .shift = 0, .size = 1 },

};



static struct clk *exynos4_clkset_mout_g2d1_list[] = {

	[0] = &exynos4_clk_mout_epll.clk,

	[1] = &exynos4_clk_sclk_vpll.clk,

};



static struct clksrc_sources exynos4_clkset_mout_g2d1 = {

struct clksrc_sources exynos4_clkset_mout_g2d1 = {

	.sources	= exynos4_clkset_mout_g2d1_list,

	.nr_sources	= ARRAY_SIZE(exynos4_clkset_mout_g2d1_list),

};



static struct clksrc_clk exynos4_clk_mout_g2d1 = {

	.clk	= {

		.name		= "mout_g2d1",

	},

	.sources = &exynos4_clkset_mout_g2d1,

	.reg_src = { .reg = EXYNOS4_CLKSRC_IMAGE, .shift = 4, .size = 1 },

};



static struct clk *exynos4_clkset_mout_g2d_list[] = {

	[0] = &exynos4_clk_mout_g2d0.clk,

	[1] = &exynos4_clk_mout_g2d1.clk,

};



static struct clksrc_sources exynos4_clkset_mout_g2d = {

	.sources	= exynos4_clkset_mout_g2d_list,

	.nr_sources	= ARRAY_SIZE(exynos4_clkset_mout_g2d_list),

};



static struct clk *exynos4_clkset_mout_mfc0_list[] = {

	[0] = &exynos4_clk_mout_mpll.clk,

	[1] = &exynos4_clk_sclk_apll.clk,
@@ -1124,13 +1094,6 @@ static struct clksrc_clk exynos4_clksrcs[] = { 
		.sources = &exynos4_clkset_group,

		.reg_src = { .reg = EXYNOS4_CLKSRC_LCD0, .shift = 0, .size = 4 },

		.reg_div = { .reg = EXYNOS4_CLKDIV_LCD0, .shift = 0, .size = 4 },

	}, {

		.clk	= {

			.name		= "sclk_fimg2d",

		},

		.sources = &exynos4_clkset_mout_g2d,

		.reg_src = { .reg = EXYNOS4_CLKSRC_IMAGE, .shift = 8, .size = 1 },

		.reg_div = { .reg = EXYNOS4_CLKDIV_IMAGE, .shift = 0, .size = 4 },

	}, {

		.clk	= {

			.name		= "sclk_mfc",

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

+3 −0
Original line number Diff line number Diff line
@@ -23,6 +23,9 @@ extern struct clksrc_sources exynos4_clkset_group; 
extern struct clk *exynos4_clkset_aclk_top_list[];

extern struct clk *exynos4_clkset_group_list[];



extern struct clksrc_sources exynos4_clkset_mout_g2d0;

extern struct clksrc_sources exynos4_clkset_mout_g2d1;



extern int exynos4_clksrc_mask_fsys_ctrl(struct clk *clk, int enable);

extern int exynos4_clk_ip_fsys_ctrl(struct clk *clk, int enable);

extern int exynos4_clk_ip_lcd1_ctrl(struct clk *clk, int enable);

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

+37 −0
Original line number Diff line number Diff line
@@ -48,6 +48,32 @@ static struct clksrc_clk *sysclks[] = { 
	/* nothing here yet */

};



static struct clksrc_clk exynos4210_clk_mout_g2d0 = {

	.clk	= {

		.name		= "mout_g2d0",

	},

	.sources = &exynos4_clkset_mout_g2d0,

	.reg_src = { .reg = EXYNOS4_CLKSRC_IMAGE, .shift = 0, .size = 1 },

};



static struct clksrc_clk exynos4210_clk_mout_g2d1 = {

	.clk	= {

		.name		= "mout_g2d1",

	},

	.sources = &exynos4_clkset_mout_g2d1,

	.reg_src = { .reg = EXYNOS4_CLKSRC_IMAGE, .shift = 4, .size = 1 },

};



static struct clk *exynos4210_clkset_mout_g2d_list[] = {

	[0] = &exynos4210_clk_mout_g2d0.clk,

	[1] = &exynos4210_clk_mout_g2d1.clk,

};



static struct clksrc_sources exynos4210_clkset_mout_g2d = {

	.sources	= exynos4210_clkset_mout_g2d_list,

	.nr_sources	= ARRAY_SIZE(exynos4210_clkset_mout_g2d_list),

};



static int exynos4_clksrc_mask_lcd1_ctrl(struct clk *clk, int enable)

{

	return s5p_gatectrl(EXYNOS4210_CLKSRC_MASK_LCD1, clk, enable);
@@ -74,6 +100,13 @@ static struct clksrc_clk clksrcs[] = { 
		.sources = &exynos4_clkset_group,

		.reg_src = { .reg = EXYNOS4210_CLKSRC_LCD1, .shift = 0, .size = 4 },

		.reg_div = { .reg = EXYNOS4210_CLKDIV_LCD1, .shift = 0, .size = 4 },

	}, {

		.clk	= {

			.name		= "sclk_fimg2d",

		},

		.sources = &exynos4210_clkset_mout_g2d,

		.reg_src = { .reg = EXYNOS4_CLKSRC_IMAGE, .shift = 8, .size = 1 },

		.reg_div = { .reg = EXYNOS4_CLKDIV_IMAGE, .shift = 0, .size = 4 },

	},

};
@@ -105,6 +138,10 @@ static struct clk init_clocks_off[] = { 
		.devname	= SYSMMU_CLOCK_DEVNAME(fimd1, 11),

		.enable		= exynos4_clk_ip_lcd1_ctrl,

		.ctrlbit	= (1 << 4),

	}, {

		.name		= "fimg2d",

		.enable		= exynos4_clk_ip_image_ctrl,

		.ctrlbit	= (1 << 0),

	},

};

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

+39 −2
Original line number Diff line number Diff line
@@ -68,12 +68,45 @@ static struct clksrc_clk clk_mout_mpll_user = { 
	.reg_src	= { .reg = EXYNOS4_CLKSRC_CPU, .shift = 24, .size = 1 },

};



static struct clksrc_clk exynos4x12_clk_mout_g2d0 = {

	.clk	= {

		.name		= "mout_g2d0",

	},

	.sources = &exynos4_clkset_mout_g2d0,

	.reg_src = { .reg = EXYNOS4_CLKSRC_DMC, .shift = 20, .size = 1 },

};



static struct clksrc_clk exynos4x12_clk_mout_g2d1 = {

	.clk	= {

		.name		= "mout_g2d1",

	},

	.sources = &exynos4_clkset_mout_g2d1,

	.reg_src = { .reg = EXYNOS4_CLKSRC_DMC, .shift = 24, .size = 1 },

};



static struct clk *exynos4x12_clkset_mout_g2d_list[] = {

	[0] = &exynos4x12_clk_mout_g2d0.clk,

	[1] = &exynos4x12_clk_mout_g2d1.clk,

};



static struct clksrc_sources exynos4x12_clkset_mout_g2d = {

	.sources	= exynos4x12_clkset_mout_g2d_list,

	.nr_sources	= ARRAY_SIZE(exynos4x12_clkset_mout_g2d_list),

};



static struct clksrc_clk *sysclks[] = {

	&clk_mout_mpll_user,

};



static struct clksrc_clk clksrcs[] = {

	/* nothing here yet */

	{

		.clk	= {

			.name		= "sclk_fimg2d",

		},

		.sources = &exynos4x12_clkset_mout_g2d,

		.reg_src = { .reg = EXYNOS4_CLKSRC_DMC, .shift = 28, .size = 1 },

		.reg_div = { .reg = EXYNOS4_CLKDIV_DMC1, .shift = 0, .size = 4 },

	},

};



static struct clk init_clocks_off[] = {
@@ -102,7 +135,11 @@ static struct clk init_clocks_off[] = { 
		.devname	= "exynos-fimc-lite.1",

		.enable		= exynos4212_clk_ip_isp0_ctrl,

		.ctrlbit	= (1 << 3),

	}

	}, {

		.name		= "fimg2d",

		.enable		= exynos4_clk_ip_dmc_ctrl,

		.ctrlbit	= (1 << 23),

	},

};



#ifdef CONFIG_PM_SLEEP

arch/arm/mach-s3c64xx/include/mach/pm-core.h

+4 −0
Original line number Diff line number Diff line
@@ -12,6 +12,9 @@ 
 * published by the Free Software Foundation.

 */



#ifndef __MACH_S3C64XX_PM_CORE_H

#define __MACH_S3C64XX_PM_CORE_H __FILE__



#include <mach/regs-gpio.h>



static inline void s3c_pm_debug_init_uart(void)
@@ -113,3 +116,4 @@ static inline void samsung_pm_saved_gpios(void) 


	__raw_writel(S3C64XX_SLPEN_USE_xSLP, S3C64XX_SLPEN);

}

#endif /* __MACH_S3C64XX_PM_CORE_H */