Commit a467b073 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux 

Pull clk fixes from Stephen Boyd:
 "A handful of clk driver fixes:

   - Build fix for CONFIG_PM=n in the mmp2 driver

   - Kconfig warning for unmet dependencies in the i.MX driver

   - Make the camera AHB clk always be enabled on qcom sc7180

   - Use rate round down semantics for qcom sm8250 SD clks"

* tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux:
  clk: mmp2: fix build without CONFIG_PM
  clk: qcom: gcc-sm250: Use floor ops for sdcc clks
  clk: imx: fix Kconfig warning for i.MX SCU clk
  clk: qcom: gcc-sc7180: Mark the camera abh clock always ON
parents be4a3385 c361c5a6

drivers/clk/imx/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -6,8 +6,6 @@ config MXC_CLK 


config MXC_CLK_SCU

	tristate

	depends on ARCH_MXC

	depends on IMX_SCU && HAVE_ARM_SMCCC



config CLK_IMX1

	def_bool SOC_IMX1

drivers/clk/mmp/clk-audio.c

+4 −2
Original line number Diff line number Diff line
@@ -392,7 +392,8 @@ static int mmp2_audio_clk_remove(struct platform_device *pdev) 
	return 0;

}



static int __maybe_unused mmp2_audio_clk_suspend(struct device *dev)

#ifdef CONFIG_PM

static int mmp2_audio_clk_suspend(struct device *dev)

{

	struct mmp2_audio_clk *priv = dev_get_drvdata(dev);
@@ -404,7 +405,7 @@ static int __maybe_unused mmp2_audio_clk_suspend(struct device *dev) 
	return 0;

}



static int __maybe_unused mmp2_audio_clk_resume(struct device *dev)

static int mmp2_audio_clk_resume(struct device *dev)

{

	struct mmp2_audio_clk *priv = dev_get_drvdata(dev);
@@ -415,6 +416,7 @@ static int __maybe_unused mmp2_audio_clk_resume(struct device *dev) 


	return 0;

}

#endif



static const struct dev_pm_ops mmp2_audio_clk_pm_ops = {

	SET_RUNTIME_PM_OPS(mmp2_audio_clk_suspend, mmp2_audio_clk_resume, NULL)

drivers/clk/qcom/gcc-sc7180.c

+3 −18
Original line number Diff line number Diff line
@@ -891,21 +891,6 @@ static struct clk_branch gcc_boot_rom_ahb_clk = { 
	},

};



static struct clk_branch gcc_camera_ahb_clk = {

	.halt_reg = 0xb008,

	.halt_check = BRANCH_HALT,

	.hwcg_reg = 0xb008,

	.hwcg_bit = 1,

	.clkr = {

		.enable_reg = 0xb008,

		.enable_mask = BIT(0),

		.hw.init = &(struct clk_init_data){

			.name = "gcc_camera_ahb_clk",

			.ops = &clk_branch2_ops,

		},

	},

};



static struct clk_branch gcc_camera_hf_axi_clk = {

	.halt_reg = 0xb020,

	.halt_check = BRANCH_HALT,
@@ -2317,7 +2302,6 @@ static struct clk_regmap *gcc_sc7180_clocks[] = { 
	[GCC_AGGRE_UFS_PHY_AXI_CLK] = &gcc_aggre_ufs_phy_axi_clk.clkr,

	[GCC_AGGRE_USB3_PRIM_AXI_CLK] = &gcc_aggre_usb3_prim_axi_clk.clkr,

	[GCC_BOOT_ROM_AHB_CLK] = &gcc_boot_rom_ahb_clk.clkr,

	[GCC_CAMERA_AHB_CLK] = &gcc_camera_ahb_clk.clkr,

	[GCC_CAMERA_HF_AXI_CLK] = &gcc_camera_hf_axi_clk.clkr,

	[GCC_CAMERA_THROTTLE_HF_AXI_CLK] = &gcc_camera_throttle_hf_axi_clk.clkr,

	[GCC_CAMERA_XO_CLK] = &gcc_camera_xo_clk.clkr,
@@ -2519,11 +2503,12 @@ static int gcc_sc7180_probe(struct platform_device *pdev) 


	/*

	 * Keep the clocks always-ON

	 * GCC_CPUSS_GNOC_CLK, GCC_VIDEO_AHB_CLK, GCC_DISP_AHB_CLK

	 * GCC_GPU_CFG_AHB_CLK

	 * GCC_CPUSS_GNOC_CLK, GCC_VIDEO_AHB_CLK, GCC_CAMERA_AHB_CLK,

	 * GCC_DISP_AHB_CLK, GCC_GPU_CFG_AHB_CLK

	 */

	regmap_update_bits(regmap, 0x48004, BIT(0), BIT(0));

	regmap_update_bits(regmap, 0x0b004, BIT(0), BIT(0));

	regmap_update_bits(regmap, 0x0b008, BIT(0), BIT(0));

	regmap_update_bits(regmap, 0x0b00c, BIT(0), BIT(0));

	regmap_update_bits(regmap, 0x71004, BIT(0), BIT(0));

drivers/clk/qcom/gcc-sm8250.c

+2 −2
Original line number Diff line number Diff line
@@ -722,7 +722,7 @@ static struct clk_rcg2 gcc_sdcc2_apps_clk_src = { 
		.name = "gcc_sdcc2_apps_clk_src",

		.parent_data = gcc_parent_data_4,

		.num_parents = 5,

		.ops = &clk_rcg2_ops,

		.ops = &clk_rcg2_floor_ops,

	},

};
@@ -745,7 +745,7 @@ static struct clk_rcg2 gcc_sdcc4_apps_clk_src = { 
		.name = "gcc_sdcc4_apps_clk_src",

		.parent_data = gcc_parent_data_0,

		.num_parents = 3,

		.ops = &clk_rcg2_ops,

		.ops = &clk_rcg2_floor_ops,

	},

};