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

Commit 9c31d88c authored by yungwenpeng's avatar yungwenpeng
Browse files

Merge branch vanilla into gms 

* ssh://ch-git3.arimacomm.com.tw:29418/kernel/msm-4.9: (82 commits)
  msm: vidc: ignore processing responses in invalid state
  msm: vidc: do not set video state to DEINIT very early
  drm/msm/sde: Change log level from error to warn
  power: smb5: update thermal mitigation configuration
  ARM: dts: qcom: Enable audio path on 8009 SoM
  msm: vidc: Increase minimum input buffer count for HEVC decode
  ASoC: Fix UBSAN warning at snd_soc_get/put_volsw_sx()
  drm/msm/dsi-staging: fix potential out of bounds memory accesses
  power: step-chg-jeita: update JEITA float voltage compensation
  ARM: dts: msm: add audio support for apq8009 rome and pronto board
  msm: kgsl: Trigger preemption only if GMU is in ACTIVE state
  fbdev: msm: try recovering from PP timeout without panic
  ARM: dts: msm: add initial dts support for QRD1130 devices
  tracing: Avoid sleep in atomic context
  msm_vidc: free buffer tags while cleanup
  ARM: dts: msm: Specify display refresh rates for Truly 720p panel
  Revert "ARM: dts: msm: Set TXHSXVTUNE0 value to 10 for MSM8937"
  ARM: dts: msm: Correct GPU bandwidth voting for MSM8953
  soc: qcom: secure_buffer: Fix the parameter passing to dmac_flush_range
  dwc3-msm: Add delay between consecutive register reads in while loop
  ...

Change-Id: I96fd15ecbcd1d80a91f3ae8d71b58a1e3010b20a
parents 87cd82e2 bcb040a5

Documentation/devicetree/bindings/arm/msm/msm.txt

+3 −0
Original line number Original line Diff line number Diff line
@@ -104,6 +104,9 @@ SoCs: 
- SXR1130

- SXR1130

  compatible = "qcom,sxr1130"

  compatible = "qcom,sxr1130"





- QRD1130

  compatible = "qcom,sxr1130-qrd"



- MSM8952

- MSM8952

  compatible = "qcom,msm8952"

  compatible = "qcom,msm8952"

Documentation/devicetree/bindings/input/qti-haptics.txt

+9 −0
Original line number Original line Diff line number Diff line
@@ -130,6 +130,15 @@ waveforms/effects: 
		 [5:1]: waveform amplitude

		 [5:1]: waveform amplitude

		 [0]: reserved.

		 [0]: reserved.





- qcom,wf-vmax-mv

  Usage:      optional

  Value type: <u32>

  Definition: Specifies the maximum allowed output voltage in millivolts

		for this effect. Value specified here will be rounded

		off to the closest multiple of 116 mV. Allowed values:

		0 to 3596. If this is not specified, the value defined in

		"qcom,vmax-mv" will be applied.



- qcom,wf-play-rate-us

- qcom,wf-play-rate-us

  Usage:      optional

  Usage:      optional

  Value type: <u32>

  Value type: <u32>

Documentation/driver-model/devres.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -306,6 +306,7 @@ IRQ 
  devm_request_any_context_irq()

  devm_request_any_context_irq()

  devm_request_irq()

  devm_request_irq()

  devm_request_threaded_irq()

  devm_request_threaded_irq()

  devm_irq_sim_init()





LED

LED

  devm_led_classdev_register()

  devm_led_classdev_register()

arch/arm/configs/msm8909-perf_defconfig

+1 −5
Original line number Original line Diff line number Diff line
@@ -33,6 +33,7 @@ CONFIG_KALLSYMS_ALL=y 
CONFIG_BPF_SYSCALL=y

CONFIG_BPF_SYSCALL=y

# CONFIG_MEMBARRIER is not set

# CONFIG_MEMBARRIER is not set

CONFIG_EMBEDDED=y

CONFIG_EMBEDDED=y

# CONFIG_SLUB_DEBUG is not set

# CONFIG_COMPAT_BRK is not set

# CONFIG_COMPAT_BRK is not set

CONFIG_PROFILING=y

CONFIG_PROFILING=y

CONFIG_OPROFILE=m

CONFIG_OPROFILE=m
@@ -150,8 +151,6 @@ CONFIG_NETFILTER_XT_MATCH_STRING=y 
CONFIG_NETFILTER_XT_MATCH_TIME=y

CONFIG_NETFILTER_XT_MATCH_TIME=y

CONFIG_NETFILTER_XT_MATCH_U32=y

CONFIG_NETFILTER_XT_MATCH_U32=y

CONFIG_NF_CONNTRACK_IPV4=y

CONFIG_NF_CONNTRACK_IPV4=y

CONFIG_NF_DUP_IPV4=y

CONFIG_NF_LOG_IPV4=y

CONFIG_IP_NF_IPTABLES=y

CONFIG_IP_NF_IPTABLES=y

CONFIG_IP_NF_MATCH_AH=y

CONFIG_IP_NF_MATCH_AH=y

CONFIG_IP_NF_MATCH_ECN=y

CONFIG_IP_NF_MATCH_ECN=y
@@ -170,8 +169,6 @@ CONFIG_IP_NF_ARPTABLES=y 
CONFIG_IP_NF_ARPFILTER=y

CONFIG_IP_NF_ARPFILTER=y

CONFIG_IP_NF_ARP_MANGLE=y

CONFIG_IP_NF_ARP_MANGLE=y

CONFIG_NF_CONNTRACK_IPV6=y

CONFIG_NF_CONNTRACK_IPV6=y

CONFIG_NF_DUP_IPV6=y

CONFIG_NF_LOG_IPV6=y

CONFIG_IP6_NF_IPTABLES=y

CONFIG_IP6_NF_IPTABLES=y

CONFIG_IP6_NF_MATCH_RPFILTER=y

CONFIG_IP6_NF_MATCH_RPFILTER=y

CONFIG_IP6_NF_FILTER=y

CONFIG_IP6_NF_FILTER=y
@@ -252,7 +249,6 @@ CONFIG_CNSS=y 
CONFIG_CNSS_SDIO=y

CONFIG_CNSS_SDIO=y

CONFIG_CLD_HL_SDIO_CORE=y

CONFIG_CLD_HL_SDIO_CORE=y

CONFIG_INPUT_EVDEV=y

CONFIG_INPUT_EVDEV=y

CONFIG_INPUT_EVBUG=m

CONFIG_KEYBOARD_GPIO=y

CONFIG_KEYBOARD_GPIO=y

CONFIG_INPUT_JOYSTICK=y

CONFIG_INPUT_JOYSTICK=y

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_INPUT_TOUCHSCREEN=y

arch/arm/configs/msm8909_defconfig

+3 −2
Original line number Original line Diff line number Diff line
@@ -36,6 +36,7 @@ CONFIG_PROFILING=y 
CONFIG_OPROFILE=m

CONFIG_OPROFILE=m

CONFIG_KPROBES=y

CONFIG_KPROBES=y

CONFIG_CC_STACKPROTECTOR_REGULAR=y

CONFIG_CC_STACKPROTECTOR_REGULAR=y

CONFIG_ARCH_MMAP_RND_BITS=16

CONFIG_MODULES=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODULE_FORCE_UNLOAD=y

CONFIG_MODULE_FORCE_UNLOAD=y
@@ -56,6 +57,7 @@ CONFIG_CMA=y 
CONFIG_CMA_DEBUGFS=y

CONFIG_CMA_DEBUGFS=y

CONFIG_ZSMALLOC=y

CONFIG_ZSMALLOC=y

CONFIG_BALANCE_ANON_FILE_RECLAIM=y

CONFIG_BALANCE_ANON_FILE_RECLAIM=y

CONFIG_PROCESS_RECLAIM=y

CONFIG_SECCOMP=y

CONFIG_SECCOMP=y

CONFIG_BUILD_ARM_APPENDED_DTB_IMAGE=y

CONFIG_BUILD_ARM_APPENDED_DTB_IMAGE=y

CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y

CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
@@ -573,13 +575,12 @@ CONFIG_SECURITY_SELINUX=y 
CONFIG_SECURITY_SMACK=y

CONFIG_SECURITY_SMACK=y

CONFIG_SECURITY_APPARMOR=y

CONFIG_SECURITY_APPARMOR=y

CONFIG_DEFAULT_SECURITY_DAC=y

CONFIG_DEFAULT_SECURITY_DAC=y

CONFIG_CRYPTO_CTR=y

CONFIG_CRYPTO_XTS=y

CONFIG_CRYPTO_XCBC=y

CONFIG_CRYPTO_XCBC=y

CONFIG_CRYPTO_CRC32=y

CONFIG_CRYPTO_CRC32=y

CONFIG_CRYPTO_MD4=y

CONFIG_CRYPTO_MD4=y

CONFIG_CRYPTO_TWOFISH=y

CONFIG_CRYPTO_TWOFISH=y

CONFIG_CRYPTO_ANSI_CPRNG=y

CONFIG_CRYPTO_ANSI_CPRNG=y

CONFIG_CRYPTO_DEV_QCE=y

CONFIG_CRYPTO_DEV_QCOM_MSM_QCE=y

CONFIG_CRYPTO_DEV_QCOM_MSM_QCE=y

CONFIG_CRYPTO_DEV_QCRYPTO=y

CONFIG_CRYPTO_DEV_QCRYPTO=y

CONFIG_CRYPTO_DEV_QCEDEV=y

CONFIG_CRYPTO_DEV_QCEDEV=y