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

Commit 0f7dd1aa authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mturquette/linux 

Pull clock controller fixes from Michael Turquette:
 "Two small fixes for the Zynq clock controller introduced in 3.11-rc1
  and another Exynos clock patch which fixes a regression that prevents
  the video pipeline from functioning on that platform"

* tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mturquette/linux:
  clk: exynos4: Add CLK_GET_RATE_NOCACHE flag for the Exynos4x12 ISP clocks
  clk/zynq/clkc: Add CLK_SET_RATE_PARENT flag to ethernet muxes
  clk/zynq/clkc: Add dedicated spinlock for the SWDT
parents 2d2843e6 a701fe38

drivers/clk/samsung/clk-exynos4.c

+34 −30
Original line number Diff line number Diff line
@@ -581,11 +581,15 @@ struct samsung_div_clock exynos4x12_div_clks[] __initdata = { 
	DIV(none, "div_spi1_isp", "mout_spi1_isp", E4X12_DIV_ISP, 16, 4),

	DIV(none, "div_spi1_isp_pre", "div_spi1_isp", E4X12_DIV_ISP, 20, 8),

	DIV(none, "div_uart_isp", "mout_uart_isp", E4X12_DIV_ISP, 28, 4),

	DIV(div_isp0, "div_isp0", "aclk200", E4X12_DIV_ISP0, 0, 3),

	DIV(div_isp1, "div_isp1", "aclk200", E4X12_DIV_ISP0, 4, 3),

	DIV_F(div_isp0, "div_isp0", "aclk200", E4X12_DIV_ISP0, 0, 3,

						CLK_GET_RATE_NOCACHE, 0),

	DIV_F(div_isp1, "div_isp1", "aclk200", E4X12_DIV_ISP0, 4, 3,

						CLK_GET_RATE_NOCACHE, 0),

	DIV(none, "div_mpwm", "div_isp1", E4X12_DIV_ISP1, 0, 3),

	DIV(div_mcuisp0, "div_mcuisp0", "aclk400_mcuisp", E4X12_DIV_ISP1, 4, 3),

	DIV(div_mcuisp1, "div_mcuisp1", "div_mcuisp0", E4X12_DIV_ISP1, 8, 3),

	DIV_F(div_mcuisp0, "div_mcuisp0", "aclk400_mcuisp", E4X12_DIV_ISP1,

						4, 3, CLK_GET_RATE_NOCACHE, 0),

	DIV_F(div_mcuisp1, "div_mcuisp1", "div_mcuisp0", E4X12_DIV_ISP1,

						8, 3, CLK_GET_RATE_NOCACHE, 0),

	DIV(sclk_fimg2d, "sclk_fimg2d", "mout_g2d", DIV_DMC1, 0, 4),

};
@@ -863,57 +867,57 @@ struct samsung_gate_clock exynos4x12_gate_clks[] __initdata = { 
	GATE_DA(i2s0, "samsung-i2s.0", "i2s0", "aclk100",

			E4X12_GATE_IP_MAUDIO, 3, 0, 0, "iis"),

	GATE(fimc_isp, "isp", "aclk200", E4X12_GATE_ISP0, 0,

			CLK_IGNORE_UNUSED, 0),

			CLK_IGNORE_UNUSED | CLK_GET_RATE_NOCACHE, 0),

	GATE(fimc_drc, "drc", "aclk200", E4X12_GATE_ISP0, 1,

			CLK_IGNORE_UNUSED, 0),

			CLK_IGNORE_UNUSED | CLK_GET_RATE_NOCACHE, 0),

	GATE(fimc_fd, "fd", "aclk200", E4X12_GATE_ISP0, 2,

			CLK_IGNORE_UNUSED, 0),

			CLK_IGNORE_UNUSED | CLK_GET_RATE_NOCACHE, 0),

	GATE(fimc_lite0, "lite0", "aclk200", E4X12_GATE_ISP0, 3,

			CLK_IGNORE_UNUSED, 0),

			CLK_IGNORE_UNUSED | CLK_GET_RATE_NOCACHE, 0),

	GATE(fimc_lite1, "lite1", "aclk200", E4X12_GATE_ISP0, 4,

			CLK_IGNORE_UNUSED, 0),

			CLK_IGNORE_UNUSED | CLK_GET_RATE_NOCACHE, 0),

	GATE(mcuisp, "mcuisp", "aclk200", E4X12_GATE_ISP0, 5,

			CLK_IGNORE_UNUSED, 0),

			CLK_IGNORE_UNUSED | CLK_GET_RATE_NOCACHE, 0),

	GATE(gicisp, "gicisp", "aclk200", E4X12_GATE_ISP0, 7,

			CLK_IGNORE_UNUSED, 0),

			CLK_IGNORE_UNUSED | CLK_GET_RATE_NOCACHE, 0),

	GATE(smmu_isp, "smmu_isp", "aclk200", E4X12_GATE_ISP0, 8,

			CLK_IGNORE_UNUSED, 0),

			CLK_IGNORE_UNUSED | CLK_GET_RATE_NOCACHE, 0),

	GATE(smmu_drc, "smmu_drc", "aclk200", E4X12_GATE_ISP0, 9,

			CLK_IGNORE_UNUSED, 0),

			CLK_IGNORE_UNUSED | CLK_GET_RATE_NOCACHE, 0),

	GATE(smmu_fd, "smmu_fd", "aclk200", E4X12_GATE_ISP0, 10,

			CLK_IGNORE_UNUSED, 0),

			CLK_IGNORE_UNUSED | CLK_GET_RATE_NOCACHE, 0),

	GATE(smmu_lite0, "smmu_lite0", "aclk200", E4X12_GATE_ISP0, 11,

			CLK_IGNORE_UNUSED, 0),

			CLK_IGNORE_UNUSED | CLK_GET_RATE_NOCACHE, 0),

	GATE(smmu_lite1, "smmu_lite1", "aclk200", E4X12_GATE_ISP0, 12,

			CLK_IGNORE_UNUSED, 0),

			CLK_IGNORE_UNUSED | CLK_GET_RATE_NOCACHE, 0),

	GATE(ppmuispmx, "ppmuispmx", "aclk200", E4X12_GATE_ISP0, 20,

			CLK_IGNORE_UNUSED, 0),

			CLK_IGNORE_UNUSED | CLK_GET_RATE_NOCACHE, 0),

	GATE(ppmuispx, "ppmuispx", "aclk200", E4X12_GATE_ISP0, 21,

			CLK_IGNORE_UNUSED, 0),

			CLK_IGNORE_UNUSED | CLK_GET_RATE_NOCACHE, 0),

	GATE(mcuctl_isp, "mcuctl_isp", "aclk200", E4X12_GATE_ISP0, 23,

			CLK_IGNORE_UNUSED, 0),

			CLK_IGNORE_UNUSED | CLK_GET_RATE_NOCACHE, 0),

	GATE(mpwm_isp, "mpwm_isp", "aclk200", E4X12_GATE_ISP0, 24,

			CLK_IGNORE_UNUSED, 0),

			CLK_IGNORE_UNUSED | CLK_GET_RATE_NOCACHE, 0),

	GATE(i2c0_isp, "i2c0_isp", "aclk200", E4X12_GATE_ISP0, 25,

			CLK_IGNORE_UNUSED, 0),

			CLK_IGNORE_UNUSED | CLK_GET_RATE_NOCACHE, 0),

	GATE(i2c1_isp, "i2c1_isp", "aclk200", E4X12_GATE_ISP0, 26,

			CLK_IGNORE_UNUSED, 0),

			CLK_IGNORE_UNUSED | CLK_GET_RATE_NOCACHE, 0),

	GATE(mtcadc_isp, "mtcadc_isp", "aclk200", E4X12_GATE_ISP0, 27,

			CLK_IGNORE_UNUSED, 0),

			CLK_IGNORE_UNUSED | CLK_GET_RATE_NOCACHE, 0),

	GATE(pwm_isp, "pwm_isp", "aclk200", E4X12_GATE_ISP0, 28,

			CLK_IGNORE_UNUSED, 0),

			CLK_IGNORE_UNUSED | CLK_GET_RATE_NOCACHE, 0),

	GATE(wdt_isp, "wdt_isp", "aclk200", E4X12_GATE_ISP0, 30,

			CLK_IGNORE_UNUSED, 0),

			CLK_IGNORE_UNUSED | CLK_GET_RATE_NOCACHE, 0),

	GATE(uart_isp, "uart_isp", "aclk200", E4X12_GATE_ISP0, 31,

			CLK_IGNORE_UNUSED, 0),

			CLK_IGNORE_UNUSED | CLK_GET_RATE_NOCACHE, 0),

	GATE(asyncaxim, "asyncaxim", "aclk200", E4X12_GATE_ISP1, 0,

			CLK_IGNORE_UNUSED, 0),

			CLK_IGNORE_UNUSED | CLK_GET_RATE_NOCACHE, 0),

	GATE(smmu_ispcx, "smmu_ispcx", "aclk200", E4X12_GATE_ISP1, 4,

			CLK_IGNORE_UNUSED, 0),

			CLK_IGNORE_UNUSED | CLK_GET_RATE_NOCACHE, 0),

	GATE(spi0_isp, "spi0_isp", "aclk200", E4X12_GATE_ISP1, 12,

			CLK_IGNORE_UNUSED, 0),

			CLK_IGNORE_UNUSED | CLK_GET_RATE_NOCACHE, 0),

	GATE(spi1_isp, "spi1_isp", "aclk200", E4X12_GATE_ISP1, 13,

			CLK_IGNORE_UNUSED, 0),

			CLK_IGNORE_UNUSED | CLK_GET_RATE_NOCACHE, 0),

	GATE(g2d, "g2d", "aclk200", GATE_IP_DMC, 23, 0, 0),

};

drivers/clk/zynq/clkc.c

+8 −5
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ static DEFINE_SPINLOCK(armpll_lock); 
static DEFINE_SPINLOCK(ddrpll_lock);

static DEFINE_SPINLOCK(iopll_lock);

static DEFINE_SPINLOCK(armclk_lock);

static DEFINE_SPINLOCK(swdtclk_lock);

static DEFINE_SPINLOCK(ddrclk_lock);

static DEFINE_SPINLOCK(dciclk_lock);

static DEFINE_SPINLOCK(gem0clk_lock);
@@ -293,7 +294,7 @@ static void __init zynq_clk_setup(struct device_node *np) 
	}

	clks[swdt] = clk_register_mux(NULL, clk_output_name[swdt],

			swdt_ext_clk_mux_parents, 2, CLK_SET_RATE_PARENT,

			SLCR_SWDT_CLK_SEL, 0, 1, 0, &gem0clk_lock);

			SLCR_SWDT_CLK_SEL, 0, 1, 0, &swdtclk_lock);



	/* DDR clocks */

	clk = clk_register_divider(NULL, "ddr2x_div", "ddrpll", 0,
@@ -364,8 +365,9 @@ static void __init zynq_clk_setup(struct device_node *np) 
			CLK_SET_RATE_PARENT, SLCR_GEM0_CLK_CTRL, 20, 6,

			CLK_DIVIDER_ONE_BASED | CLK_DIVIDER_ALLOW_ZERO,

			&gem0clk_lock);

	clk = clk_register_mux(NULL, "gem0_emio_mux", gem0_mux_parents, 2, 0,

			SLCR_GEM0_CLK_CTRL, 6, 1, 0, &gem0clk_lock);

	clk = clk_register_mux(NULL, "gem0_emio_mux", gem0_mux_parents, 2,

			CLK_SET_RATE_PARENT, SLCR_GEM0_CLK_CTRL, 6, 1, 0,

			&gem0clk_lock);

	clks[gem0] = clk_register_gate(NULL, clk_output_name[gem0],

			"gem0_emio_mux", CLK_SET_RATE_PARENT,

			SLCR_GEM0_CLK_CTRL, 0, 0, &gem0clk_lock);
@@ -386,8 +388,9 @@ static void __init zynq_clk_setup(struct device_node *np) 
			CLK_SET_RATE_PARENT, SLCR_GEM1_CLK_CTRL, 20, 6,

			CLK_DIVIDER_ONE_BASED | CLK_DIVIDER_ALLOW_ZERO,

			&gem1clk_lock);

	clk = clk_register_mux(NULL, "gem1_emio_mux", gem1_mux_parents, 2, 0,

			SLCR_GEM1_CLK_CTRL, 6, 1, 0, &gem1clk_lock);

	clk = clk_register_mux(NULL, "gem1_emio_mux", gem1_mux_parents, 2,

			CLK_SET_RATE_PARENT, SLCR_GEM1_CLK_CTRL, 6, 1, 0,

			&gem1clk_lock);

	clks[gem1] = clk_register_gate(NULL, clk_output_name[gem1],

			"gem1_emio_mux", CLK_SET_RATE_PARENT,

			SLCR_GEM1_CLK_CTRL, 0, 0, &gem1clk_lock);