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

Commit 30016e61 authored by Namratha Siddappa's avatar Namratha Siddappa
Browse files

Merge commit 'AU302' into dev/msm-4.14-display 



* commit '653fbfb6':
  msm: vidc: Update work route and power save mode for HEIC
  Documentation: sound: Add documentation for MDF nodes
  thermal: tsens: Add debug hooks for logging temperature reads and IRQs
  ARM: dts: msm: Fix the core numbering in sm6150
  defconfig: msm: Enable DSU PMU support for sm6150
  ARM: dts: msm: Enable VBIF bus governor for SM6150 GPU
  thermal: adc_tm: Add support to register channels without trips
  ARM: dtsi: add audio dt file for sa8155 auto platform
  power: qpnp-qg: Skip reading battery-temp in the resume path
  ANDROID: sched/events: Introduce util_est trace events
  ANDROID: sched/fair: schedtune: update before schedutil
  FROMLIST: sched/fair: add support to tune PELT ramp/decay timings
  BACKPORT: sched/fair: Update util_est before updating schedutil
  BACKPORT: sched/fair: Update util_est only on util_avg updates
  BACKPORT: sched/fair: Use util_est in LB and WU paths
  BACKPORT: sched/fair: Add util_est on top of PELT
  ANDROID: sched/fair: Cleanup cpu_util{_wake}()
  ANDROID: sched: Update max cpu capacity in case of max frequency constraints
  stop_machine: Atomically queue and wake stopper threads
  ANDROID: arm: enable max frequency capping
  ANDROID: arm64: enable max frequency capping
  ANDROID: implement max frequency capping
  ANDROID: sched/fair: add arch scaling function for max frequency capping
  ANDROID: trace: Add WALT util signal to trace event sched_load_cfs_rq
  ANDROID: sched, trace: Remove trace event sched_load_avg_cpu
  ANDROID: Rename and move include/linux/sched_energy.h
  ANDROID: Adjust juno energy model
  ARM: dts: msm: Add audio overlay for SM8150+SDX50M
  msm: ipa: Early assert for invalid event ring Read Pointer
  ARM:dts:msm Add ADC_TM node, channels and thermal zones on QCS405
  ARM: dts: msm: Add smp2p sleep state driver for sm6150
  ARM: dts: msm: Add smp2p sleep state driver for sdmmagpie
  msm: fastcvpd: adding support for CDSP SSR handling
  defconfig: arm64: sdmsteppe: Enable smp2p sleep state
  smb5-lib: Remove THERMAL_DAEMON_VOTER on PL_DISABLE
  usb: dwc3: Improve future uF number calculation
  usb: dwc3: gadget: always use frame number from XferNotReady
  usb: dwc3: gadget: cache frame number in struct dwc3_ep
  USB: pd: Send PS_RDY within tNewSrc after PS_RDY received
  cnss2: Support new QMI framework
  usb: pd: Keep separate counters for tx/rx msgid
  defconfig: sa8155: Enable support for UVC devices
  defconfig: sa8155: Enable USB UAC 2.0 drivers
  tcp: add tcp_ooo_try_coalesce() helper
  tcp: call tcp_drop() from tcp_data_queue_ofo()
  tcp: detect malicious patterns in tcp_collapse_ofo_queue()
  tcp: avoid collapses in tcp_prune_queue() if possible
  tcp: free batches of packets in tcp_prune_ofo_queue()
  defconfig: arm: msm: Enable memshare driver on sa8155
  soc: qcom: pil: Incorporate timeouts for notifications
  msm:ipa3: Use rate limit API for logging
  soc: qcom: ssr: Initialize high priority workqueue
  ARM: dts: msm: Add ep92 HDMI bridge support for qcs405
  defconfig : msm: enable quota feature for sa8155
  soc: qcom: service-notifier: Create qmi_client per service path
  qseecom: change check_blocked flag to an u32 value
  ARM: dts: msm: Enable I2C bus for CSRA66X0 playback on QCS405 platform
  ARM: dts: msm: enable cpufreq and devfreq nodes in sm6150 target
  Arm: dts: msm: Add shutdown-ack interrupt for QCS405
  ARM: dts: msm: Add fixed sleep clock for SDMMAGPIE
  msm: mdss: use uaccess routines to access user space buffers
  msm: mink: Fixing couple of issues in invoke req
  diag: Modify md_info and diag client map synchronization
  ext4: fix check to prevent initializing reserved inodes
  ARM: dts: msm: Update rpmh and aop clock nodes for SDMMAGPIE
  ARM: dts: msm: Add iova address for smmu and ipa into qcs405
  ARM: dts: msm: Add GENI-IR node.
  media: rc: GENI-IR controller driver
  drivers: cpuidle: lpm-levels: use addition to build up PSCI state id
  clk: qcom: debugcc-sm8150: Add mccc_debug node
  ARM: dts: msm: Modify sleep settings on SPI-8 pins for SM8150
  ARM: dts: msm: Add initial device tree support for SM6150P
  ARM: dts: msm: Add mem_dump node for SM6150
  ARM: dts: msm: Enable RPM SMD cooling device for QCS405
  defconfig: msm: Enable RPM SMD cooling device driver for QCS405
  msm: kgsl: Fix the missing IBs from the snapshot
  msm:ipa3: code changes to support WDI2 offload over GSI
  diag: Protect md_info structure while reallocation
  drivers: thermal: Add support for RPM SMD cooling device
  diag: Featurize IPC logging under IPC_LOGGING config
  sched/walt: improve the scheduler
  msm: ipa4: Fix dangling pointer dereferencing after NAT del cmd
  USB: dwc3: Fix issues in ISOC endpoint handling
  power: smb5: Fix incorrect QC2.0 pulse count enum values
  msm: adsprpc: enable remote subsystem cache flush on smmu fault
  ANDROID: update_group_capacity for single cpu in cluster
  ANDROID: sched/fair: Also do misfit in overloaded groups
  ANDROID: sched/fair: Don't balance misfits if it would overload local group
  FROMLIST: sched/fair: Don't move tasks to lower capacity cpus unless necessary
  FROMLIST: sched/core: Disable SD_PREFER_SIBLING on asymmetric cpu capacity domains
  FROMLIST: sched/core: Disable SD_ASYM_CPUCAPACITY for root_domains without asymmetry
  FROMLIST: sched/fair: Set rq->rd->overload when misfit
  FROMLIST: sched: Wrap rq->rd->overload accesses with READ/WRITE_ONCE
  FROMLIST: sched: Change root_domain->overload type to int
  FROMLIST: sched/fair: Change prefer_sibling type to bool
  FROMLIST: sched/fair: Consider misfit tasks when load-balancing
  msm: adsprpc: do not free cached session buffers on power collapse
  FROMLIST: sched: Add sched_group per-cpu max capacity
  msm: pcie: correct the enable/disable order for PCIe link ASPM
  diag: Add NULL checks for the mask and mask pointer
  ARM: dts: msm: Add smb_therm and bat_therm channels for SM6150
  usb: phy: Enable proper DP DM masks for PHY interrupts
  msm: vidc: Remove QCOM keyword from buffer flag
  thermal: tsens: Add MTC support for SDM439
  defconfig: sm6150: Enable ADC configs for SM6150
  ARM: dts: msm: add carveout region for wlan on qcs405
  ARM: dts: msm: Update the dcvs frequency tables for SM8150 v2
  FROMLIST: sched/fair: Add group_misfit_task load-balance type
  ARM: dts: Add overlay audio dt for sm8150-sdx50m target
  power: smb5: Enable read/writing of Type-C Rp value
  power_supply: Add TYPEC_SRC_RP property
  clk: qcom: clk-debug: Add custom measure operators for mccc_clk
  soc: qcom: service-notifier: Use high priority wq for PDR
  defconfig: Change panic timeout for target sa8155
  usb: pd: Don't print pd_send_msg error if PD not connected
  msm: ipa3: Update holb config on USB DPL ep
  ARM: dts: msm: Register RPM for peripheral SSR
  usb: host: replace %p with %pK
  usb: dwc3: replace %p with %pK
  clk: qcom: Add GCC clock driver for SDMMAGPIE
  clk: qcom: clk-rpmh: add support for clk-rpmh driver for SDMMAGPIE
  clk: qcom: Clear hardware clock control bit of RCG
  rpmsg: glink: spi: unregister rpdev during ept destroy
  rpmsg: glink: spi: Write unaligned data with short pkt
  ARM: dts: msm: disable L1/L1ss for PCIe1 on sm8150-sdx50 platform
  rpmsg: glink: spi: Hold channel reference during send
  rpmsg: glink: spi: Cancel work threads during remove
  msm: vidc: do not set video state to DEINIT very early
  soc: qcom: mem-offline: Update end pfn calculation
  arm64: Fix page boundary check when hot onlining
  FROMLIST: sched: Add static_key for asymmetric cpu capacity optimizations
  msm: ipa: fix to poll channel state if GSI interrupt is not yet received
  ARM: dts: msm: disable secure dma heap on qcs405
  defconfig: sa8155: Enable WLAN QCA6174 chipset support
  msm: vidc: Add HEIF encode support
  ion: Set the page private bit for secure CMA buffers
  ARM: dts: msm: Change audio property from bool type to u32
  soc: qcom: dfc: Fix potential data stall
  msm: kgsl: Request all GMU required allocations at probe time
  msm: kgsl: Do not access GMU_HFI_ON flag in power control
  msm: kgsl: Consolidate some gmu functions
  clk: qcom: clk-alpha-pll: Add support for controlling fabia PLLs
  sched/fair: fix prefer_idle behaviour
  Revert "mm: make cma the first choice for movable request"
  mmc: sdhci-msm: Update DLL reg settings per SDCC HW Guide
  drver:soc:llcc_perfmon: qdss clk node control
  ARM: dts: msm: qdss clk for llcc_perfmon sm8150
  ARM: dts: msm: Add WDI2 offload support over gsi for SM6150
  power: smb5-lib: Increase OV threshold on ADC USB_IN_V reading
  ARM: dts: msm: Update GPU clock plan for sm6150
  ARM: dts: msm: Add ion secure carveout for sm8150
  clk: qcom: videocc: Remove sleep clock for SM6150
  ARM: dts: msm: Add fixed sleep clock for SM6150
  msm: kgsl: Don't dump GPMU registers on non GPMU devices
  slim-msm: Use non-interruptible method for all QMI wait
  driver:soc:llcc_perfmon: Configure filter if events not configured
  ARM: dts: msm: Update sm8150 to V8 memory map
  usb: gadget: uac2: Change synchronization type of data ep to SYNC
  ARM: dts: msm: Enable secondary USB port for sm8150
  devfreq: suppress platform driver bind / unbind feature.

Change-Id: I00e38bf60a765a252d2d1d548aed01aa57667dd9
Signed-off-by: default avatarNamratha Siddappa <namratha@codeaurora.org>
parents 16824962 653fbfb6

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

+3 −0
Original line number Diff line number Diff line
@@ -160,6 +160,9 @@ compatible = "qcom,sm6150-mtp" 
compatible = "qcom,sm6150-cdp"

compatible = "qcom,sm6150-qrd"

compatible = "qcom,sm6150-idp"

compatible = "qcom,sm6150p-idp"

compatible = "qcom,sm6150p"

compatible = "qcom,sm6150p-qrd"

compatible = "qcom,qcs405-rumi"

compatible = "qcom,qcs405-iot"

compatible = "qcom,qcs403-iot"

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

+2 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ Required properties : 
- qcom,dispcc: phandle to the Display CC device node.

- qcom,npucc: phandle to the NPU CC device node.

- qcom,cpucc: phandle to the CPU CC debug device node.

- qcom,mccc: phandle to the MC CC debug device node.

- clock-names: Shall contain "xo_clk_src"

- clocks: phandle + clock reference to the CXO clock.

- #clock-cells : Shall contain 1.
@@ -24,6 +25,7 @@ Example: 
		qcom,dispcc = <&clock_dispcc>;

		qcom,npucc = <&clock_npucc>;

		qcom,cpucc = <&cpucc_debug>;

		qcom,mccc = <&mccc_debug>;

		clock-names = "xo_clk_src";

		clocks = <&clock_rpmh RPMH_CXO_CLK>;

		#clock-cells = <1>;

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

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ Required properties : 
			"qcom,gcc-qcs405"

			"qcom,gcc-mdss-qcs405"

			"qcom,gcc-sm6150"

			"qcom,gcc-sdmmagpie"



- reg : shall contain base register location and length

- #clock-cells : shall contain 1

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

+5 −2
Original line number Diff line number Diff line 
Qualcomm Technologies, Inc. RPMh Clocks



Required properties:

- compatible:	Must contain "qcom,rpmh-clk-sm8150" or

		"qcom,rpmh-clk-sdmshrike" or "qcom,rpmh-clk-sm6150".

- compatible:	Must contain one of the following:

		"qcom,rpmh-clk-sm6150",

		"qcom,rpmh-clk-sm8150",

		"qcom,rpmh-clk-sdmshrike",

		"qcom,rpmh-clk-sdmmagpie".

- #clock-cells:	Must contain 1.

- mboxes:	List of RPMh mailbox phandle and channel identifier tuples.

- mbox-names:	List of names to identify the RPMh mailboxes used.

Documentation/devicetree/bindings/media/msm-geni-ir.txt

0 → 100644
+44 −0
Original line number Diff line number Diff line 
MSM Generic Serial Interface Infrared (GENI-IR) Controller



Required properties:

- compatible : Should be "qcom,msm-geni-ir"

- reg : Offset and length of the register region for the device

- reg-names : Register region name referenced in 'reg' above

	The only required register resource entry is:

	"base"       : GENI-IR controller register block

- interrupts : Interrupt numbers used by this controller

- interrupt-names : Interrupt resource names referenced in 'interrupts' above

	Required interrupt resource entries are:

	"geni-ir-core-irq"   : GENI-IR core interrupt

	"geni-ir-wakeup-irq" : GENI-IR wakeup interrupt

- qcom,geni-ir-gpio-tx  : GPIO pin number of the GENI-IR transmit line

- qcom,geni-ir-gpio-rx  : GPIO pin number of the GENI-IR receive line



Aliases :

Aliases may be optionally used for GENI-IR devices on a target.

The alias will have the following format:

	'geni_ir{n}' where n is the instance number.



GENI-IR device is the child device of the SPSS device.



Example:

	aliases {

		geni_ir1 = &geni_ir_1;

	};



	qcom,msm-spss@fc5c3000 {



		...



		geni_ir_1: qcom,msm-geni-ir@fc5c1000 {

			compatible = "qcom,msm-geni-ir";

			reg-names = "base";

			reg = <0xfc5c1000 0x1000>;

			interrupts = <0 284 0>, <0 285 0>;

			interrupt-names = "geni-ir-core-irq",

					  "geni-ir-wakeup-irq";

			qcom,geni-ir-gpio-tx = <&msmgpio 8 0>;

			qcom,geni-ir-gpio-rx = <&msmgpio 9 0>;

		};

	};