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

Commit cc4502ce authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Promotion of kernel.lnx.4.4-160609.

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1026450   I0e7df68587e1a212e6c2ed7171fcd683cf115604   defconfig: msm8996: enable SD card support for 8996 boar
1018542   I4e56982700f3444f96e1100c0ce272d36d3423a5   soc: qcom: msm_glink_pkt: Register and wait for link up
1022772   Ief169f5c456dbdb989788a0147342fe91f0a836f   ARM: dts: msm: setup external clock sources for HDMI clo
1012351   Iba2ebe38c4ec1422931f2a696d9e5ca01b11a987   scsi: ufs-qcom: add svs2 support
992989   Ied4c818b0012c733e73ff894470594f9429d9882   Bluetooth: Add ioctl for pin connectivity test
1012351   I2ef01d98603840289c436e14bf3df54a2ab9198b   phy: qcom-ufs: add svs2 support
1021816   I7741eca6ac07cd4393fc373e796570066da7cce6   diag: Fix for corrupted dci log mask
1025856   Iabdb1c21757ad6dead50fdc4aa3b12077f8f840f   ARM: dts: msm: Add initial device tree files for MSMFALC
1013124   Ic57a369ed1e194ab512b4b86ce4d216df46b5f46   usb: pd: Handle disconnection immediately if SDP
1024334   I31f3ed15e8cf02046cfcc8d9c062522065bb022c   ARM: dts: msm: add gpio keys support for msmcobalt
1026010   I732b50c974a73c08038995900e008b4e16e9437b   sched: fix CPU frequency estimation while idle
1025499   Ib6f218989616b038adb7a001cbc6302924041aa1   ARM: dts: msm: Update MPM interrupt mappings for cobalt
1017798   Icd62b9d98d5763d209c7de897653f19f8031e236   qcom-charger: qpnp-smb2: update usb type on PD_ACTIVE
1012351   I50008a892c8c21a4a3361998d76a2f8cbc2995bb   scsi: ufs: add new get_scale_down_gear vops
1012351   Ife2ae05950e6c437bef779955432d91d5117d49b   scsi: ufs: add ufshcd_dme_rmw wrapper
1012351   I5a048629dade92fe79631ba30d3b3e280a77d4e6   scsi: ufs-qcom: add auto hibern8 support
1026010   I274d5047a50565cfaaa2fb821ece21c8cf4c991d   sched: fix potential deflated frequency estimation durin
992989   I9c007dededd88a7e8bc8c3226507a46046e96bc4   Defconfig: arm64: Enable BTFM in performance defconfig
1022772   If65ac051253b4e51f6af5cd60f98eaf908b3bcfd   msm: mdss: hdmi: add deep color support
1026037 994733   I8410462b17c5741fb03239377fed18c5f6034b90   diag: Update logs, events and messages codes
1011669   I9ae7a806a5b659a2c15fa86b37cd1075913095d5   defconfig: msm-perf: enable QPNP_POWER_ON driver
1024496   I5d69436ec59476fc5cd427458d79f8c99266f243   scsi: ufs: ICE 3.0 changes
1015627   Ia6584de897c366032251033aa8e03c54e9d899bb   wil6210: fix race conditions between TX send and complet
1018090   If5dafbcc0d88596332b794ad5b6fdc1f9ff98a45   pmic-voter: disassociate device from votables
1024406   Ib78b8fec5d1ab934f4d4ec80b7e008149707ce0f   USB: f_mtp: Set maximum burst value to two for superspee
1015627   I81b99522ada809fa375c6b6887f8ea0e6482fba3   wil6210: fix dma mapping error cleanup in __wil_tx_vring
1026010   I469263c90e12f39bb36bde5ed26298b7c1c77597   sched: preserve CPU cycle counter in rq
1021057   I6238b0434936fcff562d7a049e5e9d13794f9cdc   usb: pd: Add IPC logging to policy engine
1007226   I345a9b6c82fb5e591d8bdcf48afed48ccaafddc3   qseecom: added small sleep between busy-wait calls to TZ
1013680   If99081c1fd356e69710c94441affec92fac24075   ASoC: msm: Add EC reference support for USB audio ADSP s
872263   I5d02d3df7b69e30243a0b44ddf36a894ad739d59   msm: ipa3: lower turbo voting threshold
1012351   I9597507419e59884c44429c8c34f7469fa5192cb   ARM: dts: msm: enable ufs hw ctl clocks for msmcobalt
1015627   If7c91c31b490b0762d23df21db7c30652b0817d4   wil6210: guarantee safe access to rx descriptors shared
1025422   I9abc6352732c189e90cefaa3eb4161ea6d103529   ARM: dts: msm: Fix bus governor for Venus VMEM on msmcob
1010920   I2b988d2a6112add06fa433c4b1deeec0b6e6bb58   soc: qcom: glink: Fix parallel migration issue
1025431   I25a9412c32ddb5d55379b9e96c91f246f6bd4aa9   Revert "ARM: dts: msm: Add v4l2 rotator node to msm8996"
1024334   I85c0401c6c47d4988d39ef637c1517916e41e3cb   defconfig: msmcortex: enable gpio keys module
1015627   Ie7e073d672a561b768cb62f1e39af24c1d7c3322   wil6210: align wil log functions to wil_dbg_ratelimited
1021009   Ifa62e4e4662d72904411ff4dda10a29a76962851   ARM: dts: msm: Add flash nodes to camera on msmcobalt
1012351   I57e5be8eae4b2cf70a2a9d9c81c9a54a24e03e71   scsi: ufs: add auto hibern8 support
1012351   I4a027f89deddff4735df45da9cffbfb1849af5f4   scsi: ufs-qcom : Add quirk for broken auto hibern8
1022772   Ibf7877eb6edd29baefee57bc12188989d897d47e   clk: msm: hdmi: add cobalt hdmi pll calculator and clock
1018090   I8e2bc3366ec12e8485e4be86ee56ba5e4d113c3c   pmic-voter: improve pmic-voter api implementation
1018090   I81f5974f81a697f3698bc58df1d3ed59fa2579a7   pmic-voter: remove default value
1026010   I3608cb09c30797bf858f434579fd07555546fb60   sched: avoid potential race between governor and thermal
1022772   I4373fc9be34d7f49059159256cfd6dca045ff39f   ARM: dts: msm: add MDSS HDMI device support for msmcobal
1025856   Ie622624676c648cb109e62d3dcf0601222b291c9   defconfig: msm: Add MSMFALCON in defconfig
1022772   I4cf25e531fea39f7b68bd5ef6edd89243c1ded21   ARM: dts: msm: add MDSS HDMI PLL device node for msmcoba
1015627   I7af20f1db39b7e4c5ac2956fc655f120eb61e002   wil6210: protect wil_vring_fini_tx in parallel to tx com
999619   I69e1570fe2bdb2e0b5bc14eb2dc158fe504ce921   msm: camera: isp: Vote bandwidth to 0 when shutting vfe
1015627   Iddacd9b54304b47263647942e1e6784eefb9a6d2   wil6210: add pm_notify handling
1012351   I11d941f239ccd1978089194fa269e143fc640d36   ARM: dts: msm: Update min freq for UFS src clks on msmco

Change-Id: I96c059fda8202df68b41f1d8c2e034c55e683e85
CRs-Fixed: 1026037, 1024334, 1025431, 1024496, 992989, 1026010, 1007226, 1026450, 1021816, 1018542, 1025499, 1010920, 1021009, 1017798, 1012351, 1024406, 872263, 994733, 1025422, 1011669, 999619, 1015627, 1013124, 1025856, 1013680, 1022772, 1018090, 1021057
parents 9876c3c7 338cc814
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -86,6 +86,9 @@ SoCs:
- MSMHAMSTER
  compatible = "qcom,msmhamster"

- MSMFALCON
  compatible = "qcom,msmfalcon"

- MSM8952
  compatible = "qcom,msm8952"

@@ -245,6 +248,7 @@ compatible = "qcom,msmcobalt-rumi"
compatible = "qcom,msmhamster-rumi"
compatible = "qcom,msmhamster-cdp"
compatible = "qcom,msmhamster-mtp"
compatible = "qcom,msmfalcon-sim"
compatible = "qcom,msm8952-rumi"
compatible = "qcom,msm8952-sim"
compatible = "qcom,msm8952-qrd"
+2 −1
Original line number Diff line number Diff line
@@ -14,7 +14,8 @@ Required properties:
			"qcom,mdss_dsi_pll_8996", "qcom,mdss_hdmi_pll_8996",
			"qcom,mdss_hdmi_pll_8996_v2", "qcom,mdss_dsi_pll_8996_v2",
			"qcom,mdss_hdmi_pll_8996_v3", "qcom,mdss_hdmi_pll_8996_v3_1p8",
			"qcom,mdss_dsi_pll_cobalt", "qcom,mdss_dp_pll_cobalt"
			"qcom,mdss_dsi_pll_cobalt", "qcom,mdss_dp_pll_cobalt",
			"qcom,mdss_hdmi_pll_cobalt"
- cell-index:		Specifies the controller used
- reg:			offset and length of the register set for the device.
- reg-names :		names to refer to register sets related to this device
+199 −0
Original line number Diff line number Diff line
Qualcomm Technologies, Inc. MSMFALCON TLMM block

This binding describes the Top Level Mode Multiplexer block found in the
MSMFALCON platform.

- compatible:
	Usage: required
	Value type: <string>
	Definition: must be "qcom,msmfalcon-pinctrl"

- reg:
	Usage: required
	Value type: <prop-encoded-array>
	Definition: the base address and size of the TLMM register space.

- interrupts:
	Usage: required
	Value type: <prop-encoded-array>
	Definition: should specify the TLMM summary IRQ.

- interrupt-controller:
	Usage: required
	Value type: <none>
	Definition: identifies this node as an interrupt controller

- #interrupt-cells:
	Usage: required
	Value type: <u32>
	Definition: must be 2. Specifying the pin number and flags, as defined
		    in <dt-bindings/interrupt-controller/irq.h>

- gpio-controller:
	Usage: required
	Value type: <none>
	Definition: identifies this node as a gpio controller

- #gpio-cells:
	Usage: required
	Value type: <u32>
	Definition: must be 2. Specifying the pin number and flags, as defined
		    in <dt-bindings/gpio/gpio.h>

Please refer to ../gpio/gpio.txt and ../interrupt-controller/interrupts.txt for
a general description of GPIO and interrupt bindings.

Please refer to pinctrl-bindings.txt in this directory for details of the
common pinctrl bindings used by client devices, including the meaning of the
phrase "pin configuration node".

The pin configuration nodes act as a container for an arbitrary number of
subnodes. Each of these subnodes represents some desired configuration for a
pin, a group, or a list of pins or groups. This configuration can include the
mux function to select on those pin(s)/group(s), and various pin configuration
parameters, such as pull-up, drive strength, etc.


PIN CONFIGURATION NODES:

The name of each subnode is not important; all subnodes should be enumerated
and processed purely based on their content.

Each subnode only affects those parameters that are explicitly listed. In
other words, a subnode that lists a mux function but no pin configuration
parameters implies no information about any pin configuration parameters.
Similarly, a pin subnode that describes a pullup parameter implies no
information about e.g. the mux function.


The following generic properties as defined in pinctrl-bindings.txt are valid
to specify in a pin configuration subnode:

- pins:
	Usage: required
	Value type: <string-array>
	Definition: List of gpio pins affected by the properties specified in
		    this subnode.  Valid pins are:
		    gpio0-gpio149,
		    sdc1_clk,
		    sdc1_cmd,
		    sdc1_data
		    sdc2_clk,
		    sdc2_cmd,
		    sdc2_data
		    sdc1_rclk,

- function:
	Usage: required
	Value type: <string>
	Definition: Specify the alternative function to be configured for the
		    specified pins. Functions are only valid for gpio pins.
		    Valid values are:

		    blsp_uart1, blsp_spi1, blsp_i2c1, blsp_uim1, atest_tsens,
		    bimc_dte1, dac_calib0, blsp_spi8, blsp_uart8, blsp_uim8,
		    qdss_cti_trig_out_b, bimc_dte0, dac_calib1, qdss_cti_trig_in_b,
		    dac_calib2, atest_tsens2, atest_usb1, blsp_spi10, blsp_uart10,
		    blsp_uim10, atest_bbrx1, atest_usb13, atest_bbrx0, atest_usb12,
		    mdp_vsync, edp_lcd, blsp_i2c10, atest_gpsadc1, atest_usb11,
		    atest_gpsadc0, edp_hot, atest_usb10, m_voc, dac_gpio, atest_char,
		    cam_mclk, pll_bypassnl, qdss_stm7, blsp_i2c8, qdss_tracedata_b,
		    pll_reset, qdss_stm6, qdss_stm5, qdss_stm4, atest_usb2, cci_i2c,
		    qdss_stm3, dac_calib3, atest_usb23, atest_char3, dac_calib4,
		    qdss_stm2, atest_usb22, atest_char2, qdss_stm1, dac_calib5,
		    atest_usb21, atest_char1, dbg_out, qdss_stm0, dac_calib6,
		    atest_usb20, atest_char0, dac_calib10, qdss_stm10,
		    qdss_cti_trig_in_a, cci_timer4, blsp_spi6, blsp_uart6, blsp_uim6,
		    blsp2_spi, qdss_stm9, qdss_cti_trig_out_a, dac_calib11,
		    qdss_stm8, cci_timer0, qdss_stm13, dac_calib7, cci_timer1,
		    qdss_stm12, dac_calib8, cci_timer2, blsp1_spi, qdss_stm11,
		    dac_calib9, cci_timer3, cci_async, dac_calib12, blsp_i2c6,
		    qdss_tracectl_a, dac_calib13, qdss_traceclk_a, dac_calib14,
		    dac_calib15, hdmi_rcv, dac_calib16, hdmi_cec, pwr_modem,
		    dac_calib17, hdmi_ddc, pwr_nav, dac_calib18, pwr_crypto,
		    dac_calib19, hdmi_hot, dac_calib20, dac_calib21, pci_e0,
		    dac_calib22, dac_calib23, dac_calib24, tsif1_sync, dac_calib25,
		    sd_write, tsif1_error, blsp_spi2, blsp_uart2, blsp_uim2,
		    qdss_cti, blsp_i2c2, blsp_spi3, blsp_uart3, blsp_uim3, blsp_i2c3,
		    uim3, blsp_spi9, blsp_uart9, blsp_uim9, blsp10_spi, blsp_i2c9,
		    blsp_spi7, blsp_uart7, blsp_uim7, qdss_tracedata_a, blsp_i2c7,
		    qua_mi2s, gcc_gp1_clk_a, ssc_irq, uim4, blsp_spi11, blsp_uart11,
		    blsp_uim11, gcc_gp2_clk_a, gcc_gp3_clk_a, blsp_i2c11, cri_trng0,
		    cri_trng1, cri_trng, qdss_stm18, pri_mi2s, qdss_stm17, blsp_spi4,
		    blsp_uart4, blsp_uim4, qdss_stm16, qdss_stm15, blsp_i2c4,
		    qdss_stm14, dac_calib26, spkr_i2s, audio_ref, lpass_slimbus,
		    isense_dbg, tsense_pwm1, tsense_pwm2, btfm_slimbus, ter_mi2s,
		    qdss_stm22, qdss_stm21, qdss_stm20, qdss_stm19, gcc_gp1_clk_b,
		    sec_mi2s, blsp_spi5, blsp_uart5, blsp_uim5, gcc_gp2_clk_b,
		    gcc_gp3_clk_b, blsp_i2c5, blsp_spi12, blsp_uart12, blsp_uim12,
		    qdss_stm25, qdss_stm31, blsp_i2c12, qdss_stm30, qdss_stm29,
		    tsif1_clk, qdss_stm28, tsif1_en, tsif1_data, sdc4_cmd, qdss_stm27,
		    qdss_traceclk_b, tsif2_error, sdc43, vfr_1, qdss_stm26, tsif2_clk,
		    sdc4_clk, qdss_stm24, tsif2_en, sdc42, qdss_stm23, qdss_tracectl_b,
		    sd_card, tsif2_data, sdc41, tsif2_sync, sdc40, mdp_vsync_p_b,
		    ldo_en, mdp_vsync_s_b, ldo_update, blsp11_uart_tx_b, blsp11_uart_rx_b,
		    blsp11_i2c_sda_b, prng_rosc, blsp11_i2c_scl_b, uim2, uim1, uim_batt,
		    pci_e2, pa_indicator, adsp_ext, ddr_bist, qdss_tracedata_11,
		    qdss_tracedata_12, modem_tsync, nav_dr, nav_pps, pci_e1, gsm_tx,
		    qspi_cs, ssbi2, ssbi1, mss_lte, qspi_clk, qspi0, qspi1, qspi2, qspi3,
		    gpio

- bias-disable:
	Usage: optional
	Value type: <none>
	Definition: The specified pins should be configued as no pull.

- bias-pull-down:
	Usage: optional
	Value type: <none>
	Definition: The specified pins should be configued as pull down.

- bias-pull-up:
	Usage: optional
	Value type: <none>
	Definition: The specified pins should be configued as pull up.

- output-high:
	Usage: optional
	Value type: <none>
	Definition: The specified pins are configured in output mode, driven
		    high.
		    Not valid for sdc pins.

- output-low:
	Usage: optional
	Value type: <none>
	Definition: The specified pins are configured in output mode, driven
		    low.
		    Not valid for sdc pins.

- drive-strength:
	Usage: optional
	Value type: <u32>
	Definition: Selects the drive strength for the specified pins, in mA.
		    Valid values are: 2, 4, 6, 8, 10, 12, 14 and 16

Example:

	tlmm: pinctrl@01010000 {
		compatible = "qcom,msmfalcon-pinctrl";
		reg = <0x01010000 0x300000>;
		interrupts = <0 208 0>;
		gpio-controller;
		#gpio-cells = <2>;
		interrupt-controller;
		#interrupt-cells = <2>;

		uart_console_active: uart_console_active {
			mux {
				pins = "gpio4", "gpio5";
				function = "blsp_uart8";
			};

			config {
				pins = "gpio4", "gpio5";
				drive-strength = <2>;
				bias-disable;
			};
		};
	};
+2 −0
Original line number Diff line number Diff line
@@ -113,6 +113,8 @@ dtb-$(CONFIG_ARCH_MSMCOBALT) += msmcobalt-sim.dtb \

dtb-$(CONFIG_ARCH_MSMHAMSTER) += msmhamster-rumi.dtb

dtb-$(CONFIG_ARCH_MSMFALCON) += msmfalcon-sim.dtb

always		:= $(dtb-y)
subdir-y	:= $(dts-dirs)
clean-files	:= *.dtb
+12 −53
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@
		      <0x009b8000 0x1040>;
		reg-names = "mdp_phys", "vbif_phys", "vbif_nrt_phys";
		interrupts = <0 83 0>;
		interrupt-controller;
		#interrupt-cells = <1>;
		vdd-supply = <&gdsc_mdss>;

		#address-cells = <1>;
@@ -89,12 +87,14 @@
		qcom,mdss-pipe-cursor-clk-ctrl-offsets = <0x3A8 16 15>,
							 <0x3B0 16 15>;


		qcom,mdss-ctl-off = <0x00002000 0x00002200 0x00002400
				     0x00002600>;
				     0x00002600 0x00002800>;
		qcom,mdss-mixer-intf-off = <0x00045000 0x00046000
					0x00047000 0x0004A000>;
		qcom,mdss-mixer-wb-off = <0x00048000 0x00049000>;
		qcom,mdss-dspp-off = <0x00055000 0x00057000>;
		qcom,mdss-wb-off = <0x00066000>;
		qcom,mdss-wb-off = <0x00065000 0x00065800 0x00066000>;
		qcom,mdss-intf-off = <0x0006B000 0x0006B800
					0x0006C000 0x0006C800>;
		qcom,mdss-pingpong-off = <0x00071000 0x00071800
@@ -103,7 +103,6 @@
		qcom,mdss-ppb-ctl-off = <0x00000330 0x00000338>;
		qcom,mdss-ppb-cfg-off = <0x00000334 0x0000033C>;
		qcom,mdss-has-pingpong-split;
		qcom,mdss-has-separate-rotator;

		qcom,mdss-ad-off = <0x0079000 0x00079800 0x0007a000>;
		qcom,mdss-cdm-off = <0x0007a200>;
@@ -112,6 +111,7 @@
		qcom,mdss-has-source-split;
		qcom,mdss-highest-bank-bit = <0x2>;
		qcom,mdss-has-decimation;
		qcom,mdss-has-rotator-downscale;
		qcom,mdss-idle-power-collapse-enabled;
		clocks = <&clock_mmss clk_mdss_ahb_clk>,
			 <&clock_mmss clk_mdss_axi_clk>,
@@ -530,15 +530,11 @@
	};

	mdss_rotator: qcom,mdss_rotator {
		compatible = "qcom,sde_rotator";
		reg = <0x00900000 0x90000>,
		      <0x009b8000 0x1040>;
		reg-names = "mdp_phys",
			"rot_vbif_phys";
		qcom,mdss-wb-count = <1>;
		qcom,mdss-wb-id = <1>;
		qcom,mdss-ctl-id = <4>;
		qcom,mdss-highest-bank-bit = <0x2>;
		compatible = "qcom,mdss_rotator";
		qcom,mdss-wb-count = <2>;
		qcom,mdss-has-downscale;
		qcom,mdss-has-ubwc;
		qcom,mdss-has-reg-bus;
		/* Bus Scale Settings */
		qcom,msm-bus,name = "mdss_rotator";
		qcom,msm-bus,num-cases = <3>;
@@ -554,44 +550,7 @@
		qcom,supply-names = "rot-mmagic-mdss-gdsc", "rot-vdd";

		clocks = <&clock_mmss clk_mmss_misc_ahb_clk>,
			<&clock_mmss clk_mdss_rotator_vote_clk>,
			<&clock_mmss clk_mdss_ahb_clk>,
			<&clock_mmss clk_mdss_axi_clk>,
			<&clock_mmss clk_mdp_clk_src>,
			<&clock_mmss clk_mdss_mdp_vote_clk>;
		clock-names = "iface_clk", "rot_core_clk",
			"mdss_ahb_clk", "mdss_axi_clk", "mdp_clk_src",
			"mdss_mdp_vote_clk";

		interrupt-parent = <&mdss_mdp>;
		interrupts = <32 0>;

		/* VBIF QoS remapper settings*/
		qcom,mdss-rot-vbif-qos-setting = <1 1 1 1>;

		qcom,mdss-default-ot-rd-limit = <32>;
		qcom,mdss-default-ot-wr-limit = <16>;

		smmu_rot_unsecure: qcom,smmu_rot_unsec_cb {
			compatible = "qcom,smmu_sde_rot_unsec";
			iommus = <&rot_smmu 0>;
			gdsc-mdss-supply = <&gdsc_mmagic_mdss>;
			clocks = <&clock_mmss clk_smmu_rot_ahb_clk>,
				<&clock_mmss clk_mmagic_mdss_axi_clk>,
				<&clock_mmss clk_smmu_rot_axi_clk>;
			clock-names = "rot_ahb_clk", "mmagic_mdss_axi_clk",
				"rot_axi_clk";
		};

		smmu_rot_secure: qcom,smmu_rot_sec_cb {
			compatible = "qcom,smmu_sde_rot_sec";
			iommus = <&rot_smmu 1>;
			gdsc-mdss-supply = <&gdsc_mmagic_mdss>;
			clocks = <&clock_mmss clk_smmu_rot_ahb_clk>,
				<&clock_mmss clk_mmagic_mdss_axi_clk>,
				<&clock_mmss clk_smmu_rot_axi_clk>;
			clock-names = "rot_ahb_clk", "mmagic_mdss_axi_clk",
				"rot_axi_clk";
		};
			<&clock_mmss clk_mdss_rotator_vote_clk>;
		clock-names = "iface_clk", "rot_core_clk";
	};
};
Loading