Commit d6a93ceb authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'kirkwood/dt' of git://git.infradead.org/users/jcooper/linux into late/kirkwood 

From Jason Cooper:

New bindings:
  - iconnect nand and keys
  - mv_cesa
  - gpio-fan

* 'kirkwood/dt' of git://git.infradead.org/users/jcooper/linux:
  ARM: kirkwood: Use devicetree to define DNS-32[05] fan
  hwmon: Add devicetree bindings to gpio-fan
  Crypto: CESA: Add support for DT based instantiation.
  ARM: Kirkwood: Describe iconnect nand in DT.
  ARM: Kirkwood: Describe iconnect keys in DT.
parents fb6f3d69 1b90e06b

Documentation/devicetree/bindings/crypto/mv_cesa.txt

0 → 100644
+20 −0
Original line number Diff line number Diff line 
Marvell Cryptographic Engines And Security Accelerator



Required properties:

- compatible : should be "marvell,orion-crypto"

- reg : base physical address of the engine and length of memory mapped

        region, followed by base physical address of sram and its memory

        length

- reg-names : "regs" , "sram";

- interrupts : interrupt number



Examples:



	crypto@30000 {

		compatible = "marvell,orion-crypto";

		reg = <0x30000 0x10000>,

		      <0x4000000 0x800>;

		reg-names = "regs" , "sram";

		interrupts = <22>;

		status = "okay";

	};

Documentation/devicetree/bindings/gpio/gpio-fan.txt

0 → 100644
+25 −0
Original line number Diff line number Diff line 
Bindings for fan connected to GPIO lines



Required properties:

- compatible : "gpio-fan"

- gpios: Specifies the pins that map to bits in the control value,

  ordered MSB-->LSB.

- gpio-fan,speed-map: A mapping of possible fan RPM speeds and the

  control value that should be set to achieve them. This array

  must have the RPM values in ascending order.



Optional properties:

- alarm-gpios: This pin going active indicates something is wrong with

  the fan, and a udev event will be fired.



Examples:



	gpio_fan {

		compatible = "gpio-fan";

		gpios = <&gpio1 14 1

			 &gpio1 13 1>;

		gpio-fan,speed-map = <0    0

				      3000 1

				      6000 2>;

		alarm-gpios = <&gpio1 15 1>;

	};

arch/arm/boot/dts/kirkwood-dnskw.dtsi

+10 −0
Original line number Diff line number Diff line
@@ -25,6 +25,16 @@ 
		};

	};



	gpio_fan {

		/* Fan: ADDA AD045HB-G73 40mm 6000rpm@5v */

		compatible = "gpio-fan";

		gpios = <&gpio1 14 1

			 &gpio1 13 1>;

		gpio-fan,speed-map = <0    0

				      3000 1

				      6000 2>;

	};



	ocp@f1000000 {

		sata@80000 {

			status = "okay";

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

+49 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
	};



	chosen {

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

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

		linux,initrd-start = <0x4500040>;

		linux,initrd-end   = <0x4800000>;

	};
@@ -30,7 +30,37 @@ 
			clock-frequency = <200000000>;

			status = "ok";

		};



		nand@3000000 {

			status = "okay";



			partition@0 {

				label = "uboot";

				reg = <0x0000000 0xc0000>;

			};



			partition@a0000 {

				label = "env";

				reg = <0xa0000 0x20000>;

			};



			partition@100000 {

				label = "zImage";

				reg = <0x100000 0x300000>;

			};



			partition@540000 {

				label = "initrd";

				reg = <0x540000 0x300000>;

			};



			partition@980000 {

				label = "boot";

				reg = <0x980000 0x1f400000>;

			};

		};

	};



	gpio-leds {

		compatible = "gpio-leds";
@@ -69,4 +99,22 @@ 
			gpios = <&gpio1 16 0>;

		};

	};



	gpio_keys {

		compatible = "gpio-keys";

		#address-cells = <1>;

		#size-cells = <0>;

		button@1 {

			label = "OTB Button";

			linux,code = <133>;

			gpios = <&gpio1 3 1>;

			debounce-interval = <100>;

		};

		button@2 {

			label = "Reset";

			linux,code = <0x198>;

			gpios = <&gpio0 12 1>;

			debounce-interval = <100>;

		};

	};

};

arch/arm/boot/dts/kirkwood.dtsi

+11 −1
Original line number Diff line number Diff line
@@ -14,7 +14,8 @@ 


	ocp@f1000000 {

		compatible = "simple-bus";

		ranges = <0 0xf1000000 0x4000000>;

		ranges = <0x00000000 0xf1000000 0x4000000

		          0xf5000000 0xf5000000 0x0000400>;

		#address-cells = <1>;

		#size-cells = <1>;
@@ -105,5 +106,14 @@ 
			clock-frequency = <100000>;

			status = "disabled";

		};



		crypto@30000 {

			compatible = "marvell,orion-crypto";

			reg = <0x30000 0x10000>,

			      <0xf5000000 0x800>;

			reg-names = "regs", "sram";

			interrupts = <22>;

			status = "okay";

		};

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE