Merge remote-tracking branch 'quic/msm-4.14' into dev/msm-4.14-display (78e1ec79) · Commits · e / devices / android_kernel_xiaomi_nabu

* quic/msm-4.14: scripts/build-all: remove pattern-based defconfig detection defconfig: move vendor defconfigs to vendor/ subdirectory msm: ipa4: Remove IPA registers dump from dmesg ARM: dts: msm: Disable usb host mode u1/u2 on SM8150 usb: dwc3: Disable USB20 internal retry feature msm: vidc: Enable batching for H264/HEVC/VP9 formats only msm: npu: Enable npu cti/apb/atb clocks usb: pd: qpnp-pdphy: Set nRetryCount based on PD spec rev usb: pd: qpnp-pdphy: Switch to hrtimer-based wait mhi: core: rename iova address to dma_addr mhi: controller: generate firmware information based on device id msm: gsi: Update Channel Scratch structures for GSI 2.5 usb: phy: Add support for init sequence for femto phy ARM: dts: msm: Introduce bus topology for SM6150 ARM: dts: msm: Update the clock_videocc node on SM6150 clk: qcom: Add video clock driver for SM6150 msm: vidc: Amend min buffer count maintenance logic ARM: dts: msm: Add SM8150 QRD DVT support ARM: dts: msm: Add header file in camera dtsi on SM8150 sched/fair: fix possible usage of uninitialized variables drivers: GICv3: Enable logging of interrupts that triggered wakeup usb: pd: Update some sysfs entries to return hex values mhi: core: remove firmware info from devicetree ion: carveout: Use device for cache maintenance pinctrl: qcom: Add EGPIO feature support to pinctrl driver msm: ipa4: fix client register and deregister for usb usb: gadget: qdss: Fix runtime PM usage count for multiple set_alt usb: gadget: qdss: Add support for qdss fs descriptor handling ARM: dts: Update NPU clocks for sm8150 defconfig: msm: Enable energy aware scheduler for qcs405 target coresight: stm: Out of bound access from STM fbdev: msm: Fix 32 bit compilation on qcs405 msm: gsi: add support for h/w smart prefetch f_gsi: Bail out if suspend event is pending before enabling data path ARM: dts: msm: add TMC buffer reset support for qcs405 fbdev: msm: Enable led class apis in framebuffer driver defconfig: qcs405: Enable LED class config ARM: dts: msm: add remote debugger support for sm8150 net: qualcomm: rmnet: Fix use after free while sending command ack net: ipv6: Generate random IID for addresses on RAWIP devices power: qcom: step-chg-jeita: Make read_range_data_from_node global msm: ipa: fix usb pm initialization kthread, sched: Fix kthread_parkme() (again...) kthread: Allow kthread_park() on a parked kthread sched/core: Introduce set_special_state() kthread, sched/wait: Fix kthread_parkme() completion issue kthread, sched/wait: Fix kthread_parkme() wait-loop scripts/build-all: look for nested vendor/ defconfig directories scripts/build-all: relax check_kernel() scripts/build-all: remove all defconfig manipulation options cfg80211: Reset beacon interval when stop AP fails power: smb5-lib: set charger_temp_max in parallel psy mhi: controller: reorganize static symbols mhi: dev: net_dev: add missing alias documentation clk: smd-rpm: Remove noirq function call from rpm cc power: smb5: report charger_temp_max using property ARM: dts: msm: Update the clock_gpucc node on SM6150 clk: qcom: Add GPU clock driver for SM6150 ARM: dts: msm: Update the clock_gcc node on SM6150 clk: qcom: Add GCC clock driver for SM6150 ARM: dts: msm: Update CPU frequency for QCS405 mm: retry more before OOM in the presence of slow shrinkers mm: do not fail non-costly allocs if there are reclaimable pages mm: consider killable task's anon as reclaimable mm: Kconfig: add HAVE_LOW_MEMORY_KILLER ARM: dts: msm: Add energy costs for qcs405 wil6210: enable AMSDU by default msm: camera: sensor: Unlock the mutex in case of error defconfig: arm64: Enable DEBUG_PREEMPT for sm8150 SoC mm: add speculative page fault vmstats mm: speculative page fault handler return VMA mm: adding speculative page fault failure trace events mm: provide speculative fault infrastructure mm: protect mm_rb tree with a rwlock mm: introduce __page_add_new_anon_rmap() Change-Id: I6dd72d04e86899e938fda1e4a7a6e6bd6919c37f Signed-off-by:

Namratha Siddappa <namratha@codeaurora.org>

Documentation/devicetree/bindings/bus/mhi.txt

+11 −27

Original line number	Diff line number	Diff line
		@@ -19,31 +19,6 @@ Main node properties:
		Value type: <u32>
		Definition: Maximum timeout in ms wait for state and cmd completion

		- mhi,fw-name
		Usage: optional
		Value type: <string>
		Definition: Firmware image name to upload

		- mhi,edl-name
		Usage: optional
		Value type: <string>
		Definition: Firmware image name for emergency download

		- mhi,fbc-download
		Usage: optional
		Value type: <bool>
		Definition: If set true, image specified by fw-name is for full image

		- mhi,sbl-size
		Usage: optional
		Value type: <u32>
		Definition: Size of SBL image in bytes

		- mhi,seg-len
		Usage: optional
		Value type: <u32>
		Definition: Size of each segment to allocate for BHIe vector table

		- mhi,time-sync
		Usage: optional
		Value type: <bool>
		@@ -281,7 +256,6 @@ mhi_controller {
		mhi,bstmode = <2>;
		};

		mhi,fw-name = "sbl1.mbn";
		mhi,timeout = <500>;

		children_node {
		@@ -316,11 +290,21 @@ MHI netdev properties
		Value type: <bool>
		Definition: Set true if interface support recycling buffers.

		- aliases
		Usage: required
		Value type: <string>
		Definition: mhi net_device should have numbered alias in the alias node,
		in the form of mhi_netdevN, N = 0, 1..n for each network interface.

		========
		Example:
		========

		mhi_rmnet@0 {
		aliases {
		mhi_netdev0 = &mhi_netdev_0;
		};

		mhi_netdev_0: mhi_rmnet@0 {
		mhi,chan = "IP_HW0";
		mhi,interface-name = "rmnet_mhi";
		mhi,mru = <0x4000>;

Documentation/devicetree/bindings/clock/qcom,gcc.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ Required properties :
		"qcom,gcc-sdmshrike"
		"qcom,gcc-qcs405"
		"qcom,gcc-mdss-qcs405"
		"qcom,gcc-sm6150"

		- reg : shall contain base register location and length
		- #clock-cells : shall contain 1

Documentation/devicetree/bindings/clock/qcom,gpucc.txt

+6 −5

Original line number	Diff line number	Diff line
		@@ -4,21 +4,22 @@ Qualcomm Technologies, Inc. Graphics Clock & Reset Controller Binding
		Required properties :
		- compatible : shall contain one of the following:
		"qcom,gpucc-sm8150",
		"qcom,gpucc-sdmshrike".
		"qcom,gpucc-sdmshrike",
		"qcom,gpucc-sm6150".

		- reg : shall contain base register offset and size.
		- reg-names: names of registers listed in the same order as in the reg property.
		Must contain "cc_base".
		- #clock-cells : shall contain 1.
		- #reset-cells : shall contain 1.
		- #clock-cells : from common clock binding, shall contain 1.
		- #reset-cells : from common reset binding, shall contain 1.
		- vdd_cx-supply : The vdd_cx logic rail supply.
		- vdd_mx-supply : The vdd_mx logic rail supply.

		Optional properties :
		- #power-domain-cells : shall contain 1.
		- #power-domain-cells : from generic power domain binding, shall contain 1.

		Example:
		clock_gpucc: qcom,gpucc {
		clock_gpucc: clock-controller@0x2c90000 {
		compatible = "qcom,gpucc-sm8150";
		reg = <0x2c90000 0x9000>;
		reg-names = "cc_base";

Documentation/devicetree/bindings/clock/qcom,videocc.txt

+2 −1

Original line number	Diff line number	Diff line
		Qualcomm Technologies, Inc. Video Clock & Reset Controller Bindings

		Required properties:
		- compatible: shall contain "qcom,videocc-sm8150" or "qcom,videocc-sm8150-v2".
		- compatible: shall contain "qcom,videocc-sm8150" or "qcom,videocc-sm8150-v2" or
		"qcom,videocc-sm6150".
		- reg: shall contain base register location and length.
		- reg-names: names of registers listed in the same order as in the reg property.
		- vdd_mm-supply: the logic rail supply.

arch/arm/configs/qcs405_defconfig

+5 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@ CONFIG_CGROUP_DEBUG=y
		CONFIG_NAMESPACES=y
		# CONFIG_UTS_NS is not set
		# CONFIG_PID_NS is not set
		CONFIG_DEFAULT_USE_ENERGY_AWARE=y
		CONFIG_BLK_DEV_INITRD=y
		CONFIG_CC_OPTIMIZE_FOR_SIZE=y
		CONFIG_KALLSYMS_ALL=y
		@@ -41,6 +42,7 @@ CONFIG_CMA_DEBUGFS=y
		CONFIG_ZSMALLOC=y
		CONFIG_SECCOMP=y
		CONFIG_BUILD_ARM_APPENDED_DTB_IMAGE=y
		CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
		CONFIG_CPU_IDLE=y
		CONFIG_VFP=y
		CONFIG_NEON=y
		@@ -360,6 +362,9 @@ CONFIG_MMC_CLKGATE=y
		CONFIG_MMC_SDHCI=y
		CONFIG_MMC_SDHCI_PLTFM=y
		CONFIG_MMC_SDHCI_MSM=y
		CONFIG_NEW_LEDS=y
		CONFIG_LEDS_CLASS=y
		CONFIG_LEDS_TRIGGERS=y
		CONFIG_RTC_CLASS=y
		CONFIG_RTC_DRV_QPNP=y
		CONFIG_DMADEVICES=y