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

Commit a0204622 authored by shaohanlin(127659)'s avatar shaohanlin(127659) Committed by Gerrit Code Review
Browse files

Merge "Merge branch qc into vanilla" into 8901-fairphone-p-vanilla

parents 1f446091 2ad2fd93

Documentation/devicetree/bindings/drm/msm/mdss-dsi-panel.txt

+8 −6
Original line number Diff line number Diff line
@@ -164,10 +164,7 @@ Optional properties: 
					"dfps_immediate_porch_mode_vfp" = FPS change request is

					implemented immediately by changing panel vertical

					front porch values.

- qcom,min-refresh-rate:		Minimum refresh rate supported by the panel.

- qcom,max-refresh-rate:		Maximum refresh rate supported by the panel. If max refresh

					rate is not specified, then the frame rate of the panel in

					qcom,mdss-dsi-panel-framerate is used.

- qcom,dsi-supported-dfps-list:		List containing all the supported refresh rates.

- qcom,mdss-dsi-bl-pmic-control-type:	A string that specifies the implementation of backlight

					control for this panel.

					"bl_ctrl_pwm" = Backlight controlled by PWM gpio.
@@ -524,6 +521,10 @@ Optional properties: 
- qcom,mdss-dsi-panel-cmds-only-by-right: Boolean used to mention whether the panel support DSI1 or

					DSI0 to send commands. If this was set, that mean the panel only support

					DSI1 to send commands, otherwise DSI0 will send comands.

- qcom,dsi-dyn-clk-enable:		Boolean to indicate dsi dynamic clock switch feature

					is supported.

- qcom,dsi-dyn-clk-list:		An u32 array which lists all the supported dsi bit clock

					frequencies in Hz for the given panel.



Required properties for sub-nodes:	None

Optional properties:
@@ -645,8 +646,7 @@ Example: 
		qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_wled";

		qcom,mdss-dsi-pan-enable-dynamic-fps;

		qcom,mdss-dsi-pan-fps-update = "dfps_suspend_resume_mode";

		qcom,min-refresh-rate = <30>;

		qcom,max-refresh-rate = <60>;

		qcom,dsi-supported-dfps-list = <48 55 60>;

		qcom,mdss-dsi-bl-pmic-bank-select = <0>;

		qcom,mdss-dsi-bl-pmic-pwm-frequency = <0>;

		qcom,mdss-dsi-pwm-gpio = <&pm8941_mpps 5 0>;
@@ -777,5 +777,7 @@ Example: 
			                <2 2 1>;

		qcom,default-topology-index = <0>;

		qcom,mdss-dsi-dma-schedule-line = <5>;

		qcom,dsi-dyn-clk-enable;

		qcom,dsi-dyn-clk-list = <798240576 801594528 804948480>;

	};

};

Documentation/devicetree/bindings/power/supply/qcom/qpnp-smb2.txt

+6 −0
Original line number Diff line number Diff line
@@ -199,6 +199,12 @@ Charger specific properties: 
  Definition: Boolean flag which when present disables STAT pin default software

		override configuration.



- qcom,fcc-stepping-enable

  Usage:      optional

  Value type: bool

  Definition: Boolean flag which when present enables stepwise change in FCC.

		The default stepping rate is 100mA/sec.



=============================================

Second Level Nodes - SMB2 Charger Peripherals

=============================================

Documentation/devicetree/bindings/power/supply/qcom/qpnp-smb5.txt

+6 −0
Original line number Diff line number Diff line
@@ -247,6 +247,12 @@ Charger specific properties: 
	Definition: Boolean flag which when present enables mositure protection

		    feature.



- qcom,fcc-stepping-enable

  Usage:      optional

  Value type: bool

  Definition: Boolean flag which when present enables stepwise change in FCC.

		The default stepping rate is 100mA/sec.



=============================================

Second Level Nodes - SMB5 Charger Peripherals

=============================================

arch/arm/configs/msm8909w-perf_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -339,6 +339,7 @@ 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
@@ -461,6 +462,8 @@ CONFIG_SENSORS_SSC=y 
CONFIG_MSM_TZ_LOG=y

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_F2FS_FS=y

CONFIG_F2FS_FS_SECURITY=y

CONFIG_QUOTA=y

CONFIG_QUOTA_NETLINK_INTERFACE=y

CONFIG_QFMT_V2=y

arch/arm/configs/msm8909w_defconfig

+5 −0
Original line number Diff line number Diff line
@@ -330,6 +330,7 @@ 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_LCD_CLASS_DEVICE is not set

CONFIG_BACKLIGHT_CLASS_DEVICE=y
@@ -397,6 +398,8 @@ CONFIG_REMOTE_SPINLOCK_MSM=y 
CONFIG_MAILBOX=y

CONFIG_ARM_SMMU=y

CONFIG_QCOM_LAZY_MAPPING=y

CONFIG_IOMMU_DEBUG=y

CONFIG_IOMMU_DEBUG_TRACKING=y

CONFIG_MSM_SPM=y

CONFIG_MSM_L2_SPM=y

CONFIG_MSM_BOOT_STATS=y
@@ -454,6 +457,8 @@ CONFIG_SENSORS_SSC=y 
CONFIG_MSM_TZ_LOG=y

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_F2FS_FS=y

CONFIG_F2FS_FS_SECURITY=y

CONFIG_QUOTA=y

CONFIG_QUOTA_NETLINK_INTERFACE=y

CONFIG_QFMT_V2=y