| Message ID | 20230103045717.1079067-1-dmitry.baryshkov@linaro.org |
|---|---|
| State | Accepted |
| Commit | 4c4161b4c81b632fc29002c324e996cbb79894e7 |
| Headers | show |
| Series | interconnect: qcom: drop obsolete OSM_L3/EPSS defines | expand |
On 3.01.2023 05:57, Dmitry Baryshkov wrote: > Since Qualcomm platforms have switched to the separate OSM_L3/EPSS > driver, old related defines became unused. Drop them now. > > Suggested-by: Bjorn Andersson <andersson@kernel.org> > Fixes: 4529992c9474 ("interconnect: qcom: osm-l3: Use platform-independent node ids") > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > --- Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org> Konrad > drivers/interconnect/qcom/sc7180.h | 2 -- > drivers/interconnect/qcom/sc7280.h | 2 -- > drivers/interconnect/qcom/sc8180x.h | 2 -- > drivers/interconnect/qcom/sdm845.h | 2 -- > drivers/interconnect/qcom/sm8150.h | 2 -- > drivers/interconnect/qcom/sm8250.h | 2 -- > 6 files changed, 12 deletions(-) > > diff --git a/drivers/interconnect/qcom/sc7180.h b/drivers/interconnect/qcom/sc7180.h > index c6212a10c2f6..c2d8388bb880 100644 > --- a/drivers/interconnect/qcom/sc7180.h > +++ b/drivers/interconnect/qcom/sc7180.h > @@ -145,7 +145,5 @@ > #define SC7180_SLAVE_SERVICE_SNOC 134 > #define SC7180_SLAVE_QDSS_STM 135 > #define SC7180_SLAVE_TCU 136 > -#define SC7180_MASTER_OSM_L3_APPS 137 > -#define SC7180_SLAVE_OSM_L3 138 > > #endif > diff --git a/drivers/interconnect/qcom/sc7280.h b/drivers/interconnect/qcom/sc7280.h > index 1fb9839b2c14..175e400305c5 100644 > --- a/drivers/interconnect/qcom/sc7280.h > +++ b/drivers/interconnect/qcom/sc7280.h > @@ -150,7 +150,5 @@ > #define SC7280_SLAVE_PCIE_1 139 > #define SC7280_SLAVE_QDSS_STM 140 > #define SC7280_SLAVE_TCU 141 > -#define SC7280_MASTER_EPSS_L3_APPS 142 > -#define SC7280_SLAVE_EPSS_L3 143 > > #endif > diff --git a/drivers/interconnect/qcom/sc8180x.h b/drivers/interconnect/qcom/sc8180x.h > index 2eafd35543c7..ce32295af8f3 100644 > --- a/drivers/interconnect/qcom/sc8180x.h > +++ b/drivers/interconnect/qcom/sc8180x.h > @@ -168,8 +168,6 @@ > #define SC8180X_SLAVE_EBI_CH0_DISPLAY 158 > #define SC8180X_SLAVE_MNOC_SF_MEM_NOC_DISPLAY 159 > #define SC8180X_SLAVE_MNOC_HF_MEM_NOC_DISPLAY 160 > -#define SC8180X_MASTER_OSM_L3_APPS 161 > -#define SC8180X_SLAVE_OSM_L3 162 > > #define SC8180X_MASTER_QUP_CORE_0 163 > #define SC8180X_MASTER_QUP_CORE_1 164 > diff --git a/drivers/interconnect/qcom/sdm845.h b/drivers/interconnect/qcom/sdm845.h > index 776e9c2acb27..bc7e425ce985 100644 > --- a/drivers/interconnect/qcom/sdm845.h > +++ b/drivers/interconnect/qcom/sdm845.h > @@ -136,7 +136,5 @@ > #define SDM845_SLAVE_SERVICE_SNOC 128 > #define SDM845_SLAVE_QDSS_STM 129 > #define SDM845_SLAVE_TCU 130 > -#define SDM845_MASTER_OSM_L3_APPS 131 > -#define SDM845_SLAVE_OSM_L3 132 > > #endif /* __DRIVERS_INTERCONNECT_QCOM_SDM845_H__ */ > diff --git a/drivers/interconnect/qcom/sm8150.h b/drivers/interconnect/qcom/sm8150.h > index 97996f64d799..3e01ac76ae1d 100644 > --- a/drivers/interconnect/qcom/sm8150.h > +++ b/drivers/interconnect/qcom/sm8150.h > @@ -148,7 +148,5 @@ > #define SM8150_SLAVE_VSENSE_CTRL_CFG 137 > #define SM8150_SNOC_CNOC_MAS 138 > #define SM8150_SNOC_CNOC_SLV 139 > -#define SM8150_MASTER_OSM_L3_APPS 140 > -#define SM8150_SLAVE_OSM_L3 141 > > #endif > diff --git a/drivers/interconnect/qcom/sm8250.h b/drivers/interconnect/qcom/sm8250.h > index b31fb431a20f..7eb6c709c30d 100644 > --- a/drivers/interconnect/qcom/sm8250.h > +++ b/drivers/interconnect/qcom/sm8250.h > @@ -158,7 +158,5 @@ > #define SM8250_SLAVE_VSENSE_CTRL_CFG 147 > #define SM8250_SNOC_CNOC_MAS 148 > #define SM8250_SNOC_CNOC_SLV 149 > -#define SM8250_MASTER_EPSS_L3_APPS 150 > -#define SM8250_SLAVE_EPSS_L3 151 > > #endif
diff --git a/drivers/interconnect/qcom/sc7180.h b/drivers/interconnect/qcom/sc7180.h index c6212a10c2f6..c2d8388bb880 100644 --- a/drivers/interconnect/qcom/sc7180.h +++ b/drivers/interconnect/qcom/sc7180.h @@ -145,7 +145,5 @@ #define SC7180_SLAVE_SERVICE_SNOC 134 #define SC7180_SLAVE_QDSS_STM 135 #define SC7180_SLAVE_TCU 136 -#define SC7180_MASTER_OSM_L3_APPS 137 -#define SC7180_SLAVE_OSM_L3 138 #endif diff --git a/drivers/interconnect/qcom/sc7280.h b/drivers/interconnect/qcom/sc7280.h index 1fb9839b2c14..175e400305c5 100644 --- a/drivers/interconnect/qcom/sc7280.h +++ b/drivers/interconnect/qcom/sc7280.h @@ -150,7 +150,5 @@ #define SC7280_SLAVE_PCIE_1 139 #define SC7280_SLAVE_QDSS_STM 140 #define SC7280_SLAVE_TCU 141 -#define SC7280_MASTER_EPSS_L3_APPS 142 -#define SC7280_SLAVE_EPSS_L3 143 #endif diff --git a/drivers/interconnect/qcom/sc8180x.h b/drivers/interconnect/qcom/sc8180x.h index 2eafd35543c7..ce32295af8f3 100644 --- a/drivers/interconnect/qcom/sc8180x.h +++ b/drivers/interconnect/qcom/sc8180x.h @@ -168,8 +168,6 @@ #define SC8180X_SLAVE_EBI_CH0_DISPLAY 158 #define SC8180X_SLAVE_MNOC_SF_MEM_NOC_DISPLAY 159 #define SC8180X_SLAVE_MNOC_HF_MEM_NOC_DISPLAY 160 -#define SC8180X_MASTER_OSM_L3_APPS 161 -#define SC8180X_SLAVE_OSM_L3 162 #define SC8180X_MASTER_QUP_CORE_0 163 #define SC8180X_MASTER_QUP_CORE_1 164 diff --git a/drivers/interconnect/qcom/sdm845.h b/drivers/interconnect/qcom/sdm845.h index 776e9c2acb27..bc7e425ce985 100644 --- a/drivers/interconnect/qcom/sdm845.h +++ b/drivers/interconnect/qcom/sdm845.h @@ -136,7 +136,5 @@ #define SDM845_SLAVE_SERVICE_SNOC 128 #define SDM845_SLAVE_QDSS_STM 129 #define SDM845_SLAVE_TCU 130 -#define SDM845_MASTER_OSM_L3_APPS 131 -#define SDM845_SLAVE_OSM_L3 132 #endif /* __DRIVERS_INTERCONNECT_QCOM_SDM845_H__ */ diff --git a/drivers/interconnect/qcom/sm8150.h b/drivers/interconnect/qcom/sm8150.h index 97996f64d799..3e01ac76ae1d 100644 --- a/drivers/interconnect/qcom/sm8150.h +++ b/drivers/interconnect/qcom/sm8150.h @@ -148,7 +148,5 @@ #define SM8150_SLAVE_VSENSE_CTRL_CFG 137 #define SM8150_SNOC_CNOC_MAS 138 #define SM8150_SNOC_CNOC_SLV 139 -#define SM8150_MASTER_OSM_L3_APPS 140 -#define SM8150_SLAVE_OSM_L3 141 #endif diff --git a/drivers/interconnect/qcom/sm8250.h b/drivers/interconnect/qcom/sm8250.h index b31fb431a20f..7eb6c709c30d 100644 --- a/drivers/interconnect/qcom/sm8250.h +++ b/drivers/interconnect/qcom/sm8250.h @@ -158,7 +158,5 @@ #define SM8250_SLAVE_VSENSE_CTRL_CFG 147 #define SM8250_SNOC_CNOC_MAS 148 #define SM8250_SNOC_CNOC_SLV 149 -#define SM8250_MASTER_EPSS_L3_APPS 150 -#define SM8250_SLAVE_EPSS_L3 151 #endif
Since Qualcomm platforms have switched to the separate OSM_L3/EPSS driver, old related defines became unused. Drop them now. Suggested-by: Bjorn Andersson <andersson@kernel.org> Fixes: 4529992c9474 ("interconnect: qcom: osm-l3: Use platform-independent node ids") Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> --- drivers/interconnect/qcom/sc7180.h | 2 -- drivers/interconnect/qcom/sc7280.h | 2 -- drivers/interconnect/qcom/sc8180x.h | 2 -- drivers/interconnect/qcom/sdm845.h | 2 -- drivers/interconnect/qcom/sm8150.h | 2 -- drivers/interconnect/qcom/sm8250.h | 2 -- 6 files changed, 12 deletions(-)