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

Commit 718133a6 authored by Kevin Hilman's avatar Kevin Hilman
Browse files

Merge tag 'mvebu-dt-3.14-3' of git://git.infradead.org/linux-mvebu into next/dt 

From Jason Cooper:
mvebu DT changes for v3.14 (incr. #3)

 - kirkwood
    - use symbolic names for gpios and key inputs

 - mvebu
    - add the pxa nand controller to the ReadyNAS and A370-RD boards

* tag 'mvebu-dt-3.14-3' of git://git.infradead.org/linux-mvebu

:
  ARM: mvebu: Enable NAND controller in A370 Reference Design board
  ARM: mvebu: Enable NAND controller in ReadyNAS 2120 .dts file
  ARM: mvebu: Enable NAND controller in ReadyNAS 104 .dts file
  ARM: mvebu: Enable NAND controller in ReadyNAS 102 .dts file
  ARM: DT: Kirkwood: Use symbolic names from gpio.h
  ARM: DT: Kirkwood: Use symbolic names from input.h

Signed-off-by: default avatarKevin Hilman <khilman@linaro.org>
parents 1cfe0874 69e18e26

arch/arm/boot/dts/armada-370-netgear-rn102.dts

+36 −0
Original line number Original line Diff line number Diff line
@@ -131,6 +131,42 @@ 
					pwm_polarity = <0>;

					pwm_polarity = <0>;

				};

				};

			};

			};



			nand@d0000 {

				status = "okay";

				num-cs = <1>;

				marvell,nand-keep-config;

				marvell,nand-enable-arbiter;

				nand-on-flash-bbt;



				partition@0 {

					label = "u-boot";

					reg = <0x0000000 0x180000>;  /* 1.5MB */

					read-only;

				};



				partition@180000 {

					label = "u-boot-env";

					reg = <0x180000 0x20000>;    /* 128KB */

					read-only;

				};



				partition@200000 {

					label = "uImage";

					reg = <0x0200000 0x600000>;    /* 6MB */

				};



				partition@800000 {

					label = "minirootfs";

					reg = <0x0800000 0x400000>;    /* 4MB */

				};



				/* Last MB is for the BBT, i.e. not writable */

				partition@c00000 {

					label = "ubifs";

					reg = <0x0c00000 0x7400000>; /* 116MB */

				};

			};

		};

		};

	};

	};

arch/arm/boot/dts/armada-370-netgear-rn104.dts

+36 −0
Original line number Original line Diff line number Diff line
@@ -133,6 +133,42 @@ 
					reg = <0x23>;

					reg = <0x23>;

				};

				};

			};

			};



			nand@d0000 {

				status = "okay";

				num-cs = <1>;

				marvell,nand-keep-config;

				marvell,nand-enable-arbiter;

				nand-on-flash-bbt;



				partition@0 {

					label = "u-boot";

					reg = <0x0000000 0x180000>;  /* 1.5MB */

					read-only;

				};



				partition@180000 {

					label = "u-boot-env";

					reg = <0x180000 0x20000>;    /* 128KB */

					read-only;

				};



				partition@200000 {

					label = "uImage";

					reg = <0x0200000 0x600000>;    /* 6MB */

				};



				partition@800000 {

					label = "minirootfs";

					reg = <0x0800000 0x400000>;    /* 4MB */

				};



				/* Last MB is for the BBT, i.e. not writable */

				partition@c00000 {

					label = "ubifs";

					reg = <0x0c00000 0x7400000>; /* 116MB */

				};

			};

		};

		};

	};

	};

arch/arm/boot/dts/armada-370-rd.dts

+21 −0
Original line number Original line Diff line number Diff line
@@ -104,6 +104,27 @@ 
					gpios = <&gpio0 6 1>;

					gpios = <&gpio0 6 1>;

				};

				};

			};

			};



			nand@d0000 {

				status = "okay";

				num-cs = <1>;

				marvell,nand-keep-config;

				marvell,nand-enable-arbiter;

				nand-on-flash-bbt;



				partition@0 {

					label = "U-Boot";

					reg = <0 0x800000>;

				};

				partition@800000 {

					label = "Linux";

					reg = <0x800000 0x800000>;

				};

				partition@1000000 {

					label = "Filesystem";

					reg = <0x1000000 0x3f000000>;

				};

			};

		};

		};

	};

	};

 };
 
 };

arch/arm/boot/dts/armada-xp-netgear-rn2120.dts

+36 −0
Original line number Original line Diff line number Diff line
@@ -211,6 +211,42 @@ 
					reg = <0x4c>;

					reg = <0x4c>;

				};

				};

			};

			};



			nand@d0000 {

				status = "okay";

				num-cs = <1>;

				marvell,nand-keep-config;

				marvell,nand-enable-arbiter;

				nand-on-flash-bbt;



				partition@0 {

					label = "u-boot";

					reg = <0x0000000 0x180000>;  /* 1.5MB */

					read-only;

				};



				partition@180000 {

					label = "u-boot-env";

					reg = <0x180000 0x20000>;    /* 128KB */

					read-only;

				};



				partition@200000 {

					label = "uImage";

					reg = <0x0200000 0x600000>;    /* 6MB */

				};



				partition@800000 {

					label = "minirootfs";

					reg = <0x0800000 0x400000>;    /* 4MB */

				};



				/* Last MB is for the BBT, i.e. not writable */

				partition@c00000 {

					label = "ubifs";

					reg = <0x0c00000 0x7400000>; /* 116MB */

				};

			};

		};

		};

	};

	};

arch/arm/boot/dts/kirkwood-cloudbox.dts

+5 −5
Original line number Original line Diff line number Diff line
@@ -66,8 +66,8 @@ 




		button@1 {

		button@1 {

			label = "Power push button";

			label = "Power push button";

			linux,code = <116>;

			linux,code = <KEY_POWER>;

			gpios = <&gpio0 16 1>;

			gpios = <&gpio0 16 GPIO_ACTIVE_LOW>;

		};

		};

	};

	};
@@ -76,17 +76,17 @@ 




		red-fail {

		red-fail {

			label = "cloudbox:red:fail";

			label = "cloudbox:red:fail";

			gpios = <&gpio0 14 0>;

			gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>;

		};

		};

		blue-sata {

		blue-sata {

			label = "cloudbox:blue:sata";

			label = "cloudbox:blue:sata";

			gpios = <&gpio0 15 0>;

			gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>;

		};

		};

	};

	};





	gpio_poweroff {

	gpio_poweroff {

		compatible = "gpio-poweroff";

		compatible = "gpio-poweroff";

		gpios = <&gpio0 17 0>;

		gpios = <&gpio0 17 GPIO_ACTIVE_HIGH>;

	};

	};

};

};