r904 - trunk/src/target/kernel/patches
laforge at sita.openmoko.org
laforge at sita.openmoko.org
Thu Feb 8 03:08:21 CET 2007
Author: laforge
Date: 2007-02-08 03:08:20 +0100 (Thu, 08 Feb 2007)
New Revision: 904
Removed:
trunk/src/target/kernel/patches/gta01-s3c_mci-pdata.patch
Modified:
trunk/src/target/kernel/patches/gta01-core.patch
trunk/src/target/kernel/patches/series
Log:
merge s3cmci pdata into gta01 core patch
Modified: trunk/src/target/kernel/patches/gta01-core.patch
===================================================================
--- trunk/src/target/kernel/patches/gta01-core.patch 2007-02-08 00:51:24 UTC (rev 903)
+++ trunk/src/target/kernel/patches/gta01-core.patch 2007-02-08 02:08:20 UTC (rev 904)
@@ -3,8 +3,8 @@
Index: linux-2.6.17.14-fic4.test/arch/arm/mach-s3c2410/Kconfig
===================================================================
---- linux-2.6.17.14-fic4.test.orig/arch/arm/mach-s3c2410/Kconfig 2007-02-07 19:10:10.000000000 +0100
-+++ linux-2.6.17.14-fic4.test/arch/arm/mach-s3c2410/Kconfig 2007-02-07 19:10:14.000000000 +0100
+--- linux-2.6.17.14-fic4.test.orig/arch/arm/mach-s3c2410/Kconfig 2007-02-07 20:39:12.000000000 +0100
++++ linux-2.6.17.14-fic4.test/arch/arm/mach-s3c2410/Kconfig 2007-02-07 20:39:12.000000000 +0100
@@ -69,6 +69,13 @@
help
Say Y here if you are using the Armzone QT2410
@@ -21,8 +21,8 @@
select CPU_S3C2440
Index: linux-2.6.17.14-fic4.test/arch/arm/mach-s3c2410/Makefile
===================================================================
---- linux-2.6.17.14-fic4.test.orig/arch/arm/mach-s3c2410/Makefile 2007-02-07 19:10:10.000000000 +0100
-+++ linux-2.6.17.14-fic4.test/arch/arm/mach-s3c2410/Makefile 2007-02-07 19:10:14.000000000 +0100
+--- linux-2.6.17.14-fic4.test.orig/arch/arm/mach-s3c2410/Makefile 2007-02-07 20:39:12.000000000 +0100
++++ linux-2.6.17.14-fic4.test/arch/arm/mach-s3c2410/Makefile 2007-02-07 20:39:12.000000000 +0100
@@ -44,6 +44,7 @@
obj-$(CONFIG_MACH_N30) += mach-n30.o
obj-$(CONFIG_ARCH_SMDK2410) += mach-smdk2410.o
@@ -34,8 +34,8 @@
Index: linux-2.6.17.14-fic4.test/arch/arm/mach-s3c2410/mach-gta01.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.17.14-fic4.test/arch/arm/mach-s3c2410/mach-gta01.c 2007-02-07 20:00:44.000000000 +0100
-@@ -0,0 +1,497 @@
++++ linux-2.6.17.14-fic4.test/arch/arm/mach-s3c2410/mach-gta01.c 2007-02-07 20:42:17.000000000 +0100
+@@ -0,0 +1,508 @@
+/*
+ * linux/arch/arm/mach-s3c2410/mach-gta01.c
+ *
@@ -92,9 +92,11 @@
+#include <asm/arch/fb.h>
+#include <asm/arch/udc.h>
+#include <asm/arch/nand.h>
++#include <asm/arch/mci.h>
+#include <asm/arch/ts.h>
+#include <asm/arch/spi.h>
+#include <asm/arch/spi-gpio.h>
++#include <asm/arch/usb-control.h>
+
+#include <asm/arch/gta01.h>
+
@@ -270,7 +272,6 @@
+ .sets = gta01_nand_sets,
+};
+
-+#if 0
+static unsigned int mmc_millivolts[] = {
+ [MMC_VDD_145_150] = 1500,
+ [MMC_VDD_150_155] = 1500,
@@ -295,14 +296,14 @@
+ [MMC_VDD_32_33] = 3300,
+};
+
-+static void gta01_mmc_set_power(unsigned int to)
++static void gta01_mmc_set_power(unsigned short vdd)
+{
-+ /* FIXME: configure D2REG of PCF50606 using D2REGC1 */
-+ //pcf50606_voltage_set(mmc_millivolts[to]);
++ /* FIXME: set GTA01_GPIO_SDMMC_ON on GTA01v4 */
++ //pcf50606_voltage_set(mmc_millivolts[vdd]);
+}
+
-+static struct s3c24xx_mmc_platdata gta01_mmc_cfg = {
-+ .gpio_detect = S3C2410_GPF5,
++static struct s3c24xx_mci_pdata gta01_mmc_cfg = {
++ .gpio_detect = GTA01_GPIO_nSD_DETECT,
+ .set_power = >a01_mmc_set_power,
+ .ocr_avail = MMC_VDD_145_150|MMC_VDD_150_155|MMC_VDD_155_160|
+ MMC_VDD_160_165| MMC_VDD_165_170|MMC_VDD_17_18|
@@ -312,7 +313,6 @@
+ MMC_VDD_27_28|MMC_VDD_28_29|MMC_VDD_29_30|
+ MMC_VDD_30_31|MMC_VDD_31_32|MMC_VDD_32_33,
+};
-+#endif
+
+static void gta01_udc_pullup(enum s3c2410_udc_cmd_e cmd)
+{
@@ -478,6 +478,16 @@
+ .name ="gta01-pm-bt",
+};
+
++/* USB */
++static struct s3c2410_hcd_info gta01_usb_info = {
++ .port[0] = {
++ .flags = S3C_HCDFLG_USED,
++ },
++ .port[1] = {
++ .flags = 0,
++ },
++};
++
+static void __init gta01_map_io(void)
+{
+ s3c24xx_init_io(gta01_iodesc, ARRAY_SIZE(gta01_iodesc));
@@ -488,8 +498,9 @@
+
+static void __init gta01_machine_init(void)
+{
++ s3c_device_usb.dev.platform_data = >a01_usb_info;
+ s3c_device_nand.dev.platform_data = >a01_nand_info;
-+ //s3c_device_sdi.dev.platform_data = >a01_mmc_cfg;
++ s3c_device_sdi.dev.platform_data = >a01_mmc_cfg;
+
+ s3c24xx_fb_set_platdata(>a01_lcd_cfg);
+
@@ -535,8 +546,8 @@
+
Index: linux-2.6.17.14-fic4.test/arch/arm/tools/mach-types
===================================================================
---- linux-2.6.17.14-fic4.test.orig/arch/arm/tools/mach-types 2007-02-07 19:10:10.000000000 +0100
-+++ linux-2.6.17.14-fic4.test/arch/arm/tools/mach-types 2007-02-07 19:10:14.000000000 +0100
+--- linux-2.6.17.14-fic4.test.orig/arch/arm/tools/mach-types 2007-02-07 20:39:12.000000000 +0100
++++ linux-2.6.17.14-fic4.test/arch/arm/tools/mach-types 2007-02-07 20:39:12.000000000 +0100
@@ -1041,3 +1041,4 @@
ixp465 MACH_IXP465 IXP465 1028
balloon3 MACH_BALLOON3 BALLOON3 1029
@@ -545,7 +556,7 @@
Index: linux-2.6.17.14-fic4.test/include/asm-arm/arch-s3c2410/gta01.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.17.14-fic4.test/include/asm-arm/arch-s3c2410/gta01.h 2007-02-07 20:03:21.000000000 +0100
++++ linux-2.6.17.14-fic4.test/include/asm-arm/arch-s3c2410/gta01.h 2007-02-07 20:39:12.000000000 +0100
@@ -0,0 +1,60 @@
+#ifndef _GTA01_H
+#define _GTA01_H
Deleted: trunk/src/target/kernel/patches/gta01-s3c_mci-pdata.patch
===================================================================
--- trunk/src/target/kernel/patches/gta01-s3c_mci-pdata.patch 2007-02-08 00:51:24 UTC (rev 903)
+++ trunk/src/target/kernel/patches/gta01-s3c_mci-pdata.patch 2007-02-08 02:08:20 UTC (rev 904)
@@ -1,57 +0,0 @@
-Index: linux-2.6.17.14-fic4.test/arch/arm/mach-s3c2410/mach-gta01.c
-===================================================================
---- linux-2.6.17.14-fic4.test.orig/arch/arm/mach-s3c2410/mach-gta01.c 2007-01-24 12:18:13.000000000 +0100
-+++ linux-2.6.17.14-fic4.test/arch/arm/mach-s3c2410/mach-gta01.c 2007-01-24 12:18:19.000000000 +0100
-@@ -57,6 +57,7 @@
- #include <asm/arch/ts.h>
- #include <asm/arch/spi.h>
- #include <asm/arch/spi-gpio.h>
-+#include <asm/arch/mci.h>
-
- #include <asm/arch/gta01.h>
-
-@@ -232,7 +233,6 @@
- .sets = gta01_nand_sets,
- };
-
--#if 0
- static unsigned int mmc_millivolts[] = {
- [MMC_VDD_145_150] = 1500,
- [MMC_VDD_150_155] = 1500,
-@@ -257,14 +257,15 @@
- [MMC_VDD_32_33] = 3300,
- };
-
--static void gta01_mmc_set_power(unsigned int to)
-+static void gta01_mmc_set_power(unsigned short vdd)
- {
- /* FIXME: configure D2REG of PCF50606 using D2REGC1 */
-- //pcf50606_voltage_set(mmc_millivolts[to]);
-+ /* FIXME: set GTA01_GPIO_SDMMC_ON on GTA01v4 */
-+ //pcf50606_voltage_set(mmc_millivolts[vdd]);
- }
-
--static struct s3c24xx_mmc_platdata gta01_mmc_cfg = {
-- .gpio_detect = S3C2410_GPF5,
-+static struct s3c24xx_mci_pdata gta01_mmc_cfg = {
-+ .gpio_detect = GTA01_GPIO_nSD_DETECT,
- .set_power = >a01_mmc_set_power,
- .ocr_avail = MMC_VDD_145_150|MMC_VDD_150_155|MMC_VDD_155_160|
- MMC_VDD_160_165| MMC_VDD_165_170|MMC_VDD_17_18|
-@@ -274,7 +275,6 @@
- MMC_VDD_27_28|MMC_VDD_28_29|MMC_VDD_29_30|
- MMC_VDD_30_31|MMC_VDD_31_32|MMC_VDD_32_33,
- };
--#endif
-
- static void gta01_udc_pullup(enum s3c2410_udc_cmd_e cmd)
- {
-@@ -445,7 +445,7 @@
- static void __init gta01_machine_init(void)
- {
- s3c_device_nand.dev.platform_data = >a01_nand_info;
-- //s3c_device_sdi.dev.platform_data = >a01_mmc_cfg;
-+ s3c_device_sdi.dev.platform_data = >a01_mmc_cfg;
-
- s3c24xx_fb_set_platdata(>a01_lcd_cfg);
-
Modified: trunk/src/target/kernel/patches/series
===================================================================
--- trunk/src/target/kernel/patches/series 2007-02-08 00:51:24 UTC (rev 903)
+++ trunk/src/target/kernel/patches/series 2007-02-08 02:08:20 UTC (rev 904)
@@ -20,10 +20,10 @@
gta01-backlight.patch
gta01-pcf50606.patch
gta01-vibrator.patch
-gta01-s3c_mci-pdata.patch
gta01-inputdevice.patch
gta01-power_control.patch
s3c2410-bbt.patch
g_ether-highpower.patch
gta01-vbus_draw.patch
ts0710.patch
+alsa-rxmixer.patch
More information about the commitlog
mailing list