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

Commit ad15c24e authored by Niranjan Reddy Dumbala's avatar Niranjan Reddy Dumbala
Browse files

Merge commit '90c19c17' into remote 



Change-Id: I6412af20740a216c1be88b9dddeb5bcedda2fd97
Signed-off-by: default avatarNiranjan Reddy Dumbala <dnreddy@codeaurora.org>
parents 82b38362 90c19c17

AndroidKernel.mk

+2 −0
Original line number Diff line number Diff line
@@ -187,9 +187,11 @@ $(KERNEL_HEADERS_INSTALL): $(KERNEL_OUT) 
			echo $(KERNEL_CONFIG_OVERRIDE) >> $(KERNEL_OUT)/.config; \

			$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(real_cc) oldconfig; fi



.PHONY: kerneltags

kerneltags: $(KERNEL_OUT) $(KERNEL_CONFIG)

	$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(real_cc) tags



.PHONY: kernelconfig

kernelconfig: $(KERNEL_OUT) $(KERNEL_CONFIG)

	env KCONFIG_NOTIMESTAMP=true \

	     $(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(real_cc) menuconfig

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

0 → 100644
+15 −0
Original line number Diff line number Diff line 
Qualcomm Technologies, Inc. Core Control for Hypervisor



Required properties:

- compatible: should be "qcom,hyp-core-ctl"

- reg: An array of u32 values. reg[0] contains the token id to be used

       for hyp core_ctl system calls to set/get physical CPUs corresponding

       to the virtual CPUs. reg[1] ... reg[n] indicate the token ids

       to be used while referring to the virtual CPUs respectively.



Example:



	hyp-core-ctl@346 {

		compatible = "qcom,hyp-core-ctl";

		reg = <0x346 0x347 0x348>;

	};

Documentation/devicetree/bindings/bus/mhi.txt

+0 −7
Original line number Diff line number Diff line
@@ -19,13 +19,6 @@ Main node properties: 
  Value type: <u32>

  Definition: Maximum timeout in ms wait for state and cmd completion



- mhi,time-sync

  Usage: optional

  Value type: <bool>

  Definition: Set true, if the external device support MHI get time

	feature for time synchronization between host processor and

	external modem.



- mhi,use-bb

  Usage: optional

  Value type: <bool>

Documentation/devicetree/bindings/bus/mhi_qcom.txt

+6 −5
Original line number Diff line number Diff line
@@ -32,23 +32,24 @@ Main node properties: 
  Definition: Pair of values describing iova start and stop address



- qcom,msm-bus,name

  Usage: required

  Usage: required if bus scale used

  Value type: <string>

  Definition: string representing the bus scale client name to register

  Definition: string representing the bus scale client name to register if

	bus scale voting is supported and required.



- qcom,msm-bus,num-cases

  Usage: required

  Usage: required if bus scale used

  Value type: <u32>

  Definition: Must be set to two, MHI support two scales



- qcom,msm-bus,num-paths

  Usage: required

  Usage: required if bus scale used

  Value type: <u32>

  Definition: Total number of master-slave pairs MHI host will vote. Must be set

	to one.



- qcom,msm-bus,vectors-KBps

  Usage: required

  Usage: required if bus scale used

  Value type: Array of <u32>

  Definition: Array of tuples which define the bus bandwidth requirements.

	Each tuple is of length 4, values are master-id, slave-id,

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

+2 −1
Original line number Diff line number Diff line 
Qualcomm Technologies, Inc. Sensor Clock Controller Bindings



Required properties:

- compatible: shall contain "qcom,scc-sm8150" or "qcom,scc-sm8150-v2".

- compatible: shall contain "qcom,scc-sm8150" or "qcom,scc-sm8150-v2" or

		"qcom,scc-sm6150".

- reg: shall contain base register location and length.

- vdd_scc_cx-supply: the logic rail supply.

- #clock-cells: shall contain 1.