Merge "Documentation: qcom: llcc: Add support for Lito"
diff --git a/Documentation/devicetree/bindings/arm/msm/qcom,llcc.txt b/Documentation/devicetree/bindings/arm/msm/qcom,llcc.txt
index 5f437ba..1248478 100644
--- a/Documentation/devicetree/bindings/arm/msm/qcom,llcc.txt
+++ b/Documentation/devicetree/bindings/arm/msm/qcom,llcc.txt
@@ -11,7 +11,7 @@
- compatible:
Usage: required
Value type: <string>
- Definition: must be "qcom,kona-llcc"
+ Definition: must be "qcom,kona-llcc" or "qcom,lito-llcc"
- reg:
Usage: required
diff --git a/Documentation/devicetree/bindings/soc/qcom/qcom,ipcc.txt b/Documentation/devicetree/bindings/soc/qcom/qcom,ipcc.txt
index 62c1971..ed30505 100644
--- a/Documentation/devicetree/bindings/soc/qcom/qcom,ipcc.txt
+++ b/Documentation/devicetree/bindings/soc/qcom/qcom,ipcc.txt
@@ -22,7 +22,7 @@
- compatible:
Usage: required
Value type: <string>
- Definition: Must be "qcom,kona-ipcc"
+ Definition: Must be "qcom,ipcc"
- reg:
Usage: required
@@ -55,7 +55,7 @@
#include <dt-bindings/soc/qcom,ipcc.h>
ipcc_mproc: qcom,ipcc@408000 {
- compatible = "qcom,kona-ipcc";
+ compatible = "qcom,ipcc";
reg = <0x408000 0x1000>;
interrupts = <GIC_SPI 229 IRQ_TYPE_LEVEL_HIGH>,
interrupt-controller;
diff --git a/arch/arm64/boot/dts/qcom/kona.dtsi b/arch/arm64/boot/dts/qcom/kona.dtsi
index 7fe1059..341c814 100644
--- a/arch/arm64/boot/dts/qcom/kona.dtsi
+++ b/arch/arm64/boot/dts/qcom/kona.dtsi
@@ -1458,7 +1458,7 @@
};
ipcc_mproc: qcom,ipcc@408000 {
- compatible = "qcom,kona-ipcc";
+ compatible = "qcom,ipcc";
reg = <0x408000 0x1000>;
interrupts = <GIC_SPI 229 IRQ_TYPE_LEVEL_HIGH>;
interrupt-controller;
diff --git a/arch/arm64/boot/dts/qcom/lito.dtsi b/arch/arm64/boot/dts/qcom/lito.dtsi
index 1cf44d8..bb98dfc 100644
--- a/arch/arm64/boot/dts/qcom/lito.dtsi
+++ b/arch/arm64/boot/dts/qcom/lito.dtsi
@@ -14,6 +14,7 @@
#include <dt-bindings/clock/qcom,rpmh.h>
#include <dt-bindings/clock/qcom,videocc-lito.h>
#include <dt-bindings/interrupt-controller/arm-gic.h>
+#include <dt-bindings/soc/qcom,ipcc.h>
#include <dt-bindings/soc/qcom,rpmh-rsc.h>
/ {
@@ -911,6 +912,22 @@
reg-names = "rmtfs";
qcom,client-id = <0x00000001>;
};
+
+ ipcc_mproc: qcom,ipcc@408000 {
+ compatible = "qcom,ipcc";
+ reg = <0x408000 0x1000>;
+ interrupts = <GIC_SPI 229 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-controller;
+ #interrupt-cells = <3>;
+ #mbox-cells = <2>;
+ };
+
+ ipcc_self_ping: ipcc-self-ping {
+ compatible = "qcom,ipcc-self-ping";
+ interrupts-extended = <&ipcc_mproc IPCC_CLIENT_APSS
+ IPCC_MPROC_SIGNAL_SMP2P IRQ_TYPE_LEVEL_HIGH>;
+ mboxes = <&ipcc_mproc IPCC_CLIENT_APSS IPCC_MPROC_SIGNAL_SMP2P>;
+ };
};
#include "lito-pinctrl.dtsi"
diff --git a/drivers/soc/qcom/qcom_ipcc.c b/drivers/soc/qcom/qcom_ipcc.c
index 00bd692..90e3e82 100644
--- a/drivers/soc/qcom/qcom_ipcc.c
+++ b/drivers/soc/qcom/qcom_ipcc.c
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
- * Copyright (c) 2018, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.
*/
#include <linux/module.h>
@@ -384,7 +384,7 @@ static int qcom_ipcc_remove(struct platform_device *pdev)
}
static const struct of_device_id qcom_ipcc_of_match[] = {
- { .compatible = "qcom,kona-ipcc"},
+ { .compatible = "qcom,ipcc"},
{}
};
MODULE_DEVICE_TABLE(of, qcom_ipcc_of_match);
