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

Commit f6b71673 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'qcom-arm64-for-4.12' of... 

Merge tag 'qcom-arm64-for-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/dt64

Qualcomm ARM64 Updates for v4.12

* Fixup MSM8996 SMP2P and add ADSP PIL / SLPI SMP2P node
* Replace PMU compatible w/ A53 specific one
* Add APQ8016 ramoops
* Update MSM8916 hexagon node
* Add PM8994 RTC

* tag 'qcom-arm64-for-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux

:
  arm64: dts: msm8996: Add ADSP PIL node
  arm64: dts: qcom: pm8994: Add rtc node
  arm64: dts: apq8016-sbc: Add ramoops
  arm64: dts: qcom: msm8916: Update hexagon node
  arm64: dts: msm8996: Add SLPI SMP2P dt node.
  arm64: dts: qcom: Replace PMU compatible with a53 specific one
  arm64: dts: qcom: msm8996: Fixup smp2p node

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 3d3949df 6c8583d6

arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi

+11 −0
Original line number Diff line number Diff line
@@ -35,6 +35,17 @@ 
		stdout-path = "serial0";

	};



	reserved-memory {

		ramoops@bff00000{

			compatible = "ramoops";

			reg = <0x0 0xbff00000 0x0 0x100000>;



			record-size = <0x20000>;

			console-size = <0x20000>;

			ftrace-size = <0x20000>;

		};

	};



	soc {

		dma@7884000 {

			status = "okay";

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

+15 −11
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ 
	};



	pmu {

		compatible = "arm,armv8-pmuv3";

		compatible = "arm,cortex-a53-pmu";

		interrupts = <GIC_PPI 7 GIC_CPU_MASK_SIMPLE(4)>;

	};
@@ -833,8 +833,9 @@ 


			clocks = <&gcc GCC_MSS_CFG_AHB_CLK>,

				 <&gcc GCC_MSS_Q6_BIMC_AXI_CLK>,

				 <&gcc GCC_BOOT_ROM_AHB_CLK>;

			clock-names = "iface", "bus", "mem";

				 <&gcc GCC_BOOT_ROM_AHB_CLK>,

				 <&xo_board>;

			clock-names = "iface", "bus", "mem", "xo";



			qcom,smem-states = <&hexagon_smp2p_out 0>;

			qcom,smem-state-names = "stop";
@@ -842,6 +843,7 @@ 
			resets = <&scm 0>;

			reset-names = "mss_restart";



			cx-supply = <&pm8916_s1>;

			mx-supply = <&pm8916_l3>;

			pll-supply = <&pm8916_l7>;
@@ -856,6 +858,16 @@ 
			mpss {

				memory-region = <&mpss_mem>;

			};



			smd-edge {

				interrupts = <0 25 IRQ_TYPE_EDGE_RISING>;



				qcom,smd-edge = <0>;

				qcom,ipc = <&apcs 8 12>;

				qcom,remote-pid = <1>;



				label = "hexagon";

			};

		};



		pronto: wcnss@a21b000 {
@@ -1214,14 +1226,6 @@ 
				};

			};

		};



		hexagon {

			interrupts = <0 25 IRQ_TYPE_EDGE_RISING>;



			qcom,smd-edge = <0>;

			qcom,ipc = <&apcs 8 12>;

			qcom,remote-pid = <1>;

		};

	};



	hexagon-smp2p {

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

+45 −1
Original line number Diff line number Diff line
@@ -534,6 +534,26 @@ 
		};

	};



	adsp-pil {

		compatible = "qcom,msm8996-adsp-pil";



		interrupts-extended = <&intc 0 162 IRQ_TYPE_EDGE_RISING>,

				      <&adsp_smp2p_in 0 IRQ_TYPE_EDGE_RISING>,

				      <&adsp_smp2p_in 1 IRQ_TYPE_EDGE_RISING>,

				      <&adsp_smp2p_in 2 IRQ_TYPE_EDGE_RISING>,

				      <&adsp_smp2p_in 3 IRQ_TYPE_EDGE_RISING>;

		interrupt-names = "wdog", "fatal", "ready",

				  "handover", "stop-ack";



		clocks = <&xo_board>;

		clock-names = "xo";



		memory-region = <&adsp_region>;



		qcom,smem-states = <&adsp_smp2p_out 0>;

		qcom,smem-state-names = "stop";

	};



	adsp-smp2p {

		compatible = "qcom,smp2p";

		qcom,smem = <443>, <429>;
@@ -547,7 +567,7 @@ 


		adsp_smp2p_out: master-kernel {

			qcom,entry-name = "master-kernel";

			#qcom,state-cells = <1>;

			#qcom,smem-state-cells = <1>;

		};



		adsp_smp2p_in: slave-kernel {
@@ -557,5 +577,29 @@ 
			#interrupt-cells = <2>;

		};

	};



	smp2p-slpi {

		compatible = "qcom,smp2p";

		qcom,smem = <481>, <430>;



		interrupts = <GIC_SPI 178 IRQ_TYPE_EDGE_RISING>;



		qcom,ipc = <&apcs 16 26>;



		qcom,local-pid = <0>;

		qcom,remote-pid = <3>;



		slpi_smp2p_in: slave-kernel {

			qcom,entry-name = "slave-kernel";

			interrupt-controller;

			#interrupt-cells = <2>;

		};



		slpi_smp2p_out: master-kernel {

			qcom,entry-name = "master-kernel";

			#qcom,smem-state-cells = <1>;

		};

	};



};

#include "msm8996-pins.dtsi"

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

+7 −0
Original line number Diff line number Diff line
@@ -9,6 +9,13 @@ 
		#address-cells = <1>;

		#size-cells = <0>;



		rtc@6000 {

			compatible = "qcom,pm8941-rtc";

			reg = <0x6000>, <0x6100>;

			reg-names = "rtc", "alarm";

			interrupts = <0x0 0x61 0x1 IRQ_TYPE_EDGE_RISING>;

		};



		pm8994_gpios: gpios@c000 {

			compatible = "qcom,pm8994-gpio";

			reg = <0xc000>;