leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

First round of meson clock for v4.16

Browse Source 
* Fix 2 clock gates mixed up in the datasheet
 * Remove unnecessary CLK_IGNORE_UNUSED on mmc clocks
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEhTN4patJkYmDQpdpAVGjkwQWlNEFAlouVzUACgkQAVGjkwQW
 lNE/EQ//c6Xjc2qirCTvhWsaJFTHPe/+uC3ZnwHhmRfI8h2Dp1oblYZOUZqKu9HL
 pqluUFSrcwaI5ZPXtKeXeLrJ6Z/aMe0kTz1eLeTZ54OE8BxGVhB4eLqcwIYGk/DA
 HCyMb5PLLdqUgsgxwLxp/wR+ej2l+Ow4zBiK3yZMn18vvyPGUzGbHfxnwUIssSTV
 q5VrbPD1fGeu461W4tO5lTcPVjrYF/d92r3x87MCKjcfP4hXFcIT10wMinV04MW5
 WqeK+rRcm6KljQ2so7P9i9YfnqFuu5MhU4jlnZ3osiR4GuDOgIhU+wfSAkdhCweN
 bmFYxXcdI1MzNbmyUcyLo9RY57eWuZNmy3I/JoV+td7qoFcW0Yd3OjXzkFAXr7bE
 pefm1+WMKg8NffeFrPqyKKvC4PO+ikvzR5RCQncvyiXFTKhA3OR+7yJ5Jwi9+Yni
 4JAJYuOJkNNLyZKl++90JSMsPq0+2UBRvCK5+hK3FhNDbuKRY2GbMxhaUmlxovZF
 fOgl7s5ThJjGvgfMMXRCWXopakJ3BtiBBMs1vqa/eJZ+mr8dmxQQo+mWgY7aRRsm
 A9JITSHttobeQ4QopOsiLyOhVOJXLZ7ssre5zn6luSUwsa54ydY9TWQz8sYQAflf
 s58xa6WgoBt5go/PgBTtOEBydx03he0e6vStglD9YJUxALFC6yE=
 =l+5L
 -----END PGP SIGNATURE-----

Merge tag 'clk-for-v4.16-1' of git://github.com/BayLibre/clk-meson into clk-meson

First round of meson clock for v4.16
* Fix 2 clock gates mixed up in the datasheet
* Remove unnecessary CLK_IGNORE_UNUSED on mmc clocks
This commit is contained in:
Michael Turquette 2017-12-19 14:42:52 -08:00
commit 8049d8118a
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/clk/meson/gxbb.c
View File

@ -1031,17 +1031,7 @@ static struct clk_gate gxbb_sd_emmc_a_clk0 = {
.ops = &clk_gate_ops,
.parent_names = (const char *[]){ "sd_emmc_a_clk0_div" },
.num_parents = 1,
/*
* FIXME:
* We need CLK_IGNORE_UNUSED because mmc DT node point to xtal
* instead of this clock. CCF would gate this on boot, killing
* the mmc controller. Please remove this flag once DT properly
* point to this clock instead of xtal
*
* Same goes for emmc B and C clocks
*/
.flags = CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED,
.flags = CLK_SET_RATE_PARENT,
},
};
@ -1084,7 +1074,7 @@ static struct clk_gate gxbb_sd_emmc_b_clk0 = {
.ops = &clk_gate_ops,
.parent_names = (const char *[]){ "sd_emmc_b_clk0_div" },
.num_parents = 1,
.flags = CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED,
.flags = CLK_SET_RATE_PARENT,
},
};
@ -1127,7 +1117,7 @@ static struct clk_gate gxbb_sd_emmc_c_clk0 = {
.ops = &clk_gate_ops,
.parent_names = (const char *[]){ "sd_emmc_c_clk0_div" },
.num_parents = 1,
.flags = CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED,
.flags = CLK_SET_RATE_PARENT,
},
};
@ -1386,7 +1376,7 @@ static MESON_GATE(gxbb_pl301, HHI_GCLK_MPEG0, 6);
static MESON_GATE(gxbb_periphs, HHI_GCLK_MPEG0, 7);
static MESON_GATE(gxbb_spicc, HHI_GCLK_MPEG0, 8);
static MESON_GATE(gxbb_i2c, HHI_GCLK_MPEG0, 9);
static MESON_GATE(gxbb_sar_adc, HHI_GCLK_MPEG0, 10);
static MESON_GATE(gxbb_sana, HHI_GCLK_MPEG0, 10);
static MESON_GATE(gxbb_smart_card, HHI_GCLK_MPEG0, 11);
static MESON_GATE(gxbb_rng0, HHI_GCLK_MPEG0, 12);
static MESON_GATE(gxbb_uart0, HHI_GCLK_MPEG0, 13);
@ -1437,7 +1427,7 @@ static MESON_GATE(gxbb_usb0_ddr_bridge, HHI_GCLK_MPEG2, 9);
static MESON_GATE(gxbb_mmc_pclk, HHI_GCLK_MPEG2, 11);
static MESON_GATE(gxbb_dvin, HHI_GCLK_MPEG2, 12);
static MESON_GATE(gxbb_uart2, HHI_GCLK_MPEG2, 15);
static MESON_GATE(gxbb_sana, HHI_GCLK_MPEG2, 22);
static MESON_GATE(gxbb_sar_adc, HHI_GCLK_MPEG2, 22);
static MESON_GATE(gxbb_vpu_intr, HHI_GCLK_MPEG2, 25);
static MESON_GATE(gxbb_sec_ahb_ahb3_bridge, HHI_GCLK_MPEG2, 26);
static MESON_GATE(gxbb_clk81_a53, HHI_GCLK_MPEG2, 29);