Commit Graph

17 Commits

Author SHA1 Message Date
JohnnLee
2ec8b3a5cb Merge branch 'LA.UM.9.12.C10.11.00.00.840.201' via branch 'qcom-msm-4.19-7250' into android-msm-pixel-4.19
Conflicts:
	Documentation/devicetree/bindings~qcom
	arch/arm64/configs/vendor/kona_defconfig
	arch/arm64/configs/vendor/lito_defconfig
	drivers/char/diag/diagmem.c
	drivers/dma-buf/dma-buf.c
	drivers/gpu/msm/Makefile
	drivers/gpu/msm/kgsl.c
	drivers/hid/Kconfig
	drivers/hid/hid-ids.h
	drivers/hid/hid-playstation.c
	drivers/hid/hid-quirks.c
	drivers/md/dm-default-key.c
	drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_hw_stats.c
	drivers/power/supply/qcom/Makefile
	drivers/power/supply/qcom/qpnp-smb5.c
	drivers/scsi/ufs/ufs-qcom.c
	drivers/tty/serial/msm_geni_serial.c
	drivers/usb/gadget/function/f_fs.c
	fs/f2fs/node.c
	fs/f2fs/node.h
	fs/f2fs/recovery.c
	fs/f2fs/segment.c
	fs/incfs/data_mgmt.c
	fs/incfs/format.c
	fs/incfs/main.c
	fs/incfs/vfs.c
	include/linux/mm.h
	include/soc/qcom/memory_dump.h
	kernel/futex.c
	mm/mmap.c
	mm/mremap.c

Bug: 210578498
Signed-off-by: JohnnLee <johnnlee@google.com>
Change-Id: Ic925ed432e887337ebd6027007853cedde7fd64e
2022-03-08 15:42:12 +08:00
Archana Sriram
72394b6690 thermal: Update copyright info for ADC_TM driver
Update copyright info for qpnp-adc-tm driver files.

Change-Id: I07a0846c0fdc6970e092b1d2d3fb741aef73b952
Signed-off-by: Archana Sriram <quic_c_apsrir@quicinc.com>
2021-11-16 15:07:32 +05:30
Archana Sriram
c57142fede thermal: Modify qpnp_adc_tm driver for IIO framework
Make changes to use IIO framework APIs for reading
ADC channel information instead of VADC APIs.

Change-Id: I70ab09905d0f4a23fb5d0617ba6d031ecc7fb8bc
Signed-off-by: Manjunatha Madana <mamanj@codeaurora.org>
Signed-off-by: Archana Sriram <apsrir@codeaurora.org>
2021-10-09 07:41:39 +05:30
Manjunatha Madana
14595b56e3 thermal: qpnp-adc: Add snapshot of qpnp-adc-tm driver
This is snapshot of qpnp-adc-tm  driver as of
msm-4.9 'commit 7e65e03259909 (Merge "msm: kgsl:
Deregister gpu address on memdesc_sg_virt failure")'.

Removed support for adc_tm_hc and hkadc_ldo as they
are not used for SPF targets. Removed IADC, VADC APIS,
structs and enums not needed for ADC_TM. VADC functions
required for sake of compilation have been retained,
which will be subsequently replaced with IIO functions
to suit msm-4.19.

Change-Id: If8e4fb03471ec045293659b2404f8be95684f8be
Signed-off-by: Manjunatha Madana <mamanj@codeaurora.org>
Signed-off-by: Archana Sriram <apsrir@codeaurora.org>
2021-10-08 07:02:23 -07:00
Kavya Nunna
9995b02041 platform: qpnp-revid: Add REVID support for PM8010
Add PMIC subtype for PM8010.

Change-Id: I6e185be5db95687b06fa3b15e43c5f223622647b
Signed-off-by: Kavya Nunna <knunna@codeaurora.org>
2021-09-15 15:43:58 +05:30
Lucas Wei
e7e6a26ceb Merge LA.UM.9.12.R2.10.00.00.685.039 via branch 'qcom-msm-4.19-7250' into android-msm-pixel-4.19
Conflicts:
	modified:   arch/arm64/configs/redbull_defconfig
	modified:   arch/arm64/configs/vendor/kona_defconfig
	modified:   arch/arm64/configs/vendor/lito_defconfig
	modified:   arch/arm64/include/asm/traps.h
	modified:   arch/arm64/kernel/smp.c
	modified:   arch/arm64/mm/dma-mapping.c
	modified:   arch/arm64/mm/fault.c
	modified:   drivers/android/binder.c
	modified:   drivers/base/power/wakeup.c
	modified:   drivers/bus/mhi/core/mhi_main.c
	modified:   drivers/clk/clk.c
	modified:   drivers/clocksource/arm_arch_timer.c
	modified:   drivers/cpuidle/lpm-levels.c
	modified:   drivers/crypto/msm/qcedev.c
	modified:   drivers/devfreq/governor_memlat_trace.h
	modified:   drivers/dma-buf/dma-buf.c
	modified:   drivers/gpu/Makefile
	modified:   drivers/gpu/drm/drm_dp_mst_topology.c
	modified:   drivers/gpu/drm/drm_edid.c
	modified:   drivers/gpu/msm/Kconfig
	modified:   drivers/gpu/msm/kgsl.c
	modified:   drivers/gpu/msm/kgsl_sharedmem.c
	modified:   drivers/hwtracing/coresight/coresight-etm-perf.c
	modified:   drivers/hwtracing/coresight/coresight-tmc-etr.c
	modified:   drivers/iommu/arm-smmu.c
	modified:   drivers/iommu/io-pgtable-arm.c
	modified:   drivers/iommu/io-pgtable-fast.c
	modified:   drivers/iommu/io-pgtable.c
	modified:   drivers/iommu/iommu.c
	modified:   drivers/leds/leds-qpnp-flash-v2.c
	modified:   drivers/misc/Kconfig
	modified:   drivers/misc/qseecom.c
	modified:   drivers/mmc/core/Kconfig
	modified:   drivers/mmc/core/block.c
	modified:   drivers/mmc/host/cqhci-crypto-qti.c
	modified:   drivers/mmc/host/cqhci-crypto.c
	modified:   drivers/mmc/host/cqhci.c
	modified:   drivers/mmc/host/sdhci-msm.c
	modified:   drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c
	modified:   drivers/net/wireless/ath/wil6210/interrupt.c
	modified:   drivers/net/wireless/ath/wil6210/wmi.c
	modified:   drivers/platform/msm/ipa/ipa_v3/ipa_qmi_service.c
	modified:   drivers/power/supply/power_supply_sysfs.c
	modified:   drivers/power/supply/qcom/Kconfig
	modified:   drivers/power/supply/qcom/Makefile
	modified:   drivers/power/supply/qcom/qg-core.h
	modified:   drivers/power/supply/qcom/qpnp-qg.c
	modified:   drivers/power/supply/qcom/qpnp-smb5.c
	modified:   drivers/power/supply/qcom/smb5-lib.c
	modified:   drivers/power/supply/qcom/smb5-lib.h
	modified:   drivers/regulator/core.c
	modified:   drivers/regulator/proxy-consumer.c
	modified:   drivers/scsi/ufs/ufs_quirks.h
	modified:   drivers/scsi/ufs/ufshcd.c
	modified:   drivers/soc/qcom/icnss.c
	modified:   drivers/soc/qcom/minidump_log.c
	modified:   drivers/soc/qcom/watchdog_v2.c
	modified:   drivers/spi/spi-geni-qcom.c
	modified:   drivers/staging/android/ion/Makefile
	modified:   drivers/staging/android/ion/ion.c
	modified:   drivers/thermal/cpu_cooling.c
	modified:   drivers/thermal/of-thermal.c
	modified:   drivers/thermal/thermal_core.c
	modified:   drivers/tty/serial/Kconfig
	modified:   drivers/tty/serial/Makefile
	modified:   drivers/tty/serial/msm_geni_serial.c
	modified:   drivers/usb/core/usb.c
	modified:   drivers/usb/dwc3/gadget.c
	modified:   drivers/usb/dwc3/gadget.h
	modified:   drivers/usb/gadget/composite.c
	modified:   drivers/usb/gadget/epautoconf.c
	modified:   drivers/usb/gadget/udc/core.c
	modified:   drivers/usb/host/xhci.c
	modified:   fs/crypto/crypto.c
	modified:   fs/crypto/keysetup.c
	modified:   fs/crypto/keysetup_v1.c
	modified:   fs/f2fs/checkpoint.c
	modified:   fs/f2fs/data.c
	modified:   fs/f2fs/f2fs.h
	modified:   fs/f2fs/node.c
	modified:   fs/incfs/Kconfig
	modified:   fs/incfs/data_mgmt.c
	modified:   fs/incfs/data_mgmt.h
	modified:   fs/incfs/vfs.c
	modified:   fs/proc/task_mmu.c
	modified:   include/drm/drm_connector.h
	modified:   include/drm/drm_dp_mst_helper.h
	modified:   include/linux/clk-provider.h
	modified:   include/linux/dma-buf.h
	modified:   include/linux/dma-mapping.h
	modified:   include/linux/fs.h
	modified:   include/linux/io-pgtable.h
	modified:   include/linux/iommu.h
	modified:   include/linux/mm.h
	modified:   include/linux/mm_types.h
	modified:   include/linux/mmc/host.h
	modified:   include/linux/mmzone.h
	modified:   include/linux/perf_event.h
	modified:   include/linux/power_supply.h
	modified:   include/linux/pwm.h
	modified:   include/linux/regulator/driver.h
	modified:   include/linux/rwsem.h
	modified:   include/linux/sched.h
	modified:   include/linux/sched/signal.h
	modified:   include/linux/sched/sysctl.h
	modified:   include/linux/sched/topology.h
	modified:   include/linux/sched/user.h
	modified:   include/linux/thermal.h
	modified:   include/linux/usb.h
	modified:   include/linux/usb/gadget.h
	modified:   include/linux/usb/hcd.h
	modified:   include/linux/vm_event_item.h
	modified:   include/net/cfg80211.h
	modified:   include/scsi/scsi_device.h
	modified:   include/soc/qcom/minidump.h
	modified:   include/soc/qcom/qmi_rmnet.h
	modified:   include/soc/qcom/socinfo.h
	modified:   include/trace/events/power.h
	modified:   include/uapi/drm/drm_mode.h
	modified:   include/uapi/linux/coresight-stm.h
	modified:   include/uapi/linux/ip.h
	modified:   include/uapi/linux/nl80211.h
	modified:   include/uapi/linux/videodev2.h
	modified:   kernel/dma/mapping.c
	modified:   kernel/dma/removed.c
	modified:   kernel/panic.c
	modified:   kernel/sched/cpupri.c
	modified:   kernel/sched/cpupri.h
	modified:   kernel/sched/fair.c
	modified:   kernel/sched/rt.c
	modified:   kernel/sched/sched.h
	modified:   kernel/sched/walt.h
	modified:   kernel/sysctl.c
	modified:   mm/Kconfig
	modified:   mm/compaction.c
	modified:   mm/oom_kill.c
	modified:   mm/page_alloc.c
	modified:   mm/vmalloc.c
	modified:   mm/vmscan.c
	modified:   net/qrtr/qrtr.c
	modified:   net/wireless/nl80211.c
	modified:   net/wireless/scan.c
	modified:   sound/core/init.c
	modified:   sound/soc/soc-core.c
	modified:   sound/usb/card.c
	modified:   sound/usb/pcm.c
	modified:   sound/usb/pcm.h
	modified:   sound/usb/usbaudio.h

Bug: 172988823
Bug: 173092548
Signed-off-by: Lucas Wei <lucaswei@google.com>
Change-Id: I9c86e3a0309b7078e7640788c00172c6e9b4cf67
2021-03-17 10:53:52 +08:00
Shilpa Suresh
955b3c66ca drivers: Update the PMIC drivers for PM660
Bring in all the required PMIC drivers for SDM660 on 4.19 kernel
and make the required changes to successfully build these drivers.
Snapshot of the new drivers are added from the below commits
and required cleanup has been addressed :

From 4.14 kernel commit: 68b7015e5
qcom-rradc.c, qcom-tadc.c, qpnp-fg-gen3.c, qpnp-smb2.c,
qpnp-misc.c, smb1351-charger.c, qpnp-misc.h

From 4.9 kernel commit: ad779e060
smb-lib.c, smb-lib.h, smb-reg.h, smb138x-charger.c

qpnp-fg-gen3.c - additional changes from 4.9 pulled in.
smb-lib.c - additional changes from 4.14 pulled in.

Change-Id: I1c59dc0f41706fb10de82ff6bd6707758d351fd2
Signed-off-by: Shilpa Suresh <sbsure@codeaurora.org>
2020-07-02 00:28:30 -07:00
Robin Peng
58a95695aa Merge LA.UM.9.12.R1.10.00.00.597.032 via branch 'qcom-msm-4.19-7250' into android-msm-pixel-4.19
Conflicts:
	arch/arm64/configs/vendor/kona_defconfig
	arch/arm64/configs/vendor/lito_defconfig
	arch/arm64/include/asm/traps.h
	drivers/power/supply/qcom/qpnp-smb5.c
	kernel/sched/sched.h

Bug: 151568484
Change-Id: I6ed9ae8bc29d93e42b8527ae25074db334c640da
Signed-off-by: Robin Peng <robinpeng@google.com>
2020-05-30 02:18:38 +08:00
Robin Peng
252284b7f7 Merge LA.UM.9.12.R1.10.00.00.597.022 via branch 'qcom-msm-4.19-7250' into android-msm-pixel-4.19
Conflicts:
	arch/arm64/configs/vendor/lito_defconfig
	block/blk-merge.c
	drivers/acpi/scan.c
	drivers/soc/qcom/minidump_log.c
	drivers/mmc/core/queue.c
	drivers/platform/msm/ipa/ipa_v3/ipa_debugfs.c
	drivers/power/supply/power_supply_sysfs.c
	drivers/power/supply/qcom/qpnp-smb5.c
	drivers/power/supply/qcom/smb5-lib.c
	drivers/power/supply/qcom/smb5-lib.h
	drivers/scsi/ufs/ufs.h
	drivers/scsi/ufs/ufshcd.c
	drivers/staging/android/ion/ion_secure_util.c
	drivers/thermal/qcom/Makefile
	drivers/thermal/qcom/adc-tm5.c
	fs/f2fs/data.c
	fs/f2fs/super.c
	include/linux/power_supply.h
	include/linux/qcom-geni-se.h

Bug: 150587879
Bug: 150587495
Bug: 149799837
Bug: 150109764
Change-Id: Ib20ed28d481cee37153148328427e40c32252a5b
Signed-off-by: Robin Peng <robinpeng@google.com>
2020-05-30 02:15:03 +08:00
Quentin Perret
2873e5a9cd GKI: enable QPNP_REVID modularization
Replace #ifdef CONFIG with #if IS_ENABLED(CONFIG) and report all the
missing dependencies in various subsystems.

Bug: 142049345
Test: compiled and booted on lito, all devices still probe
Signed-off-by: Quentin Perret <qperret@google.com>
Change-Id: Ibed489e7a3856ee2e236b2bd7a1a8cfa4b1eded6
2020-05-30 02:01:08 +08:00
Jishnu Prakash
fe15e8a30c platform: qpnp-revid: Add REVID support for PM6350, PMK8350 and PMR735B
Add PMIC subtype and revid details for PM6350, PMK8350 and PMR735B.

Change-Id: I08432528d8d5ff57244410e447d15c2953af5df0
Signed-off-by: Jishnu Prakash <jprakash@codeaurora.org>
2020-02-07 13:05:47 +05:30
Umang Chheda
16be97cc43 platform: qpnp-revid: Add REVID support for PM2250
Add PMIC subtype and revid details for PM2250.
Remove subtype of PMI8937 as it is same as subtype
of PM2250 and is not used in this kernel version.

Change-Id: I64ad30101ab0e957bab52ac4dc6a464c1ab59739
Signed-off-by: Umang Chheda <uchheda@codeaurora.org>
2020-02-03 17:45:24 +05:30
Jishnu Prakash
c10c60d95d platform: qpnp-revid: Add REVID support for PM8008, SMB1355 and SMB1390
Add PMIC subtypes for PM8008, SMB1355 and SMB1390.

Change-Id: I03929a86686aa5e3affde1c7a208f29e1639aadd
Signed-off-by: Jishnu Prakash <jprakash@codeaurora.org>
2019-10-04 19:23:11 +05:30
Kiran Gunda
db653e149f platform: qpnp-revid: Add REVID support for PM6125
Add PMIC subtype and revid details for PM6125.

Change-Id: Ibd185198ba74e31a0c89f640e7de4fdb94f4157d
Signed-off-by: Kiran Gunda <kgunda@codeaurora.org>
2019-08-26 13:14:46 +05:30
Umang Agrawal
26cc77df5a platform: qpnp-revid: Add REVID support for PM7250B
Add PMIC subtype and revid details for PM7250B.

Change-Id: I1d5f28b9130f00ec30ee9935914d847652cc7435
Signed-off-by: Umang Agrawal <uagrawal@codeaurora.org>
2019-04-30 14:40:08 +05:30
Subbaraman Narayanamurthy
eb15eb3c5b soc: qcom: Add snapshot of QTI PBS driver
QTI PBS (Programmable Boot Sequence) driver helps triggering
certain PBS on QTI PMICs when available for APPS.

This snapshot is taken as of msm-4.14
commit 9bb584ae3a9d ("msm/sde/rotator: Add rev checks for sdmmagpie").

Change-Id: I25b6f7cb2bf1cad1413c4389cd2e77e021016b3f
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
2018-11-07 10:56:47 -08:00
Subbaraman Narayanamurthy
757be87dc5 platform: msm: Add snapshot of QPNP_REVID driver
QPNP_REVID driver provides the PMIC revision, type and subtype
of every PMIC device to the peripheral drivers on request. This
is used by peripheral drivers to configure the hardware properly.

This is taken as a snapshot from msm-4.14 kernel
'commit 9bb584ae3a9d ("msm/sde/rotator: Add rev checks for sdmmagpie")'

Change-Id: Ieee794353be062104230e3e01c3b2c3b7a3d2c16
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
2018-11-06 18:17:38 -08:00