Merge "pmic: gpio: dt: disable unnecessary gpios in la-gvm" (055c0ed6) · Commits · e / devices / android_kernel_sony_msm8998

arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-ivi-la.dts

+19 −11

Original line number	Diff line number	Diff line
		@@ -228,7 +228,7 @@
		qcom,mode = <0>;
		qcom,vin-sel = <2>;
		qcom,src-sel = <0>;
		status = "okay";
		status = "disabled";
		};

		gpio@c800 { /* GPIO 9 - Rome 3.3V control */
		@@ -239,7 +239,7 @@
		qcom,src-sel = <0>; /* Constant */
		qcom,out-strength = <1>; /* High drive strength */
		qcom,master-en = <1>; /* Enable GPIO */
		status = "okay";
		status = "disabled";
		};

		gpio@c900 { /* GPIO 10 - NFC CLK _REQ*/
		@@ -247,7 +247,7 @@
		qcom,vin-sel = <2>;
		qcom,src-sel = <0>;
		qcom,master-en = <1>;
		status = "okay";
		status = "disabled";
		};

		gpio@cd00 { /* GPIO 14 - lcd_bklt_reg_en */
		@@ -258,35 +258,35 @@
		qcom,src-sel = <0>; /* CONSTANT */
		qcom,out-strength = <1>; /* Low drive strength */
		qcom,master-en = <1>; /* ENABLE GPIO */
		status = "okay";
		status = "disabled";
		};
		gpio@c100 { /* GPIO 2 */
		qcom,mode = <0>;
		qcom,pull = <0>;
		qcom,vin-sel = <2>;
		qcom,src-sel = <0>;
		status = "okay";
		status = "disabled";
		};
		gpio@c300 { /* GPIO 4 - adv7481 RST */
		qcom,mode = <1>;
		qcom,pull = <0>;
		qcom,vin-sel = <2>;
		qcom,src-sel = <0>;
		status = "okay";
		status = "disabled";
		};

		gpio@c400 { /* GPIO 5 - adv7481 INT1 */
		qcom,mode = <0>;
		qcom,vin-sel = <2>;
		qcom,src-sel = <0>;
		status = "okay";
		status = "disabled";
		};

		gpio@c500 { /* GPIO 6 - adv7481 INT2*/
		qcom,mode = <0>;
		qcom,vin-sel = <2>;
		qcom,src-sel = <0>;
		status = "okay";
		status = "disabled";
		};

		gpio@ca00 { /* GPIO 11 - USB enb1 (otg switch) */
		@@ -305,7 +305,7 @@
		qcom,out-strength = <1>;
		qcom,src-sel = <0>; /* GPIO */
		qcom,master-en = <1>; /* Enable GPIO */
		status = "okay";
		status = "disabled";
		};

		gpio@ce00 { /* GPIO 15 */
		@@ -316,7 +316,7 @@
		qcom,out-strength = <1>;
		qcom,src-sel = <2>;
		qcom,master-en = <1>;
		status = "okay";
		status = "disabled";
		};
		gpio@d000 { /* GPIO 17 - USB1 VBUS detect */
		qcom,mode = <0>; /* Digital Input*/
		@@ -335,7 +335,7 @@
		qcom,src-sel = <3>; /* Function 2 */
		qcom,out-strength = <2>; /* Medium */
		qcom,master-en = <1>; /* Enable GPIO */
		status = "okay";
		status = "disabled";
		};

		gpio@d200 { /* GPIO 19 - Rome BT Reset */
		@@ -349,6 +349,14 @@
		};
		};

		&pm8994_adc_tm {
		status = "disabled";
		};

		&pm8994_vadc {
		status = "disabled";
		};

		&sde_kms_hyp {
		qcom,client-id = "7815";
		};

drivers/media/platform/msm/ais/isp/msm_isp_axi_util.c

+5 −4

Original line number	Diff line number	Diff line
		@@ -3968,7 +3968,7 @@ void msm_isp_process_axi_irq_stream(struct vfe_device *vfe_dev,
		struct msm_isp_buffer *done_buf = NULL;
		unsigned long flags;
		struct timeval *time_stamp;
		struct timeval *time_stamp_system;
		struct timeval *time_stamp_system = NULL;
		uint32_t frame_id, buf_index = -1;
		struct msm_vfe_axi_stream *temp_stream;

		@@ -4124,10 +4124,11 @@ void msm_isp_process_axi_irq_stream(struct vfe_device *vfe_dev,
		stream_info, done_buf, time_stamp, frame_id);
		return;
		}

		if (time_stamp_system != NULL) {
		msm_isp_process_done_buf(vfe_dev, stream_info,
		done_buf, time_stamp, time_stamp_system, frame_id);
		}
		}

		void msm_isp_process_axi_irq(struct vfe_device *vfe_dev,
		uint32_t irq_status0, uint32_t irq_status1,

drivers/net/ethernet/atheros/atl1c/atl1c_main.c

+9 −10

Original line number	Diff line number	Diff line
		@@ -2181,21 +2181,20 @@ static int atl1c_tx_map(struct atl1c_adapter *adapter,
		use_tpd->buffer_addr = cpu_to_le64(buffer_info->dma);
		use_tpd->buffer_len = cpu_to_le16(buffer_info->length);
		}

		if (use_tpd && buffer_info) {
		/The last tpd/
		use_tpd->word1 \|= 1 << TPD_EOP_SHIFT;
		/*The last buffer info contain the skb address,
		so it will be free after unmap */
		*so it will be free after unmap
		*/
		buffer_info->skb = skb;

		return 0;

		}
		err_dma:
		buffer_info->dma = 0;
		buffer_info->length = 0;
		return -1;
		}

		static void atl1c_tx_queue(struct atl1c_adapter adapter, struct sk_buff skb,
		struct atl1c_tpd_desc *tpd, enum atl1c_trans_queue type)
		{