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

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

Merge pull request #96 from derfelot/lineage-17.1_update2 

April update
parents 93751113 eee9bff4

Documentation/devicetree/bindings/powerpc/fsl/fman.txt

+7 −0
Original line number Diff line number Diff line
@@ -110,6 +110,13 @@ PROPERTIES 
		Usage: required

		Definition: See soc/fsl/qman.txt and soc/fsl/bman.txt



- fsl,erratum-a050385

		Usage: optional

		Value type: boolean

		Definition: A boolean property. Indicates the presence of the

		erratum A050385 which indicates that DMA transactions that are

		split can result in a FMan lock.



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

FMan MURAM Node

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 213

SUBLEVEL = 218

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/arc/boot/dts/axs10x_mb.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
			interrupt-names = "macirq";

			phy-mode = "rgmii";

			snps,pbl = < 32 >;

			snps,multicast-filter-bins = <256>;

			clocks = <&apbclk>;

			clock-names = "stmmaceth";

			max-speed = <100>;

arch/arc/include/asm/linkage.h

+2 −0
Original line number Diff line number Diff line
@@ -12,6 +12,8 @@ 
#ifdef __ASSEMBLY__



#define ASM_NL		 `	/* use '`' to mark new line in macro */

#define __ALIGN		.align 4

#define __ALIGN_STR	__stringify(__ALIGN)



/* annotation for data we want in DCCM - if enabled in .config */

.macro ARCFP_DATA nm

arch/arm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -2092,7 +2092,7 @@ config XIP_PHYS_ADDR 
config KEXEC

	bool "Kexec system call (EXPERIMENTAL)"

	depends on (!SMP || PM_SLEEP_SMP)

	depends on !CPU_V7M

	depends on MMU

	select KEXEC_CORE

	help

	  kexec is a system call that implements the ability to shutdown your