Commit fac9a55b authored by Neil Armstrong's avatar Neil Armstrong Committed by Kevin Hilman
Browse files

clk: meson-gxbb: Add MALI clocks 



The Mali is clocked by two identical clock paths behind a glitch free mux
to safely change frequency while running.

The two "mali_0" and "mali_1" clocks are composed of a mux, divider and gate.
Expose these two clocks trees using generic clocks.
Finally the glitch free mux is added as "mali" clock.

Signed-off-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
Signed-off-by: default avatarMichael Turquette <mturquette@baylibre.com>
Link: lkml.kernel.org/r/1490177935-9646-3-git-send-email-narmstrong@baylibre.com
parent b68fb787

drivers/clk/meson/gxbb.c

+139 −0
Original line number Original line Diff line number Diff line
@@ -634,6 +634,131 @@ static struct clk_gate gxbb_sar_adc_clk = { 
	},

	},

};

};





/*

 * The MALI IP is clocked by two identical clocks (mali_0 and mali_1)

 * muxed by a glitch-free switch.

 */



static u32 mux_table_mali_0_1[] = {0, 1, 2, 3, 4, 5, 6, 7};

static const char *gxbb_mali_0_1_parent_names[] = {

	"xtal", "gp0_pll", "mpll2", "mpll1", "fclk_div7",

	"fclk_div4", "fclk_div3", "fclk_div5"

};



static struct clk_mux gxbb_mali_0_sel = {

	.reg = (void *)HHI_MALI_CLK_CNTL,

	.mask = 0x7,

	.shift = 9,

	.table = mux_table_mali_0_1,

	.lock = &clk_lock,

	.hw.init = &(struct clk_init_data){

		.name = "mali_0_sel",

		.ops = &clk_mux_ops,

		/*

		 * bits 10:9 selects from 8 possible parents:

		 * xtal, gp0_pll, mpll2, mpll1, fclk_div7,

		 * fclk_div4, fclk_div3, fclk_div5

		 */

		.parent_names = gxbb_mali_0_1_parent_names,

		.num_parents = 8,

		.flags = CLK_SET_RATE_NO_REPARENT,

	},

};



static struct clk_divider gxbb_mali_0_div = {

	.reg = (void *)HHI_MALI_CLK_CNTL,

	.shift = 0,

	.width = 7,

	.lock = &clk_lock,

	.hw.init = &(struct clk_init_data){

		.name = "mali_0_div",

		.ops = &clk_divider_ops,

		.parent_names = (const char *[]){ "mali_0_sel" },

		.num_parents = 1,

		.flags = CLK_SET_RATE_NO_REPARENT,

	},

};



static struct clk_gate gxbb_mali_0 = {

	.reg = (void *)HHI_MALI_CLK_CNTL,

	.bit_idx = 8,

	.lock = &clk_lock,

	.hw.init = &(struct clk_init_data){

		.name = "mali_0",

		.ops = &clk_gate_ops,

		.parent_names = (const char *[]){ "mali_0_div" },

		.num_parents = 1,

		.flags = CLK_SET_RATE_PARENT,

	},

};



static struct clk_mux gxbb_mali_1_sel = {

	.reg = (void *)HHI_MALI_CLK_CNTL,

	.mask = 0x7,

	.shift = 25,

	.table = mux_table_mali_0_1,

	.lock = &clk_lock,

	.hw.init = &(struct clk_init_data){

		.name = "mali_1_sel",

		.ops = &clk_mux_ops,

		/*

		 * bits 10:9 selects from 8 possible parents:

		 * xtal, gp0_pll, mpll2, mpll1, fclk_div7,

		 * fclk_div4, fclk_div3, fclk_div5

		 */

		.parent_names = gxbb_mali_0_1_parent_names,

		.num_parents = 8,

		.flags = CLK_SET_RATE_NO_REPARENT,

	},

};



static struct clk_divider gxbb_mali_1_div = {

	.reg = (void *)HHI_MALI_CLK_CNTL,

	.shift = 16,

	.width = 7,

	.lock = &clk_lock,

	.hw.init = &(struct clk_init_data){

		.name = "mali_1_div",

		.ops = &clk_divider_ops,

		.parent_names = (const char *[]){ "mali_1_sel" },

		.num_parents = 1,

		.flags = CLK_SET_RATE_NO_REPARENT,

	},

};



static struct clk_gate gxbb_mali_1 = {

	.reg = (void *)HHI_MALI_CLK_CNTL,

	.bit_idx = 24,

	.lock = &clk_lock,

	.hw.init = &(struct clk_init_data){

		.name = "mali_1",

		.ops = &clk_gate_ops,

		.parent_names = (const char *[]){ "mali_1_div" },

		.num_parents = 1,

		.flags = CLK_SET_RATE_PARENT,

	},

};



static u32 mux_table_mali[] = {0, 1};

static const char *gxbb_mali_parent_names[] = {

	"mali_0", "mali_1"

};



static struct clk_mux gxbb_mali = {

	.reg = (void *)HHI_MALI_CLK_CNTL,

	.mask = 1,

	.shift = 31,

	.table = mux_table_mali,

	.lock = &clk_lock,

	.hw.init = &(struct clk_init_data){

		.name = "mali",

		.ops = &clk_mux_ops,

		.parent_names = gxbb_mali_parent_names,

		.num_parents = 2,

		.flags = CLK_SET_RATE_NO_REPARENT,

	},

};



/* Everything Else (EE) domain gates */

/* Everything Else (EE) domain gates */

static MESON_GATE(gxbb_ddr, HHI_GCLK_MPEG0, 0);

static MESON_GATE(gxbb_ddr, HHI_GCLK_MPEG0, 0);

static MESON_GATE(gxbb_dos, HHI_GCLK_MPEG0, 1);

static MESON_GATE(gxbb_dos, HHI_GCLK_MPEG0, 1);
@@ -827,6 +952,13 @@ static struct clk_hw_onecell_data gxbb_hw_onecell_data = { 
		[CLKID_SAR_ADC_CLK]	    = &gxbb_sar_adc_clk.hw,

		[CLKID_SAR_ADC_CLK]	    = &gxbb_sar_adc_clk.hw,

		[CLKID_SAR_ADC_SEL]	    = &gxbb_sar_adc_clk_sel.hw,

		[CLKID_SAR_ADC_SEL]	    = &gxbb_sar_adc_clk_sel.hw,

		[CLKID_SAR_ADC_DIV]	    = &gxbb_sar_adc_clk_div.hw,

		[CLKID_SAR_ADC_DIV]	    = &gxbb_sar_adc_clk_div.hw,

		[CLKID_MALI_0_SEL]	    = &gxbb_mali_0_sel.hw,

		[CLKID_MALI_0_DIV]	    = &gxbb_mali_0_div.hw,

		[CLKID_MALI_0]		    = &gxbb_mali_0.hw,

		[CLKID_MALI_1_SEL]	    = &gxbb_mali_1_sel.hw,

		[CLKID_MALI_1_DIV]	    = &gxbb_mali_1_div.hw,

		[CLKID_MALI_1]		    = &gxbb_mali_1.hw,

		[CLKID_MALI]		    = &gxbb_mali.hw,

	},

	},

	.num = NR_CLKS,

	.num = NR_CLKS,

};

};
@@ -930,16 +1062,23 @@ static struct clk_gate *const gxbb_clk_gates[] = { 
	&gxbb_emmc_b,

	&gxbb_emmc_b,

	&gxbb_emmc_c,

	&gxbb_emmc_c,

	&gxbb_sar_adc_clk,

	&gxbb_sar_adc_clk,

	&gxbb_mali_0,

	&gxbb_mali_1,

};

};





static struct clk_mux *const gxbb_clk_muxes[] = {

static struct clk_mux *const gxbb_clk_muxes[] = {

	&gxbb_mpeg_clk_sel,

	&gxbb_mpeg_clk_sel,

	&gxbb_sar_adc_clk_sel,

	&gxbb_sar_adc_clk_sel,

	&gxbb_mali_0_sel,

	&gxbb_mali_1_sel,

	&gxbb_mali,

};

};





static struct clk_divider *const gxbb_clk_dividers[] = {

static struct clk_divider *const gxbb_clk_dividers[] = {

	&gxbb_mpeg_clk_div,

	&gxbb_mpeg_clk_div,

	&gxbb_sar_adc_clk_div,

	&gxbb_sar_adc_clk_div,

	&gxbb_mali_0_div,

	&gxbb_mali_1_div,

};

};





static int gxbb_clkc_probe(struct platform_device *pdev)

static int gxbb_clkc_probe(struct platform_device *pdev)

CRA Git | Maintained and supported by SUSTech CRA and CCSE