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

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

Merge "ARM: dts: msm: add SPMI debug bus for Kona boards"

parents 5ade36d8 1c547a7e
Loading
Loading
Loading
Loading
+15 −0
Original line number Diff line number Diff line
@@ -35,6 +35,19 @@ Supported Properties:
		    the corresponding addresses are specified in the reg
		    property.

- clocks
	Usage:      optional
	Value type: <prop-encoded-array>
	Definition: Clock tuple consisting of a phandle to a clock controller
		    device and the clock ID number for the SPMI debug controller
		    clock.

- clock-names
	Usage:      required if clocks property is specified
	Value type: <string>
	Definition: Defines the name of the clock defined in the "clocks"
		    property.  This must be "core_clk".

- #address-cells
	Usage:      required
	Value type: <u32>
@@ -57,6 +70,8 @@ qcom,spmi-debug@6b22000 {
	compatible = "qcom,spmi-pmic-arb-debug";
	reg = <0x6b22000 0x60>, <0x7820a8 4>;
	reg-names = "core", "fuse";
	clocks = <&clock_aop QDSS_CLK>;
	clock-names = "core_clk";
	qcom,fuse-disable-bit = <12>;
	#address-cells = <2>;
	#size-cells = <0>;
+4 −0
Original line number Diff line number Diff line
@@ -513,6 +513,10 @@
	};
};

&spmi_debug_bus {
	status = "ok";
};

&kona_snd {
	qcom,model = "kona-cdp-snd-card";
	qcom,audio-routing =
+4 −0
Original line number Diff line number Diff line
@@ -415,6 +415,10 @@
	};
};

&spmi_debug_bus {
	status = "ok";
};

&dsi_sw43404_amoled_cmd {
	qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;
	qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs";
+4 −0
Original line number Diff line number Diff line
@@ -511,6 +511,10 @@
	};
};

&spmi_debug_bus {
	status = "ok";
};

&dsi_sw43404_amoled_cmd {
	qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;
	qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs";
+109 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@
#include <dt-bindings/regulator/qcom,rpmh-regulator-levels.h>
#include <dt-bindings/soc/qcom,ipcc.h>
#include <dt-bindings/soc/qcom,rpmh-rsc.h>
#include <dt-bindings/spmi/spmi.h>
#include <dt-bindings/gpio/gpio.h>

#define MHZ_TO_MBPS(mhz, w) ((mhz * 1000000 * w) / (1024 * 1024))
@@ -1890,6 +1891,114 @@
		cell-index = <0>;
	};

	spmi_debug_bus: qcom,spmi-debug@6b0f000 {
		compatible = "qcom,spmi-pmic-arb-debug";
		reg = <0x6b0f000 0x60>, <0x7820a8 0x4>;
		reg-names = "core", "fuse";
		clocks = <&clock_aop QDSS_CLK>;
		clock-names = "core_clk";
		qcom,fuse-disable-bit = <24>;
		#address-cells = <2>;
		#size-cells = <0>;
		status = "disabled";

		qcom,pm8150-debug@0 {
			compatible = "qcom,spmi-pmic";
			reg = <0x0 SPMI_USID>;
			#address-cells = <2>;
			#size-cells = <0>;
			qcom,can-sleep;
		};

		qcom,pm8150-debug@1 {
			compatible = "qcom,spmi-pmic";
			reg = <0x1 SPMI_USID>;
			#address-cells = <2>;
			#size-cells = <0>;
			qcom,can-sleep;
		};

		qcom,pm8150b-debug@2 {
			compatible = "qcom,spmi-pmic";
			reg = <0x2 SPMI_USID>;
			#address-cells = <2>;
			#size-cells = <0>;
			qcom,can-sleep;
		};

		qcom,pm8150b-debug@3 {
			compatible = "qcom,spmi-pmic";
			reg = <0x3 SPMI_USID>;
			#address-cells = <2>;
			#size-cells = <0>;
			qcom,can-sleep;
		};

		qcom,pm8150l-debug@4 {
			compatible = "qcom,spmi-pmic";
			reg = <0x4 SPMI_USID>;
			#address-cells = <2>;
			#size-cells = <0>;
			qcom,can-sleep;
		};

		qcom,pm8150l-debug@5 {
			compatible = "qcom,spmi-pmic";
			reg = <0x5 SPMI_USID>;
			#address-cells = <2>;
			#size-cells = <0>;
			qcom,can-sleep;
		};

		qcom,pmk8002-debug@6 {
			compatible = "qcom,spmi-pmic";
			reg = <0x6 SPMI_USID>;
			#address-cells = <2>;
			#size-cells = <0>;
			qcom,can-sleep;
		};

		qcom,pmk8002-debug@7 {
			compatible = "qcom,spmi-pmic";
			reg = <0x7 SPMI_USID>;
			#address-cells = <2>;
			#size-cells = <0>;
			qcom,can-sleep;
		};

		qcom,pmxprairie-debug@8 {
			compatible = "qcom,spmi-pmic";
			reg = <0x8 SPMI_USID>;
			#address-cells = <2>;
			#size-cells = <0>;
			qcom,can-sleep;
		};

		qcom,pmxprairie-debug@9 {
			compatible ="qcom,spmi-pmic";
			reg = <0x9 SPMI_USID>;
			#address-cells = <2>;
			#size-cells = <0>;
			qcom,can-sleep;
		};

		qcom,pm8009-debug@a {
			compatible = "qcom,spmi-pmic";
			reg = <0xa SPMI_USID>;
			#address-cells = <2>;
			#size-cells = <0>;
			qcom,can-sleep;
		};

		qcom,pm8009-debug@b {
			compatible = "qcom,spmi-pmic";
			reg = <0xb SPMI_USID>;
			#address-cells = <2>;
			#size-cells = <0>;
			qcom,can-sleep;
		};
	};

	ufs_ice: ufsice@1d90000 {
		compatible = "qcom,ice";
		reg = <0x1d90000 0x8000>;