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

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

Merge "ARM: dts: msm: Fix compilation warnings for auto GVM device tree"

parents d95c54c6 7c762769

qcom/direwolf-vm.dtsi

+0 −1
Original line number Diff line number Diff line 
#include <dt-bindings/interrupt-controller/arm-gic.h>

#include <dt-bindings/clock/qcom,gcc-direwolf.h>

#include "quin-vm-common.dtsi"

qcom/pm6155-vm.dtsi

+1 −2
Original line number Diff line number Diff line 
#include <dt-bindings/interrupt-controller/irq.h>

#include <dt-bindings/spmi/spmi.h>

#include <dt-bindings/iio/qcom,spmi-vadc.h>
@@ -6,7 +5,7 @@ 
	qcom,pm6155@0 {

		compatible = "qcom,spmi-pmic";

		reg = <0 SPMI_USID>;

		#address-cells = <2>;

		#address-cells = <1>;

		#size-cells = <0>;



		pm6155_1_gpios: pinctrl@c000 {

qcom/pm8150-vm.dtsi

+0 −2
Original line number Diff line number Diff line 
#include <dt-bindings/clock/qcom,rpmh.h>

#include <dt-bindings/input/input.h>

#include <dt-bindings/input/qcom,qpnp-power-on.h>

#include <dt-bindings/interrupt-controller/irq.h>

#include <dt-bindings/spmi/spmi.h>

#include <dt-bindings/iio/qcom,spmi-vadc.h>

qcom/pm8195-vm.dtsi

+0 −2
Original line number Diff line number Diff line 
#include <dt-bindings/clock/qcom,rpmh.h>

#include <dt-bindings/input/input.h>

#include <dt-bindings/input/qcom,qpnp-power-on.h>

#include <dt-bindings/interrupt-controller/irq.h>

#include <dt-bindings/spmi/spmi.h>

#include <dt-bindings/iio/qcom,spmi-vadc.h>

qcom/quin-vm-common.dtsi

+10 −5
Original line number Diff line number Diff line 
#include <dt-bindings/interrupt-controller/arm-gic.h>

#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/arm/msm/msm_ion_ids.h>

#include <dt-bindings/clock/qcom,rpmh.h>

#include <dt-bindings/regulator/qcom,rpmh-regulator-levels.h>



/ {

	#address-cells = <2>;
@@ -97,6 +100,8 @@ 


	intc: vgic@0 {

		qvm,vdev = "gic";

		#interrupt-cells = <3>;

		interrupt-controller;

	};



	dummycc: qcom,dummycc {
@@ -108,7 +113,7 @@ 
	gcc: virtio_clock@1c200000 {

		compatible = "virtio,mmio";

		reg = <0x1c200000 0x1000>;

		interrupts = <0 48 IRQ_TYPE_LEVEL_HIGH>;

		interrupts = <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>;

		#clock-cells = <1>;

		#reset-cells = <1>;

	};
@@ -116,14 +121,14 @@ 
	scc: virtio_clock@1c300000 {

		compatible = "virtio,mmio";

		reg = <0x1c300000 0x1000>;

		interrupts = <0 49 IRQ_TYPE_LEVEL_HIGH>;

		interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>;

		#clock-cells = <1>;

	};



	regulator: virtio_regulator@1c700000 {

		compatible = "virtio,mmio";

		reg = <0x1c700000 0x1000>;

		interrupts = <0 42 IRQ_TYPE_LEVEL_HIGH>;

		interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>;

	};



	msm_ion: qcom,ion {
@@ -292,8 +297,8 @@ 
		compatible = "qcom,msm-watchdog";

		reg = <0x17c10000 0x1000>;

		reg-names = "wdt-base";

		interrupts = <0 0 IRQ_TYPE_LEVEL_HIGH>,

			     <0 1 IRQ_TYPE_LEVEL_HIGH>;

		interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;

		qcom,bark-time = <11000>;

		qcom,pet-time = <9360>;

		qcom,ipi-ping;