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

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

Merge "ARM: dts: msm: Fix kernel warning for sm8150"

parents 0cbecdc8 866061a1
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -400,6 +400,9 @@
		};

		pm8150a_amoled: qcom,amoled {
			#address-cells = <1>;
			#size-cells = <1>;

			compatible = "qcom,qpnp-amoled-regulator";
			status = "disabled";

+3 −0
Original line number Diff line number Diff line
@@ -61,6 +61,9 @@
};

&soc {
	#address-cells = <1>;
	#size-cells = <1>;

	refgen: refgen-regulator@88e7000 {
		compatible = "qcom,refgen-regulator";
		reg = <0x88e7000 0x60>;
+3 −0
Original line number Diff line number Diff line
@@ -51,6 +51,9 @@
};

&qupv3_se10_i2c {
	#address-cells = <1>;
	#size-cells = <0>;

	status = "ok";
	asm330@6a {
		compatible = "st,asm330lhh";
+8 −2
Original line number Diff line number Diff line
@@ -62,6 +62,9 @@
};

&qupv3_se15_i2c {
	#address-cells = <1>;
	#size-cells = <0>;

	status = "ok";

	pinctrl-0 = <&qupv3_se15_i2c_active
@@ -119,9 +122,9 @@
		#size-cells = <0>;

		i2c@0 {
			reg = <0>;
			#address-cells = <1>;
			#size-cells = <0>;
			reg = <0>;

			anx_7625_1: anx7625@2c {
				compatible = "analogix,anx7625";
@@ -135,9 +138,9 @@
		};

		i2c@1 {
			reg = <1>;
			#address-cells = <1>;
			#size-cells = <0>;
			reg = <1>;

			anx_7625_2: anx7625@2c {
				compatible = "analogix,anx7625";
@@ -192,6 +195,9 @@
};

&soc {
	#address-cells = <1>;
	#size-cells = <1>;

	dsi_anx_7625_1: qcom,dsi-display@17 {
		label = "dsi_anx_7625_1";
		qcom,dsi-display-active;
+2 −0
Original line number Diff line number Diff line
@@ -803,6 +803,8 @@
			mhi,bhie-offset = <0x0324>;

			mhi_channels {
				#address-cells = <1>;
				#size-cells = <0>;
				mhi_chan@0 {
					reg = <0>;
					label = "LOOPBACK";
Loading