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

Commit 80783426 authored Apr 05, 2012 by Olof Johansson

Merge branch 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes

* 'at91-fixes' of git://github.com/at91linux/linux-at91:
  ARM: at91: dt: remove unit-address part for memory nodes
  ARM: at91: fix check of valid GPIO for SPI and USB
  USB: ehci-atmel: add needed of.h header file
  ARM: at91/NAND DT bindings: add comments
  ARM: at91/at91sam9x5.dtsi: fix NAND ale/cle in DT file
  USB: ohci-at91: trivial return code name change
  USB: ohci-at91: change maximum number of ports
  USB: ohci-at91: rework and fix initialization
  ARM: at91/dts: USB host vbus is active low
  ARM: at91/USB host: specify and handle properly vbus_pin_active_low
  USB: ohci-at91: fix vbus_pin_active_low handling
  ARM: at91/at91sam9x5: add clkdev entries for DMA controllers

parents 98f0ec0d dcce6ce8

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

+5 −5

Original line number	Diff line number	Diff line
		@@ -27,13 +27,13 @@ nand0: nand@40000000,0 {
		reg = <0x40000000 0x10000000
		0xffffe800 0x200
		>;
		atmel,nand-addr-offset = <21>;
		atmel,nand-cmd-offset = <22>;
		atmel,nand-addr-offset = <21>; /* ale */
		atmel,nand-cmd-offset = <22>; /* cle */
		nand-on-flash-bbt;
		nand-ecc-mode = "soft";
		gpios = <&pioC 13 0
		&pioC 14 0
		0
		gpios = <&pioC 13 0 /* rdy */
		&pioC 14 0 /* nce */
		0 /* cd */
		>;
		partition@0 {
		...

arch/arm/boot/dts/at91sam9g20.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -35,7 +35,7 @@
		};
		};

		memory@20000000 {
		memory {
		reg = <0x20000000 0x08000000>;
		};

arch/arm/boot/dts/at91sam9g25ek.dts

+2 −2

Original line number	Diff line number	Diff line
		@@ -37,8 +37,8 @@
		usb0: ohci@00600000 {
		status = "okay";
		num-ports = <2>;
		atmel,vbus-gpio = <&pioD 19 0
		&pioD 20 0
		atmel,vbus-gpio = <&pioD 19 1
		&pioD 20 1
		>;
		};

arch/arm/boot/dts/at91sam9g45.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -36,7 +36,7 @@
		};
		};

		memory@70000000 {
		memory {
		reg = <0x70000000 0x10000000>;
		};

arch/arm/boot/dts/at91sam9m10g45ek.dts

+3 −3

Original line number	Diff line number	Diff line
		@@ -17,7 +17,7 @@
		bootargs = "mem=64M console=ttyS0,115200 root=/dev/mtdblock1 rw rootfstype=jffs2";
		};

		memory@70000000 {
		memory {
		reg = <0x70000000 0x4000000>;
		};

		@@ -73,8 +73,8 @@
		usb0: ohci@00700000 {
		status = "okay";
		num-ports = <2>;
		atmel,vbus-gpio = <&pioD 1 0
		&pioD 3 0>;
		atmel,vbus-gpio = <&pioD 1 1
		&pioD 3 1>;
		};

		usb1: ehci@00800000 {