| Message ID | 20230106073313.1720029-1-dmitry.baryshkov@linaro.org |
|---|---|
| Headers | show |
| Series | clk/interconnect: qcom: finish migration of IP0 to clocks | expand |
On 1/6/23 1:33 AM, Dmitry Baryshkov wrote: > Drop two defines leftover from the commit 2f3724930eb4 ("interconnect: > qcom: sc7180: Drop IP0 interconnects"), which dropped handling of the > IP0 resource in favour of handling it in the clk-rpmh driver. > > Fixes: 2f3724930eb4 ("interconnect: qcom: sc7180: Drop IP0 interconnects") > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> On this patch and the rest like it in this series, I suggest adding a comment that indicates why there's a gap in the simple numeric sequence. Feel free to ignore this if you don't think this is a good idea. I'll give examples below, although I don't fully understand why there's a master and slave on the interconnect, but just a single clock for RPMH clock... -Alex > --- > drivers/interconnect/qcom/sc7180.h | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/drivers/interconnect/qcom/sc7180.h b/drivers/interconnect/qcom/sc7180.h > index c6212a10c2f6..b691d97d56cf 100644 > --- a/drivers/interconnect/qcom/sc7180.h > +++ b/drivers/interconnect/qcom/sc7180.h > @@ -11,7 +11,6 @@ > #define SC7180_MASTER_APPSS_PROC 0 > #define SC7180_MASTER_SYS_TCU 1 > #define SC7180_MASTER_NPU_SYS 2 > -#define SC7180_MASTER_IPA_CORE 3 /* MASTER_IPA_CORE (4) is represented as an RPMH clock */ > #define SC7180_MASTER_LLCC 4 > #define SC7180_MASTER_A1NOC_CFG 5 > #define SC7180_MASTER_A2NOC_CFG 6 > @@ -58,7 +57,6 @@ > #define SC7180_MASTER_USB3 47 > #define SC7180_MASTER_EMMC 48 > #define SC7180_SLAVE_EBI1 49 > -#define SC7180_SLAVE_IPA_CORE 50 /* SLAVE_IPA_CORE (50) is represented as an RPMH clock */ > #define SC7180_SLAVE_A1NOC_CFG 51 > #define SC7180_SLAVE_A2NOC_CFG 52 > #define SC7180_SLAVE_AHB2PHY_SOUTH 53
Commits 2f3724930eb4 ("interconnect: qcom: sc7180: Drop IP0 interconnects") and 2fb251c26560 ("interconnect: qcom: sdx55: Drop IP0 interconnects") removed IP0 interconnects (and ipa-virt devices support) in favour of the RPMH clocks. Follow this example for other platforms defining IP0 RPMH resource. While we are at it, remove several leftover from the mentioned patches. Dmitry Baryshkov (9): clk: qcom: rpmh: define IPA clocks where required interconnect: qcom: sdx55: drop IP0 remnants interconnect: qcom: sc7180: drop IP0 remnants interconnect: qcom: sm8150: Drop IP0 interconnects interconnect: qcom: sm8250: Drop IP0 interconnects interconnect: qcom: sc8180x: Drop IP0 interconnects interconnect: qcom: sc8280xp: Drop IP0 interconnects dt-bindings: interconnect: qcom: Remove sc7180/sdx55 ipa compatibles dt-bindings: interconnect: qcom: drop IPA_CORE related defines .../bindings/interconnect/qcom,rpmh.yaml | 3 -- drivers/clk/qcom/clk-rpmh.c | 4 ++ drivers/interconnect/qcom/sc7180.h | 2 - drivers/interconnect/qcom/sc8180x.c | 38 ------------------- drivers/interconnect/qcom/sc8180x.h | 2 - drivers/interconnect/qcom/sc8280xp.c | 25 ------------ drivers/interconnect/qcom/sc8280xp.h | 2 - drivers/interconnect/qcom/sdx55.h | 2 - drivers/interconnect/qcom/sm8150.c | 21 ---------- drivers/interconnect/qcom/sm8150.h | 2 - drivers/interconnect/qcom/sm8250.c | 21 ---------- drivers/interconnect/qcom/sm8250.h | 2 - .../dt-bindings/interconnect/qcom,sc7180.h | 3 -- .../dt-bindings/interconnect/qcom,sc8180x.h | 3 -- .../dt-bindings/interconnect/qcom,sc8280xp.h | 2 - include/dt-bindings/interconnect/qcom,sdx55.h | 2 - .../dt-bindings/interconnect/qcom,sm8150.h | 3 -- .../dt-bindings/interconnect/qcom,sm8250.h | 3 -- 18 files changed, 4 insertions(+), 136 deletions(-)