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

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

Merge "ARM: dts: msm: Modify pm2250 spmi node name"

parents 489b460a 38e74283

bindings/sound/wcd_codec.txt

+2 −2
Original line number Diff line number Diff line
@@ -457,7 +457,7 @@ Required properties: 
 -compatible: "qcom,pm2250-spmi";



&spmi_bus {

                pm2250_spmi: qcom,pm2250-spmi {

                pm2250_cdc: qcom,pm2250-cdc {

                        compatible = "qcom,pm2250-spmi";

                };

};
@@ -512,7 +512,7 @@ Example: 
	rouleur_codec: rouleur-codec {

		compatible = "qcom,rouleur-codec";

		qcom,split-codec = <1>;

		qcom,pmic-spmi-node = <&pm2250_spmi>;

		qcom,pmic-spmi-node = <&pm2250_cdc>;

		qcom,wcd-reset-reg = <0x0000F3DB>;

		qcom,rx_swr_ch_map = <0 HPH_L 0x1 0 HPH_L>,

			<0 HPH_R 0x2 0 HPH_R>, <1 CLSH 0x1 0 CLSH>,

qcom/pm2250.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ 
			interrupts = <0x0 0x61 0x1 IRQ_TYPE_NONE>;

		};



		pm2250_spmi: qcom,pm2250-spmi {

		pm2250_cdc: qcom,pm2250-cdc {

			compatible = "qcom,pm2250-spmi";

		};

qcom/scuba-audio-overlay.dtsi

+2 −3
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 
#include <dt-bindings/sound/audio-codec-port-types.h>

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

#include "scuba-lpi.dtsi"

#include "pm2250.dtsi"



&bolero {

	qcom,num-macros = <3>;
@@ -115,7 +114,7 @@ 
	rouleur_codec: rouleur-codec {

		compatible = "qcom,rouleur-codec";

		qcom,split-codec = <1>;

		qcom,pmic-spmi-node = <&pm2250_spmi>;

		qcom,pmic-spmi-node = <&pm2250_cdc>;

		qcom,wcd-reset-reg = <0x0000F3DB>;

		qcom,rx_swr_ch_map = <0 HPH_L 0x1 0 HPH_L>,

			<0 HPH_R 0x2 0 HPH_R>,
@@ -282,7 +281,7 @@ 
		pinctrl-1 = <&tx_swr_clk_sleep &tx_swr_data1_sleep

			    &tx_swr_data2_sleep>;

		qcom,lpi-gpios;

		qcom,chip-wakeup-reg = <0x003ca04c>;

		qcom,chip-wakeup-reg = <0x003ca064>;

		qcom,chip-wakeup-maskbit = <0>;

		qcom,chip-wakeup-default-val = <0x1>;

	};