Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0110dbe4 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Documentation: qcom: llcc: Add support for Lito"

parents 52f68201 a7cdfa6a

Documentation/devicetree/bindings/arm/msm/qcom,llcc.txt

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ Properties: 
- 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

Documentation/devicetree/bindings/soc/qcom/qcom,ipcc.txt

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ mailbox interface, which again requires client-id and signal-id. 
- compatible:

  Usage: required

  Value type: <string>

  Definition: Must be "qcom,kona-ipcc"

  Definition: Must be "qcom,ipcc"



- reg:

  Usage: required
@@ -55,7 +55,7 @@ Example 
	#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;

arch/arm64/boot/dts/qcom/kona.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -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;

arch/arm64/boot/dts/qcom/lito.dtsi

+17 −0
Original line number Diff line number Diff line
@@ -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"

drivers/soc/qcom/qcom_ipcc.c

+2 −2
Original line number Diff line number Diff line 
// 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);