[pkg-fso-commits] [SCM] linux-2.6-openmoko, the Linux 2.6 kernel tree from Openmoko branch, andy-tracking, updated. upstream/20090303.gitb9de904e-140-g23b564c

[Nelson Castillo]

The following commit has been merged in the andy-tracking branch:
commit 44bf2b8856db1f5079a1a531f70bbd25cf4ed488
Author: Paul Fertser <fercerpav at gmail.com>
Date:   Sun May 24 15:19:58 2009 +0400

    gta01: fix jbt6k74 spi registration
    
    Without this jbt6k74 is not seen by the system and consequently
    display doesn't work with Qi.
    
    Rebasing to .28 introduced a regression (probably in
    a6af63e826b79ae1ba2d8cbfa66805cc2dfe367c) resulting in jbt6k74 no longer
    manageable by the kernel. This was unnoticed before because u-boot does its
    own LCM initialization. With Qi it resulted in a white screen.
    
    This patch is fixing it by making spi host bus number (unspecified,
    defaults to 0) and spi device (jbt6k74) bus number match.
    
    Signed-off-by: Paul Fertser <fercerpav at gmail.com>

diff --git a/arch/arm/mach-s3c2410/mach-gta01.c b/arch/arm/mach-s3c2410/mach-gta01.c
index bddba99..1fe3eef 100644
--- a/arch/arm/mach-s3c2410/mach-gta01.c
+++ b/arch/arm/mach-s3c2410/mach-gta01.c
@@ -775,7 +775,6 @@ static struct spi_board_info gta01_spi_board_info[] = {
 		/* controller_data */
 		/* irq */
 		.max_speed_hz	= 10 * 1000 * 1000,
-		.bus_num	= 1,
 		/* chip_select */
 	},
 };

-- 
linux-2.6-openmoko, the Linux 2.6 kernel tree from Openmoko