Merging OLPC XO-1 DCON driver to mainstream kernel tree?

Raymond Lai airwave209gt at gmail.com
Wed Feb 24 14:17:20 UTC 2010


Had ran through a little comparison between OLPC's 2.6.31 source

http://dev.laptop.org/git/olpc-2.6/tree/?h=olpc-2.6.31

with the mainstream kernel source, version 2.6.31-12

http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.31.y.git;a=tree;hb=5e20b95750867086fff98e5c3eaa00c3bc01d8ee

and I saw the difference is only in gxfb_core.c and lxfb_core.c 
regarding the configuration flag, i.e.

CONFIG_OLPC -> |CONFIG_OLPC_XO_1

so I think efforts required for the Geode driver is very little.

OTOH, I think making the changes on the OLPC sources regarding XO-1 
support back to the mainstream is necessary before getting the DCON 
driver back. Simply merge the DCON driver but keep the configuration 
flag CONFIG_OLPC is not a good idea.

I actually had made the changes on my own. I only added changes related 
to XO-1 only, as I don't own a XO-1.5 yet that I cannot test it. I can 
send it in along with the DCON driver integration patch when I get back 
to work tomorrow. Otherwise I'll simply compile the kernel off the 
source pulled off OLPC's git.

regards,
Raymond

|On 2010年02月24日 13:21, Andres Salomon wrote:
> On Wed, 24 Feb 2010 12:26:55 +0800
> Raymond Lai<airwave209gt at gmail.com>  wrote:
>
>    
>>> Usually we just want a "clean" driver in one patch, but if you have
>>> the full history, in the proper place, I would consider it.  Have a
>>> pointer to it somewhere?
>>>
>>>        
>> Definitely.
>>
>> It's in a full kernel tree, at
>> http://git.infradead.org/geode.git/tree/dcon. Driver itself is
>> integrated under drivers/video/geode
>>
>>      
> That's actually pretty old; better to look at OLPC's git.
>
>
>    
>> However, I also looked at the kernel tree on OLPC's own git too
>>
>> http://dev.laptop.org/git/olpc-2.6/log/?h=olpc-2.6.31
>>
>> The DCON driver is moved out of drivers/video/geode and renamed as
>> olpc_dcon.* (previously gxfb_dcon.*) and had refactoring for
>> supporting XO-1 and XO-1.5. Seems the integration effort is not small
>> to me...
>>
>>      
> There's a bunch of gxfb changes in there too.  I can separate out the
> dcon stuff from the olpc-2.6 tree and put it online.
>
>
>    
>> 2010/2/24 Greg KH<gregkh at suse.de>
>>
>>      
>>> On Mon, Feb 22, 2010 at 04:41:44PM -0500, Andres Salomon wrote:
>>>        
>>>> On Wed, 17 Feb 2010 19:53:18 +0800
>>>> Raymond Lai<airwave209gt-Re5JQEeQqe8AvxtiuMwx3w at public.gmane.org>
>>>> wrote:
>>>>
>>>>          
>>>>> Hello world,
>>>>>
>>>>> I'm a OLPC XO-1 owner from HK. Out of boredom and fun I decided
>>>>> to make this little green baby to run Ubuntu (OK, OK...), with
>>>>> the help of various resources on the net, especially
>>>>> wiki.laptop.org.
>>>>>
>>>>> On the way of preparing the kernel, I wonder why the DCON
>>>>> driver (as onhttp://git.infradead.org/geode.git) wasn't merged
>>>>> back to the mainstream kernel tree? At the end, I did the
>>>>> changes on my own, and I'm able to compile the kernel with DCON
>>>>> support added.
>>>>>            
>>>> It was waiting on CS5535 GPIO changes.  Those changes are now
>>>> upstream.
>>>>
>>>>
>>>>          
>>>>> I can submit a patch for such changes with the sources on
>>>>> kernel.org. But a few questions...
>>>>>
>>>>> - Should I?
>>>>>            
>>>> Maybe.  It could certainly live in the staging tree while we do
>>>> cleanups, and while the OLPC folks do their XO-1.5 changes.
>>>> Greg, what do you think? We have the full (git) history for the
>>>> dcon driver; should I clean those up and provide a staging tree
>>>> for you to pull from, or would you prefer the current driver
>>>> w/out the history?
>>>>          
>>> How is the history structured?  Is it within a full kernel tree, or
>>> as a stand-alone driver?
>>>
>>> Usually we just want a "clean" driver in one patch, but if you have
>>> the full history, in the proper place, I would consider it.  Have a
>>> pointer to it somewhere?
>>>
>>> thanks,
>>>
>>> greg k-h
>>>
>>>
>>>        
>    


-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 3664 bytes
Desc: S/MIME Cryptographic Signature
URL: <http://driverdev.linuxdriverproject.org/pipermail/driverdev-devel/attachments/20100224/4f10a9e6/attachment.p7s>


More information about the devel mailing list