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

Commit a3136751 authored by Shreyas Narayan's avatar Shreyas Narayan
Browse files

Merge commit '96aa5972' into HEAD 



Change-Id: Ica58527e4328f962b5eba4f9c5c35a9881f7034c
Signed-off-by: default avatarShreyas Narayan <shrena@codeaurora.org>
parents 28216361 96aa5972

AndroidKernel.mk

+7 −0
Original line number Diff line number Diff line
@@ -118,8 +118,15 @@ endif 
ifeq ($(TARGET_KERNEL_APPEND_DTB), true)

$(info Using appended DTB)

TARGET_PREBUILT_INT_KERNEL_ := $(TARGET_PREBUILT_INT_KERNEL_)-dtb

else

$(info Using DTB Image)

INSTALLED_DTBIMAGE_TARGET := $(PRODUCT_OUT)/dtb.img

endif



# Creating a dtb.img once the kernel is compiled if TARGET_KERNEL_APPEND_DTB is set to be false

$(INSTALLED_DTBIMAGE_TARGET): $(INSTALLED_KERNEL_TARGET)

	cat $(KERNEL_OUT)/arch/$(KERNEL_ARCH)/boot/dts/qcom/*.dtb > $@



KERNEL_HEADERS_INSTALL := $(KERNEL_OUT)/usr

KERNEL_MODULES_INSTALL ?= system

KERNEL_MODULES_OUT ?= $(PRODUCT_OUT)/$(KERNEL_MODULES_INSTALL)/lib/modules

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

+2 −2
Original line number Diff line number Diff line
@@ -410,6 +410,6 @@ compatible = "qcom,sdxpoorwills-rumi" 
compatible = "qcom,sdxpoorwills-atp"

compatible = "qcom,sdxpoorwills-mtp"

compatible = "qcom,sdxpoorwills-cdp"

compatible = "qcom,sdxpoorwills-ttp"

compatible = "qcom,sdxpoorwills-ccard"

compatible = "qcom,sa415m-ttp"

compatible = "qcom,sa415m-ccard"

compatible = "qcom,mdm9607-ttp"

Documentation/devicetree/bindings/mhi/msm_mhi_dev.txt

+17 −0
Original line number Diff line number Diff line
@@ -31,6 +31,18 @@ Optional property: 
		MHI driver on the host. This property is required if iatu

		property qcom,mhi-config-iatu is present.



MSM MHI DEV NET



MSM MHI DEV enables communication with the host over a PCIe link using the

Network Interface.



Required properties:

  - compatible: should be "qcom,msm-mhi-dev-net" for MHI net device driver.



Optional property:

  - qcom,mhi-ethernet-interface;: If property is present use ethernet packet

	parsing support.



Example:



	mhi: qcom,msm-mhi-dev {
@@ -44,3 +56,8 @@ Example: 
		qcom,mhi-ep-msi = <1>;

		qcom,mhi-version = <0x1000000>;

	};



	qcom,mhi_net_dev {

		compatible = "qcom,msm-mhi-dev-net";

		qcom,mhi-ethernet-interface;

	};

Documentation/devicetree/bindings/sound/aw8896.txt

+10 −1
Original line number Diff line number Diff line
@@ -8,6 +8,12 @@ Required properties: 


  - reset-gpio : gpio used for HW reset



  - dvdd-supply : Power supply for PA's dvdd



  - dvdd-voltage : Minimum and maximum voltage in uV to set for power supply



  - dvdd-current : dvdd's max current in uA



Optional properties:



  - irq-gpio: gpio used for irq indicator
@@ -18,4 +24,7 @@ Examples: 
		compatible = "awinic,i2c_smartpa";

		reg = <0x34>;

		reset-gpio = <&tlmm 68 0>;

		dvdd-supply = <&pm660_l9>;

		dvdd-voltage = <1800000 1800000>;

		dvdd-current = <15000>;

	};

arch/arm/boot/dts/qcom/Makefile

+5 −4
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ dtb-$(CONFIG_ARCH_SDXPOORWILLS) += sdxpoorwills-rumi.dtb \ 
	sdxpoorwills-cdp.dtb \

	sdxpoorwills-mtp.dtb \

	sdxpoorwills-atp.dtb \

	sdxpoorwills-v2-ttp.dtb \

	sa415m-ttp.dtb \

	sdxpoorwills-cdp-256.dtb \

	sdxpoorwills-mtp-256.dtb \

	sdxpoorwills-dualwifi-cdp.dtb \
@@ -16,9 +16,10 @@ dtb-$(CONFIG_ARCH_SDXPOORWILLS) += sdxpoorwills-rumi.dtb \ 
	sdxpoorwills-v2-cdp.dtb \

	sdxpoorwills-v2-dualwifi-mtp.dtb \

	sdxpoorwills-v2-dualwifi-cdp.dtb \

	sdxpoorwills-ccard.dtb \

	sdxpoorwills-ccard-pcie-ep.dtb \

	sdxpoorwills-ccard-usb-ep.dtb \

	sa415m-ccard.dtb \

	sa415m-ccard-pcie-ep.dtb \

	sa415m-ccard-usb-ep.dtb \

	sa415m-ttp-usb-ep.dtb \

	sdxpoorwills-v2-pcie-ep-mtp-256.dtb \

	sdxpoorwills-v2-pcie-ep-mtp.dtb