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

Commit bfa9b60c authored by Venkatesh Yadav Abbarapu's avatar Venkatesh Yadav Abbarapu
Browse files

ARM: dts: msm: Initial device tree changes for MSM8909 



Changes include removal of audio and video device nodes.
Adding the necessary pinctrl changes as per 3.18 kernel
pinctrl structure.

Change-Id: If04e3cd7d93a84745d996f31cbeae6f6743a4776
Signed-off-by: default avatarVenkatesh Yadav Abbarapu <vabbar@codeaurora.org>
parent 0fe30edd

Documentation/devicetree/bindings/pinctrl/msm.txt

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ Required properties: 
	      "qcom,msmtitanium-pinctrl"

	      "qcom,msm8937-pinctrl"

	      "qcom,msmcobalt-pinctrl"

	      "qcom,msm8909-pinctrl"



- reg: Should be the base address and length of the TLMM block.

- interrupts: Should be the parent IRQ of the TLMM block.

arch/arm/boot/dts/qcom/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -144,6 +144,10 @@ dtb-$(CONFIG_ARCH_MSM8916) += msm8952-qrd-skum.dtb \ 
       msm8952-ext-codec-cdp.dtb \

       msm8952-mtp.dtb



dtb-$(CONFIG_ARCH_MSM8909) += msm8909-pm8916-mtp.dtb \

	msm8909w-wtp.dtb \

	apq8009w-wtp.dtb



ifeq ($(CONFIG_ARM64),y)

always          := $(dtb-y)

subdir-y        := $(dts-dirs)

arch/arm/boot/dts/qcom/apq8009w-wtp.dts

+1 −24
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015, The Linux Foundation. All rights reserved.

 * Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -39,10 +39,6 @@ 
	reg = <0x0 0x8ac00000 0x0 0x0500000>;

};



&mdss_dsi0 {

	qcom,dsi-pref-prim-pan = <&dsi_hx8394d_480_vid>;

};



&soc {

	i2c@78b9000 { /* BLSP1 QUP5 */

		synaptics@20 {
@@ -101,22 +97,3 @@ 
	pinctrl-names = "default";

	pinctrl-0 = <&uart_console_sleep>;

};
 


&audio_codec_mtp {

	pinctrl-names = "cdc_lines_act",

			"cdc_lines_sus",

			"cross_conn_det_act",

			"cross_conn_det_sus";

	pinctrl-0 = <&cdc_pdm_lines_act>;

	pinctrl-1 = <&cdc_pdm_lines_sus>;

	pinctrl-2 = <&cross_conn_det_act>;

	pinctrl-3 = <&cross_conn_det_sus>;

};



&soc {

	tlmm_pinmux: pinctrl@1000000 {

		vdd_spkdrv {

			status = "disabled";

		};

	};

};

arch/arm/boot/dts/qcom/msm8909-ion.dtsi

+8 −11
Original line number Diff line number Diff line 
/* Copyright (c) 2014, Linux Foundation. All rights reserved.

/* Copyright (c) 2014, 2016 Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -16,34 +16,31 @@ 
		#address-cells = <1>;

		#size-cells = <0>;



		system_heap: qcom,ion-heap@25 {

		qcom,ion-heap@25 {

			reg = <25>;

			qcom,ion-heap-type = "SYSTEM";

		};



		system_contig_heap: qcom,ion-heap@21 {

		qcom,ion-heap@21 {

			reg = <21>;

			qcom,ion-heap-type = "SYSTEM_CONTIG";

		};



		qsecom_heap: qcom,ion-heap@27 { /* QSEECOM HEAP */

			compatible = "qcom,msm-ion-reserve";

		qcom,ion-heap@27 { /* QSEECOM HEAP */

			reg = <27>;

			linux,contiguous-region = <&venus_qseecom_mem>;

			memory-region = <&venus_qseecom_mem>;

			qcom,ion-heap-type = "DMA";

		};



		audio_heap: qcom,ion-heap@28 { /* AUDIO HEAP */

			compatible = "qcom,msm-ion-reserve";

		qcom,ion-heap@28 { /* AUDIO HEAP */

			reg = <28>;

			linux,contiguous-region = <&audio_mem>;

			memory-region = <&audio_mem>;

			qcom,ion-heap-type = "DMA";

		};



		modem_heap: qcom,ion-heap@26 { /* MODEM HEAP */

			compatible = "qcom,msm-ion-reserve";

			reg = <26>;

			linux,contiguous-region = <&modem_adsp_mem>;

			memory-region = <&modem_adsp_mem>;

			qcom,ion-heap-type = "DMA";

		};

	};

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

+39 −217
Original line number Diff line number Diff line 
/* Copyright (c) 2014-2015, The Linux Foundation. All rights reserved.

/* Copyright (c) 2014-2016, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -12,7 +12,6 @@ 


#include "msm8909.dtsi"

#include "msm8909-pinctrl.dtsi"

#include "msm8909-camera-sensor-mtp.dtsi"



&soc {

	/*
@@ -145,41 +144,6 @@ 
		qcom,key-codes = <158 139 172 217>;

	};



	i2c@78b6000 { /* BLSP1 QUP2 */

		nfc-nci@e {

			compatible = "qcom,nfc-nci";

			reg = <0x0e>;

			qcom,irq-gpio = <&msm_gpio 21 0x00>;

			qcom,dis-gpio = <&msm_gpio 20 0x00>;

			qcom,clk-src = "BBCLK2";

			interrupt-parent = <&msm_gpio>;

			interrupts = <21 0>;

			interrupt-names = "nfc_irq";

			pinctrl-names = "nfc_active","nfc_suspend";

			pinctrl-0 = <&nfc_int_active &nfc_disable_active>;

			pinctrl-1 = <&nfc_int_suspend &nfc_disable_suspend>;

			clocks = <&clock_rpm clk_bb_clk2_pin>;

			clock-names = "ref_clk";

		};



		nq@2b {

			compatible = "qcom,nq-nci";

			reg = <0x2b>;

			qcom,nq-irq = <&msm_gpio 21 0x00>;

			qcom,nq-ven = <&msm_gpio 20 0x00>;

			qcom,nq-firm = <&msm_gpio 45 0x00>;

			qcom,clk-src = "BBCLK2";

			interrupt-parent = <&msm_gpio>;

			interrupts = <21 0>;

			interrupt-names = "nfc_irq";

			pinctrl-names = "nfc_active","nfc_suspend";

			pinctrl-0 = <&nfc_int_active &nfc_disable_active>;

			pinctrl-1 = <&nfc_int_suspend &nfc_disable_suspend>;

			clocks = <&clock_rpm clk_bb_clk2_pin>;

			clock-names = "ref_clk";

			};

	};



	gpio_keys {

		compatible = "gpio-keys";

		input-name = "gpio-keys";
@@ -215,75 +179,10 @@ 
		};

	};



	audio_codec_mtp: sound {

		compatible = "qcom,msm8x16-audio-codec";

		qcom,model = "msm8909-snd-card";

		qcom,msm-snd-card-id = <0>;

		qcom,msm-codec-type = "internal";

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

		qcom,msm-mclk-freq = <9600000>;

		qcom,msm-mbhc-hphl-swh = <0>;

		qcom,msm-mbhc-gnd-swh = <0>;

		qcom,msm-hs-micbias-type = "internal";

		qcom,msm-micbias1-ext-cap;

		qcom,audio-routing =

			"RX_BIAS", "MCLK",

			"SPK_RX_BIAS", "MCLK",

			"INT_LDO_H", "MCLK",

			"MIC BIAS External", "Handset Mic",

			"MIC BIAS Internal2", "Headset Mic",

			"MIC BIAS External", "Secondary Mic",

			"AMIC1", "MIC BIAS External",

			"AMIC2", "MIC BIAS Internal2",

			"AMIC3", "MIC BIAS External";

		pinctrl-names = "cdc_lines_act",

				"cdc_lines_sus",

				"cross_conn_det_act",

				"cross_conn_det_sus",

				"vdd_spkdrv_act",

				"vdd_spkdrv_sus";

		pinctrl-0 = <&cdc_pdm_lines_act &vdd_spkdrv_act>;

		pinctrl-1 = <&cdc_pdm_lines_sus &vdd_spkdrv_sus>;

		pinctrl-2 = <&cross_conn_det_act>;

		pinctrl-3 = <&cross_conn_det_sus>;

		qcom,cdc-us-euro-gpios = <&msm_gpio 97 0>;

		asoc-platform = <&pcm0>, <&pcm1>, <&voip>, <&voice>,

				<&loopback>, <&compress>, <&hostless>,

				<&afe>, <&lsm>, <&routing>, <&lpa>,

				<&voice_svc>;

		asoc-platform-names = "msm-pcm-dsp.0", "msm-pcm-dsp.1",

				"msm-voip-dsp", "msm-pcm-voice", "msm-pcm-loopback",

				"msm-compress-dsp", "msm-pcm-hostless", "msm-pcm-afe",

				"msm-lsm-client", "msm-pcm-routing", "msm-pcm-lpa",

				"msm-voice-svc";

		asoc-cpu = <&dai_pri_auxpcm>, <&dai_hdmi>,

				<&dai_mi2s0>, <&dai_mi2s1>, <&dai_mi2s2>, <&dai_mi2s3>,

				<&sb_0_rx>, <&sb_0_tx>, <&sb_1_rx>, <&sb_1_tx>,

				<&sb_3_rx>, <&sb_3_tx>, <&sb_4_rx>, <&sb_4_tx>,

				<&bt_sco_rx>, <&bt_sco_tx>, <&int_fm_rx>, <&int_fm_tx>,

				<&afe_pcm_rx>, <&afe_pcm_tx>, <&afe_proxy_rx>, <&afe_proxy_tx>,

				<&incall_record_rx>, <&incall_record_tx>, <&incall_music_rx>,

				<&incall_music_2_rx>;

		asoc-cpu-names = "msm-dai-q6-auxpcm.1", "msm-dai-q6-hdmi.8",

				"msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",

				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",

				"msm-dai-q6-dev.16384", "msm-dai-q6-dev.16385",

				"msm-dai-q6-dev.16386", "msm-dai-q6-dev.16387",

				"msm-dai-q6-dev.16390", "msm-dai-q6-dev.16391",

				"msm-dai-q6-dev.16392", "msm-dai-q6-dev.16393",

				"msm-dai-q6-dev.12288", "msm-dai-q6-dev.12289",

				"msm-dai-q6-dev.12292", "msm-dai-q6-dev.12293",

				"msm-dai-q6-dev.224", "msm-dai-q6-dev.225",

				"msm-dai-q6-dev.241", "msm-dai-q6-dev.240",

				"msm-dai-q6-dev.32771", "msm-dai-q6-dev.32772",

				"msm-dai-q6-dev.32773", "msm-dai-q6-dev.32770";

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

		asoc-codec-names = "msm-stub-codec.1", "tombak_codec";

	};

};



&blsp1_uart1 {

	status = "disabled";

	status = "ok";

	pinctrl-names = "default";

	pinctrl-0 = <&uart_console_sleep>;

};
@@ -365,113 +264,6 @@ 
	status = "ok";

};



&tlmm_pinmux {

	mpu6050_int_pin {

		qcom,pins = <&gp 96>;

		qcom,pin-func = <0>;

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

		label = "mpu6050-irq";

		mpu6050_default: mpu6050_default {

			drive-strength = <6>;

			bias-pull-down;

		};

		mpu6050_sleep: mpu6050_sleep {

			drive-strength = <2>;

			bias-pull-down;

		};

	};



	apds99xx_int_pin {

		qcom,pins = <&gp 94>;

		qcom,pin-func = <0>;

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

		label = "apds99xx-irq";

		apds99xx_default: apds99xx_default {

			drive-strength = <6>;

			bias-pull-up;

		};

		apds99xx_sleep: apds99xx_sleep {

			drive-strength = <2>;

			bias-pull-down;

		};

	};



	ak8963_int_pin {

		qcom,pins = <&gp 65>;

		qcom,pin-func = <0>;

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

		label = "ak8963-irq";

		ak8963_default: ak8963_default {

			drive-strength = <6>;

			bias-pull-up;

		};

		ak8963_sleep: ak8963_sleep {

			drive-strength = <2>;

			bias-pull-down;

		};

	};

};



&i2c_1 { /* BLSP1 QUP1 */

	mpu6050@68 { /* Gyroscope and accelerometer sensor combo */

		compatible = "invn,mpu6050";

		reg = <0x68>;

		pinctrl-names = "mpu_default","mpu_sleep";

		pinctrl-0 = <&mpu6050_default>;

		pinctrl-1 = <&mpu6050_sleep>;

		interrupt-parent = <&msm_gpio>;

		interrupts = <96 0x1>;

		vdd-supply = <&pm8909_l17>;

		vlogic-supply = <&pm8909_l6>;

		invn,gpio-int = <&msm_gpio 96 0x1>;

		invn,place = "Portrait Down Back Side";

	};



	avago@39 { /* Ambient light and proximity sensor */

		compatible = "avago,apds9900";

		reg = <0x39>;

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

		pinctrl-0 = <&apds99xx_default>;

		pinctrl-1 = <&apds99xx_sleep>;

		interrupt-parent = <&msm_gpio>;

		interrupts = <94 0x2002>;

		vdd-supply = <&pm8909_l17>;

		vio-supply = <&pm8909_l6>;

		avago,irq-gpio = <&msm_gpio 94 0x2002>;

		avago,ps-threshold = <600>;

		avago,ps-hysteresis-threshold = <500>;

		avago,ps-pulse = <8>;

		avago,ps-pgain = <0>;

		avago,als-B = <186>;

		avago,als-C = <75>;

		avago,als-D = <129>;

		avago,ga-value = <256>;

	};



	memsic@30 { /* Magnetic field sensor */

		compatible = "memsic,mmc3416x";

		reg = <0x30>;

		vdd-supply = <&pm8909_l17>;

		vio-supply = <&pm8909_l6>;

		memsic,dir = "obverse-x-axis-forward";

		memsic,auto-report;

	};



	akm@c { /* Magnetic field sensor */

		compatible = "ak,ak8963";

		reg = <0x0c>;

		pinctrl-names = "ak8963_default", "ak8963_sleep";

		pinctrl-0 = <&ak8963_default>;

		pinctrl-1 = <&ak8963_sleep>;

		interrupt-parent = <&msm_gpio>;

		interrupts = <65 0x2>;

		vdd-supply = <&pm8909_l17>;

		vio-supply = <&pm8909_l6>;

		ak,layout = <0x6>;

		ak,auto-report;

	};

};



&mdss_mdp {

	qcom,mdss-pref-prim-intf = "dsi";

};
@@ -492,15 +284,45 @@ 
	qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;

};



&pmx_mdss {

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

	qcom,pins = <&gp 25>, <&gp 37>;

&msm_gpio {

	pmx_mdss {

		mdss_dsi_active: mdss_dsi_active {

			mux {

				pins = "gpio25", "gpio37";

			};

			config {

				pins = "gpio25", "gpio37";

			};

		};

		mdss_dsi_suspend: mdss_dsi_suspend {

			mux {

				pins = "gpio25", "gpio37";

			};

			config {

				pins = "gpio25", "gpio37";

			};



&pmx_mdss_te {

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

	qcom,pins = <&gp 24>;

		};

	};

	pmx_mdss_te {

		mdss_te_active: mdss_te_active {

			mux {

				pins = "gpio24";

			};

			config {

				pins = "gpio24";

			};

		};

		mdss_te_suspend: mdss_te_suspend {

			mux {

				pins = "gpio24";

			};

			config {

				pins = "gpio24";

			};

		};

	};

};





&mdss_dsi0 {

	qcom,dsi-pref-prim-pan = <&dsi_hx8394d_720_vid>;