On Sun 27 Oct 2019 at 17:18, Martin Blumenstingl <martin.blumenstingl@xxxxxxxxxxxxxx> wrote:
> The XTAL clock is an actual crystal which is mounted on the PCB. Thus
> the meson8b clock controller driver should not provide the XTAL clock.
>
> The meson8b clock controller driver must not use references to
> the meson8b_xtal clock anymore before we can provide the XTAL clock
> via OF. Replace the references to the meson8b_xtal.hw by using
> clk_parent_data.name = "xtal" (along with index = -1) because this works
> regardless how the XTAL clock is registered (either as fixed-clock in
> the .dtb or - if missing - when registered in the meson8b clock
> controller driver).
>
> Signed-off-by: Martin Blumenstingl <martin.blumenstingl@xxxxxxxxxxxxxx>
> ---
> drivers/clk/meson/meson8b.c | 73 ++++++++++++++++++++-----------------
> 1 file changed, 39 insertions(+), 34 deletions(-)
>
> diff --git a/drivers/clk/meson/meson8b.c b/drivers/clk/meson/meson8b.c
> index d376f80e806d..b785b67baf2b 100644
> --- a/drivers/clk/meson/meson8b.c
> +++ b/drivers/clk/meson/meson8b.c
> @@ -97,8 +97,9 @@ static struct clk_regmap meson8b_fixed_pll_dco = {
> .hw.init = &(struct clk_init_data){
> .name = "fixed_pll_dco",
> .ops = &meson_clk_pll_ro_ops,
> - .parent_hws = (const struct clk_hw *[]) {
> - &meson8b_xtal.hw
> + .parent_data = &(const struct clk_parent_data) {
> + .name = "xtal",
> + .index = -1,
if I got correctly, when transitioning to DT, you can specify both
"fw_name" and "name". CCF should try to get the clock through DT and
fallback to global name matching if not available
> },
> .num_parents = 1,
> },
> @@ -162,8 +163,9 @@ static struct clk_regmap meson8b_hdmi_pll_dco = {
> /* sometimes also called "HPLL" or "HPLL PLL" */
> .name = "hdmi_pll_dco",
> .ops = &meson_clk_pll_ro_ops,
> - .parent_hws = (const struct clk_hw *[]) {
> - &meson8b_xtal.hw
> + .parent_data = &(const struct clk_parent_data) {
> + .name = "xtal",
> + .index = -1,
> },
> .num_parents = 1,
> },
> @@ -237,8 +239,9 @@ static struct clk_regmap meson8b_sys_pll_dco = {
> .hw.init = &(struct clk_init_data){
> .name = "sys_pll_dco",
> .ops = &meson_clk_pll_ops,
> - .parent_hws = (const struct clk_hw *[]) {
> - &meson8b_xtal.hw
> + .parent_data = &(const struct clk_parent_data) {
> + .name = "xtal",
> + .index = -1,
> },
> .num_parents = 1,
> },
> @@ -631,9 +634,9 @@ static struct clk_regmap meson8b_cpu_in_sel = {
> .hw.init = &(struct clk_init_data){
> .name = "cpu_in_sel",
> .ops = &clk_regmap_mux_ops,
> - .parent_hws = (const struct clk_hw *[]) {
> - &meson8b_xtal.hw,
> - &meson8b_sys_pll.hw,
> + .parent_data = (const struct clk_parent_data[]) {
> + { .name = "xtal", .index = -1, },
> + { .hw = &meson8b_sys_pll.hw, },
> },
> .num_parents = 2,
> .flags = (CLK_SET_RATE_PARENT |
> @@ -736,9 +739,9 @@ static struct clk_regmap meson8b_cpu_clk = {
> .hw.init = &(struct clk_init_data){
> .name = "cpu_clk",
> .ops = &clk_regmap_mux_ops,
> - .parent_hws = (const struct clk_hw *[]) {
> - &meson8b_xtal.hw,
> - &meson8b_cpu_scale_out_sel.hw,
> + .parent_data = (const struct clk_parent_data[]) {
> + { .name = "xtal", .index = -1, },
> + { .hw = &meson8b_cpu_scale_out_sel.hw, },
> },
> .num_parents = 2,
> .flags = (CLK_SET_RATE_PARENT |
> @@ -758,12 +761,12 @@ static struct clk_regmap meson8b_nand_clk_sel = {
> .name = "nand_clk_sel",
> .ops = &clk_regmap_mux_ops,
> /* FIXME all other parents are unknown: */
> - .parent_hws = (const struct clk_hw *[]) {
> - &meson8b_fclk_div4.hw,
> - &meson8b_fclk_div3.hw,
> - &meson8b_fclk_div5.hw,
> - &meson8b_fclk_div7.hw,
> - &meson8b_xtal.hw,
> + .parent_data = (const struct clk_parent_data[]) {
> + { .hw = &meson8b_fclk_div4.hw, },
> + { .hw = &meson8b_fclk_div3.hw, },
> + { .hw = &meson8b_fclk_div5.hw, },
> + { .hw = &meson8b_fclk_div7.hw, },
> + { .name = "xtal", .index = -1, },
> },
> .num_parents = 5,
> .flags = CLK_SET_RATE_PARENT,
> @@ -1721,8 +1724,9 @@ static struct clk_regmap meson8b_hdmi_sys_sel = {
> .name = "hdmi_sys_sel",
> .ops = &clk_regmap_mux_ro_ops,
> /* FIXME: all other parents are unknown */
> - .parent_hws = (const struct clk_hw *[]) {
> - &meson8b_xtal.hw
> + .parent_data = &(const struct clk_parent_data) {
> + .name = "xtal",
> + .index = -1,
> },
> .num_parents = 1,
> .flags = CLK_SET_RATE_NO_REPARENT,
> @@ -1767,14 +1771,14 @@ static struct clk_regmap meson8b_hdmi_sys = {
> * muxed by a glitch-free switch on Meson8b and Meson8m2. Meson8 only
> * has mali_0 and no glitch-free mux.
> */
> -static const struct clk_hw *meson8b_mali_0_1_parent_hws[] = {
> - &meson8b_xtal.hw,
> - &meson8b_mpll2.hw,
> - &meson8b_mpll1.hw,
> - &meson8b_fclk_div7.hw,
> - &meson8b_fclk_div4.hw,
> - &meson8b_fclk_div3.hw,
> - &meson8b_fclk_div5.hw,
> +static const struct clk_parent_data meson8b_mali_0_1_parent_data[] = {
> + { .name = "xtal", .index = -1, },
> + { .hw = &meson8b_mpll2.hw, },
> + { .hw = &meson8b_mpll1.hw, },
> + { .hw = &meson8b_fclk_div7.hw, },
> + { .hw = &meson8b_fclk_div4.hw, },
> + { .hw = &meson8b_fclk_div3.hw, },
> + { .hw = &meson8b_fclk_div5.hw, },
> };
>
> static u32 meson8b_mali_0_1_mux_table[] = { 0, 2, 3, 4, 5, 6, 7 };
> @@ -1789,8 +1793,8 @@ static struct clk_regmap meson8b_mali_0_sel = {
> .hw.init = &(struct clk_init_data){
> .name = "mali_0_sel",
> .ops = &clk_regmap_mux_ops,
> - .parent_hws = meson8b_mali_0_1_parent_hws,
> - .num_parents = ARRAY_SIZE(meson8b_mali_0_1_parent_hws),
> + .parent_data = meson8b_mali_0_1_parent_data,
> + .num_parents = ARRAY_SIZE(meson8b_mali_0_1_parent_data),
> /*
> * Don't propagate rate changes up because the only changeable
> * parents are mpll1 and mpll2 but we need those for audio and
> @@ -1844,8 +1848,8 @@ static struct clk_regmap meson8b_mali_1_sel = {
> .hw.init = &(struct clk_init_data){
> .name = "mali_1_sel",
> .ops = &clk_regmap_mux_ops,
> - .parent_hws = meson8b_mali_0_1_parent_hws,
> - .num_parents = ARRAY_SIZE(meson8b_mali_0_1_parent_hws),
> + .parent_data = meson8b_mali_0_1_parent_data,
> + .num_parents = ARRAY_SIZE(meson8b_mali_0_1_parent_data),
> /*
> * Don't propagate rate changes up because the only changeable
> * parents are mpll1 and mpll2 but we need those for audio and
> @@ -1944,8 +1948,9 @@ static struct clk_regmap meson8m2_gp_pll_dco = {
> .hw.init = &(struct clk_init_data){
> .name = "gp_pll_dco",
> .ops = &meson_clk_pll_ops,
> - .parent_hws = (const struct clk_hw *[]) {
> - &meson8b_xtal.hw
> + .parent_data = &(const struct clk_parent_data) {
> + .name = "xtal",
> + .index = -1,
> },
> .num_parents = 1,
> },
