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

Commit 93e729b1 authored by yungwenpeng's avatar yungwenpeng
Browse files

Merge branch vanilla into gms 

* ssh://ch-git3.arimacomm.com.tw:29418/kernel/msm-4.9:
  Audio porting for smart amp AW8898.

Change-Id: I88bc9f9a713d4fd436b62242aac09f6682c5b7e0
parents 3bd378d3 8b920f71

arch/arm64/boot/dts/qcom/msm-audio-lpass.dtsi

100644 → 100755
+10 −7
Original line number Diff line number Diff line
@@ -115,19 +115,22 @@ 
			qcom,msm-mi2s-tx-lines = <2>;

		};



		dai_mi2s4: qcom,msm-dai-q6-mi2s-quin {

//[FairPhone][Audio][jinjia]=2018.11.21=smart amp porting. -s

		dai_mi2s4: qcom,msm-dai-q6-mi2s-senary {

			compatible = "qcom,msm-dai-q6-mi2s";

			qcom,msm-dai-q6-mi2s-dev-id = <4>;

			qcom,msm-mi2s-rx-lines = <1>;

			qcom,msm-mi2s-tx-lines = <2>;

			qcom,msm-mi2s-rx-lines = <3>;

			qcom,msm-mi2s-tx-lines = <0>;

		};



		dai_mi2s5: qcom,msm-dai-q6-mi2s-senary {

		dai_mi2s5: qcom,msm-dai-q6-mi2s-quin {

			compatible = "qcom,msm-dai-q6-mi2s";

			qcom,msm-dai-q6-mi2s-dev-id = <6>;

			qcom,msm-mi2s-rx-lines = <0>;

			qcom,msm-mi2s-tx-lines = <3>;

			qcom,msm-dai-q6-mi2s-dev-id = <4>;

			qcom,msm-mi2s-rx-lines = <3>;

			qcom,msm-mi2s-tx-lines = <0>;

		};

//[FairPhone][Audio][jinjia]=2018.11.21=smart amp porting. -e



	};



	lsm: qcom,msm-lsm-client {

arch/arm64/boot/dts/qcom/msm8953-audio.dtsi

+14 −6
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ 
		//pinctrl-1 = <&wsa_reset_off>;

	};



//[FairPhone][Audio][jinjia]=2018.10.19=Audio porting. -s

//[FairPhone][Audio][jinjia]=2018.11.21=Audio porting. -s

	ext_codec: sound-9335 {

		status = "okay";

		compatible = "qcom,msm8952-audio-slim-codec";
@@ -214,11 +214,17 @@ 
		reg = <0xc051000 0x4>,

			<0xc051004 0x4>,

			<0xc055000 0x4>,

			<0xc052000 0x4>;

			<0xc052000 0x4>,

			<0x0c056000 0x4>,

			<0x0c054000 0x4>,

			<0x0c053000 0x4>;

		reg-names = "csr_gp_io_mux_mic_ctl",

			"csr_gp_io_mux_spkr_ctl",

			"csr_gp_io_lpaif_pri_pcm_pri_mode_muxsel",

			"csr_gp_io_mux_quin_ctl";

			"csr_gp_io_mux_quin_ctl",

			"csr_gp_io_lpaif_qui_pcm_sec_mode_muxsel",

			"csr_gp_io_mux_mic_ext_clk_ctl",

			"csr_gp_io_mux_sec_tlmm_ctl";



/*		reg-names = "csr_gp_io_mux_mic_ctl",

			"csr_gp_io_mux_spkr_ctl",
@@ -228,6 +234,8 @@ 
			"csr_gp_io_mux_mic_ext_clk_ctl",

			"csr_gp_io_mux_sec_tlmm_ctl";

*/

		qcom,msm-ext-pa = "quinary";



		qcom,audio-routing =

			"AIF4 VI", "MCLK",

			"AIF4 VI", "MICBIAS_REGULATOR",
@@ -310,8 +318,8 @@ 
				"msm-dai-q6-dev.12289", "msm-dai-q6-dev.12292",

				"msm-dai-q6-dev.12293", "msm-dai-q6-dev.16396";



		asoc-codec = <&stub_codec>, <&hdmi_dba>;

		asoc-codec-names = "msm-stub-codec.1", "msm-hdmi-dba-codec-rx";

		asoc-codec = <&stub_codec>, <&dai_mi2s5>;

		asoc-codec-names = "msm-stub-codec.1", "msm-dai-q6-mi2s.5";



		qcom,wsa-max-devs = <0>;

		qcom,wsa-devs = <&wsa881x_211>, <&wsa881x_212>,
@@ -319,7 +327,7 @@ 
		qcom,wsa-aux-dev-prefix = "SpkrLeft", "SpkrRight",

				"SpkrLeft", "SpkrRight";

	};

//[FairPhone][Audio][jinjia]=2018.10.19=Audio porting. -e

//[FairPhone][Audio][jinjia]=2018.11.21=Audio porting. -e



	cpe: qcom,msm-cpe-lsm {

		compatible = "qcom,msm-cpe-lsm";

arch/arm64/boot/dts/qcom/msm8953-mtp.dtsi

+15 −0
Original line number Diff line number Diff line
@@ -55,6 +55,21 @@ 
	};

};



//[FairPhone][Audio][jinjia]=2018.11.21=smart amp porting. -s

&i2c_6 { /* BLSP2 QUP2 (smart amp) */

	    status = "ok";

	    /* AWINIC AW8898 Smart PA */

	    aw8898_smartpa@34{

	        compatible = "awinic,aw8898_smartpa";

	        reg = <0x34>;

	        reset-gpio = <&tlmm 21 0>;

	        irq-gpio = <&tlmm 20 0>;

	        status = "okay";

	    };

	    /* AWINIC AW8898 Smart PA End */

};

//[FairPhone][Audio][jinjia]=2018.11.21=smart amp porting. -e



&sdhc_1 {

	/* device core power supply */

	vdd-supply = <&pm8953_l8>;

arch/arm64/boot/dts/qcom/msm8953-pinctrl.dtsi

+48 −63
Original line number Diff line number Diff line
@@ -51,6 +51,8 @@ 
				};

			};



//[FairPhone][Audio][jinjia]=2018.11.21=smart amp porting. -s

/*

			uart1_console_active: uart1_console_active {

				mux {

					pins = "gpio20", "gpio21";
@@ -76,6 +78,9 @@ 
					bias-pull-down;

				};

			};

*/

//[FairPhone][Audio][jinjia]=2018.11.21=smart amp porting. -e



		};

		cci {

			cci0_active: cci0_active {
@@ -763,6 +768,8 @@ 
			};

		};



//[FairPhone][Audio][jinjia]=2018.11.21=smart amp porting. -s

/*

		blsp2_uart1_active: blsp2_uart1_active {

			mux {

				pins = "gpio20", "gpio21", "gpio22", "gpio23";
@@ -788,6 +795,8 @@ 
				bias-disable;

			};

		};

*/

//[FairPhone][Audio][jinjia]=2018.11.21=smart amp porting. -e



		/* SDC pin type */

		sdc1_clk_on: sdc1_clk_on {
@@ -1043,6 +1052,38 @@ 
			};

		};



//[FairPhone][Audio][jinjia]=2018.11.21=smart amp porting. -s

		i2c_6 {

			i2c_6_active: i2c_6_active {

				/* active state */

				mux {

					pins = "gpio22", "gpio23";

					function = "blsp_i2c6";

				};



				config {

					pins = "gpio22", "gpio23";

					drive-strength = <2>;

					bias-disable;

				};

			};



			i2c_6_sleep: i2c_6_sleep {

				/* suspended state */

				mux {

					pins = "gpio22", "gpio23";

					function = "gpio";

				};



				config {

					pins = "gpio22", "gpio23";

					drive-strength = <2>;

					bias-disable;

				};

			};

		};

//[FairPhone][Audio][jinjia]=2018.11.21=smart amp porting. -e



		nfc {

			nfc_int_active: nfc_int_active {

				/* active state */
@@ -1450,27 +1491,28 @@ 
			};

		};



//[FairPhone][Audio][jinjia]=2018.11.21=smart amp porting. -s

		pri-tlmm-lines {

			pri_tlmm_lines_act: pri_tlmm_lines_act {

				mux {

					pins = "gpio91", "gpio93";

					pins = "gpio91", "gpio93", "gpio88";

					function = "pri_mi2s";

				};



				config {

					pins = "gpio91", "gpio93";

					pins = "gpio91", "gpio93", "gpio88";

					drive-strength = <8>;

				};

			};



			pri_tlmm_lines_sus: pri_tlmm_lines_sus {

				mux {

					pins = "gpio91", "gpio93";

					pins = "gpio91", "gpio93", "gpio88";

					function = "pri_mi2s";

				};



				config {

					pins = "gpio91", "gpio93";

					pins = "gpio91", "gpio93", "gpio88";

					drive-strength = <2>;

					bias-pull-down;

				};
@@ -1503,6 +1545,8 @@ 
				};

			};

		};

//[FairPhone][Audio][jinjia]=2018.11.21=smart amp porting. -e



/*[Arima_8901][allen_yu] Himax83112-A touch driver porting (Fairphone) 20181102 begin*/

//		spi3 {

//			spi3_default: spi3_default {
@@ -1564,65 +1608,6 @@ 
//			};

//		};

/*[Arima_8901][allen_yu] 20181102 end*/

		spi6 {

			spi6_default: spi6_default {

				/* active state */

				mux {

					/* MOSI, MISO, CLK */

					pins = "gpio20", "gpio21", "gpio23";

					function = "blsp_spi6";

				};



				config {

					pins = "gpio20", "gpio21", "gpio23";

					drive-strength = <12>; /* 12 MA */

					bias-disable = <0>; /* No PULL */

				};

			};



			spi6_sleep: spi6_sleep {

				/* suspended state */

				mux {

					/* MOSI, MISO, CLK */

					pins = "gpio20", "gpio21", "gpio23";

					function = "gpio";

				};



				config {

					pins = "gpio20", "gpio21", "gpio23";

					drive-strength = <2>; /* 2 MA */

					bias-pull-down; /* PULL Down */

				};

			};



			spi6_cs0_active: cs0_active {

				/* CS */

				mux {

					pins = "gpio22";

					function = "blsp_spi6";

				};



				config {

					pins = "gpio22";

					drive-strength = <2>;

					bias-disable = <0>;

				};

			};



			spi6_cs0_sleep: cs0_sleep {

				/* CS */

				mux {

					pins = "gpio22";

					function = "gpio";

				};



				config {

					pins = "gpio22";

					drive-strength = <2>;

					bias-disable = <0>;

				};

			};

		};



		/* add pingrp for touchscreen */

		ts_int_default: ts_int_default {

arch/arm64/boot/dts/qcom/msm8953.dtsi

+31 −61
Original line number Diff line number Diff line
@@ -151,6 +151,7 @@ 
		};

	};



//[FairPhone][Audio][jinjia]=2018.11.21=smart amp porting. -s

	aliases {

		/* smdtty devices */

		smd1 = &smdtty_apps_fm;
@@ -170,11 +171,12 @@ 
		i2c2 = &i2c_2;

		i2c3 = &i2c_3;

		i2c5 = &i2c_5;

		i2c6 = &i2c_6;

/*[Arima_8901][allen_yu] Himax83112-A touch driver porting (Fairphone) 20181102 begin*/

//		spi3 = &spi_3;

/*[Arima_8901][allen_yu] 20181102 end*/

		spi6 = &spi_6;

	};

//[FairPhone][Audio][jinjia]=2018.11.21=smart amp porting. -e



	soc: soc {

		/*
@@ -609,41 +611,6 @@ 
		status = "disabled";

	};



	blsp2_uart1: uart@7af0000 {

		compatible = "qcom,msm-hsuart-v14";

		reg = <0x7af0000 0x200>,

			<0x7ac4000 0x1f000>;

		reg-names = "core_mem", "bam_mem";



		interrupt-names = "core_irq", "bam_irq", "wakeup_irq";

		#address-cells = <0>;

		interrupt-parent = <&blsp2_uart1>;

		interrupts = <0 1 2>;

		#interrupt-cells = <1>;

		interrupt-map-mask = <0xffffffff>;

		interrupt-map = <0 &intc 0 307 0

				1 &intc 0 239 0

				2 &tlmm 21 0>;



		qcom,inject-rx-on-wakeup;

		qcom,rx-char-to-inject = <0xFD>;

		qcom,master-id = <84>;

		clock-names = "core_clk", "iface_clk";

		clocks = <&clock_gcc clk_gcc_blsp2_uart2_apps_clk>,

			<&clock_gcc clk_gcc_blsp2_ahb_clk>;

		pinctrl-names = "sleep", "default";

		pinctrl-0 = <&blsp2_uart1_sleep>;

		pinctrl-1 = <&blsp2_uart1_active>;

		qcom,bam-tx-ep-pipe-index = <2>;

		qcom,bam-rx-ep-pipe-index = <3>;

		qcom,msm-bus,name = "blsp2_uart1";

		qcom,msm-bus,num-cases = <2>;

		qcom,msm-bus,num-paths = <1>;

		qcom,msm-bus,vectors-KBps =

				<84 512 0 0>,

				<84 512 500 800>;

		status = "disabled";

	};



	blsp1_serial1: serial@78b0000 {

		compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm";
@@ -699,31 +666,6 @@ 
//	};

/*[Arima_8901][allen_yu] 20181102 end*/



	spi_6: spi@7af6000 { /* BLSP2 QUP2 */

		compatible = "qcom,spi-qup-v2";

		#address-cells = <1>;

		#size-cells = <0>;

		reg-names = "spi_physical", "spi_bam_physical";

		reg = <0x7af6000 0x600>,

			<0x7ac4000 0x1f000>;

		interrupt-names = "spi_irq", "spi_bam_irq";

		interrupts = <0 300 0>, <0 239 0>;

		spi-max-frequency = <19200000>;

		pinctrl-names = "spi_default", "spi_sleep";

		pinctrl-0 = <&spi6_default &spi6_cs0_active>;

		pinctrl-1 = <&spi6_sleep &spi6_cs0_sleep>;

		clocks = <&clock_gcc clk_gcc_blsp2_ahb_clk>,

			<&clock_gcc clk_gcc_blsp2_qup2_spi_apps_clk>;

		clock-names = "iface_clk", "core_clk";

		qcom,infinite-mode = <0>;

		qcom,use-bam;

		qcom,use-pinctrl;

		qcom,ver-reg-exists;

		qcom,bam-consumer-pipe-index = <6>;

		qcom,bam-producer-pipe-index = <7>;

		qcom,master-id = <84>;

		status = "disabled";

	};



	i2c_1: i2c@78b5000 { /* BLSP1 QUP1 */

		compatible = "qcom,i2c-msm-v2";
@@ -831,6 +773,34 @@ 
		status = "disabled";

	};



//[FairPhone][Audio][jinjia]=2018.11.21=smart amp porting. -s

	i2c_6: i2c@7af6000 { /* BLSP2 QUP2 */

		compatible = "qcom,i2c-msm-v2";

		#address-cells = <1>;

		#size-cells = <0>;

		reg-names = "qup_phys_addr";

		reg = <0x7af6000 0x600>;

		interrupt-names = "qup_irq";

		interrupts = <0 300 0>;

		qcom,clk-freq-out = <400000>;

		qcom,clk-freq-in  = <19200000>;

		clock-names = "iface_clk", "core_clk";

		clocks = <&clock_gcc clk_gcc_blsp2_ahb_clk>,

			<&clock_gcc clk_gcc_blsp2_qup2_i2c_apps_clk>;



		pinctrl-names = "i2c_active", "i2c_sleep";

		pinctrl-0 = <&i2c_6_active>;

		pinctrl-1 = <&i2c_6_sleep>;

		qcom,noise-rjct-scl = <0>;

		qcom,noise-rjct-sda = <0>;

		qcom,master-id = <84>;

		dmas = <&dma_blsp2 6 64 0x20000020 0x20>,

			<&dma_blsp2 7 32 0x20000020 0x20>;

		dma-names = "tx", "rx";

		status = "ok";

	};

//[FairPhone][Audio][jinjia]=2018.11.21=smart amp porting. -e



	slim_msm: slim@c140000{

		cell-index = <1>;

		compatible = "qcom,slim-ngd";