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

Commit f26bec74 authored by shaohanlin's avatar shaohanlin
Browse files

Merge branch qc2 into vanilla

parents ed0a172a a9ec0eb5

Documentation/devicetree/bindings/media/video/msm-cam-ife-csid.txt

+2 −1
Original line number Diff line number Diff line
@@ -15,7 +15,8 @@ First Level Node - CAM IFE CSID device 
- compatible

  Usage: required

  Value type: <string>

  Definition: Should be "qcom,csid170" or "qcom,csid-lite170".

  Definition: Should be "qcom,csid170", "qcom,csid175", "qcom,csid175_200",

		"qcom,csid-lite170" or "qcom,csid-lite175".



- cell-index

  Usage: required

Documentation/devicetree/bindings/media/video/msm-cam-vfe.txt

+2 −1
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ Required properties: 
  Usage: required

  Value type: <string>

  Definition: Should specify the compatibility string for matching the

    driver. e.g. "qcom,vfe170", "qcom,vfe-lite170".

	driver. e.g. "qcom,vfe175", "qcom,vfe170", "qcom,vfe175_130",

		"qcom,vfe-lite175", "qcom,vfe-lite175_130", "qcom,vfe-lite170".



- cell-index

  Usage: required

Documentation/devicetree/bindings/power/supply/qcom/smb1360-charger-fg.txt

+16 −6
Original line number Diff line number Diff line
@@ -13,12 +13,15 @@ Required Properties: 


Optional Properties:



- interrupts			This indicates the IRQ number of the GPIO

				connected to the STAT pin.

- interrupts			This indicates the IRQ numbers of the GPIOs

				connected to the STAT and usb-id pins.

- interrupt-names		The irq names should be smb1360_stat_irq and

				smb1360_usb_id_irq.The stat irq is mandatory

				and usb_id irq is optional.

- pinctrl-names:		The state name of the pin configuration. Only

				support: "default".

- pinctrl-0:			The phandle of the pin configuration node in

				pinctrl for smb_int_pin.

- pinctrl-0:			The phandles of the pin configuration node in

				pinctrl for smb_int_pin and usb-id pin.

				For details of pinctrl properties, please refer to:

				"Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt"

- qcom,float-voltage-mv	 	Float Voltage in mV - the maximum voltage up to which
@@ -177,6 +180,8 @@ Optional Properties: 
				Please go through the documentation for PMIC gpio

				configuration details:

				Documentation/devicetree/bindings/gpio/qpnp-pin.txt

- qcom,usb-id-gpio		GPIO for usb-id detection.This property is mandatory

				if usb-id irq is specified.

- qcom,parallel-charging-enabled: A bool property which enables SMB1360 to

				operate in the parallel mode. SMB1360 acts

				as the primary charger.
@@ -192,9 +197,13 @@ Example: 
			compatible = "qcom,smb1360-chg-fg";

			reg = <0x1b>;

			interrupt-parent = <&spmi_bus>;

			interrupts = <0x00 0xcd 0>;

			interrupts = <0x00 0xcd 0>,

					<0 0xc3 0 3>;

			interrupt-names = "smb1360_stat_irq",

					"smb1360_usb_id_irq";

			pinctrl-names = "default";

			pinctrl-0 = <&smb_int_default>;

			pinctrl-0 = <&smb_int_default>,

					<&usb_id_default>;



			/* battery-profile selection properties */

			qcom,batt-profile-select;
@@ -242,5 +251,6 @@ Example: 


			qcom,otg-fet-present;

			qcom,otg-fet-enable-gpio = <&pm8916_gpios 3 0>;

			qcom,usb-id-gpio = <&pm8916_gpios 4 0>;

		};

	};

arch/arm/configs/msm8909w-perf_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -329,7 +329,6 @@ CONFIG_FB_MSM_MDSS=y 
CONFIG_FB_MSM_MDSS_WRITEBACK=y

CONFIG_FB_MSM_MDSS_SPI_PANEL=y

CONFIG_FB_MSM_MDSS_MDP3=y

CONFIG_FB_MSM_MDSS_XLOG_DEBUG=y

CONFIG_BACKLIGHT_LCD_SUPPORT=y

CONFIG_BACKLIGHT_CLASS_DEVICE=y

CONFIG_SOUND=y

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

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2017-2019, 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
@@ -59,7 +59,7 @@ 
};



&secure_display_memory {

	status = "disabled";

	size = <0 0xa000000>;

};



&sp_mem {