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

Commit ab74a914 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'v3.3-samsung-fixes-2' of... 

Merge branch 'v3.3-samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes

* 'v3.3-samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: EXYNOS: Correct M-5MOLS sensor clock frequency on Universal C210 board
  ARM: EXYNOS: Correct framebuffer window size on Nuri board
  ARM: SAMSUNG: Fix missing api-change from subsys_interface change
  ARM: EXYNOS: Fix "warning: initialization from incompatible pointer type"
  ARM: S5PV210: Fix the name of exynos4_clk_hdmiphy_ctrl() for S5PV210
  ARM: EXYNOS: Remove build warning without enabling PM
  ARM: SAMSUNG: Fix platform data setup for I2C adapter 0
  ARM: EXYNOS: fix non-SMP builds for EXYNOS4
  ARM: S3C6410: Use device names for both I2C clocks
  ARM: S3C64XX: Make s3c64xx_init_uarts() static
parents ca43784d 3e8ad561

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

+2 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 


#include "common.h"



#ifdef CONFIG_PM_SLEEP

static struct sleep_save exynos4210_clock_save[] = {

	SAVE_ITEM(S5P_CLKSRC_IMAGE),

	SAVE_ITEM(S5P_CLKSRC_LCD1),
@@ -42,6 +43,7 @@ static struct sleep_save exynos4210_clock_save[] = { 
	SAVE_ITEM(S5P_CLKGATE_IP_LCD1),

	SAVE_ITEM(S5P_CLKGATE_IP_PERIR_4210),

};

#endif



static struct clksrc_clk *sysclks[] = {

	/* nothing here yet */

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

+2 −0
Original line number Diff line number Diff line
@@ -32,12 +32,14 @@ 


#include "common.h"



#ifdef CONFIG_PM_SLEEP

static struct sleep_save exynos4212_clock_save[] = {

	SAVE_ITEM(S5P_CLKSRC_IMAGE),

	SAVE_ITEM(S5P_CLKDIV_IMAGE),

	SAVE_ITEM(S5P_CLKGATE_IP_IMAGE_4212),

	SAVE_ITEM(S5P_CLKGATE_IP_PERIR_4212),

};

#endif



static struct clk *clk_src_mpll_user_list[] = {

	[0] = &clk_fin_mpll,

arch/arm/mach-exynos/clock.c

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 


#include "common.h"



#ifdef CONFIG_PM_SLEEP

static struct sleep_save exynos4_clock_save[] = {

	SAVE_ITEM(S5P_CLKDIV_LEFTBUS),

	SAVE_ITEM(S5P_CLKGATE_IP_LEFTBUS),
@@ -93,6 +94,7 @@ static struct sleep_save exynos4_clock_save[] = { 
	SAVE_ITEM(S5P_CLKGATE_SCLKCPU),

	SAVE_ITEM(S5P_CLKGATE_IP_CPU),

};

#endif



struct clk clk_sclk_hdmi27m = {

	.name		= "sclk_hdmi27m",

arch/arm/mach-exynos/mach-nuri.c

+4 −4
Original line number Diff line number Diff line
@@ -220,14 +220,14 @@ static struct s3c_fb_pd_win nuri_fb_win0 = { 
		.lower_margin	= 1,

		.hsync_len	= 48,

		.vsync_len	= 3,

		.xres		= 1280,

		.yres		= 800,

		.xres		= 1024,

		.yres		= 600,

		.refresh	= 60,

	},

	.max_bpp	= 24,

	.default_bpp	= 16,

	.virtual_x	= 1280,

	.virtual_y	= 800,

	.virtual_x	= 1024,

	.virtual_y	= 2 * 600,

};



static struct s3c_fb_platdata nuri_fb_pdata __initdata = {

arch/arm/mach-exynos/mach-universal_c210.c

+1 −1
Original line number Diff line number Diff line
@@ -910,7 +910,7 @@ static struct s5p_fimc_isp_info universal_camera_sensors[] = { 
		.bus_type	= FIMC_MIPI_CSI2,

		.board_info	= &m5mols_board_info,

		.i2c_bus_num	= 0,

		.clk_frequency	= 21600000UL,

		.clk_frequency	= 24000000UL,

		.csi_data_align	= 32,

	},

};