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

diff --combined drivers/clk/qcom/gcc-msm8996.c
index 90ac993,aafcc2d..9f35b3f
--- 1/drivers/clk/qcom/gcc-msm8996.c
--- 2/drivers/clk/qcom/gcc-msm8996.c
+++ b/drivers/clk/qcom/gcc-msm8996.c
@@@ -1418,6 -1418,7 +1418,7 @@@ static struct clk_branch gcc_usb3_phy_a
  
  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 +2473,7 @@@ static struct clk_branch gcc_pcie_0_aux
  
  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 +2549,7 @@@ static struct clk_branch gcc_pcie_1_aux
  
  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 +2625,7 @@@ static struct clk_branch gcc_pcie_2_aux
  
  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 +2796,7 @@@ static struct clk_branch gcc_ufs_tx_sym
  
  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 +2812,7 @@@
  
  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),
@@@ -2895,7 -2901,7 +2901,7 @@@ static struct clk_branch gcc_aggre0_sno
                        .name = "gcc_aggre0_snoc_axi_clk",
                        .parent_names = (const char *[]){ "system_noc_clk_src" },
                        .num_parents = 1,
 -                      .flags = CLK_SET_RATE_PARENT,
 +                      .flags = CLK_SET_RATE_PARENT | CLK_IS_CRITICAL,
                        .ops = &clk_branch2_ops,
                },
        },
@@@ -2910,7 -2916,7 +2916,7 @@@ static struct clk_branch gcc_aggre0_cno
                        .name = "gcc_aggre0_cnoc_ahb_clk",
                        .parent_names = (const char *[]){ "config_noc_clk_src" },
                        .num_parents = 1,
 -                      .flags = CLK_SET_RATE_PARENT,
 +                      .flags = CLK_SET_RATE_PARENT | CLK_IS_CRITICAL,
                        .ops = &clk_branch2_ops,
                },
        },
@@@ -2925,7 -2931,7 +2931,7 @@@ static struct clk_branch gcc_smmu_aggre
                        .name = "gcc_smmu_aggre0_axi_clk",
                        .parent_names = (const char *[]){ "system_noc_clk_src" },
                        .num_parents = 1,
 -                      .flags = CLK_SET_RATE_PARENT,
 +                      .flags = CLK_SET_RATE_PARENT | CLK_IS_CRITICAL,
                        .ops = &clk_branch2_ops,
                },
        },
@@@ -2940,7 -2946,7 +2946,7 @@@ static struct clk_branch gcc_smmu_aggre
                        .name = "gcc_smmu_aggre0_ahb_clk",
                        .parent_names = (const char *[]){ "config_noc_clk_src" },
                        .num_parents = 1,
 -                      .flags = CLK_SET_RATE_PARENT,
 +                      .flags = CLK_SET_RATE_PARENT | CLK_IS_CRITICAL,
                        .ops = &clk_branch2_ops,
                },
        },
@@@ -3105,7 -3111,7 +3111,7 @@@ static struct gdsc aggre0_noc_gdsc = 
                .name = "aggre0_noc",
        },
        .pwrsts = PWRSTS_OFF_ON,
 -      .flags = VOTABLE,
 +      .flags = VOTABLE | ALWAYS_ON,
  };
  
  static struct gdsc hlos1_vote_aggre0_noc_gdsc = {