7b6dfa1bbe
Amit Pundir reports that audio and USB-C host mode stops working if the gcc_usb30_prim_master_clk_src clk is registered and clk_rcg2_shared_init() parks it on XO. Skip parking this clk at registration time to fix those issues. Partially revert commit01a0a6cc8c
("clk: qcom: Park shared RCGs upon registration") by skipping the parking bit for this clk, but keep the part where we cache the config register. That's still necessary to figure out the true parent of the clk at registration time. Fixes:01a0a6cc8c
("clk: qcom: Park shared RCGs upon registration") Fixes:929c75d575
("clk: qcom: gcc-sm8550: Mark RCGs shared where applicable") Cc: Konrad Dybcio <konradybcio@kernel.org> Cc: Bjorn Andersson <andersson@kernel.org> Cc: Taniya Das <quic_tdas@quicinc.com> Reported-by: Amit Pundir <amit.pundir@linaro.org> Closes: https://lore.kernel.org/CAMi1Hd1KQBE4kKUdAn8E5FV+BiKzuv+8FoyWQrrTHPDoYTuhgA@mail.gmail.com Signed-off-by: Stephen Boyd <swboyd@chromium.org> Link: https://lore.kernel.org/r/20240819233628.2074654-3-swboyd@chromium.org Tested-by: Amit Pundir <amit.pundir@linaro.org> Signed-off-by: Stephen Boyd <sboyd@kernel.org>
216 lines
5.3 KiB
C
216 lines
5.3 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
/* Copyright (c) 2013, 2018, The Linux Foundation. All rights reserved. */
|
|
|
|
#ifndef __QCOM_CLK_RCG_H__
|
|
#define __QCOM_CLK_RCG_H__
|
|
|
|
#include <linux/clk-provider.h>
|
|
#include "clk-regmap.h"
|
|
|
|
#define F(f, s, h, m, n) { (f), (s), (2 * (h) - 1), (m), (n) }
|
|
|
|
struct freq_tbl {
|
|
unsigned long freq;
|
|
u8 src;
|
|
u8 pre_div;
|
|
u16 m;
|
|
u16 n;
|
|
};
|
|
|
|
#define C(s, h, m, n) { (s), (2 * (h) - 1), (m), (n) }
|
|
#define FM(f, confs) { (f), ARRAY_SIZE(confs), (confs) }
|
|
#define FMS(f, s, h, m, n) { (f), 1, (const struct freq_conf []){ C(s, h, m, n) } }
|
|
|
|
struct freq_conf {
|
|
u8 src;
|
|
u8 pre_div;
|
|
u16 m;
|
|
u16 n;
|
|
};
|
|
|
|
struct freq_multi_tbl {
|
|
unsigned long freq;
|
|
size_t num_confs;
|
|
const struct freq_conf *confs;
|
|
};
|
|
|
|
/**
|
|
* struct mn - M/N:D counter
|
|
* @mnctr_en_bit: bit to enable mn counter
|
|
* @mnctr_reset_bit: bit to assert mn counter reset
|
|
* @mnctr_mode_shift: lowest bit of mn counter mode field
|
|
* @n_val_shift: lowest bit of n value field
|
|
* @m_val_shift: lowest bit of m value field
|
|
* @width: number of bits in m/n/d values
|
|
* @reset_in_cc: true if the mnctr_reset_bit is in the CC register
|
|
*/
|
|
struct mn {
|
|
u8 mnctr_en_bit;
|
|
u8 mnctr_reset_bit;
|
|
u8 mnctr_mode_shift;
|
|
#define MNCTR_MODE_DUAL 0x2
|
|
#define MNCTR_MODE_MASK 0x3
|
|
u8 n_val_shift;
|
|
u8 m_val_shift;
|
|
u8 width;
|
|
bool reset_in_cc;
|
|
};
|
|
|
|
/**
|
|
* struct pre_div - pre-divider
|
|
* @pre_div_shift: lowest bit of pre divider field
|
|
* @pre_div_width: number of bits in predivider
|
|
*/
|
|
struct pre_div {
|
|
u8 pre_div_shift;
|
|
u8 pre_div_width;
|
|
};
|
|
|
|
/**
|
|
* struct src_sel - source selector
|
|
* @src_sel_shift: lowest bit of source selection field
|
|
* @parent_map: map from software's parent index to hardware's src_sel field
|
|
*/
|
|
struct src_sel {
|
|
u8 src_sel_shift;
|
|
#define SRC_SEL_MASK 0x7
|
|
const struct parent_map *parent_map;
|
|
};
|
|
|
|
/**
|
|
* struct clk_rcg - root clock generator
|
|
*
|
|
* @ns_reg: NS register
|
|
* @md_reg: MD register
|
|
* @mn: mn counter
|
|
* @p: pre divider
|
|
* @s: source selector
|
|
* @freq_tbl: frequency table
|
|
* @clkr: regmap clock handle
|
|
* @lock: register lock
|
|
*/
|
|
struct clk_rcg {
|
|
u32 ns_reg;
|
|
u32 md_reg;
|
|
|
|
struct mn mn;
|
|
struct pre_div p;
|
|
struct src_sel s;
|
|
|
|
const struct freq_tbl *freq_tbl;
|
|
|
|
struct clk_regmap clkr;
|
|
};
|
|
|
|
extern const struct clk_ops clk_rcg_ops;
|
|
extern const struct clk_ops clk_rcg_floor_ops;
|
|
extern const struct clk_ops clk_rcg_bypass_ops;
|
|
extern const struct clk_ops clk_rcg_bypass2_ops;
|
|
extern const struct clk_ops clk_rcg_pixel_ops;
|
|
extern const struct clk_ops clk_rcg_esc_ops;
|
|
extern const struct clk_ops clk_rcg_lcc_ops;
|
|
|
|
#define to_clk_rcg(_hw) container_of(to_clk_regmap(_hw), struct clk_rcg, clkr)
|
|
|
|
/**
|
|
* struct clk_dyn_rcg - root clock generator with glitch free mux
|
|
*
|
|
* @mux_sel_bit: bit to switch glitch free mux
|
|
* @ns_reg: NS0 and NS1 register
|
|
* @md_reg: MD0 and MD1 register
|
|
* @bank_reg: register to XOR @mux_sel_bit into to switch glitch free mux
|
|
* @mn: mn counter (banked)
|
|
* @s: source selector (banked)
|
|
* @freq_tbl: frequency table
|
|
* @clkr: regmap clock handle
|
|
* @lock: register lock
|
|
*/
|
|
struct clk_dyn_rcg {
|
|
u32 ns_reg[2];
|
|
u32 md_reg[2];
|
|
u32 bank_reg;
|
|
|
|
u8 mux_sel_bit;
|
|
|
|
struct mn mn[2];
|
|
struct pre_div p[2];
|
|
struct src_sel s[2];
|
|
|
|
const struct freq_tbl *freq_tbl;
|
|
|
|
struct clk_regmap clkr;
|
|
};
|
|
|
|
extern const struct clk_ops clk_dyn_rcg_ops;
|
|
|
|
#define to_clk_dyn_rcg(_hw) \
|
|
container_of(to_clk_regmap(_hw), struct clk_dyn_rcg, clkr)
|
|
|
|
/**
|
|
* struct clk_rcg2 - root clock generator
|
|
*
|
|
* @cmd_rcgr: corresponds to *_CMD_RCGR
|
|
* @mnd_width: number of bits in m/n/d values
|
|
* @hid_width: number of bits in half integer divider
|
|
* @safe_src_index: safe src index value
|
|
* @parent_map: map from software's parent index to hardware's src_sel field
|
|
* @freq_tbl: frequency table
|
|
* @freq_multi_tbl: frequency table for clocks reachable with multiple RCGs conf
|
|
* @clkr: regmap clock handle
|
|
* @cfg_off: defines the cfg register offset from the CMD_RCGR + CFG_REG
|
|
* @parked_cfg: cached value of the CFG register for parked RCGs
|
|
* @hw_clk_ctrl: whether to enable hardware clock control
|
|
*/
|
|
struct clk_rcg2 {
|
|
u32 cmd_rcgr;
|
|
u8 mnd_width;
|
|
u8 hid_width;
|
|
u8 safe_src_index;
|
|
const struct parent_map *parent_map;
|
|
union {
|
|
const struct freq_tbl *freq_tbl;
|
|
const struct freq_multi_tbl *freq_multi_tbl;
|
|
};
|
|
struct clk_regmap clkr;
|
|
u8 cfg_off;
|
|
u32 parked_cfg;
|
|
bool hw_clk_ctrl;
|
|
};
|
|
|
|
#define to_clk_rcg2(_hw) container_of(to_clk_regmap(_hw), struct clk_rcg2, clkr)
|
|
|
|
struct clk_rcg2_gfx3d {
|
|
u8 div;
|
|
struct clk_rcg2 rcg;
|
|
struct clk_hw **hws;
|
|
};
|
|
|
|
#define to_clk_rcg2_gfx3d(_hw) \
|
|
container_of(to_clk_rcg2(_hw), struct clk_rcg2_gfx3d, rcg)
|
|
|
|
extern const struct clk_ops clk_rcg2_ops;
|
|
extern const struct clk_ops clk_rcg2_floor_ops;
|
|
extern const struct clk_ops clk_rcg2_fm_ops;
|
|
extern const struct clk_ops clk_rcg2_mux_closest_ops;
|
|
extern const struct clk_ops clk_edp_pixel_ops;
|
|
extern const struct clk_ops clk_byte_ops;
|
|
extern const struct clk_ops clk_byte2_ops;
|
|
extern const struct clk_ops clk_pixel_ops;
|
|
extern const struct clk_ops clk_gfx3d_ops;
|
|
extern const struct clk_ops clk_rcg2_shared_ops;
|
|
extern const struct clk_ops clk_rcg2_shared_no_init_park_ops;
|
|
extern const struct clk_ops clk_dp_ops;
|
|
|
|
struct clk_rcg_dfs_data {
|
|
struct clk_rcg2 *rcg;
|
|
struct clk_init_data *init;
|
|
};
|
|
|
|
#define DEFINE_RCG_DFS(r) \
|
|
{ .rcg = &r, .init = &r##_init }
|
|
|
|
extern int qcom_cc_register_rcg_dfs(struct regmap *regmap,
|
|
const struct clk_rcg_dfs_data *rcgs,
|
|
size_t len);
|
|
#endif
|