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

Commit 2ddda43d authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: msm8992: Add device tree for Silabs FM on 8992"

parents ef97c0fc 9e902fc5

arch/arm/boot/dts/qcom/msm8992-cdp.dtsi

+27 −0
Original line number Diff line number Diff line
@@ -303,6 +303,33 @@ 
	};

};



&i2c_5 {

	silabs4705@11 { /* SiLabs FM chip, slave id 0x11*/

		status = "ok";

		compatible = "silabs,si4705";

		reg = <0x11>;

		vdd-supply = <&pm8994_s4>;

		silabs,vdd-supply-voltage = <1800000 1800000>;

		va-supply = <&bt_vreg>;

		silabs,va-supply-voltage = <3300000 3300000>;

		pinctrl-names = "pmx_fm_active","pmx_fm_suspend";

		pinctrl-0 = <&fm_int_active &fm_status_int_active &fm_rst_active>;

		pinctrl-1 = <&fm_int_suspend &fm_status_int_suspend &fm_rst_suspend>;

		silabs,reset-gpio = <&msm_gpio 62 0>;

		silabs,int-gpio = <&msm_gpio 9 0>;

		silabs,status-gpio = <&msm_gpio 11 0>;

		#address-cells = <0>;

		interrupts = <0 1>;

		#interrupt-cells = <1>;

		interrupt-map-mask = <0xffffffff>;

		interrupt-map = <

				  0 &msm_gpio 9 2

				  1 &msm_gpio 11 1

				>;

		interrupt-names = "silabs_fm_int", "silabs_fm_status_int";

	};

};



&pmi8994_gpios {

	gpio@c400 {	/* GPIO 5  OTG SWITCH EN */

		qcom,mode = <1>;	/* DIGITAL OUT */

arch/arm/boot/dts/qcom/msm8992-mtp.dtsi

+27 −0
Original line number Diff line number Diff line
@@ -294,6 +294,33 @@ 
	};

};



&i2c_5 {

	silabs4705@11 { /* SiLabs FM chip, slave id 0x11*/

		status = "ok";

		compatible = "silabs,si4705";

		reg = <0x11>;

		vdd-supply = <&pm8994_s4>;

		silabs,vdd-supply-voltage = <1800000 1800000>;

		va-supply = <&bt_vreg>;

		silabs,va-supply-voltage = <3300000 3300000>;

		pinctrl-names = "pmx_fm_active","pmx_fm_suspend";

		pinctrl-0 = <&fm_int_active &fm_status_int_active &fm_rst_active>;

		pinctrl-1 = <&fm_int_suspend &fm_status_int_suspend &fm_rst_suspend>;

		silabs,reset-gpio = <&msm_gpio 62 0>;

		silabs,int-gpio = <&msm_gpio 9 0>;

		silabs,status-gpio = <&msm_gpio 11 0>;

		#address-cells = <0>;

		interrupts = <0 1>;

		#interrupt-cells = <1>;

		interrupt-map-mask = <0xffffffff>;

		interrupt-map = <

				  0 &msm_gpio 9 2

				  1 &msm_gpio 11 1

				>;

		interrupt-names = "silabs_fm_int", "silabs_fm_status_int";

	};

};



&soc {

	gen-vkeys {

		compatible = "qcom,gen-vkeys";

arch/arm/boot/dts/qcom/msm8992-pinctrl.dtsi

+89 −0
Original line number Diff line number Diff line
@@ -758,6 +758,95 @@ 
			};

		};



		pmx_i2c_5 {

			qcom,pins = <&gp 83>, <&gp 84>; /* SDA, SCL */

			qcom,num-grp-pins = <2>;

			qcom,pin-func = <3>;

			label = "pmx_i2c_5";



			i2c_5_active: i2c_5_active {

				drive-strength = <2>;

				bias-disable;

			};



			i2c_5_sleep: i2c_5_sleep {

				drive-strength = <2>;

				bias-disable;

			};

		};



		pmx_fm_int_active {

			qcom,pins = <&gp 9>;

			qcom,pin-func = <0>;

			qcom,num-grp-pins = <1>;

			label = "pmx_fm_int_active";



			fm_int_active: fm_int_active {

				drive-strength = <16>;

				bias-pull-up;

			};

		};



		pmx_fm_int_suspend {

			qcom,pins = <&gp 9>;

			qcom,pin-func = <0>;

			qcom,num-grp-pins = <1>;

			label = "pmx_fm_int_suspend";



			fm_int_suspend: fm_int_suspend {

				drive-strength = <16>;

				bias-pull-up;

			};

		};



		pmx_fm_status_int_active {

			qcom,pins = <&gp 11>;

			qcom,pin-func = <0>;

			qcom,num-grp-pins = <1>;

			label = "pmx_fm_status_int_active";



			fm_status_int_active: fm_status_int_active {

				drive-strength = <16>;

				bias-pull-up;

			};

		};



		pmx_fm_status_int_suspend {

			qcom,pins = <&gp 11>;

			qcom,pin-func = <0>;

			qcom,num-grp-pins = <1>;

			label = "pmx_fm_status_int_suspend";



			fm_status_int_suspend: fm_status_int_suspend {

				drive-strength = <16>;

				bias-pull-up;

			};

		};



		pmx_fm_rst_active {

			qcom,pins = <&gp 62>;

			qcom,pin-func = <0>;

			qcom,num-grp-pins = <1>;

			label = "pmx_fm_rst_active";



			fm_rst_active: fm_rst_active {

				drive-strength = <16>;

				bias-pull-down;

			};

		};



		pmx_fm_rst_suspend {

			qcom,pins = <&gp 62>;

			qcom,pin-func = <0>;

			qcom,num-grp-pins = <1>;

			label = "pmx_fm_rst_suspend";



			fm_rst_suspend: fm_rst_suspend {

				drive-strength = <16>;

				bias-pull-down;

			};

		};



		pmx_ts {

			qcom,pins = <&gp 60>, <&gp 61>;

			qcom,pin-func = <0>;

arch/arm/boot/dts/qcom/msm8992.dtsi

+26 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
		sdhc1 = &sdhc_1; /* SDC1 eMMC slot */

		sdhc2 = &sdhc_2; /* SDC2 SD card slot */

		i2c2  = &i2c_2;

		i2c5 = &i2c_5;



		/* smdtty devices */

		smd4 = &smdtty_mbalbridge;
@@ -1012,6 +1013,31 @@ 
		interrupt-names = "cdc-int";

	};



	i2c_5: i2c_11: i2c@f9967000 { /* BLSP2 QUP5 */

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

		#address-cells = <1>;

		#size-cells = <0>;

		reg-names = "qup_phys_addr", "bam_phys_addr";

		reg = <0xf9967000 0x1000>,

			<0xf9944000 0x19000>;

		interrupt-names = "qup_irq", "bam_irq";

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

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

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

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

		clocks = <&clock_gcc clk_gcc_blsp2_ahb_clk>,

				<&clock_gcc clk_gcc_blsp2_qup5_i2c_apps_clk>;



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

		pinctrl-0 = <&i2c_5_active>;

		pinctrl-1 = <&i2c_5_sleep>;

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

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

		qcom,bam-pipe-idx-cons = <20>;

		qcom,bam-pipe-idx-prod = <21>;

		qcom,master-id = <84>;

	};



	slim_msm: slim@fe12f000 {

		cell-index = <1>;

		compatible = "qcom,slim-ngd";