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

This project is archived. Its data is read-only.

Commit bbc0c207 authored Sep 09, 2013 by Linux Build Service Account Committed by Gerrit - the friendly Code Review server Sep 09, 2013

Merge "msm: camera: use 24MHz for camera sensor ext clk"

parents 59fbc7f4 51c686c0

arch/arm/mach-msm/board-8974-gpiomux.c

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1365,6 +1365,11 @@ void __init msm_8974_init_gpiomux(void)
	return;		return;
	}		}

			pr_debug("%s:%d socinfo_get_version %x\n", __func__, __LINE__,
			socinfo_get_version());
			if (socinfo_get_version() >= 0x20000)
			msm_tlmm_misc_reg_write(TLMM_SPARE_REG, 0xf);

	#if defined(CONFIG_KS8851) \|\| defined(CONFIG_KS8851_MODULE)		#if defined(CONFIG_KS8851) \|\| defined(CONFIG_KS8851_MODULE)
	if (!(of_board_is_dragonboard() && machine_is_apq8074()))		if (!(of_board_is_dragonboard() && machine_is_apq8074()))
	msm_gpiomux_install(msm_eth_configs, \		msm_gpiomux_install(msm_eth_configs, \

arch/arm/mach-msm/clock-8974.c

+8 −8

Original line number	Original line	Diff line number	Diff line
	@@ -5028,14 +5028,14 @@ static struct clk_lookup msm_clocks_8974_common[] __initdata = {
	CLK_LOOKUP("vsync_clk", mdss_vsync_clk.c, "mdp.0"),		CLK_LOOKUP("vsync_clk", mdss_vsync_clk.c, "mdp.0"),

	/* MM sensor clocks */		/* MM sensor clocks */
	CLK_LOOKUP("cam_src_clk", mclk0_clk_src.c, "6e.qcom,camera"),		CLK_LOOKUP("cam_src_clk", mmss_gp0_clk_src.c, "6e.qcom,camera"),
	CLK_LOOKUP("cam_src_clk", mclk0_clk_src.c, "20.qcom,camera"),		CLK_LOOKUP("cam_src_clk", mmss_gp0_clk_src.c, "20.qcom,camera"),
	CLK_LOOKUP("cam_src_clk", mclk2_clk_src.c, "6c.qcom,camera"),		CLK_LOOKUP("cam_src_clk", gp1_clk_src.c, "6c.qcom,camera"),
	CLK_LOOKUP("cam_src_clk", mclk1_clk_src.c, "90.qcom,camera"),		CLK_LOOKUP("cam_src_clk", mmss_gp1_clk_src.c, "90.qcom,camera"),
	CLK_LOOKUP("cam_clk", camss_mclk0_clk.c, "6e.qcom,camera"),		CLK_LOOKUP("cam_clk", camss_gp0_clk.c, "6e.qcom,camera"),
	CLK_LOOKUP("cam_clk", camss_mclk0_clk.c, "20.qcom,camera"),		CLK_LOOKUP("cam_clk", camss_gp0_clk.c, "20.qcom,camera"),
	CLK_LOOKUP("cam_clk", camss_mclk2_clk.c, "6c.qcom,camera"),		CLK_LOOKUP("cam_clk", gcc_gp1_clk.c, "6c.qcom,camera"),
	CLK_LOOKUP("cam_clk", camss_mclk1_clk.c, "90.qcom,camera"),		CLK_LOOKUP("cam_clk", camss_gp1_clk.c, "90.qcom,camera"),
	CLK_LOOKUP("cam_clk", camss_mclk1_clk.c, ""),		CLK_LOOKUP("cam_clk", camss_mclk1_clk.c, ""),
	CLK_LOOKUP("cam_clk", camss_mclk2_clk.c, ""),		CLK_LOOKUP("cam_clk", camss_mclk2_clk.c, ""),
	CLK_LOOKUP("cam_clk", camss_mclk3_clk.c, ""),		CLK_LOOKUP("cam_clk", camss_mclk3_clk.c, ""),

arch/arm/mach-msm/include/mach/gpiomux.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -113,6 +113,7 @@ struct msm_gpiomux_configs {
	enum msm_tlmm_misc_reg {		enum msm_tlmm_misc_reg {
	TLMM_ETM_MODE_REG = 0x2014,		TLMM_ETM_MODE_REG = 0x2014,
	TLMM_SDC2_HDRV_PULL_CTL = 0x2048,		TLMM_SDC2_HDRV_PULL_CTL = 0x2048,
			TLMM_SPARE_REG = 0x2024,
	};		};

	void msm_tlmm_misc_reg_write(enum msm_tlmm_misc_reg misc_reg, int val);		void msm_tlmm_misc_reg_write(enum msm_tlmm_misc_reg misc_reg, int val);

drivers/media/platform/msm/camera_v2/sensor/msm_sensor.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -957,7 +957,7 @@ static struct msm_cam_clk_info cam_8610_clk_info[] = {
	};		};

	static struct msm_cam_clk_info cam_8974_clk_info[] = {		static struct msm_cam_clk_info cam_8974_clk_info[] = {
	[SENSOR_CAM_MCLK] = {"cam_src_clk", 19200000},		[SENSOR_CAM_MCLK] = {"cam_src_clk", 24000000},
	[SENSOR_CAM_CLK] = {"cam_clk", 0},		[SENSOR_CAM_CLK] = {"cam_clk", 0},
	};		};