[Armadeus-commitlog] SF.net SVN: armadeus:[838] trunk/buildroot/target/device/armadeus/linux/ kerne
Brought to you by:
sszy
|
From: <ar...@us...> - 2008-07-19 15:56:21
|
Revision: 838
http://armadeus.svn.sourceforge.net/armadeus/?rev=838&view=rev
Author: artemys
Date: 2008-07-19 15:55:28 +0000 (Sat, 19 Jul 2008)
Log Message:
-----------
[LINUX] 020-scbfb patch is no more used so rename it so it won't be applied
Added Paths:
-----------
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/020-linux-2.6.23.1-scbfb.no_more_used
Removed Paths:
-------------
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/020-linux-2.6.23.1-scbfb.diff
Deleted: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/020-linux-2.6.23.1-scbfb.diff
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/020-linux-2.6.23.1-scbfb.diff 2008-07-18 19:52:49 UTC (rev 837)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/020-linux-2.6.23.1-scbfb.diff 2008-07-19 15:55:28 UTC (rev 838)
@@ -1,65 +0,0 @@
---- linux-org/arch/arm/mach-imx/scb9328.c 2006-10-01 14:21:57.000000000 +0200
-+++ linux-imx/arch/arm/mach-imx/scb9328.c 2006-10-01 14:26:43.000000000 +0200
-@@ -34,6 +34,8 @@
- #include <linux/usb_isp116x.h>
- #endif
-
-+#include <asm/arch/imxfb.h>
-+
- #define TYPE_NONE 0
- #define TYPE_EVK9328 1
- #define TYPE_EVK9328L 2
-@@ -246,6 +248,37 @@ static struct platform_device serial_dev
- },
- };
-
-+static void apf9328_lcd_power(int on)
-+{
-+ printk("apf9328_lcd_power: %d\n", on);
-+ /* use Port_D CONTRAST pin to control LCD power down mode */
-+ if(on)
-+ DR(3) &= 0xFFFFF7FF;
-+ else
-+ DR(3) |= 0x00000800;
-+}
-+
-+static struct imxfb_mach_info apf9328_fb_info __initdata = {
-+ .pixclock = 62500,
-+ .bpp = 16,
-+ .xres = 240,
-+ .yres = 320,
-+
-+ .hsync_len = 9,
-+ .vsync_len = 2,
-+ .left_margin = 9,
-+ .upper_margin = 2,
-+ .right_margin = 27,
-+ .lower_margin = 4,
-+
-+ .pcr = PCR_TFT | PCR_COLOR | PCR_PBSIZ_8 | PCR_BPIX_16 | PCR_CLKPOL |
-+ PCR_SCLKIDLE | PCR_SCLK_SEL | PCR_PCD(9),
-+
-+ .lcd_power = apf9328_lcd_power,
-+};
-+
-+
-+
- static struct platform_device *devices[] __initdata = {
- &serial_device,
- #ifdef CONFIG_DM9000
-@@ -261,6 +294,15 @@ static int __init scb9328_init(void)
- /// ej //evk9328_init_leds();
- UFCR(IMX_UART1_BASE) = 0xa81;
- UFCR(IMX_UART2_BASE) = 0xa81;
-+
-+ set_imx_fb_info(&apf9328_fb_info);
-+
-+ DR(3) |= 0x00000800; // essai Nico ...
-+ DDIR(3) |= 0x7FFFFFC0;
-+ GIUS(3) &= 0x8000003F;
-+ GPR(3) &= 0x8000003F;
-+
-+
- return platform_add_devices(devices, ARRAY_SIZE(devices));
- }
-
Copied: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/020-linux-2.6.23.1-scbfb.no_more_used (from rev 833, trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/020-linux-2.6.23.1-scbfb.diff)
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/020-linux-2.6.23.1-scbfb.no_more_used (rev 0)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/020-linux-2.6.23.1-scbfb.no_more_used 2008-07-19 15:55:28 UTC (rev 838)
@@ -0,0 +1,65 @@
+--- linux-org/arch/arm/mach-imx/scb9328.c 2006-10-01 14:21:57.000000000 +0200
++++ linux-imx/arch/arm/mach-imx/scb9328.c 2006-10-01 14:26:43.000000000 +0200
+@@ -34,6 +34,8 @@
+ #include <linux/usb_isp116x.h>
+ #endif
+
++#include <asm/arch/imxfb.h>
++
+ #define TYPE_NONE 0
+ #define TYPE_EVK9328 1
+ #define TYPE_EVK9328L 2
+@@ -246,6 +248,37 @@ static struct platform_device serial_dev
+ },
+ };
+
++static void apf9328_lcd_power(int on)
++{
++ printk("apf9328_lcd_power: %d\n", on);
++ /* use Port_D CONTRAST pin to control LCD power down mode */
++ if(on)
++ DR(3) &= 0xFFFFF7FF;
++ else
++ DR(3) |= 0x00000800;
++}
++
++static struct imxfb_mach_info apf9328_fb_info __initdata = {
++ .pixclock = 62500,
++ .bpp = 16,
++ .xres = 240,
++ .yres = 320,
++
++ .hsync_len = 9,
++ .vsync_len = 2,
++ .left_margin = 9,
++ .upper_margin = 2,
++ .right_margin = 27,
++ .lower_margin = 4,
++
++ .pcr = PCR_TFT | PCR_COLOR | PCR_PBSIZ_8 | PCR_BPIX_16 | PCR_CLKPOL |
++ PCR_SCLKIDLE | PCR_SCLK_SEL | PCR_PCD(9),
++
++ .lcd_power = apf9328_lcd_power,
++};
++
++
++
+ static struct platform_device *devices[] __initdata = {
+ &serial_device,
+ #ifdef CONFIG_DM9000
+@@ -261,6 +294,15 @@ static int __init scb9328_init(void)
+ /// ej //evk9328_init_leds();
+ UFCR(IMX_UART1_BASE) = 0xa81;
+ UFCR(IMX_UART2_BASE) = 0xa81;
++
++ set_imx_fb_info(&apf9328_fb_info);
++
++ DR(3) |= 0x00000800; // essai Nico ...
++ DDIR(3) |= 0x7FFFFFC0;
++ GIUS(3) &= 0x8000003F;
++ GPR(3) &= 0x8000003F;
++
++
+ return platform_add_devices(devices, ARRAY_SIZE(devices));
+ }
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|