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

Commit f6a26ae7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull arm-soc board specific changes from Olof Johansson:
 "While we generally attempt to get rid of board specific files and
  replace them with device tree based descriptions, a lot of platforms
  have not come that far:

  In shmobile, we add two new board files because their recently started
  effort to add DT support has not proceeded enough to use it for all of
  the important hardware.

  In Kirkwood, we are adding support for new boards with a combination
  of DT and board file contents in multiple cases.

  pxa/mmp and imx are extending support for existing board files but not
  adding new ones."

Fix up trivial conflicts in arch/arm/mach-{mmp/ttc_dkb.c,shmobile/{Kconfig,Makefile}}

* tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (94 commits)
  ARM: shmobile: fix smp build
  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
  ARM: mach-shmobile: Use DT_MACHINE for armadillo 800 eva
  ARM: mach-shmobile: Use DT_MACHINE for KZM9G
  ARM: pxa: hx4700: Add Synaptics NavPoint touchpad
  ARM: pxa: Use REGULATOR_SUPPLY macro
  ARM: mach-shmobile: kzm9g: enable SMP boot
  ARM: mach-shmobile: kzm9g: defconfig update
  ARM: mach-shmobile: kzm9g: add PCF8757 gpio-key
  ARM: mach-shmobile: kzm9g: add SDHI support
  ARM: mach-shmobile: kzm9g: add MMCIF support
  ARM: mach-shmobile: kzm9g: correct screen direction
  ARM: mach-shmobile: sh73a0.h: add GPIO_NR
  ...
parents cdd3a354 48a5765e

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>;

	};

};

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>;

			};

		};

	};

};

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

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



/include/ "kirkwood.dtsi"



/ {

	model = "RaidSonic ICY BOX IB-NAS62x0 (Rev B)";

	compatible = "raidsonic,ib-nas6210-b", "raidsonic,ib-nas6220-b", "raidsonic,ib-nas6210", "raidsonic,ib-nas6220", "raidsonic,ib-nas62x0",  "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>;

			};



			partition@100000 {

				label = "uImage";

				reg = <0x0100000 0x600000>;

			};



			partition@700000 {

				label = "root";

				reg = <0x0700000 0xf900000>;

			};



		};

	};

};

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

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



/include/ "kirkwood.dtsi"



/ {

	model = "Iomega Iconnect";

	compatible = "iom,iconnect-1.1", "iom,iconnect", "mrvl,kirkwood-88f6281", "mrvl,kirkwood";



	memory {

		device_type = "memory";

		reg = <0x00000000 0x10000000>;

	};



	chosen {

		bootargs = "console=ttyS0,115200n8 earlyprintk mtdparts=orion_nand:0xc0000@0x0(uboot),0x20000@0xa0000(env),0x300000@0x100000(zImage),0x300000@0x540000(initrd),0x1f400000@0x980000(boot)";

		linux,initrd-start = <0x4500040>;

		linux,initrd-end   = <0x4800000>;

	};



	ocp@f1000000 {

		serial@12000 {

			clock-frequency = <200000000>;

			status = "ok";

		};

	};

};