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

Commit b0ef8a19 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge e0da3764 on remote branch 

Change-Id: I1124263843b67a2faff8fa0eb76e7304be8418b6
parents 38af877d e0da3764

AndroidKernel.mk

+18 −1
Original line number Diff line number Diff line
@@ -210,14 +210,31 @@ $(KERNEL_CONFIG): $(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



$(TARGET_PREBUILT_INT_KERNEL): $(KERNEL_OUT) $(KERNEL_HEADERS_INSTALL)

ifeq ($(TARGET_KERNEL_APPEND_DTB), true)

TARGET_PREBUILT_INT_KERNEL_IMAGE := $(KERNEL_OUT)/arch/$(KERNEL_ARCH)/boot/Image

$(TARGET_PREBUILT_INT_KERNEL_IMAGE): $(KERNEL_USR)

$(TARGET_PREBUILT_INT_KERNEL_IMAGE): $(KERNEL_OUT) $(KERNEL_HEADERS_INSTALL)

	$(hide) echo "Building kernel modules..."

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

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

	$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) INSTALL_MOD_PATH=$(BUILD_ROOT_LOC)../$(KERNEL_MODULES_INSTALL) INSTALL_MOD_STRIP=1 $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(real_cc) modules_install

	$(mv-modules)

	$(clean-module-folder)



$(TARGET_PREBUILT_INT_KERNEL): $(TARGET_PREBUILT_INT_KERNEL_IMAGE)

	$(hide) echo "Building kernel..."

	$(hide) rm -rf $(KERNEL_OUT)/arch/$(KERNEL_ARCH)/boot/dts

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

else

TARGET_PREBUILT_INT_KERNEL_IMAGE := $(TARGET_PREBUILT_INT_KERNEL)

$(TARGET_PREBUILT_INT_KERNEL): $(KERNEL_OUT) $(KERNEL_HEADERS_INSTALL)

	$(hide) echo "Building kernel..."

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

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

	$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) INSTALL_MOD_PATH=$(BUILD_ROOT_LOC)../$(KERNEL_MODULES_INSTALL) INSTALL_MOD_STRIP=1 $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(real_cc) modules_install

	$(mv-modules)

	$(clean-module-folder)

endif



$(KERNEL_HEADERS_INSTALL): $(KERNEL_OUT)

	$(hide) if [ ! -z "$(KERNEL_HEADER_DEFCONFIG)" ]; then \

Documentation/conf.py

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ from load_config import loadConfig 
extensions = ['kernel-doc', 'rstFlatTable', 'kernel_include', 'cdomain']



# The name of the math extension changed on Sphinx 1.4

if major == 1 and minor > 3:

if (major == 1 and minor > 3) or (major > 1):

    extensions.append("sphinx.ext.imgmath")

else:

    extensions.append("sphinx.ext.pngmath")

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

+4 −0
Original line number Diff line number Diff line
@@ -152,6 +152,9 @@ SoCs: 
- QM215

  compatible = "qcom, qm215"



- QCM2150

  compatible = "qcom, qcm2150"



- MDM9640

  compatible = "qcom,mdm9640"
@@ -378,6 +381,7 @@ compatible = "qcom,sdm439-qrd" 
compatible = "qcom,sda439-cdp"

compatible = "qcom,sda439-mtp"

compatible = "qcom,qm215-qrd"

compatible = "qcom,qcm2150-qrd"

compatible = "qcom,msm8953-rumi"

compatible = "qcom,msm8953-sim"

compatible = "qcom,msm8953-cdp"

Documentation/devicetree/bindings/media/video/msm-cam-ppi.txt

0 → 100644
+102 −0
Original line number Diff line number Diff line 
* Qualcomm Technologies, Inc. MSM camera PPI



=======================

Required Node Structure

=======================

The camera PPI node must be described in First level of device nodes. The

first level describe the overall PPI node structure.



======================================

First Level Node - PPI device

======================================



- compatible

  Usage: required

  Value type: <string>

  Definition: Should be "qcom,ppi-v1.0",

        "qcom,ppi-v1.1", "qcom,ppi-v1.2",

        "qcom,ppi-v2.0", "qcom,ppi".



- cell-index: ppi hardware core index

  Usage: required

  Value type: <u32>

  Definition: Should specify the Hardware index id.



- reg

  Usage: required

  Value type: <u32>

  Definition: offset and length of the register set

        for the device for the ppi operating in

        compatible mode.



- reg-names

  Usage: required

  Value type: <string>

  Definition: Should specify relevant names to each

        reg property defined.



- reg-cam-base

  Usage: required

  Value type: <string>

  Definition: offset of PPI in  camera hw block



- interrupts

  Usage: required

  Value type: <u32>

  Definition: Interrupt associated with PPI HW.



- interrupt-names

  Usage: required

  Value type: <string>

  Definition: Name of the interrupt.



- clock-names

  Usage: required

  Value type: <string>

  Definition: List of clock names required for PPI HW.



- clock-rates

  Usage: required

  Value type: <u32>

  Definition: List of clock rates in Hz for PPI HW.



- clock-cntl-level

  Usage: required

  Value type: <string>

  Definition: All different clock level node can support.



- clocks

  Usage: required

  Value type: <phandle>

  Definition: all clock phandle and source clocks.



- regulator-names

  Usage: required

  Value type: <string>

  Definition: name of the voltage regulators required for the device.



- gdscr-supply

  Usage: required

  Value type: <phandle>

  Definition: should contain gdsr regulator used for PPI clocks.



Example:

     qcom,ppi0@ace0000 {

     cell-index = <0>;

     compatible = "qcom,ppi170";

     reg-names = "ppi";

     reg = <0xace0000 0x200>;

     reg-cam-base = <0xe0000>;

     interrupt-names = "ppi";

     interrupts = <0 202 0>;

     regulator-names = "gdscr", "refgen";

     gdscr-supply = <&titan_top_gdsc>;

     clocks = <&clock_camcc CAM_CC_CPHY_RX_CLK_SRC>,

              <&clock_camcc CAM_CC_PPI0_CLK>,

              <&clock_camcc CAM_CC_CSI0PHYTIMER_CLK_SRC>,

              <&clock_camcc CAM_CC_CSI0PHYTIMER_CLK>;

     clock-names = "cphy_rx_clk_src", "ppi0_clk"

     clock-rates = <400000000 0 300000000 0>;

     clock-cntl-level = "turbo";

     status = "ok";

};

Documentation/devicetree/bindings/net/can/microchip,mcp251x.txt

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ Required properties: 
 - compatible: Should be one of the following:

   - "microchip,mcp2510" for MCP2510.

   - "microchip,mcp2515" for MCP2515.

   - "microchip,mcp25625" for MCP25625.

 - reg: SPI chip select.

 - clocks: The clock feeding the CAN controller.

 - interrupt-parent: The parent interrupt controller.