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

Unverified Commit 2201449d authored by Alexander Grund's avatar Alexander Grund
Browse files

Merge tag 'v4.4.277' into lineage-4.4.277 

This is the 4.4.277 stable release

Change-Id: I97294e16bfe6e041e1ff30784cb43b5e28d3760b
parents 29d87903 b9a023d8

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 276

SUBLEVEL = 277

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/arm/boot/dts/bcm63138.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ 
			status = "disabled";

		};



		nand: nand@2000 {

		nand_controller: nand-controller@2000 {

			#address-cells = <1>;

			#size-cells = <0>;

			compatible = "brcm,nand-bcm63138", "brcm,brcmnand-v7.0", "brcm,brcmnand";

arch/arm/boot/dts/bcm7445-bcm97445svmb.dts

+2 −2
Original line number Diff line number Diff line
@@ -13,10 +13,10 @@ 
	};

};



&nand {

&nand_controller {

	status = "okay";



	nandcs@1 {

	nand@1 {

		compatible = "brcm,nandcs";

		reg = <1>;

		nand-ecc-step-size = <512>;

arch/arm/boot/dts/bcm7445.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ 
			reg-names = "aon-ctrl", "aon-sram";

		};



		nand: nand@3e2800 {

		nand_controller: nand-controller@3e2800 {

			status = "disabled";

			#address-cells = <1>;

			#size-cells = <0>;

arch/arm/boot/dts/bcm963138dvt.dts

+2 −2
Original line number Diff line number Diff line
@@ -29,10 +29,10 @@ 
	status = "okay";

};



&nand {

&nand_controller {

	status = "okay";



	nandcs@0 {

	nand@0 {

		compatible = "brcm,nandcs";

		reg = <0>;

		nand-ecc-strength = <4>;