[Armadeus-commitlog] SF.net SVN: armadeus:[1278] trunk/buildroot/target/device/armadeus/linux/ kern
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] SF.net SVN: armadeus:[1278] trunk/buildroot/target/device/armadeus/linux/ kernel-patches/2.6.29
|
From: <th...@us...> - 2009-05-15 13:02:06
|
Revision: 1278
http://armadeus.svn.sourceforge.net/armadeus/?rev=1278&view=rev
Author: thom25
Date: 2009-05-15 13:01:52 +0000 (Fri, 15 May 2009)
Log Message:
-----------
[LINUX] make usb gadget compile again on apf9328
Modified Paths:
--------------
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/021-armadeus-apf9328.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/030-armadeus-imx_udc-add_clock.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/031-armadeus-imx_udc_add_usb_h_include_to_arch_arm_mach-imx_include_mach.patch
Added Paths:
-----------
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/030-armadeus-imx-generic.patch
Removed Paths:
-------------
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/030-armadeus-imx-add_USB_ressources.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/040-armadeus-imx_mmc.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/078-armadeus-set_imx_fb_info-sectio-mismatch.patch
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/021-armadeus-apf9328.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/021-armadeus-apf9328.patch 2009-05-14 10:05:30 UTC (rev 1277)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/021-armadeus-apf9328.patch 2009-05-15 13:01:52 UTC (rev 1278)
@@ -5,7 +5,7 @@
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.29/arch/arm/mach-imx/apf9328.c 2009-05-06 18:25:52.000000000 +0200
-@@ -0,0 +1,787 @@
+@@ -0,0 +1,806 @@
+/*
+ * linux/arch/arm/mach-imx/apf9328.c
+ *
@@ -48,6 +48,7 @@
+#include <asm/mach/arch.h>
+#include <mach/imx-uart.h>
+#include <mach/mmc.h>
++#include <mach/usb.h>
+#include <mach/spi_imx.h>
+#include <mach/imx-regs.h> /* imx_gpio_mode() */
+#include <mach/imx-alsa.h>
@@ -83,6 +84,7 @@
+#define CONFIG_PWM
+#endif
+
++
+/* --- ISP1761 */
+#ifdef CONFIG_ARMADEUS_ISP1761
+
@@ -219,7 +221,23 @@
+
+#endif /* CONFIG_PWM */
+
++static int apf9328_udc_0_init(struct device * dev)
++{
++ return 0;
++}
+
++static int apf9328_udc_0_exit(struct device * dev)
++{
++ return 0;
++}
++
++static struct imxusb_platform_data apf9328_udc_0_data = {
++ .init = apf9328_udc_0_init,
++ .exit = apf9328_udc_0_exit,
++};
++
++
++
+#if defined(CONFIG_SND_IMX_TSC2102) || defined(CONFIG_SND_IMX_TSC2102_MODULE)
+int apf9328_ssi_gpio_init(struct platform_device *pdev)
+{
@@ -726,6 +744,7 @@
+#ifdef CONFIG_ARMADEUS_ISP1761
+ imx_gpio_mode( ISP1761_GPIO_IRQ | GPIO_IN | GPIO_GIUS ); /* Set up IRQ line. */
+#endif
++ set_imx_usb_info(&apf9328_udc_0_data);
+
+ platform_add_devices(devices, ARRAY_SIZE(devices));
+
Deleted: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/030-armadeus-imx-add_USB_ressources.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/030-armadeus-imx-add_USB_ressources.patch 2009-05-14 10:05:30 UTC (rev 1277)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/030-armadeus-imx-add_USB_ressources.patch 2009-05-15 13:01:52 UTC (rev 1278)
@@ -1,63 +0,0 @@
---- linux-org/arch/arm/mach-imx/generic.c 2006-09-20 05:42:06.000000000 +0200
-+++ linux-imx/arch/arm/mach-imx/generic.c 2006-10-01 14:30:03.000000000 +0200
-@@ -279,9 +279,60 @@ static struct platform_device imxfb_devi
- .resource = imxfb_resources,
- };
-
-+static struct resource imx_usb_resources[] = {
-+ [0] = {
-+ .start = 0x00212000,
-+ .end = 0x00212FFF,
-+ .flags = IORESOURCE_MEM,
-+ },
-+ [1] = {
-+ .start = USBD_INT0,
-+ .end = USBD_INT0,
-+ .flags = IORESOURCE_IRQ,
-+ },
-+ [2] = {
-+ .start = USBD_INT1,
-+ .end = USBD_INT1,
-+ .flags = IORESOURCE_IRQ,
-+ },
-+ [3] = {
-+ .start = USBD_INT2,
-+ .end = USBD_INT2,
-+ .flags = IORESOURCE_IRQ,
-+ },
-+ [4] = {
-+ .start = USBD_INT3,
-+ .end = USBD_INT3,
-+ .flags = IORESOURCE_IRQ,
-+ },
-+ [5] = {
-+ .start = USBD_INT4,
-+ .end = USBD_INT4,
-+ .flags = IORESOURCE_IRQ,
-+ },
-+ [6] = {
-+ .start = USBD_INT5,
-+ .end = USBD_INT5,
-+ .flags = IORESOURCE_IRQ,
-+ },
-+ [7] = {
-+ .start = USBD_INT6,
-+ .end = USBD_INT6,
-+ .flags = IORESOURCE_IRQ,
-+ },
-+};
-+
-+static struct platform_device imx_usb_device = {
-+ .name = "imx-udc",
-+ .id = 0,
-+ .num_resources = ARRAY_SIZE(imx_usb_resources),
-+ .resource = imx_usb_resources,
-+};
-+
- static struct platform_device *devices[] __initdata = {
- &imx_mmc_device,
- &imxfb_device,
-+ &imx_usb_device,
- };
-
- static struct map_desc imx_io_desc[] __initdata = {
Added: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/030-armadeus-imx-generic.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/030-armadeus-imx-generic.patch (rev 0)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/030-armadeus-imx-generic.patch 2009-05-15 13:01:52 UTC (rev 1278)
@@ -0,0 +1,110 @@
+--- linux-2.6.29.orig/arch/arm/mach-imx/generic.c 2009-03-30 11:16:06.000000000 +0200
++++ linux-2.6.29/arch/arm/mach-imx/generic.c 2009-03-30 11:18:12.000000000 +0200
+@@ -30,6 +30,7 @@
+
+ #include <asm/errno.h>
+ #include <mach/imxfb.h>
++#include <mach/usb.h>
+ #include <mach/hardware.h>
+ #include <mach/imx-regs.h>
+
+@@ -229,10 +230,13 @@ static struct resource imx_mmc_resources
+
+ static u64 imxmmmc_dmamask = 0xffffffffUL;
+
++static struct imxmmc_platform_data imx_mmc_info;
++
+ static struct platform_device imx_mmc_device = {
+ .name = "imx-mmc",
+ .id = 0,
+ .dev = {
++ .platform_data = &imx_mmc_info,
+ .dma_mask = &imxmmmc_dmamask,
+ .coherent_dma_mask = 0xffffffff,
+ },
+@@ -242,12 +246,12 @@ static struct platform_device imx_mmc_de
+
+ void __init imx_set_mmc_info(struct imxmmc_platform_data *info)
+ {
+- imx_mmc_device.dev.platform_data = info;
++ memcpy(&imx_mmc_info,info,sizeof(struct imxmmc_platform_data));
+ }
+
+ static struct imx_fb_platform_data imx_fb_info;
+
+-void __init set_imx_fb_info(struct imx_fb_platform_data *hard_imx_fb_info)
++void set_imx_fb_info(struct imx_fb_platform_data *hard_imx_fb_info)
+ {
+ memcpy(&imx_fb_info,hard_imx_fb_info,sizeof(struct imx_fb_platform_data));
+ }
+@@ -279,9 +283,70 @@ static struct platform_device imxfb_devi
+ .resource = imxfb_resources,
+ };
+
++static struct resource imx_usb_resources[] = {
++ [0] = {
++ .start = 0x00212000,
++ .end = 0x00212FFF,
++ .flags = IORESOURCE_MEM,
++ },
++ [1] = {
++ .start = USBD_INT0,
++ .end = USBD_INT0,
++ .flags = IORESOURCE_IRQ,
++ },
++ [2] = {
++ .start = USBD_INT1,
++ .end = USBD_INT1,
++ .flags = IORESOURCE_IRQ,
++ },
++ [3] = {
++ .start = USBD_INT2,
++ .end = USBD_INT2,
++ .flags = IORESOURCE_IRQ,
++ },
++ [4] = {
++ .start = USBD_INT3,
++ .end = USBD_INT3,
++ .flags = IORESOURCE_IRQ,
++ },
++ [5] = {
++ .start = USBD_INT4,
++ .end = USBD_INT4,
++ .flags = IORESOURCE_IRQ,
++ },
++ [6] = {
++ .start = USBD_INT5,
++ .end = USBD_INT5,
++ .flags = IORESOURCE_IRQ,
++ },
++ [7] = {
++ .start = USBD_INT6,
++ .end = USBD_INT6,
++ .flags = IORESOURCE_IRQ,
++ },
++};
++
++static struct imxusb_platform_data imx_usb_info;
++
++static struct platform_device imx_usb_device = {
++ .name = "imx_udc",
++ .id = 0,
++ .dev = {
++ .platform_data = &imx_usb_info,
++ },
++ .num_resources = ARRAY_SIZE(imx_usb_resources),
++ .resource = imx_usb_resources,
++};
++
++void set_imx_usb_info(struct imxusb_platform_data *hard_imx_usb_info)
++{
++ memcpy(&imx_usb_info,hard_imx_usb_info,sizeof(struct imxusb_platform_data));
++}
++
+ static struct platform_device *devices[] __initdata = {
+ &imx_mmc_device,
+ &imxfb_device,
++ &imx_usb_device,
+ };
+
+ static struct map_desc imx_io_desc[] __initdata = {
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/030-armadeus-imx_udc-add_clock.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/030-armadeus-imx_udc-add_clock.patch 2009-05-14 10:05:30 UTC (rev 1277)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/030-armadeus-imx_udc-add_clock.patch 2009-05-15 13:01:52 UTC (rev 1278)
@@ -21,7 +21,7 @@
};
+static struct clk clk_usb_clk = {
-+ .name = "usb_clk",
++ .name = "usbd_clk",
+ .get_rate = imx_get_usb_clk,
+};
+
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/031-armadeus-imx_udc_add_usb_h_include_to_arch_arm_mach-imx_include_mach.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/031-armadeus-imx_udc_add_usb_h_include_to_arch_arm_mach-imx_include_mach.patch 2009-05-14 10:05:30 UTC (rev 1277)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/031-armadeus-imx_udc_add_usb_h_include_to_arch_arm_mach-imx_include_mach.patch 2009-05-15 13:01:52 UTC (rev 1278)
@@ -5,7 +5,7 @@
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.29/arch/arm/mach-imx/include/mach/usb.h 2009-05-01 13:51:56.000000000 +0200
-@@ -0,0 +1,23 @@
+@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2008 Darius Augulis <aug...@gm...>
+ *
@@ -28,4 +28,6 @@
+ int (*exit)(struct device *);
+};
+
++void set_imx_usb_info(struct imxusb_platform_data *hard_imx_usb_info);
++
+#endif /* __ASM_ARCH_MXC_USB */
Deleted: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/040-armadeus-imx_mmc.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/040-armadeus-imx_mmc.patch 2009-05-14 10:05:30 UTC (rev 1277)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/040-armadeus-imx_mmc.patch 2009-05-15 13:01:52 UTC (rev 1278)
@@ -1,25 +0,0 @@
---- linux-org/arch/arm/mach-imx/generic.c 2006-10-20 00:13:49.000000000 +0200
-+++ linux-imx/arch/arm/mach-imx/generic.c 2006-10-18 22:47:19.000000000 +0200
-@@ -229,10 +229,13 @@ static struct resource imx_mmc_resources
-
- static u64 imxmmmc_dmamask = 0xffffffffUL;
-
-+static struct imxmmc_platform_data imx_mmc_info;
-+
- static struct platform_device imx_mmc_device = {
- .name = "imx-mmc",
- .id = 0,
- .dev = {
-+ .platform_data = &imx_mmc_info,
- .dma_mask = &imxmmmc_dmamask,
- .coherent_dma_mask = 0xffffffff,
- },
-@@ -242,7 +245,7 @@ static struct platform_device imx_mmc_de
-
- void __init imx_set_mmc_info(struct imxmmc_platform_data *info)
- {
-- imx_mmc_device.dev.platform_data = info;
-+ memcpy(&imx_mmc_info,info,sizeof(struct imxmmc_platform_data));
- }
- EXPORT_SYMBOL(imx_set_mmc_info);
-
Deleted: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/078-armadeus-set_imx_fb_info-sectio-mismatch.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/078-armadeus-set_imx_fb_info-sectio-mismatch.patch 2009-05-14 10:05:30 UTC (rev 1277)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/078-armadeus-set_imx_fb_info-sectio-mismatch.patch 2009-05-15 13:01:52 UTC (rev 1278)
@@ -1,13 +0,0 @@
-Index: linux-2.6.29/arch/arm/mach-imx/generic.c
-===================================================================
---- linux-2.6.29.orig/arch/arm/mach-imx/generic.c 2009-03-30 11:16:06.000000000 +0200
-+++ linux-2.6.29/arch/arm/mach-imx/generic.c 2009-03-30 11:18:12.000000000 +0200
-@@ -250,7 +250,7 @@
-
- static struct imx_fb_platform_data imx_fb_info;
-
--void __init set_imx_fb_info(struct imx_fb_platform_data *hard_imx_fb_info)
-+void set_imx_fb_info(struct imx_fb_platform_data *hard_imx_fb_info)
- {
- memcpy(&imx_fb_info,hard_imx_fb_info,sizeof(struct imx_fb_platform_data));
- }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
