diff options
| author | Linaro CI <ci_notify@linaro.org> | 2022-01-18 17:57:28 +0000 |
|---|---|---|
| committer | Linaro CI <ci_notify@linaro.org> | 2022-01-18 17:57:28 +0000 |
| commit | 3c629730b25e722e468c0676b44dd135d03fe788 (patch) | |
| tree | 46f4d44076823bb6565fbcb558862531eacf92e7 | |
| parent | 4205b1fd654c58bce9c8cfe96a6e5ea6682658ae (diff) | |
| parent | b0ec4d7fab3bc62bd16d0de28c234980416b863b (diff) | |
Merge remote-tracking branch 'sm8250-gdsc/tracking-qcomlt-sm8250-gdsc' into integration-linux-qcomlt
# Conflicts:
# drivers/clk/qcom/gdsc.h
| -rw-r--r-- | drivers/clk/qcom/dispcc-sm8250.c | 1 | ||||
| -rw-r--r-- | drivers/clk/qcom/videocc-sm8250.c | 4 |
2 files changed, 0 insertions, 5 deletions
diff --git a/drivers/clk/qcom/dispcc-sm8250.c b/drivers/clk/qcom/dispcc-sm8250.c index 566fdfa0a15b..ac6e68064ea5 100644 --- a/drivers/clk/qcom/dispcc-sm8250.c +++ b/drivers/clk/qcom/dispcc-sm8250.c @@ -1131,7 +1131,6 @@ static struct gdsc mdss_gdsc = { }, .pwrsts = PWRSTS_OFF_ON, .flags = HW_CTRL, - .supply = "mmcx", }; static struct clk_regmap *disp_cc_sm8250_clocks[] = { diff --git a/drivers/clk/qcom/videocc-sm8250.c b/drivers/clk/qcom/videocc-sm8250.c index 8617454e4a77..f28f2cb051d7 100644 --- a/drivers/clk/qcom/videocc-sm8250.c +++ b/drivers/clk/qcom/videocc-sm8250.c @@ -277,7 +277,6 @@ static struct gdsc mvs0c_gdsc = { }, .flags = 0, .pwrsts = PWRSTS_OFF_ON, - .supply = "mmcx", }; static struct gdsc mvs1c_gdsc = { @@ -287,7 +286,6 @@ static struct gdsc mvs1c_gdsc = { }, .flags = 0, .pwrsts = PWRSTS_OFF_ON, - .supply = "mmcx", }; static struct gdsc mvs0_gdsc = { @@ -297,7 +295,6 @@ static struct gdsc mvs0_gdsc = { }, .flags = HW_CTRL, .pwrsts = PWRSTS_OFF_ON, - .supply = "mmcx", }; static struct gdsc mvs1_gdsc = { @@ -307,7 +304,6 @@ static struct gdsc mvs1_gdsc = { }, .flags = HW_CTRL, .pwrsts = PWRSTS_OFF_ON, - .supply = "mmcx", }; static struct clk_regmap *video_cc_sm8250_clocks[] = { |