Commit 282ce32e authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'omap-for-v3.14/dt' into omap-for-v3.14/board-removal

parents f19f8d8e bd5fc6fa

arch/arm/boot/dts/Makefile

+5 −0
Original line number Diff line number Diff line
@@ -173,12 +173,17 @@ dtb-$(CONFIG_ARCH_NSPIRE) += nspire-cx.dtb \ 
	nspire-tp.dtb \

	nspire-clp.dtb

dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \

	omap2430-sdp.dtb \

	omap2420-n800.dtb \

	omap2420-n810.dtb \

	omap2420-n810-wimax.dtb \

	omap3430-sdp.dtb \

	omap3-beagle.dtb \

	omap3-devkit8000.dtb \

	omap3-beagle-xm.dtb \

	omap3-evm.dtb \

	omap3-evm-37xx.dtb \

	omap3-ldp.dtb \

	omap3-n900.dtb \

	omap3-n9.dtb \

	omap3-n950.dtb \

arch/arm/boot/dts/omap2420-n800.dts

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



#include "omap2420-n8x0-common.dtsi"



/ {

	model = "Nokia N800";

	compatible = "nokia,n800", "nokia,n8x0", "ti,omap2420", "ti,omap2";

};

arch/arm/boot/dts/omap2420-n810-wimax.dts

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



#include "omap2420-n8x0-common.dtsi"



/ {

	model = "Nokia N810 WiMax";

	compatible = "nokia,n810-wimax", "nokia,n8x0", "ti,omap2420", "ti,omap2";

};

arch/arm/boot/dts/omap2420-n810.dts

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



#include "omap2420-n8x0-common.dtsi"



/ {

	model = "Nokia N810";

	compatible = "nokia,n810", "nokia,n8x0", "ti,omap2420", "ti,omap2";

};

arch/arm/boot/dts/omap2420-n8x0-common.dtsi

0 → 100644
+34 −0
Original line number Diff line number Diff line 
#include "omap2420.dtsi"



/ {

	memory {

		device_type = "memory";

		reg = <0x80000000 0x8000000>; /* 128 MB */

	};



	ocp {

		i2c@0 {

			compatible = "i2c-cbus-gpio";

			gpios = <&gpio3 2 0 /* gpio66 clk */

				 &gpio3 1 0 /* gpio65 dat */

				 &gpio3 0 0 /* gpio64 sel */

				>;

			#address-cells = <1>;

			#size-cells = <0>;

			retu_mfd: retu@1 {

				compatible = "retu-mfd";

				interrupt-parent = <&gpio4>;

				interrupts = <12 IRQ_TYPE_EDGE_RISING>;

				reg = <0x1>;

			};

		};

	};

};



&i2c1 {

	clock-frequency = <400000>;

};



&i2c2 {

	clock-frequency = <400000>;

};