diff --git a/Documentation/devicetree/bindings/interconnect/qcom,osm-l3.yaml b/Documentation/devicetree/bindings/interconnect/qcom,osm-l3.yaml
index 4b9b98fbe8f22..fa5cf4a114a30 100644
--- a/Documentation/devicetree/bindings/interconnect/qcom,osm-l3.yaml
+++ b/Documentation/devicetree/bindings/interconnect/qcom,osm-l3.yaml
@@ -17,6 +17,8 @@ description:
 properties:
   compatible:
     oneOf:
+      - enum:
+          - qcom,shikra-epss-l3
       - items:
           - enum:
               - qcom,sc7180-osm-l3
diff --git a/Documentation/devicetree/bindings/interconnect/qcom,shikra-epss-l3.yaml b/Documentation/devicetree/bindings/interconnect/qcom,shikra-epss-l3.yaml
deleted file mode 100644
index 333ed40ea8e93..0000000000000
--- a/Documentation/devicetree/bindings/interconnect/qcom,shikra-epss-l3.yaml
+++ /dev/null
@@ -1,60 +0,0 @@
-# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
-%YAML 1.2
----
-$id: http://devicetree.org/schemas/interconnect/qcom,shikra-epss-l3.yaml#
-$schema: http://devicetree.org/meta-schemas/core.yaml#
-
-title: Qualcomm Epoch Subsystem (EPSS) L3 Shikra Interconnect Provider
-
-maintainers:
-  - Raviteja Laggyshetty <raviteja.laggyshetty@oss.qualcomm.com>
-
-description:
-  L3 cache bandwidth requirements on Qualcomm SoCs is serviced by the EPSS.
-  The EPSS L3 interconnect provider aggregates the L3 bandwidth requests
-  from CPU/GPU and relays it to the EPSS HW.
-
-  The Qualcomm Shikra SoC EPSS L3 supports up to twelve frequency lookup
-  table (LUT) entries.
-
-properties:
-  compatible:
-    enum:
-      - qcom,shikra-epss-l3
-
-  reg:
-    maxItems: 1
-
-  clocks:
-    items:
-      - description: xo clock
-      - description: alternate clock
-
-  clock-names:
-    items:
-      - const: xo
-      - const: alternate
-
-  '#interconnect-cells':
-    const: 1
-
-required:
-  - compatible
-  - reg
-  - clocks
-  - clock-names
-  - '#interconnect-cells'
-
-additionalProperties: false
-
-examples:
-  - |
-    epss_l3: interconnect@fd90000 {
-      compatible = "qcom,shikra-epss-l3";
-      reg = <0xfd90000 0x1000>;
-
-      clocks = <&rpm_smd_xo_clk_src>, <&gpll0>;
-      clock-names = "xo", "alternate";
-
-      #interconnect-cells = <1>;
-    };
diff --git a/drivers/interconnect/qcom/Kconfig b/drivers/interconnect/qcom/Kconfig
index aa2b14420b055..7d2bbfe44b3b3 100644
--- a/drivers/interconnect/qcom/Kconfig
+++ b/drivers/interconnect/qcom/Kconfig
@@ -278,6 +278,7 @@ config INTERCONNECT_QCOM_SHIKRA
 	tristate "Qualcomm SHIKRA interconnect driver"
 	depends on INTERCONNECT_QCOM
 	depends on QCOM_SMD_RPM
+	default ARCH_QCOM
 	select INTERCONNECT_QCOM_SMD_RPM
 	help
 	  This is a driver for the Qualcomm Network-on-Chip on shikra-based