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

Commit 0dff9d69 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge remote-tracking branch 'remotes/origin/tmp-a45ab563' into msm-4.14" into msm-4.14

parents 7b633b09 805d1341

Documentation/devicetree/bindings/display/panel/toppoly,td028ttec1.txt→Documentation/devicetree/bindings/display/panel/tpo,td028ttec1.txt

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ Toppoly TD028TTEC1 Panel 
========================



Required properties:

- compatible: "toppoly,td028ttec1"

- compatible: "tpo,td028ttec1"



Optional properties:

- label: a symbolic name for the panel
@@ -14,7 +14,7 @@ Example 
-------



lcd-panel: td028ttec1@0 {

	compatible = "toppoly,td028ttec1";

	compatible = "tpo,td028ttec1";

	reg = <0>;

	spi-max-frequency = <100000>;

	spi-cpol;

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 29

SUBLEVEL = 30

EXTRAVERSION =

NAME = Petit Gorille

arch/alpha/kernel/console.c

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
struct pci_controller *pci_vga_hose;

static struct resource alpha_vga = {

	.name	= "alpha-vga+",

	.flags	= IORESOURCE_IO,

	.start	= 0x3C0,

	.end	= 0x3DF

};

arch/arm/boot/dts/aspeed-ast2500-evb.dts

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
		bootargs = "console=ttyS4,115200 earlyprintk";

	};



	memory {

	memory@80000000 {

		reg = <0x80000000 0x20000000>;

	};

};

arch/arm64/crypto/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -95,4 +95,10 @@ config CRYPTO_AES_ARM64_BS 
	select CRYPTO_AES_ARM64

	select CRYPTO_SIMD



config CRYPTO_SPECK_NEON

	tristate "NEON accelerated Speck cipher algorithms"

	depends on KERNEL_MODE_NEON

	select CRYPTO_BLKCIPHER

	select CRYPTO_SPECK



endif