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

Commit 423b742b authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'kirkwood_boards_for_v3.5' of... 

Merge branch 'kirkwood_boards_for_v3.5' of git://git.infradead.org/users/jcooper/linux into next/boards

* 'kirkwood_boards_for_v3.5' of git://git.infradead.org/users/jcooper/linux

:
  ARM: kirkwood: Add support for RaidSonic IB-NAS6210/6220 using devicetree
  kirkwood: Add iconnect support
  orion/kirkwood: create a generic function for gpio led blinking
  kirkwood/orion: fix orion_gpio_set_blink
  ARM: kirkwood: Define DNS-320/DNS-325 NAND in fdt
  kirkwood: Allow nand to be configured via. devicetree
  mtd: Add orion_nand devicetree bindings
  ARM: kirkwood: Basic support for DNS-320 and DNS-325

Includes an update to v3.4-rc7

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents be944f1e f5520363

Documentation/devicetree/bindings/mtd/orion-nand.txt

0 → 100644
+50 −0
Original line number Diff line number Diff line 
NAND support for Marvell Orion SoC platforms



Required properties:

- compatible : "mrvl,orion-nand".

- reg : Base physical address of the NAND and length of memory mapped

	region



Optional properties:

- cle : Address line number connected to CLE. Default is 0

- ale : Address line number connected to ALE. Default is 1

- bank-width : Width in bytes of the device. Default is 1

- chip-delay : Chip dependent delay for transferring data from array to read

               registers in usecs



The device tree may optionally contain sub-nodes describing partitions of the

address space. See partition.txt for more detail.



Example:



nand@f4000000 {

	#address-cells = <1>;

	#size-cells = <1>;

	cle = <0>;

	ale = <1>;

	bank-width = <1>;

	chip-delay = <25>;

	compatible = "mrvl,orion-nand";

	reg = <0xf4000000 0x400>;



	partition@0 {

		label = "u-boot";

		reg = <0x0000000 0x100000>;

		read-only;

	};



	partition@100000 {

		label = "uImage";

		reg = <0x0100000 0x200000>;

	};



	partition@300000 {

		label = "dtb";

		reg = <0x0300000 0x100000>;

	};



	partition@400000 {

		label = "root";

		reg = <0x0400000 0x7d00000>;

	};

};

MAINTAINERS

+3 −0
Original line number Diff line number Diff line
@@ -1968,7 +1968,9 @@ S: Maintained 
F:	drivers/net/ethernet/ti/cpmac.c



CPU FREQUENCY DRIVERS

M:	Rafael J. Wysocki <rjw@sisk.pl>

L:	cpufreq@vger.kernel.org

L:	linux-pm@vger.kernel.org

S:	Maintained

F:	drivers/cpufreq/

F:	include/linux/cpufreq.h
@@ -4034,6 +4036,7 @@ F: Documentation/scsi/53c700.txt 
F:	drivers/scsi/53c700*



LED SUBSYSTEM

M:	Bryan Wu <bryan.wu@canonical.com>

M:	Richard Purdie <rpurdie@rpsys.net>

S:	Maintained

F:	drivers/leds/

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 0

EXTRAVERSION = -rc6

EXTRAVERSION = -rc7

NAME = Saber-toothed Squirrel



# *DOCUMENTATION*

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

0 → 100644
+64 −0
Original line number Diff line number Diff line 
/dts-v1/;



/include/ "kirkwood.dtsi"



/ {

	model = "D-Link DNS-320 NAS (Rev A1)";

	compatible = "dlink,dns-320-a1", "dlink,dns-320", "dlink,dns-kirkwood", "mrvl,kirkwood-88f6281", "mrvl,kirkwood";



	memory {

		device_type = "memory";

		reg = <0x00000000 0x8000000>;

	};



	chosen {

		bootargs = "console=ttyS0,115200n8 earlyprintk";

	};



	ocp@f1000000 {

		serial@12000 {

			clock-frequency = <166666667>;

			status = "okay";

		};



		serial@12100 {

			clock-frequency = <166666667>;

			status = "okay";

		};



		nand@3000000 {

			status = "okay";



			partition@0 {

				label = "u-boot";

				reg = <0x0000000 0x100000>;

				read-only;

			};



			partition@100000 {

				label = "uImage";

				reg = <0x0100000 0x500000>;

			};



			partition@600000 {

				label = "ramdisk";

				reg = <0x0600000 0x500000>;

			};



			partition@b00000 {

				label = "image";

				reg = <0x0b00000 0x6600000>;

			};



			partition@7100000 {

				label = "mini firmware";

				reg = <0x7100000 0xa00000>;

			};



			partition@7b00000 {

				label = "config";

				reg = <0x7b00000 0x500000>;

			};

		};

	};

};

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

0 → 100644
+59 −0
Original line number Diff line number Diff line 
/dts-v1/;



/include/ "kirkwood.dtsi"



/ {

	model = "D-Link DNS-325 NAS (Rev A1)";

	compatible = "dlink,dns-325-a1", "dlink,dns-325", "dlink,dns-kirkwood", "mrvl,kirkwood-88f6281", "mrvl,kirkwood";



	memory {

		device_type = "memory";

		reg = <0x00000000 0x10000000>;

	};



	chosen {

		bootargs = "console=ttyS0,115200n8 earlyprintk";

	};



	ocp@f1000000 {

		serial@12000 {

			clock-frequency = <200000000>;

			status = "okay";

		};



		nand@3000000 {

			status = "okay";



			partition@0 {

				label = "u-boot";

				reg = <0x0000000 0x100000>;

				read-only;

			};



			partition@100000 {

				label = "uImage";

				reg = <0x0100000 0x500000>;

			};



			partition@600000 {

				label = "ramdisk";

				reg = <0x0600000 0x500000>;

			};



			partition@b00000 {

				label = "image";

				reg = <0x0b00000 0x6600000>;

			};



			partition@7100000 {

				label = "mini firmware";

				reg = <0x7100000 0xa00000>;

			};



			partition@7b00000 {

				label = "config";

				reg = <0x7b00000 0x500000>;

			};

		};

	};

};