evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "clk: qcom: Remove gcc_rx2_qlink_clkref_clk for sdm660"

Browse source
This commit is contained in:
Linux Build Service Account 2017-02-09 03:11:34 -08:00 • committed by Gerrit - the friendly Code Review server
commit 33112fe182
2 changed files with 0 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/clk/qcom/gcc-sdm660.c
View file

@ -2082,19 +2082,6 @@ static struct clk_branch gcc_rx1_usb2_clkref_clk = {
}, },
}; };
static struct clk_branch gcc_rx2_qlink_clkref_clk = {
.halt_reg = 0x88034,
.halt_check = BRANCH_HALT_VOTED,
.clkr = {
.enable_reg = 0x88034,
.enable_mask = BIT(0),
.hw.init = &(struct clk_init_data){
.name = "gcc_rx2_qlink_clkref_clk",
.ops = &clk_branch2_ops,
},
},
};
static struct clk_branch gcc_sdcc1_ahb_clk = { static struct clk_branch gcc_sdcc1_ahb_clk = {
.halt_reg = 0x16008, .halt_reg = 0x16008,
.halt_check = BRANCH_HALT, .halt_check = BRANCH_HALT,
@ -2671,7 +2658,6 @@ static struct clk_regmap *gcc_660_clocks[] = {
[GCC_QSPI_SER_CLK] = &gcc_qspi_ser_clk.clkr, [GCC_QSPI_SER_CLK] = &gcc_qspi_ser_clk.clkr,
[GCC_RX0_USB2_CLKREF_CLK] = &gcc_rx0_usb2_clkref_clk.clkr, [GCC_RX0_USB2_CLKREF_CLK] = &gcc_rx0_usb2_clkref_clk.clkr,
[GCC_RX1_USB2_CLKREF_CLK] = &gcc_rx1_usb2_clkref_clk.clkr, [GCC_RX1_USB2_CLKREF_CLK] = &gcc_rx1_usb2_clkref_clk.clkr,
[GCC_RX2_QLINK_CLKREF_CLK] = &gcc_rx2_qlink_clkref_clk.clkr,
[GCC_SDCC1_AHB_CLK] = &gcc_sdcc1_ahb_clk.clkr, [GCC_SDCC1_AHB_CLK] = &gcc_sdcc1_ahb_clk.clkr,
[GCC_SDCC1_APPS_CLK] = &gcc_sdcc1_apps_clk.clkr, [GCC_SDCC1_APPS_CLK] = &gcc_sdcc1_apps_clk.clkr,
[GCC_SDCC1_ICE_CORE_CLK] = &gcc_sdcc1_ice_core_clk.clkr, [GCC_SDCC1_ICE_CORE_CLK] = &gcc_sdcc1_ice_core_clk.clkr,

1
include/dt-bindings/clock/qcom,gcc-sdm660.h
View file

@ -99,7 +99,6 @@
#define GCC_QSPI_SER_CLK 86 #define GCC_QSPI_SER_CLK 86
#define GCC_RX0_USB2_CLKREF_CLK 87 #define GCC_RX0_USB2_CLKREF_CLK 87
#define GCC_RX1_USB2_CLKREF_CLK 88 #define GCC_RX1_USB2_CLKREF_CLK 88
#define GCC_RX2_QLINK_CLKREF_CLK 89
#define GCC_SDCC1_AHB_CLK 90 #define GCC_SDCC1_AHB_CLK 90
#define GCC_SDCC1_APPS_CLK 91 #define GCC_SDCC1_APPS_CLK 91
#define GCC_SDCC1_ICE_CORE_CLK 92 #define GCC_SDCC1_ICE_CORE_CLK 92