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

Commit 73912188 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'dts-fixes' into omap-for-v4.8/fixes

parents 5f3530a0 4875b8fc

arch/arm/boot/dts/am335x-baltos.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ 


		#address-cells = <1>;

		#size-cells = <1>;

		elm_id = <&elm>;

		ti,elm-id = <&elm>;

	};

};

arch/arm/boot/dts/am335x-igep0033.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ 


		#address-cells = <1>;

		#size-cells = <1>;

		elm_id = <&elm>;

		ti,elm-id = <&elm>;



		/* MTD partition table */

		partition@0 {

arch/arm/boot/dts/am335x-phycore-som.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ 
		gpmc,wr-access-ns = <30>;

		gpmc,wr-data-mux-bus-ns = <0>;



		elm_id = <&elm>;

		ti,elm-id = <&elm>;



		#address-cells = <1>;

		#size-cells = <1>;

arch/arm/boot/dts/logicpd-som-lv.dtsi

+6 −5
Original line number Diff line number Diff line
@@ -35,10 +35,15 @@ 
	ranges = <0 0 0x00000000 0x1000000>;	/* CS0: 16MB for NAND */



	nand@0,0 {

		linux,mtd-name = "micron,mt29f4g16abbda3w";

		compatible = "ti,omap2-nand";

		reg = <0 0 4>; /* CS0, offset 0, IO size 4 */

		interrupt-parent = <&gpmc>;

		interrupts = <0 IRQ_TYPE_NONE>, /* fifoevent */

			     <1 IRQ_TYPE_NONE>;	/* termcount */

		linux,mtd-name = "micron,mt29f4g16abbda3w";

		nand-bus-width = <16>;

		ti,nand-ecc-opt = "bch8";

		rb-gpios = <&gpmc 0 GPIO_ACTIVE_HIGH>; /* gpmc_wait0 */

		gpmc,sync-clk-ps = <0>;

		gpmc,cs-on-ns = <0>;

		gpmc,cs-rd-off-ns = <44>;
@@ -54,10 +59,6 @@ 
		gpmc,wr-access-ns = <40>;

		gpmc,wr-data-mux-bus-ns = <0>;

		gpmc,device-width = <2>;



		gpmc,page-burst-access-ns = <5>;

		gpmc,cycle2cycle-delay-ns = <50>;



		#address-cells = <1>;

		#size-cells = <1>;

arch/arm/boot/dts/logicpd-torpedo-som.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 
		linux,mtd-name = "micron,mt29f4g16abbda3w";

		nand-bus-width = <16>;

		ti,nand-ecc-opt = "bch8";

		rb-gpios = <&gpmc 0 GPIO_ACTIVE_HIGH>; /* gpmc_wait0 */

		gpmc,sync-clk-ps = <0>;

		gpmc,cs-on-ns = <0>;

		gpmc,cs-rd-off-ns = <44>;