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

Commit 7513ba4c 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 '4.9/tmp-8cca21f2' into 4.9"

parents a1a6a4a9 01bff910

Documentation/devicetree/bindings/arm/davinci.txt

+0 −4
Original line number Original line Diff line number Diff line
@@ -13,10 +13,6 @@ EnBW AM1808 based CMC board 
Required root node properties:

Required root node properties:

    - compatible = "enbw,cmc", "ti,da850;

    - compatible = "enbw,cmc", "ti,da850;





LEGO MINDSTORMS EV3 (AM1808 based)

Required root node properties:

    - compatible = "lego,ev3", "ti,da850";



Generic DaVinci Boards

Generic DaVinci Boards

----------------------

----------------------

Documentation/devicetree/bindings/vendor-prefixes.txt

+0 −1
Original line number Original line Diff line number Diff line
@@ -155,7 +155,6 @@ kosagi Sutajio Ko-Usagi PTE Ltd. 
kyo	Kyocera Corporation

kyo	Kyocera Corporation

lacie	LaCie

lacie	LaCie

lantiq	Lantiq Semiconductor

lantiq	Lantiq Semiconductor

lego	LEGO Systems A/S

lenovo	Lenovo Group Ltd.

lenovo	Lenovo Group Ltd.

lg	LG Corporation

lg	LG Corporation

linux	Linux-specific binding

linux	Linux-specific binding

Makefile

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

VERSION = 4

PATCHLEVEL = 9

PATCHLEVEL = 9

SUBLEVEL = 62

SUBLEVEL = 65

EXTRAVERSION =

EXTRAVERSION =

NAME = Roaring Lionus

NAME = Roaring Lionus

arch/arm/boot/dts/am33xx.dtsi

+2 −1
Original line number Original line Diff line number Diff line
@@ -143,10 +143,11 @@ 
				};

				};





				scm_conf: scm_conf@0 {

				scm_conf: scm_conf@0 {

					compatible = "syscon";

					compatible = "syscon", "simple-bus";

					reg = <0x0 0x800>;

					reg = <0x0 0x800>;

					#address-cells = <1>;

					#address-cells = <1>;

					#size-cells = <1>;

					#size-cells = <1>;

					ranges = <0 0 0x800>;





					scm_clocks: clocks {

					scm_clocks: clocks {

						#address-cells = <1>;

						#address-cells = <1>;

arch/arm/boot/dts/dm814x.dtsi

+5 −4
Original line number Original line Diff line number Diff line
@@ -252,7 +252,7 @@ 
			};

			};





			uart1: uart@20000 {

			uart1: uart@20000 {

				compatible = "ti,omap3-uart";

				compatible = "ti,am3352-uart", "ti,omap3-uart";

				ti,hwmods = "uart1";

				ti,hwmods = "uart1";

				reg = <0x20000 0x2000>;

				reg = <0x20000 0x2000>;

				clock-frequency = <48000000>;

				clock-frequency = <48000000>;
@@ -262,7 +262,7 @@ 
			};

			};





			uart2: uart@22000 {

			uart2: uart@22000 {

				compatible = "ti,omap3-uart";

				compatible = "ti,am3352-uart", "ti,omap3-uart";

				ti,hwmods = "uart2";

				ti,hwmods = "uart2";

				reg = <0x22000 0x2000>;

				reg = <0x22000 0x2000>;

				clock-frequency = <48000000>;

				clock-frequency = <48000000>;
@@ -272,7 +272,7 @@ 
			};

			};





			uart3: uart@24000 {

			uart3: uart@24000 {

				compatible = "ti,omap3-uart";

				compatible = "ti,am3352-uart", "ti,omap3-uart";

				ti,hwmods = "uart3";

				ti,hwmods = "uart3";

				reg = <0x24000 0x2000>;

				reg = <0x24000 0x2000>;

				clock-frequency = <48000000>;

				clock-frequency = <48000000>;
@@ -332,10 +332,11 @@ 
				ranges = <0 0x140000 0x20000>;

				ranges = <0 0x140000 0x20000>;





				scm_conf: scm_conf@0 {

				scm_conf: scm_conf@0 {

					compatible = "syscon";

					compatible = "syscon", "simple-bus";

					reg = <0x0 0x800>;

					reg = <0x0 0x800>;

					#address-cells = <1>;

					#address-cells = <1>;

					#size-cells = <1>;

					#size-cells = <1>;

					ranges = <0 0 0x800>;





					scm_clocks: clocks {

					scm_clocks: clocks {

						#address-cells = <1>;

						#address-cells = <1>;