N900 device tree conversion: how to do first step

Commit Message

Pavel Machek June 13, 2013, 3:52 p.m. UTC

Hi!

> * Pavel Machek <[e-mail]> [130613 07:34]:
> > On Thu 2013-06-13 07:10:01, Tony Lindgren wrote:
> > > * Pavel Machek <[e-mail]> [130613 06:32]:
> > >  
> > > > If I init spi manually (and some more hacks), it works in the
> > > > qemu. But I have not tested on real hw for a while.
> > > 
> > > You should be able to initialize spi by adding the .dts entry,
> > > or is there something missing in drivers/spi/spi-omap2-mcspi.c?
> > 
> > Not sure, I guess I'll find out soon. Do you have example dts that
> > uses drivers/spi/spi-omap2-mcspi.c? Grepping spi in dts/ was not too
> > successful.
> 
> Hmm I think all we have is what's written in
> Documentation/devicetree/bindings/spi/omap-spi.txt and
> omap4-sdp.dts.

Ok, this was easier than expected.

Now, by chance, any idea what is DT equivalent of 

omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);

?

(Plus I'll still have to figure out why it works on emulator but not
on hw).

Thanks,
									Pavel

Patch

diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts
index 10a880f..3918ae1 100644
--- a/arch/arm/boot/dts/omap3-n900.dts
+++ b/arch/arm/boot/dts/omap3-n900.dts
@@ -65,6 +65,14 @@ 
 	status = "disabled";
 };
 
+&mcspi1 {
+	mipid@2 {
+		compatible = "acx565akm";
+		spi-max-frequency = <6000000>;
+		reg = <2>;
+	};
+};
+
 /*
 &usb_otg_hs {
 	interface-type = <0>;
diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c
index 996ffc3..597ade9 100644
--- a/arch/arm/mach-omap2/board-generic.c
+++ b/arch/arm/mach-omap2/board-generic.c
@@ -130,9 +130,10 @@  void __init omap_generic_init(void)
 		regulator_use_dummy_regulator();
 
 		omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
-
+#if 0
 		spi_register_board_info(rx51_peripherals_spi_board_info,
 				ARRAY_SIZE(rx51_peripherals_spi_board_info));
+#endif
 #else
 		rx51_video_init();
 #endif