diff mbox

[v2] N900: add device tree

Message ID 20130810110955.GA11437@amd.pavel.ucw.cz (mailing list archive)
State New, archived
Headers show

Commit Message

Pavel Machek Aug. 10, 2013, 11:09 a.m. UTC
On Fri 2013-08-02 01:43:55, Pavel Machek wrote:
> On Sun 2013-07-28 15:44:09, Pavel Machek wrote:
> > On Mon 2013-07-15 01:28:19, Aaro Koskinen wrote:
> > > Hi,
> > > 
> > > On Sat, Jul 13, 2013 at 02:17:09PM +0200, Pavel Machek wrote:
> > > > 
> > > > This adds device tree with neccessary support to boot with functional
> > > > video (on both emulator and real N900 device).
> > > > 
> > > > Signed-off-by: Pavel Machek <pavel@ucw.cz>
> > > 
> > > You can also add:
> > > 
> > > Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
> > 
> > Benoit, could you apply this? Tony said you are doing dts changes, and
> > the patch seems to be ready.
> 
> Tony, Benoit was apparently abducted by aliens or something. Is there
> chance you could take the patch?

Hello, is there anybody out there?

There's nice and simple patch enabling device tree on n900, it is even
reviewed by Aaro, and it is neither applied nor are negative comments
coming? ...for a month...?

Tony also seen the patch and comment was "Benoit takes these", so I
assume it looks basically ok. 

Benoit, you are supposed to maintain device tree for omap2. 

[I wonder if this is clean-enough cause for "trivial in resubmit
mode?]
								Pavel
---

This adds device tree with neccessary support to boot with functional
video (on both emulator and real N900 device).

Signed-off-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>

---

From v1: Aaro wants just GPLv2, so I did that. I re-enabled parts that
can be enabled on 3.10, and tested it on that kernel.

Comments

Pavel Machek Aug. 10, 2013, 11:27 a.m. UTC | #1
On Sat 2013-08-10 13:09:55, Pavel Machek wrote:
> On Fri 2013-08-02 01:43:55, Pavel Machek wrote:
> > On Sun 2013-07-28 15:44:09, Pavel Machek wrote:
> > > On Mon 2013-07-15 01:28:19, Aaro Koskinen wrote:
> > > > Hi,
> > > > 
> > > > On Sat, Jul 13, 2013 at 02:17:09PM +0200, Pavel Machek wrote:
> > > > > 
> > > > > This adds device tree with neccessary support to boot with functional
> > > > > video (on both emulator and real N900 device).
> > > > > 
> > > > > Signed-off-by: Pavel Machek <pavel@ucw.cz>
> > > > 
> > > > You can also add:
> > > > 
> > > > Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
> > > 
> > > Benoit, could you apply this? Tony said you are doing dts changes, and
> > > the patch seems to be ready.
> > 
> > Tony, Benoit was apparently abducted by aliens or something. Is there
> > chance you could take the patch?
> 
> Hello, is there anybody out there?
> 
> There's nice and simple patch enabling device tree on n900, it is even
> reviewed by Aaro, and it is neither applied nor are negative comments
> coming? ...for a month...?
> 
> Tony also seen the patch and comment was "Benoit takes these", so I
> assume it looks basically ok. 
> 
> Benoit, you are supposed to maintain device tree for omap2. 

From archives I see Benoit is normally quite active... so I tried
adding few more keywords to the subject line. Hopefully he's back from
holidays and notices this...?
 

> [I wonder if this is clean-enough cause for "trivial in resubmit
> mode?]
> 								Pavel
> ---
> 
> This adds device tree with neccessary support to boot with functional
> video (on both emulator and real N900 device).
> 
> Signed-off-by: Pavel Machek <pavel@ucw.cz>
> Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
> 
> ---
> 
> From v1: Aaro wants just GPLv2, so I did that. I re-enabled parts that
> can be enabled on 3.10, and tested it on that kernel.
> 
> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> index f0895c5..1950aed 100644
> --- a/arch/arm/boot/dts/Makefile
> +++ b/arch/arm/boot/dts/Makefile
> @@ -141,6 +141,7 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \
>  	omap3-devkit8000.dtb \
>  	omap3-beagle-xm.dtb \
>  	omap3-evm.dtb \
> +	omap3-n900.dtb \
>  	omap3-tobi.dtb \
>  	omap3-igep0020.dtb \
>  	omap3-igep0030.dtb \
> diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts
> new file mode 100644
> index 0000000..fb461bf
> --- /dev/null
> +++ b/arch/arm/boot/dts/omap3-n900.dts
> @@ -0,0 +1,92 @@
> +/*
> + * Copyright (C) 2013 Pavel Machek <pavel@ucw.cz>
> + * Copyright 2013 Aaro Koskinen <aaro.koskinen@iki.fi>
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as
> + * published by the Free Software Foundation.
> + */
> +
> +/dts-v1/;
> +
> +/include/ "omap34xx.dtsi"
> +
> +/ {
> +	model = "Nokia N900";
> +	compatible = "nokia,omap3-n900", "ti,omap3";
> +
> +	cpus {
> +		cpu@0 {
> +			cpu0-supply = <&vcc>;
> +		};
> +	};
> +
> +	memory {
> +		device_type = "memory";
> +		reg = <0x80000000 0x10000000>; /* 256 MB */
> +	};
> +
> +};
> +
> +&i2c1 {
> +	clock-frequency = <2200000>;
> +
> +	twl: twl@48 {
> +		reg = <0x48>;
> +		interrupts = <7>; /* SYS_NIRQ cascaded to intc */
> +		interrupt-parent = <&intc>;
> +	};
> +};
> +
> +/include/ "twl4030.dtsi"
> +
> +&twl_gpio {
> +	ti,pullups	= <0x0>;
> +	ti,pulldowns	= <0x03ff3f>; /* BIT(0..5) | BIT(8..17) */
> +};
> +
> +&i2c2 {
> +	clock-frequency = <400000>;
> +};
> +
> +&i2c3 {
> +	clock-frequency = <100000>;
> +};
> +
> +&mmc1 {
> +	status = "disabled";
> +};
> +
> +&mmc2 {
> +	status = "disabled";
> +};
> +
> +&mmc3 {
> +	status = "disabled";
> +};
> +
> +&mcspi1 {
> +	// For some reason, touchscreen is neccessary for screen to work at 
> +	// all on real hw. It works well without it on emulator.
> +	//
> +	// Also... order in the device tree actually matters here.
> +	tsc2005@0 {
> +		compatible = "tsc2005";
> +		spi-max-frequency = <6000000>;
> +		reg = <0>;
> +	};
> +	mipid@2 {
> +		compatible = "acx565akm";
> +		spi-max-frequency = <6000000>;
> +		reg = <2>;
> +		// turbo_mode = 0,
> +		// cs_per_word = 0
> +	};
> +};
> +
> +&usb_otg_hs {
> +	interface-type = <0>;
> +	usb-phy = <&usb2_phy>;
> +	mode = <2>;
> +	power = <50>;
> +};
>
Belisko Marek Aug. 10, 2013, 11:46 a.m. UTC | #2
Hi All,

On Sat, Aug 10, 2013 at 1:09 PM, Pavel Machek <pavel@ucw.cz> wrote:
> On Fri 2013-08-02 01:43:55, Pavel Machek wrote:
>> On Sun 2013-07-28 15:44:09, Pavel Machek wrote:
>> > On Mon 2013-07-15 01:28:19, Aaro Koskinen wrote:
>> > > Hi,
>> > >
>> > > On Sat, Jul 13, 2013 at 02:17:09PM +0200, Pavel Machek wrote:
>> > > >
>> > > > This adds device tree with neccessary support to boot with functional
>> > > > video (on both emulator and real N900 device).
>> > > >
>> > > > Signed-off-by: Pavel Machek <pavel@ucw.cz>
>> > >
>> > > You can also add:
>> > >
>> > > Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
>> >
>> > Benoit, could you apply this? Tony said you are doing dts changes, and
>> > the patch seems to be ready.
>>
>> Tony, Benoit was apparently abducted by aliens or something. Is there
>> chance you could take the patch?
>
> Hello, is there anybody out there?
>
> There's nice and simple patch enabling device tree on n900, it is even
> reviewed by Aaro, and it is neither applied nor are negative comments
> coming? ...for a month...?
Same for gta04 (omap3 based device) [1].
It was send upstream 2 times and second time there is no reply from 1.3.2013.
>
> Tony also seen the patch and comment was "Benoit takes these", so I
> assume it looks basically ok.
>
> Benoit, you are supposed to maintain device tree for omap2.
>
> [I wonder if this is clean-enough cause for "trivial in resubmit
> mode?]
>                                                                 Pavel
> ---
>
> This adds device tree with neccessary support to boot with functional
> video (on both emulator and real N900 device).
>
> Signed-off-by: Pavel Machek <pavel@ucw.cz>
> Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
>
> ---
>
> From v1: Aaro wants just GPLv2, so I did that. I re-enabled parts that
> can be enabled on 3.10, and tested it on that kernel.
>
> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> index f0895c5..1950aed 100644
> --- a/arch/arm/boot/dts/Makefile
> +++ b/arch/arm/boot/dts/Makefile
> @@ -141,6 +141,7 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \
>         omap3-devkit8000.dtb \
>         omap3-beagle-xm.dtb \
>         omap3-evm.dtb \
> +       omap3-n900.dtb \
>         omap3-tobi.dtb \
>         omap3-igep0020.dtb \
>         omap3-igep0030.dtb \
> diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts
> new file mode 100644
> index 0000000..fb461bf
> --- /dev/null
> +++ b/arch/arm/boot/dts/omap3-n900.dts
> @@ -0,0 +1,92 @@
> +/*
> + * Copyright (C) 2013 Pavel Machek <pavel@ucw.cz>
> + * Copyright 2013 Aaro Koskinen <aaro.koskinen@iki.fi>
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as
> + * published by the Free Software Foundation.
> + */
> +
> +/dts-v1/;
> +
> +/include/ "omap34xx.dtsi"
> +
> +/ {
> +       model = "Nokia N900";
> +       compatible = "nokia,omap3-n900", "ti,omap3";
> +
> +       cpus {
> +               cpu@0 {
> +                       cpu0-supply = <&vcc>;
> +               };
> +       };
> +
> +       memory {
> +               device_type = "memory";
> +               reg = <0x80000000 0x10000000>; /* 256 MB */
> +       };
> +
> +};
> +
> +&i2c1 {
> +       clock-frequency = <2200000>;
> +
> +       twl: twl@48 {
> +               reg = <0x48>;
> +               interrupts = <7>; /* SYS_NIRQ cascaded to intc */
> +               interrupt-parent = <&intc>;
> +       };
> +};
> +
> +/include/ "twl4030.dtsi"
> +
> +&twl_gpio {
> +       ti,pullups      = <0x0>;
> +       ti,pulldowns    = <0x03ff3f>; /* BIT(0..5) | BIT(8..17) */
> +};
> +
> +&i2c2 {
> +       clock-frequency = <400000>;
> +};
> +
> +&i2c3 {
> +       clock-frequency = <100000>;
> +};
> +
> +&mmc1 {
> +       status = "disabled";
> +};
> +
> +&mmc2 {
> +       status = "disabled";
> +};
> +
> +&mmc3 {
> +       status = "disabled";
> +};
> +
> +&mcspi1 {
> +       // For some reason, touchscreen is neccessary for screen to work at
> +       // all on real hw. It works well without it on emulator.
> +       //
> +       // Also... order in the device tree actually matters here.
> +       tsc2005@0 {
> +               compatible = "tsc2005";
> +               spi-max-frequency = <6000000>;
> +               reg = <0>;
> +       };
> +       mipid@2 {
> +               compatible = "acx565akm";
> +               spi-max-frequency = <6000000>;
> +               reg = <2>;
> +               // turbo_mode = 0,
> +               // cs_per_word = 0
> +       };
> +};
> +
> +&usb_otg_hs {
> +       interface-type = <0>;
> +       usb-phy = <&usb2_phy>;
> +       mode = <2>;
> +       power = <50>;
> +};
>
> --
> (english) http://www.livejournal.com/~pavelmachek
> (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

[1] - https://lkml.org/lkml/2013/3/1/526

marek
Jiri Kosina Aug. 10, 2013, 8:29 p.m. UTC | #3
On Sat, 10 Aug 2013, Pavel Machek wrote:

> [I wonder if this is clean-enough cause for "trivial in resubmit
> mode?]

On Sat, 10 Aug 2013, Belisko Marek wrote:

> Same for gta04 (omap3 based device) [1].
> It was send upstream 2 times and second time there is no reply from 1.3.2013.

Hi guys,

once I am able to match signoffs in the patches to MAINTAINERS, I can take 
those through trivial.git in "re-transmission mode" (or feeeding those 
thgough akpm si an option as well).

Please just send the patches to me in a new thread properly with all the 
Acks/Signoffs, and mark those appropriately (i.e. maintainer that would 
normally push this upstream desurfaced).
Pavel Machek Aug. 11, 2013, 12:55 a.m. UTC | #4
Hi!

> > [I wonder if this is clean-enough cause for "trivial in resubmit
> > mode?]
> 
> On Sat, 10 Aug 2013, Belisko Marek wrote:
> 
> > Same for gta04 (omap3 based device) [1].
> > It was send upstream 2 times and second time there is no reply from 1.3.2013.
> 
> Hi guys,
> 
> once I am able to match signoffs in the patches to MAINTAINERS, I can take 
> those through trivial.git in "re-transmission mode" (or feeeding those 
> thgough akpm si an option as well).
> 
> Please just send the patches to me in a new thread properly with all the 
> Acks/Signoffs, and mark those appropriately (i.e. maintainer that would 
> normally push this upstream desurfaced).

Mail sent (just to you, to keep mail volume down).

I noticed two non-delivery reports in my INBOX; seems Benoit
disappeared rather permanently:

...
If you do so, please include this problem report. You can
delete your own text from the attached returned message.
 
                   The mail system
 
<b-cousson@ti.com>: host cluster5.us.messagelabs.com[216.82.250.99]
said: 550   
    Invalid recipient <b-cousson@ti.com> (#5.1.1) (in reply to RCPT TO
    command)
 

...so maybe MAINTAINERS file will need fixing?

OMAP DEVICE TREE SUPPORT
M:      BenoƮt Cousson <b-cousson@ti.com>
M:      Tony Lindgren <tony@atomide.com>
L:      linux-omap@vger.kernel.org
L:      devicetree@vger.kernel.org
S:      Maintained
F:      arch/arm/boot/dts/*omap*
F:      arch/arm/boot/dts/*am3*

:-(. Thanks,
									Pavel
Javier Martinez Canillas Aug. 11, 2013, 11:50 a.m. UTC | #5
On Sat, Aug 10, 2013 at 10:29 PM, Jiri Kosina <jkosina@suse.cz> wrote:
> On Sat, 10 Aug 2013, Pavel Machek wrote:
>
>> [I wonder if this is clean-enough cause for "trivial in resubmit
>> mode?]
>
> On Sat, 10 Aug 2013, Belisko Marek wrote:
>
>> Same for gta04 (omap3 based device) [1].
>> It was send upstream 2 times and second time there is no reply from 1.3.2013.
>
> Hi guys,
>
> once I am able to match signoffs in the patches to MAINTAINERS, I can take
> those through trivial.git in "re-transmission mode" (or feeeding those
> thgough akpm si an option as well).
>
> Please just send the patches to me in a new thread properly with all the
> Acks/Signoffs, and mark those appropriately (i.e. maintainer that would
> normally push this upstream desurfaced).
>

Hi folks,

I noticed that you are using Benoit older emails address
(b-cousson@ti.com) which no longer exists instead of his new email
address (benoit.cousson@linaro.org). So, it may be possible that
Benoit have not even been getting your patches.

I'll send a patch to MAINTAINERS updating Benoit's email address so
get_maintainer.pl will stop lying.

Jiri, is ok if I send this patch to you? I guess this falls into the
trivial group.

Thanks a lot and best regards,
Javier
Pavel Machek Aug. 11, 2013, 1:47 p.m. UTC | #6
Hi!

> >> [I wonder if this is clean-enough cause for "trivial in resubmit
> >> mode?]
> >
> > On Sat, 10 Aug 2013, Belisko Marek wrote:
> >
> >> Same for gta04 (omap3 based device) [1].
> >> It was send upstream 2 times and second time there is no reply from 1.3.2013.
> >
> > Hi guys,
> >
> > once I am able to match signoffs in the patches to MAINTAINERS, I can take
> > those through trivial.git in "re-transmission mode" (or feeeding those
> > thgough akpm si an option as well).
> >
> > Please just send the patches to me in a new thread properly with all the
> > Acks/Signoffs, and mark those appropriately (i.e. maintainer that would
> > normally push this upstream desurfaced).
> 
> I noticed that you are using Benoit older emails address
> (b-cousson@ti.com) which no longer exists instead of his new email
> address (benoit.cousson@linaro.org). So, it may be possible that
> Benoit have not even been getting your patches.

Thanks for update.

> I'll send a patch to MAINTAINERS updating Benoit's email address so
> get_maintainer.pl will stop lying.

Thanks!

Benoit, could you take a look at the patch from this thread? I can
resend it, but it should be in pretty much _all_ the webmail archives
now :-).

Regards,
								Pavel
Tony Lindgren Aug. 12, 2013, 7:36 a.m. UTC | #7
* Jiri Kosina <jkosina@suse.cz> [130810 13:36]:
> On Sat, 10 Aug 2013, Pavel Machek wrote:
> 
> > [I wonder if this is clean-enough cause for "trivial in resubmit
> > mode?]
> 
> On Sat, 10 Aug 2013, Belisko Marek wrote:
> 
> > Same for gta04 (omap3 based device) [1].
> > It was send upstream 2 times and second time there is no reply from 1.3.2013.
> 
> Hi guys,
> 
> once I am able to match signoffs in the patches to MAINTAINERS, I can take 
> those through trivial.git in "re-transmission mode" (or feeeding those 
> thgough akpm si an option as well).
> 
> Please just send the patches to me in a new thread properly with all the 
> Acks/Signoffs, and mark those appropriately (i.e. maintainer that would 
> normally push this upstream desurfaced).

Sorry for the delays, I think Benoit is still on vacation. Plus the
non-functioning email address issue certainly does not help..

Anyways, let's just let Benoit queue these to avoid pointless merge
conflicts with the .dts files as discussed several times earlier.

Regards,

Tony
Tony Lindgren Aug. 12, 2013, 7:37 a.m. UTC | #8
* Pavel Machek <pavel@ucw.cz> [130811 06:54]:
> Hi!
> 
> > >> [I wonder if this is clean-enough cause for "trivial in resubmit
> > >> mode?]
> > >
> > > On Sat, 10 Aug 2013, Belisko Marek wrote:
> > >
> > >> Same for gta04 (omap3 based device) [1].
> > >> It was send upstream 2 times and second time there is no reply from 1.3.2013.
> > >
> > > Hi guys,
> > >
> > > once I am able to match signoffs in the patches to MAINTAINERS, I can take
> > > those through trivial.git in "re-transmission mode" (or feeeding those
> > > thgough akpm si an option as well).
> > >
> > > Please just send the patches to me in a new thread properly with all the
> > > Acks/Signoffs, and mark those appropriately (i.e. maintainer that would
> > > normally push this upstream desurfaced).
> > 
> > I noticed that you are using Benoit older emails address
> > (b-cousson@ti.com) which no longer exists instead of his new email
> > address (benoit.cousson@linaro.org). So, it may be possible that
> > Benoit have not even been getting your patches.
> 
> Thanks for update.
> 
> > I'll send a patch to MAINTAINERS updating Benoit's email address so
> > get_maintainer.pl will stop lying.
> 
> Thanks!
> 
> Benoit, could you take a look at the patch from this thread? I can
> resend it, but it should be in pretty much _all_ the webmail archives
> now :-).

Hopefully Benoit will be back online after vacation soon :)

Regaqrds,

Tony
diff mbox

Patch

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index f0895c5..1950aed 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -141,6 +141,7 @@  dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \
 	omap3-devkit8000.dtb \
 	omap3-beagle-xm.dtb \
 	omap3-evm.dtb \
+	omap3-n900.dtb \
 	omap3-tobi.dtb \
 	omap3-igep0020.dtb \
 	omap3-igep0030.dtb \
diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts
new file mode 100644
index 0000000..fb461bf
--- /dev/null
+++ b/arch/arm/boot/dts/omap3-n900.dts
@@ -0,0 +1,92 @@ 
+/*
+ * Copyright (C) 2013 Pavel Machek <pavel@ucw.cz>
+ * Copyright 2013 Aaro Koskinen <aaro.koskinen@iki.fi>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+/dts-v1/;
+
+/include/ "omap34xx.dtsi"
+
+/ {
+	model = "Nokia N900";
+	compatible = "nokia,omap3-n900", "ti,omap3";
+
+	cpus {
+		cpu@0 {
+			cpu0-supply = <&vcc>;
+		};
+	};
+
+	memory {
+		device_type = "memory";
+		reg = <0x80000000 0x10000000>; /* 256 MB */
+	};
+
+};
+
+&i2c1 {
+	clock-frequency = <2200000>;
+
+	twl: twl@48 {
+		reg = <0x48>;
+		interrupts = <7>; /* SYS_NIRQ cascaded to intc */
+		interrupt-parent = <&intc>;
+	};
+};
+
+/include/ "twl4030.dtsi"
+
+&twl_gpio {
+	ti,pullups	= <0x0>;
+	ti,pulldowns	= <0x03ff3f>; /* BIT(0..5) | BIT(8..17) */
+};
+
+&i2c2 {
+	clock-frequency = <400000>;
+};
+
+&i2c3 {
+	clock-frequency = <100000>;
+};
+
+&mmc1 {
+	status = "disabled";
+};
+
+&mmc2 {
+	status = "disabled";
+};
+
+&mmc3 {
+	status = "disabled";
+};
+
+&mcspi1 {
+	// For some reason, touchscreen is neccessary for screen to work at 
+	// all on real hw. It works well without it on emulator.
+	//
+	// Also... order in the device tree actually matters here.
+	tsc2005@0 {
+		compatible = "tsc2005";
+		spi-max-frequency = <6000000>;
+		reg = <0>;
+	};
+	mipid@2 {
+		compatible = "acx565akm";
+		spi-max-frequency = <6000000>;
+		reg = <2>;
+		// turbo_mode = 0,
+		// cs_per_word = 0
+	};
+};
+
+&usb_otg_hs {
+	interface-type = <0>;
+	usb-phy = <&usb2_phy>;
+	mode = <2>;
+	power = <50>;
+};