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

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

Merge "Merge android-4.9.218(1caf614f) into msm-4.9"

parents a9763cb6 d2440d68

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 = 9

SUBLEVEL = 217

SUBLEVEL = 218

EXTRAVERSION =

NAME = Roaring Lionus

arch/arm/boot/dts/dra7.dtsi

+3 −0
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ 
		#address-cells = <1>;

		#size-cells = <1>;

		ranges = <0x0 0x0 0x0 0xc0000000>;

		dma-ranges = <0x80000000 0x0 0x80000000 0x80000000>;

		ti,hwmods = "l3_main_1", "l3_main_2";

		reg = <0x0 0x44000000 0x0 0x1000000>,

		      <0x0 0x45000000 0x0 0x1000>;
@@ -282,6 +283,7 @@ 
				device_type = "pci";

				ranges = <0x81000000 0 0          0x03000 0 0x00010000

					  0x82000000 0 0x20013000 0x13000 0 0xffed000>;

				dma-ranges = <0x02000000 0x0 0x00000000 0x00000000 0x1 0x00000000>;

				bus-range = <0x00 0xff>;

				#interrupt-cells = <1>;

				num-lanes = <1>;
@@ -319,6 +321,7 @@ 
				device_type = "pci";

				ranges = <0x81000000 0 0          0x03000 0 0x00010000

					  0x82000000 0 0x30013000 0x13000 0 0xffed000>;

				dma-ranges = <0x02000000 0x0 0x00000000 0x00000000 0x1 0x00000000>;

				bus-range = <0x00 0xff>;

				#interrupt-cells = <1>;

				num-lanes = <1>;

arch/arm/boot/dts/omap5.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ 
		#address-cells = <1>;

		#size-cells = <1>;

		ranges = <0 0 0 0xc0000000>;

		dma-ranges = <0x80000000 0x0 0x80000000 0x80000000>;

		ti,hwmods = "l3_main_1", "l3_main_2", "l3_main_3";

		reg = <0 0x44000000 0 0x2000>,

		      <0 0x44800000 0 0x3000>,

arch/arm64/include/asm/alternative.h

+1 −1
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ alternative_endif 


.macro user_alt, label, oldinstr, newinstr, cond

9999:	alternative_insn "\oldinstr", "\newinstr", \cond

	_ASM_EXTABLE 9999b, \label

	_asm_extable 9999b, \label

.endm



/*