Skip to content
This repository has been archived by the owner on Dec 28, 2020. It is now read-only.

Commit

Permalink
Merge tag 'LE.UM.3.2.1-18400-SDX24' into neutrino-msm-fajita-4.9
Browse files Browse the repository at this point in the history
"LE.UM.3.2.1-18400-SDX24"

* tag 'LE.UM.3.2.1-18400-SDX24':
  msm: ADSPRPC: queue glink intents for concurrence
  ANDROID: arm64: lse: fix LSE atomics with LTO
  ion: Disable ION_HEAP_TYPE_SYSTEM_CONTIG
  UPSTREAM: virt_wifi: fix error return code in virt_wifi_newlink()
  ANDROID: Turn xt_owner module on
  ANDROID: Move from clang r346389b to r349610.
  Add XFRM-I to cuttlefish defconfigs
  ANDROID: cuttlefish: enable CONFIG_NET_SCH_NETEM=y
  ANDROID: cuttlefish_defconfig: Enable DEBUG_SET_MODULE_RONX
  BACKPORT: userfaultfd: shmem/hugetlbfs: only allow to register VM_MAYWRITE vmas
  FROMLIST: BACKPORT: overlayfs: override_creds=off option bypass creator_cred
  Build break
  ANDROID: cpufreq: times: optimize proc files
  ANDROID: revert "sysfs_net_ipv4: Add sysfs-based knobs for controlling TCP window size"
  FROMGIT: binder: create node flag to request sender's security context
  ANDROID: overlayfs: override_creds=off option bypass creator_cred
  ANDROID: cuttlefish: enable CONFIG_NETFILTER_XT_TARGET_CT=y
  ANDROID: cfi: Remove unused variable in ptr_to_check_fn
  Revert "arm: fix show_data fallout from KERN_CONT changes"
  Revert "ANDROID: arm: process: Add display of memory around registers when displaying regs."
  ANDROID: cuttlefish_defconfig: Add support for AC97 audio
  ANDROID: cpufreq: times: record fast switch frequency transitions
  ANDROID: cuttlefish: enable CONFIG_USB_RTL8152=y
  ANDROID: cpufreq: times: don't copy invalid freqs from freq table
  thermal: tsens: Fix CLANG compilation issues in TSENS for kernel 4.9
  msm: mhi_dev: Check DTR and RTS signals sent by host
  ANDROID: cuttlefish: enable CONFIG_INET_UDP_DIAG=y
  misc: lkdtm: Add volatile to intentional NULL pointer reference
  msm: sps: Update debug message format specifier
  drivers: hwmon: Fix compilation errors in ADC for kernel 4.9
  net: can: qti-can: Notify power events to firmware
  sysmon-qmi: Fix compilation error while using LLVM
  msm: ipa3: Fix compilation errors after enabling LLVM
  msm: audio: support for gapless_pcm
  ARM: dts: msm: add device tree compile for SDM429 spyro EVT
  input: sensors: Add SMI130 IMU DT bindings
  ARM: dts: msm: Enable SMI130 sensor for sdxpoorwills-ttp
  msm: ipa: Move NAT invalid protocol define to uapi
  power: qpnp-fg-gen3: Enable voltage-mode correction saturation clear
  arm: dts: msm: Add thermal property to adc_tm on PM8937
  drm/msm: avoid unmapping the buffer twice during msm_release
  sched/sysctl: Fix attributes of some extern declarations
  defconfig: msm: Enable BPF related defconfigs
  fbdev: msm: check for panel status before waiting for pp done
  drm/msm/sde: Add support for DSC 4 4 2 Topology
  tty: serial: msm_geni_serial: Disable manual rts if CRTSCTS is set
  ARM: dts: add system fstab node to SDW2700 dts
  ARM: dts: decrease modem firmware size for SDW2700
  ARM: dts: msm: Update USB SSPHY init sequence for SDXPOORWILLS
  qcom-geni-se: Convert agrregate ab/ib into actual bandwidth
  usb: gadget: composite: fill bcdUSB as 0x0320 for SuperSpeed or higher speeds
  ARM: dts: msm: Add camera sensor support for SDM845 robotics2.0
  drivers: input: sensors: Reduce i2c iteration to read chip id
  msm: vidc: Ensure validity of shared Q indices
  ARM: dts: msm: Increasing shared mem region size for SDM845 and SDM710
  locking/spinlock/debug: Remove spinlock lockup detection code
  defconfig: msm: disable DEBUG_SPINLOCK
  Makefile: Disable undefined-optimized and tautological features
  msm: msm_bus: resend TCS commands for IPA
  drm: lock the user blob access while traversing the list
  qcom-geni-se: Add IOMMU check in geni common driver
  include: linux: Correct MHI_MAX_CHANNELS macro
  msm: ipa3: add ipa_wigig_msg to fix compilation
  spi-geni: Synchronize SPI transfer and ISR
  soc: qcom: ssr: Initialize high priority workqueue
  ARM: dts: msm: add thermal zone names to sdm845
  msm: kgsl: show max gpu temperature
  qseecom: Move qseecom_ioctl from inline to normal function
  Usb: f_gsi: Add uevent support for connect/disconnect events
  drm/msm/sde: update the error message for dt parse handler
  diag: Update new msg, log and event logging codes
  defconfig: msm: enable debug options for spyro
  cnss2: Add support for USB transport
  icnss: return recovery success to wlan driver
  ARM: dts: msm: Add custom ACC for APC on 8909w
  ARM: dts: msm: Fix kernel warnings for msm8953
  Revert "drivers: iio: imu: decreased the ASM buffer size and IAM timeout"
  driver: input: sensors:  SMI130 early buffer implemented
  defconfig: msm: Enable early buffer for smi130 sensor
  ARM: dts: msm: Add new dts for sdm845 RB3 board
  ARM: dts: msm: Add pinctrl conifg to support led and pcie on sdm845 rb3
  mmc: sd: set card removed to true
  ANDROID: cpufreq: times: Have two spinlock in different cache line
  qseecom: use wait_event_interruptible
  usb: f_gsi: Fix GSI enable logic for ADPL only composition
  cnss2: Add device version to SOC info structure
  ARM: dts : msm: Fix kernel compile warnings for msm8937
  arm: dts: Add new msm-id and platform subtype for LW.BR.4.0.3
  soc: qcom: secure_buffer: Process large SG tables in batches
  defconfig: msm: enable USB_OTG for spyro
  msm: ipa: ipa_tx_dp issued after suspend
  msm: phy: Add WOL functions in micrel driver
  msm: sps: Destroy IPC logs for BAM registration failure
  defconfig: msm: resovle audio can't work and optimize perf config
  clk: qcom: gdsc: Add support for min operational vote on GDSC parent
  ARM: dts: msm: Disable SMMU S1 for USB on sdxpoorwills PCIe EP
  usb: gadget: f_mtp: Add ipc logging for mtp driver
  ARM: dts: msm: Add the parent supply for CX GDSC for sdm845
  defconfig: msm: Enable CONFIG_HID_SONY for SDM439 and SDM632
  qcom-geni-se: Handle return value from iommu_map_and_attach function
  diag: dci: Add missing length check before parsing the buffer
  ARM: dts: qcom: Add support for TDM over I2S
  wil6210: disallow changing power save profile while in VR mode
  diag: Prevent out of bound access while getting build mask
  diag: Check command size against the minimum before parsing
  msm: ipa3: Fix to correct mem allocated flag
  defconfig: Enable OverlayFS for MSM8953 and MSM8937
  usb: dwc3: Remove extra format specifier
  serial: msm_geni_serial: Align to HW assisted flow control support
  Revert "ARM: dts: msm: Increasing shared mem region size for SDM845 and SDM710"
  ARM: dts: msm: disable "dma-coherent" on qcs605-360camera variant
  msm: mhi_dev: Add wait when write requests are exhausted
  msm: wlan: Update regulatory rules for JM
  msm: ipa3: add check to load gsi fw once
  diag: dci: Validate dci response length before parsing
  drm/msm/dsi-staging: add default edid
  drm/msm/dsi-staging: update edid with resolution details
  drm/msm/dp: reallocate EDID buffer when needed
  cnss2: Expose PCIe DRV connection status
  ARM: dts: msm: optimze the time of power on screen on sdm429
  diag: Validate command length against size of command structure
  thermal: qpnp-adc: Update ADC_TM interrupt type
  arm: dts: Add new board id on APQ8009W and MSM8909W
  msm: phy: Fix WOL disable for Micrel PHY
  diag: Check buffer size against command structure size
  ARM: dts: msm: Add sdhc1 and sdhc2 support for QM215
  usb: dwc3-msm: Ensure hardware is reset during role change
  msm: ipa: fix to validate input parameters
  msm: ipa: Fix to decouple MHI initialization from uC load
  ARM: dts: qcom: Update sec_mi2s gpio pinctrl for sdxpoorwills
  ARM: dts: msm: update to memory map v3 for QCS605
  Correct args while calling setup_blendstage
  cnss2: Expose idle restart/shutdown APIs
  ARM: dts: msm: APC CPR voltage margins for QM215
  icnss: Add a flag to indicate PDR
  nvmem: core: add NVMEM_SYSFS Kconfig
  defconfig: msm: Disable config NVMEM_SYSFS for SDM710
  ARM: dts: msm: increase modem size as per new memory map
  qseecom: improve app_block_wq processing
  soc: qcom: glink: Return error in case of invalid input
  NFC: Fix for nq-nci dev node recovery
  usb: f_gsi: Avoid starting transfer if disconnected
  usb: f_gsi: Prevent enabling data path if disconnect follows connect
  msm: ep_pcie: Add debugfs option to set the link speed
  ARM: dts: msm: increase modem size as per new memory map
  Revert "ARM: dts: msm: increase modem size as per new memory map"
  FROMLIST: sched/fair: Don't move tasks to lower capacity cpus unless necessary
  sched/fair: Don't let tasks slip away from gold to silver cluster
  sched/fair: Improve the scheduler
  ARM: dts: msm: Modify SDM845 RB3 subtype id to adapt corresponding CDT
  msm: kgsl: Fix race condition while making page as dirty
  defconfig: msm: set the size of printk buffer as default
  msm: vidc: Add state check to allow flush command
  ARM: dts: msm: enable ulps support to wear panel
  drm/msm/sde: fix feature enable check for WB support
  drivers: dma-removed: fix signedness issue
  msm: vidc: Fix  to prevent bus voting overflow
  soc: qcom: smem: validate fields of shared structures
  icnss: Add check on msa region
  arm: mm: init: check for upper PAGE_SHIFT bits in pfn_valid()
  ARM: dts: msm: Adding dts file for sdxpoorwills adp platform.
  ARM: dts: msm: Add battery specs for sdm429w target
  ARM: dts: msm: Add sdm429w pmic configuration
  msm: vidc: Check ion_handle for errors
  defconfig: spyro: Enable SMB2 and FG_GEN_3 support
  diag: Prevent out-of-bound access while processing dci transaction
  uapi: sound: add support for TTP render mode
  qcom: smcinvoke: Fix stack overflow for arr_filp
  ion: fix a possible memory leak in ion_cma_allocate
  usb: gadget: f_ipc: Use timeout when waiting for request completion
  ARM: dts: msm: Add tpdm lpass for sdm670

[@0ctobot: This reverts the following deprecated clang fixes:
a779e56 ("hwmon: qpnp-adc: Fix enum conversion warning")
0384f45 ("thermal: tsens: Fix enum-conversion warnings")
7c0b9d1 ("msm: ipa: Fix enum conversion warning")
4b2f245 ("hwmon: qpnp-adc: Fix logical-not-parentheses warning")]
Signed-off-by: Adam W. Willis <return.of.octobot@gmail.com>

Conflicts:
	Makefile
	arch/arm/kernel/setup.c
	arch/arm64/boot/dts/qcom/qm215-qrd-smb1360.dtsi
	arch/arm64/boot/dts/qcom/qm215-qrd.dtsi
	arch/arm64/boot/dts/qcom/sdm845-gpu.dtsi
	arch/arm64/configs/sdm845-perf_defconfig
	arch/arm64/configs/sdm845_defconfig
	build.config.cuttlefish.aarch64
	build.config.cuttlefish.x86_64
	drivers/cpufreq/cpufreq_times.c
	drivers/gpu/drm/msm/dsi-staging/dsi_phy.c
	drivers/gpu/drm/msm/msm_rd.c
	drivers/hwmon/qpnp-adc-common.c
	drivers/hwmon/qpnp-adc-voltage.c
	drivers/media/platform/msm/camera/cam_cdm/cam_cdm_virtual_core.c
	drivers/media/platform/msm/camera/cam_core/cam_context_utils.c
	drivers/media/platform/msm/camera/cam_core/cam_node.c
	drivers/media/platform/msm/camera/cam_fd/fd_hw_mgr/cam_fd_hw_mgr.c
	drivers/media/platform/msm/camera/cam_icp/fw_inc/hfi_reg.h
	drivers/media/platform/msm/camera/cam_icp/icp_hw/icp_hw_mgr/cam_icp_hw_mgr.h
	drivers/media/platform/msm/camera/cam_isp/cam_isp_context.c
	drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c
	drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/hw_utils/cam_isp_packet_parser.c
	drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid170.h
	drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_core.c
	drivers/media/platform/msm/camera/cam_lrme/lrme_hw_mgr/cam_lrme_hw_mgr.c
	drivers/media/platform/msm/camera/cam_sensor_module/cam_actuator/cam_actuator_core.c
	drivers/media/platform/msm/camera/cam_sensor_module/cam_csiphy/cam_csiphy_core.c
	drivers/media/platform/msm/camera/cam_sensor_module/cam_csiphy/cam_csiphy_dev.h
	drivers/media/platform/msm/camera/cam_sensor_module/cam_eeprom/cam_eeprom_core.c
	drivers/media/platform/msm/camera/cam_sensor_module/cam_flash/cam_flash_core.c
	drivers/media/platform/msm/camera/cam_sensor_module/cam_flash/cam_flash_dev.c
	drivers/media/platform/msm/camera/cam_sensor_module/cam_flash/cam_flash_dev.h
	drivers/media/platform/msm/camera/cam_sensor_module/cam_ois/cam_ois_core.c
	drivers/media/platform/msm/camera/cam_sensor_module/cam_ois/cam_ois_core.h
	drivers/media/platform/msm/camera/cam_sensor_module/cam_sensor/cam_sensor_core.c
	drivers/media/platform/msm/camera/cam_sensor_module/cam_sensor_utils/cam_sensor_util.c
	drivers/media/platform/msm/camera/cam_sensor_module/cam_sensor_utils/cam_sensor_util.h
	drivers/media/platform/msm/camera/cam_smmu/cam_smmu_api.h
	drivers/media/platform/msm/camera/cam_utils/cam_packet_util.c
	drivers/media/platform/msm/camera_v2/fd/msm_fd_dev.c
	drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c
	drivers/media/platform/msm/camera_v3/cam_cdm/cam_cdm_core_common.c
	drivers/media/platform/msm/camera_v3/cam_cdm/cam_cdm_hw_core.c
	drivers/media/platform/msm/camera_v3/cam_core/cam_context.c
	drivers/media/platform/msm/camera_v3/cam_core/cam_context.h
	drivers/media/platform/msm/camera_v3/cam_core/cam_context_utils.c
	drivers/media/platform/msm/camera_v3/cam_core/cam_hw_mgr_intf.h
	drivers/media/platform/msm/camera_v3/cam_core/cam_node.c
	drivers/media/platform/msm/camera_v3/cam_core/cam_node.h
	drivers/media/platform/msm/camera_v3/cam_cpas/cam_cpas_hw.c
	drivers/media/platform/msm/camera_v3/cam_cpas/include/cam_cpas_api.h
	drivers/media/platform/msm/camera_v3/cam_fd/cam_fd_context.c
	drivers/media/platform/msm/camera_v3/cam_fd/fd_hw_mgr/cam_fd_hw_mgr.c
	drivers/media/platform/msm/camera_v3/cam_fd/fd_hw_mgr/fd_hw/cam_fd_hw_soc.c
	drivers/media/platform/msm/camera_v3/cam_icp/cam_icp_context.c
	drivers/media/platform/msm/camera_v3/cam_icp/fw_inc/hfi_intf.h
	drivers/media/platform/msm/camera_v3/cam_icp/fw_inc/hfi_reg.h
	drivers/media/platform/msm/camera_v3/cam_icp/hfi.c
	drivers/media/platform/msm/camera_v3/cam_icp/icp_hw/a5_hw/a5_core.c
	drivers/media/platform/msm/camera_v3/cam_icp/icp_hw/bps_hw/bps_core.c
	drivers/media/platform/msm/camera_v3/cam_icp/icp_hw/icp_hw_mgr/cam_icp_hw_mgr.c
	drivers/media/platform/msm/camera_v3/cam_icp/icp_hw/icp_hw_mgr/cam_icp_hw_mgr.h
	drivers/media/platform/msm/camera_v3/cam_icp/icp_hw/ipe_hw/ipe_core.c
	drivers/media/platform/msm/camera_v3/cam_isp/cam_isp_context.c
	drivers/media/platform/msm/camera_v3/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c
	drivers/media/platform/msm/camera_v3/cam_isp/isp_hw_mgr/include/cam_isp_hw_mgr_intf.h
	drivers/media/platform/msm/camera_v3/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_core.c
	drivers/media/platform/msm/camera_v3/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_soc.c
	drivers/media/platform/msm/camera_v3/cam_isp/isp_hw_mgr/isp_hw/include/cam_vfe_hw_intf.h
	drivers/media/platform/msm/camera_v3/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/cam_vfe_soc.c
	drivers/media/platform/msm/camera_v3/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_top/cam_vfe_top_ver2.c
	drivers/media/platform/msm/camera_v3/cam_jpeg/cam_jpeg_context.c
	drivers/media/platform/msm/camera_v3/cam_jpeg/jpeg_hw/cam_jpeg_hw_mgr.c
	drivers/media/platform/msm/camera_v3/cam_jpeg/jpeg_hw/jpeg_dma_hw/jpeg_dma_core.c
	drivers/media/platform/msm/camera_v3/cam_jpeg/jpeg_hw/jpeg_enc_hw/jpeg_enc_core.c
	drivers/media/platform/msm/camera_v3/cam_lrme/cam_lrme_context.c
	drivers/media/platform/msm/camera_v3/cam_lrme/lrme_hw_mgr/cam_lrme_hw_mgr.c
	drivers/media/platform/msm/camera_v3/cam_lrme/lrme_hw_mgr/lrme_hw/cam_lrme_hw_soc.c
	drivers/media/platform/msm/camera_v3/cam_req_mgr/cam_mem_mgr.c
	drivers/media/platform/msm/camera_v3/cam_req_mgr/cam_mem_mgr.h
	drivers/media/platform/msm/camera_v3/cam_req_mgr/cam_req_mgr_core.c
	drivers/media/platform/msm/camera_v3/cam_sensor_module/cam_actuator/cam_actuator_dev.h
	drivers/media/platform/msm/camera_v3/cam_sensor_module/cam_cci/cam_cci_soc.c
	drivers/media/platform/msm/camera_v3/cam_sensor_module/cam_csiphy/Makefile
	drivers/media/platform/msm/camera_v3/cam_sensor_module/cam_csiphy/cam_csiphy_core.c
	drivers/media/platform/msm/camera_v3/cam_sensor_module/cam_csiphy/cam_csiphy_dev.h
	drivers/media/platform/msm/camera_v3/cam_sensor_module/cam_csiphy/include/cam_csiphy_1_0_hwreg.h
	drivers/media/platform/msm/camera_v3/cam_sensor_module/cam_eeprom/Makefile
	drivers/media/platform/msm/camera_v3/cam_sensor_module/cam_eeprom/cam_eeprom_core.c
	drivers/media/platform/msm/camera_v3/cam_sensor_module/cam_eeprom/cam_eeprom_dev.h
	drivers/media/platform/msm/camera_v3/cam_sensor_module/cam_flash/cam_flash_dev.c
	drivers/media/platform/msm/camera_v3/cam_sensor_module/cam_flash/cam_flash_dev.h
	drivers/media/platform/msm/camera_v3/cam_sensor_module/cam_ois/Makefile
	drivers/media/platform/msm/camera_v3/cam_sensor_module/cam_ois/cam_ois_dev.h
	drivers/media/platform/msm/camera_v3/cam_sensor_module/cam_sensor/cam_sensor_core.c
	drivers/media/platform/msm/camera_v3/cam_sensor_module/cam_sensor/cam_sensor_dev.h
	drivers/media/platform/msm/camera_v3/cam_sensor_module/cam_sensor_utils/cam_sensor_util.c
	drivers/media/platform/msm/camera_v3/cam_smmu/cam_smmu_api.c
	drivers/media/platform/msm/camera_v3/cam_smmu/cam_smmu_api.h
	drivers/media/platform/msm/camera_v3/cam_sync/cam_sync.c
	drivers/media/platform/msm/camera_v3/cam_utils/cam_debug_util.h
	drivers/media/platform/msm/camera_v3/cam_utils/cam_packet_util.c
	drivers/media/platform/msm/camera_v3/cam_utils/cam_packet_util.h
	drivers/media/platform/msm/camera_v3/cam_utils/cam_soc_util.c
	drivers/media/platform/msm/camera_v3/cam_utils/cam_soc_util.h
	drivers/platform/msm/ipa/ipa_v3/rmnet_ipa.c
	drivers/soc/qcom/msm_bus/msm_bus_arb_rpmh.c
	drivers/thermal/tsens.h
	drivers/tty/serial/msm_geni_serial.c
	drivers/usb/gadget/function/f_mtp.c
	fs/f2fs/f2fs.h
	include/soc/qcom/icnss.h
	include/uapi/media/cam_isp.h
  • Loading branch information
0ctobot committed Jun 8, 2019
2 parents e09508d + 58f8ada commit a516ff0
Show file tree
Hide file tree
Showing 216 changed files with 5,583 additions and 738 deletions.
1 change: 1 addition & 0 deletions Documentation/devicetree/bindings/arm/msm/msm.txt
Original file line number Diff line number Diff line change
Expand Up @@ -407,4 +407,5 @@ compatible = "qcom,sdxpoorwills-atp"
compatible = "qcom,sdxpoorwills-mtp"
compatible = "qcom,sdxpoorwills-cdp"
compatible = "qcom,sdxpoorwills-ttp"
compatible = "qcom,sdxpoorwills-adp"
compatible = "qcom,mdm9607-ttp"
4 changes: 4 additions & 0 deletions Documentation/devicetree/bindings/gpu/adreno.txt
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,10 @@ Optional Properties:
Specify the name of GPU temperature sensor. This name will be used
to get the temperature from the thermal driver API.

- tzone-names:
Specify the names of GPU thermal zones. These will be used
to get the temperature from the thermal driver API.

- qcom,enable-midframe-timer:
Boolean. Enables the use of midframe sampling timer. This timer
samples the GPU powerstats if the cmdbatch expiry takes longer than
Expand Down
56 changes: 56 additions & 0 deletions Documentation/devicetree/bindings/input/sensors/smi130.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
The SMI130 is a highly integrated, low power inertial measurement unit (IMU)
that provides precise acceleration and angular rate (gyroscopic) measurement.

To enable driver probing, add the smi130_gyro and smi130_acc node to the platform
device tree as described below.

Required properties:

- compatible: "smi130_gyro", "smi130_acc"
- reg: the I2C address or SPI chip select the device will respond to
- interrupt-parent: phandle to the parent interrupt controller as documented in [interrupts][4]
- interrupts: interrupt mapping for IRQ as documented in [interrupts][4]

Recommended properties for SPI bus usage:
- spi-max-frequency: maximum SPI bus frequency as documented in [SPI][3]

Optional properties:
- smi130_gyro,gpio_irq: MEMS sensor interrupt line to use (default 1)

I2C example (based on Raspberry PI 3):

&i2c0 {
status = "ok";
#address-cells = <0x1>;
#size-cells = <0x0>;
smi130_gyro@68 {
compatible = "smi130_gyro";
reg = <0x68>;
interrupt-parent = <&gpio>;
interrupts = <26 IRQ_TYPE_EDGE_RISING>;
};
smi130_acc@18 {
compatible = "smi130_acc";
reg = <0x18>;
interrupt-parent = <&gpio>;
interrupts = <25 IRQ_TYPE_EDGE_RISING>;
};

SPI example (based on Raspberry PI 3):

&spi0 {
status = "ok";
#address-cells = <0x1>;
#size-cells = <0x0>;
smi130_gyro@68 {
compatible = "smi130_gyro";
reg = <0x68>;
interrupt-parent = <&gpio>;
interrupts = <26 IRQ_TYPE_EDGE_RISING>;
};
smi130_acc@18 {
compatible = "smi130_acc";
reg = <0x18>;
interrupt-parent = <&gpio>;
interrupts = <25 IRQ_TYPE_EDGE_RISING>;
};
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,11 @@ Optional properties:
to enable.
- qcom,reset-aon-logic: If present, the GPU DEMET cells need to be reset while
enabling the GX GDSC.
- vdd_parent-supply: phandle to the regulator that this GDSC gates. If
present, need to vote for a minimum operational voltage
(LOW_SVS) on the GDSC parent regulator prior to
configuring it. The vote is removed once the GDSC FSM
has latched on to the new state.
- resets: reset specifier pair consisting of phandle for the reset controller
and reset lines used by this controller. These can be
supplied only if we support qcom,skip-logic-collapse.
Expand Down
23 changes: 23 additions & 0 deletions Documentation/filesystems/overlayfs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,29 @@ Only the lists of names from directories are merged. Other content
such as metadata and extended attributes are reported for the upper
directory only. These attributes of the lower directory are hidden.

credentials
-----------

By default, all access to the upper, lower and work directories is the
recorded mounter's MAC and DAC credentials. The incoming accesses are
checked against the caller's credentials.

In the case where caller MAC or DAC credentials do not overlap, a
use case available in older versions of the driver, the
override_creds mount flag can be turned off and help when the use
pattern has caller with legitimate credentials where the mounter
does not. Several unintended side effects will occur though. The
caller without certain key capabilities or lower privilege will not
always be able to delete files or directories, create nodes, or
search some restricted directories. The ability to search and read
a directory entry is spotty as a result of the cache mechanism not
retesting the credentials because of the assumption, a privileged
caller can fill cache, then a lower privilege can read the directory
cache. The uneven security model where cache, upperdir and workdir
are opened at privilege, but accessed without creating a form of
privilege escalation, should only be used with strict understanding
of the side effects and of the security policies.

whiteouts and opaque directories
--------------------------------

Expand Down
Empty file modified Makefile
100644 → 100755
Empty file.
5 changes: 4 additions & 1 deletion arch/arm/boot/dts/qcom/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@ dtb-$(CONFIG_ARCH_SDXPOORWILLS) += sdxpoorwills-rumi.dtb \
sdxpoorwills-v2-mtp.dtb \
sdxpoorwills-v2-cdp.dtb \
sdxpoorwills-v2-dualwifi-mtp.dtb \
sdxpoorwills-v2-dualwifi-cdp.dtb
sdxpoorwills-v2-dualwifi-cdp.dtb \
sdxpoorwills-adp.dtb \
sdxpoorwills-pcie-ep-adp.dtb \
sdxpoorwills-usb-ep-adp.dtb

dtb-$(CONFIG_ARCH_MDM9650) += mdm9650-nand-mtp.dtb \
mdm9650-ttp.dtb \
Expand Down
81 changes: 80 additions & 1 deletion arch/arm/boot/dts/qcom/sdx-audio-lpass.dtsi
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.
* Copyright (c) 2015-2019, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
Expand Down Expand Up @@ -191,6 +191,85 @@
qcom,msm-cpudai-afe-clk-ver = <2>;
};

qcom,msm-dai-tdm-pri-rx {
compatible = "qcom,msm-dai-tdm";
qcom,msm-cpudai-tdm-group-id = <37120>;
qcom,msm-cpudai-tdm-group-num-ports = <1>;
qcom,msm-cpudai-tdm-group-port-id = <36864>;
qcom,msm-cpudai-tdm-clk-rate = <12288000>;
qcom,msm-cpudai-tdm-clk-internal = <1>;
qcom,msm-cpudai-tdm-sync-mode = <0>;
qcom,msm-cpudai-tdm-sync-src = <1>;
qcom,msm-cpudai-tdm-data-out = <0>;
qcom,msm-cpudai-tdm-invert-sync = <0>;
qcom,msm-cpudai-tdm-data-delay = <1>;
qcom,msm-cpudai-tdm-clk-attribute = /bits/ 16 <1>;
dai_pri_tdm_rx_0: qcom,msm-dai-q6-tdm-pri-rx-0 {
compatible = "qcom,msm-dai-q6-tdm";
qcom,msm-cpudai-tdm-dev-id = <36864>;
qcom,msm-cpudai-tdm-data-align = <0>;
};

};

qcom,msm-dai-tdm-pri-tx {
compatible = "qcom,msm-dai-tdm";
qcom,msm-cpudai-tdm-group-id = <37121>;
qcom,msm-cpudai-tdm-group-num-ports = <1>;
qcom,msm-cpudai-tdm-group-port-id = <36865>;
qcom,msm-cpudai-tdm-clk-rate = <12288000>;
qcom,msm-cpudai-tdm-clk-internal = <1>;
qcom,msm-cpudai-tdm-sync-mode = <0>;
qcom,msm-cpudai-tdm-sync-src = <1>;
qcom,msm-cpudai-tdm-data-out = <0>;
qcom,msm-cpudai-tdm-invert-sync = <0>;
qcom,msm-cpudai-tdm-data-delay = <1>;
qcom,msm-cpudai-tdm-clk-attribute = /bits/ 16 <1>;
dai_pri_tdm_tx_0: qcom,msm-dai-q6-tdm-pri-tx-0 {
compatible = "qcom,msm-dai-q6-tdm";
qcom,msm-cpudai-tdm-dev-id = <36865>;
qcom,msm-cpudai-tdm-data-align = <0>;
};
};

qcom,msm-dai-tdm-sec-rx {
compatible = "qcom,msm-dai-tdm";
qcom,msm-cpudai-tdm-group-id = <37136>;
qcom,msm-cpudai-tdm-group-num-ports = <1>;
qcom,msm-cpudai-tdm-group-port-id = <36880>;
qcom,msm-cpudai-tdm-clk-rate = <12288000>;
qcom,msm-cpudai-tdm-clk-internal = <1>;
qcom,msm-cpudai-tdm-sync-mode = <1>;
qcom,msm-cpudai-tdm-sync-src = <0>;
qcom,msm-cpudai-tdm-data-out = <0>;
qcom,msm-cpudai-tdm-invert-sync = <0>;
qcom,msm-cpudai-tdm-data-delay = <0>;
dai_sec_tdm_rx_0: qcom,msm-dai-q6-tdm-sec-rx-0 {
compatible = "qcom,msm-dai-q6-tdm";
qcom,msm-cpudai-tdm-dev-id = <36880>;
qcom,msm-cpudai-tdm-data-align = <0>;
};
};

qcom,msm-dai-tdm-sec-tx {
compatible = "qcom,msm-dai-tdm";
qcom,msm-cpudai-tdm-group-id = <37137>;
qcom,msm-cpudai-tdm-group-num-ports = <1>;
qcom,msm-cpudai-tdm-group-port-id = <36881>;
qcom,msm-cpudai-tdm-clk-rate = <12288000>;
qcom,msm-cpudai-tdm-clk-internal = <1>;
qcom,msm-cpudai-tdm-sync-mode = <1>;
qcom,msm-cpudai-tdm-sync-src = <0>;
qcom,msm-cpudai-tdm-data-out = <0>;
qcom,msm-cpudai-tdm-invert-sync = <0>;
qcom,msm-cpudai-tdm-data-delay = <0>;
dai_sec_tdm_tx_0: qcom,msm-dai-q6-tdm-sec-tx-0 {
compatible = "qcom,msm-dai-q6-tdm";
qcom,msm-cpudai-tdm-dev-id = <36881>;
qcom,msm-cpudai-tdm-data-align = <0>;
};
};

qcom,msm-dai-mi2s {
compatible = "qcom,msm-dai-mi2s";
mi2s_prim: qcom,msm-dai-q6-mi2s-prim {
Expand Down
22 changes: 22 additions & 0 deletions arch/arm/boot/dts/qcom/sdxpoorwills-adp.dts
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
/* Copyright (c) 2019, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
* only version 2 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/

/dts-v1/;

#include "sdxpoorwills-adp.dtsi"

/ {
model = "Qualcomm Technologies, Inc. SDXPOORWILLS ADP";
compatible = "qcom,sdxpoorwills-adp",
"qcom,sdxpoorwills", "qcom,adp";
qcom,board-id = <25 0>, <25 0x100>;
};
29 changes: 29 additions & 0 deletions arch/arm/boot/dts/qcom/sdxpoorwills-adp.dtsi
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
/* Copyright (c) 2019, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
* only version 2 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/

#include "sdxpoorwills-mtp.dtsi"

&qcom_seecom {
status = "okay";
};

&qseecom_mem {
status = "okay";
};

&qseecom_ta_mem {
status = "okay";
};

&blsp1_uart2b_hs {
status = "okay";
};
6 changes: 5 additions & 1 deletion arch/arm/boot/dts/qcom/sdxpoorwills-audio.dtsi
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.
/* Copyright (c) 2015-2019, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
Expand Down Expand Up @@ -37,6 +37,8 @@
<&afe_pcm_rx>, <&afe_pcm_tx>, <&afe_proxy_rx>,
<&afe_proxy_tx>, <&incall_record_rx>,
<&incall_record_tx>, <&incall_music_rx>,
<&dai_pri_tdm_rx_0>, <&dai_pri_tdm_tx_0>,
<&dai_sec_tdm_rx_0>, <&dai_sec_tdm_tx_0>,
<&dai_sec_auxpcm>;
asoc-cpu-names = "msm-dai-q6-auxpcm.1",
"msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",
Expand All @@ -46,6 +48,8 @@
"msm-dai-q6-dev.225", "msm-dai-q6-dev.241",
"msm-dai-q6-dev.240", "msm-dai-q6-dev.32771",
"msm-dai-q6-dev.32772", "msm-dai-q6-dev.32773",
"msm-dai-q6-tdm.36864", "msm-dai-q6-tdm.36865",
"msm-dai-q6-tdm.36880", "msm-dai-q6-tdm.36881",
"msm-dai-q6-auxpcm.2";
};
};
26 changes: 26 additions & 0 deletions arch/arm/boot/dts/qcom/sdxpoorwills-pcie-ep-adp.dts
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
/* Copyright (c) 2019, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
* only version 2 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/

/dts-v1/;

#include "sdxpoorwills-adp.dtsi"

/ {
model = "Qualcomm Technologies, Inc. SDXPOORWILLS PCIE-EP ADP";
compatible = "qcom,sdxpoorwills-adp",
"qcom,sdxpoorwills", "qcom,adp";
qcom,board-id = <25 2>, <25 0x102>;
};

&blsp1_uart2b_hs {
status = "okay";
};
3 changes: 2 additions & 1 deletion arch/arm/boot/dts/qcom/sdxpoorwills-pcie-ep-cdp-256.dtsi
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2018, The Linux Foundation. All rights reserved.
/* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
Expand All @@ -20,6 +20,7 @@
status = "okay";
qcom,connector-type-uAB;
extcon = <0>, <0>, <0>, <&vbus_detect>;
/delete-property/ iommus;
};

&pcie_ep {
Expand Down
6 changes: 5 additions & 1 deletion arch/arm/boot/dts/qcom/sdxpoorwills-pcie-ep-cdp.dtsi
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2018, The Linux Foundation. All rights reserved.
/* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
Expand All @@ -16,6 +16,10 @@
status = "okay";
};

&usb {
/delete-property/ iommus;
};

&pcie_ep {
status = "okay";
};
Expand Down
3 changes: 2 additions & 1 deletion arch/arm/boot/dts/qcom/sdxpoorwills-pcie-ep-mtp-256.dtsi
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2018, The Linux Foundation. All rights reserved.
/* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
Expand All @@ -20,6 +20,7 @@
status = "okay";
qcom,connector-type-uAB;
extcon = <0>, <0>, <0>, <&vbus_detect>;
/delete-property/ iommus;
};

&pcie_ep {
Expand Down
6 changes: 5 additions & 1 deletion arch/arm/boot/dts/qcom/sdxpoorwills-pcie-ep-mtp.dtsi
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2018, The Linux Foundation. All rights reserved.
/* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
Expand All @@ -16,6 +16,10 @@
status = "okay";
};

&usb {
/delete-property/ iommus;
};

&pcie_ep {
status = "okay";
};
Expand Down
Loading

0 comments on commit a516ff0

Please sign in to comment.