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

Unverified Commit 6e4d5be7 authored by Andreas Schneider's avatar Andreas Schneider Committed by GitHub
Browse files

Merge pull request #35 from derfelot/lineage-15.1_caf 

Updates
parents b836a475 8228fd47

Documentation/devicetree/bindings/platform/msm/ssm.txt

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
* Qualcomm Technologies, Inc. Secure Service Module driver



This module enables framework to which a client can register itself

specifying different attributes and defining various permission levels

associated with different combination of attribute values and mode of the system.



Required properties:

- compatible:		Must be "qcom,ssm"



Example:

	qcom,ssm {

		compatible = "qcom,ssm";

	};
 
 No newline at end of file

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 4

SUBLEVEL = 155

SUBLEVEL = 156

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/arm/configs/imx_v6_v7_defconfig

+0 −2
Original line number Diff line number Diff line
@@ -261,7 +261,6 @@ CONFIG_USB_STORAGE=y 
CONFIG_USB_CHIPIDEA=y

CONFIG_USB_CHIPIDEA_UDC=y

CONFIG_USB_CHIPIDEA_HOST=y

CONFIG_USB_CHIPIDEA_ULPI=y

CONFIG_USB_SERIAL=m

CONFIG_USB_SERIAL_GENERIC=y

CONFIG_USB_SERIAL_FTDI_SIO=m
@@ -288,7 +287,6 @@ CONFIG_USB_G_NCM=m 
CONFIG_USB_GADGETFS=m

CONFIG_USB_MASS_STORAGE=m

CONFIG_USB_G_SERIAL=m

CONFIG_USB_ULPI_BUS=y

CONFIG_MMC=y

CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI_PLTFM=y

arch/arm/include/asm/arch_gicv3.h

+1 −0
Original line number Diff line number Diff line
@@ -117,6 +117,7 @@ static inline u32 gic_read_iar(void) 
	u32 irqstat;



	asm volatile("mrc " __stringify(ICC_IAR1) : "=r" (irqstat));

	dsb(sy);

	return irqstat;

}

arch/arm64/configs/lineage-msm8998-yoshino-lilac_defconfig

+1 −2
Original line number Diff line number Diff line 
#

# Automatically generated file; DO NOT EDIT.

# Linux/arm64 4.4.146 Kernel Configuration

# Linux/arm64 4.4.155 Kernel Configuration

#

CONFIG_ARM64=y

CONFIG_64BIT=y
@@ -4127,7 +4127,6 @@ CONFIG_GSI=y 
CONFIG_IPA3=y

CONFIG_RMNET_IPA3=y

# CONFIG_IPA_UT is not set

# CONFIG_SSM is not set

# CONFIG_GPIO_USB_DETECT is not set

CONFIG_MSM_MHI=y

CONFIG_MSM_MHI_UCI=y