Merge "ARM: dts: msm: Add spmi device tree node for sa8195"

#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>

&spmi_bus {

	qcom,pm8195@0 {

		compatible = "qcom,spmi-pmic";

		reg = <0 SPMI_USID>;

		#address-cells = <1>;

		#size-cells = <0>;

		pm8195_1_gpios: pinctrl@c000 {

			compatible = "qcom,pm8150-gpio";

			reg = <0xc000>;

			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupt-cells = <2>;

		};

	};

};

&pm8195_1_gpios {

	storage_sd_detect {

		storage_cd_default: storage_cd_default {

			pins = "gpio4";

			function = "normal";

			input-enable;

			bias-pull-up;

			power-source = <0>;

		};

	};

	key_vol_up {

		key_vol_up_default: key_vol_up_default {

			pins = "gpio6";

			function = "normal";

			input-enable;

			bias-pull-up;

			power-source = <1>;

		};

	};

};

#include "sa8195-qupv3.dtsi"

#include "sa8195-ssc-qupv3.dtsi"

#include "sa8155-vm-audio.dtsi"

#include "pm8195-vm.dtsi"

&tlmm {

	/delete-property/ wakeup-parent;