mirror of https://gitee.com/openkylin/linux.git
Merge branch 'clk-qcom-8996-halt' into clk-next
* clk-qcom-8996-halt: clk: qcom: gcc-msm8996: Disable halt check on UFS clocks clk: msm8996-gcc: Mark halt check as no-op for USB/PCIE pipe_clk
This commit is contained in:
commit
a74271a507
|
@ -1418,6 +1418,7 @@ static struct clk_branch gcc_usb3_phy_aux_clk = {
|
|||
|
||||
static struct clk_branch gcc_usb3_phy_pipe_clk = {
|
||||
.halt_reg = 0x50004,
|
||||
.halt_check = BRANCH_HALT_SKIP,
|
||||
.clkr = {
|
||||
.enable_reg = 0x50004,
|
||||
.enable_mask = BIT(0),
|
||||
|
@ -2472,6 +2473,7 @@ static struct clk_branch gcc_pcie_0_aux_clk = {
|
|||
|
||||
static struct clk_branch gcc_pcie_0_pipe_clk = {
|
||||
.halt_reg = 0x6b018,
|
||||
.halt_check = BRANCH_HALT_SKIP,
|
||||
.clkr = {
|
||||
.enable_reg = 0x6b018,
|
||||
.enable_mask = BIT(0),
|
||||
|
@ -2547,6 +2549,7 @@ static struct clk_branch gcc_pcie_1_aux_clk = {
|
|||
|
||||
static struct clk_branch gcc_pcie_1_pipe_clk = {
|
||||
.halt_reg = 0x6d018,
|
||||
.halt_check = BRANCH_HALT_SKIP,
|
||||
.clkr = {
|
||||
.enable_reg = 0x6d018,
|
||||
.enable_mask = BIT(0),
|
||||
|
@ -2622,6 +2625,7 @@ static struct clk_branch gcc_pcie_2_aux_clk = {
|
|||
|
||||
static struct clk_branch gcc_pcie_2_pipe_clk = {
|
||||
.halt_reg = 0x6e018,
|
||||
.halt_check = BRANCH_HALT_SKIP,
|
||||
.clkr = {
|
||||
.enable_reg = 0x6e018,
|
||||
.enable_mask = BIT(0),
|
||||
|
@ -2792,6 +2796,7 @@ static struct clk_branch gcc_ufs_tx_symbol_0_clk = {
|
|||
|
||||
static struct clk_branch gcc_ufs_rx_symbol_0_clk = {
|
||||
.halt_reg = 0x7501c,
|
||||
.halt_check = BRANCH_HALT_SKIP,
|
||||
.clkr = {
|
||||
.enable_reg = 0x7501c,
|
||||
.enable_mask = BIT(0),
|
||||
|
@ -2807,6 +2812,7 @@ static struct clk_branch gcc_ufs_rx_symbol_0_clk = {
|
|||
|
||||
static struct clk_branch gcc_ufs_rx_symbol_1_clk = {
|
||||
.halt_reg = 0x75020,
|
||||
.halt_check = BRANCH_HALT_SKIP,
|
||||
.clkr = {
|
||||
.enable_reg = 0x75020,
|
||||
.enable_mask = BIT(0),
|
||||
|
|
Loading…
Reference in New Issue