[Armadeus-commitlog] SF.net SVN: armadeus:[1221] trunk/buildroot/target/device/armadeus/linux/ kern
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] SF.net SVN: armadeus:[1221] trunk/buildroot/target/device/armadeus/linux/ kernel-patches/2.6.27.13
|
From: <ar...@us...> - 2009-04-14 17:36:45
|
Revision: 1221
http://armadeus.svn.sourceforge.net/armadeus/?rev=1221&view=rev
Author: artemys
Date: 2009-04-14 17:36:32 +0000 (Tue, 14 Apr 2009)
Log Message:
-----------
[LINUX] Divides patch 321 in 2
Added Paths:
-----------
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.13/321-apf27-armadeus-mx2_adds_pwm_ressources.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.13/321-apf27-armadeus-mx2_pwm_fixes.patch
Removed Paths:
-------------
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.13/321-apf27-armadeus-pengu_pwm_fix.patch
Copied: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.13/321-apf27-armadeus-mx2_adds_pwm_ressources.patch (from rev 1220, trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.13/321-apf27-armadeus-pengu_pwm_fix.patch)
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.13/321-apf27-armadeus-mx2_adds_pwm_ressources.patch (rev 0)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.13/321-apf27-armadeus-mx2_adds_pwm_ressources.patch 2009-04-14 17:36:32 UTC (rev 1221)
@@ -0,0 +1,44 @@
+Adds PWM ressources on MX2.
+
+Signed-off-by: Nicolas Colombain <nic...@ar...>
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: linux-2.6.27.13/arch/arm/mach-mx2/devices.c
+===================================================================
+--- linux-2.6.27.13.orig/arch/arm/mach-mx2/devices.c 2009-04-12 16:10:13.000000000 +0200
++++ linux-2.6.27.13/arch/arm/mach-mx2/devices.c 2009-04-12 16:04:25.000000000 +0200
+@@ -637,6 +637,25 @@ struct platform_device mxc_ehci2 = {
+ .resource = mxc_ehci2_resources,
+ };
+
++static struct resource mxc_pwm_resources[] = {
++ [0] = {
++ .start = (PWM_BASE_ADDR),
++ .end = (PWM_BASE_ADDR + 0x14),
++ .flags = IORESOURCE_MEM,
++ },
++ [1] = {
++ .start = (MXC_INT_PWM),
++ .end = (MXC_INT_PWM),
++ .flags = IORESOURCE_IRQ,
++ },
++};
++
++struct platform_device mxc_pwm_device0 = {
++ .name = "imx-pwm",
++ .id = 0,
++ .num_resources = ARRAY_SIZE(mxc_pwm_resources),
++ .resource = mxc_pwm_resources,
++};
+
+ /* GPIO port description */
+ static struct mxc_gpio_port imx_gpio_ports[] = {
+Index: linux-2.6.27.13/arch/arm/mach-mx2/devices.h
+===================================================================
+--- linux-2.6.27.13.orig/arch/arm/mach-mx2/devices.h 2009-04-12 16:10:13.000000000 +0200
++++ linux-2.6.27.13/arch/arm/mach-mx2/devices.h 2009-04-12 16:05:02.000000000 +0200
+@@ -29,3 +29,4 @@ extern struct platform_device mxc_dam_de
+ extern struct platform_device mxc_otg;
+ extern struct platform_device mxc_ehci1;
+ extern struct platform_device mxc_ehci2;
++extern struct platform_device mxc_pwm_device0;
Added: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.13/321-apf27-armadeus-mx2_pwm_fixes.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.13/321-apf27-armadeus-mx2_pwm_fixes.patch (rev 0)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.13/321-apf27-armadeus-mx2_pwm_fixes.patch 2009-04-14 17:36:32 UTC (rev 1221)
@@ -0,0 +1,34 @@
+Changes to have a working PWM on i.MX27:
+* adds pwm pin configuration
+* fixes pwm clock
+
+Signed-off-by: Nicolas Colombain <nic...@ar...>
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: linux-2.6.27.13/arch/arm/plat-mxc/include/mach/iomux-mx1-mx2.h
+===================================================================
+--- linux-2.6.27.13.orig/arch/arm/plat-mxc/include/mach/iomux-mx1-mx2.h 2009-04-12 16:10:13.000000000 +0200
++++ linux-2.6.27.13/arch/arm/plat-mxc/include/mach/iomux-mx1-mx2.h 2009-04-12 16:05:57.000000000 +0200
+@@ -388,6 +388,7 @@ extern void mxc_gpio_release_multiple(co
+ #define PE2_PF_USBOTG_DIR (GPIO_PORTE | GPIO_OUT | GPIO_PF | 2)
+ #define PE3_PF_UART2_CTS (GPIO_PORTE | GPIO_OUT | GPIO_PF | 3)
+ #define PE4_PF_UART2_RTS (GPIO_PORTE | GPIO_IN | GPIO_PF | 4)
++#define PE5_PF_PWM0 (GPIO_PORTE | GPIO_OUT | GPIO_PF | 5)
+ #define PE6_PF_UART2_TXD (GPIO_PORTE | GPIO_OUT | GPIO_PF | 6)
+ #define PE7_PF_UART2_RXD (GPIO_PORTE | GPIO_IN | GPIO_PF | 7)
+ #define PE8_PF_UART3_TXD (GPIO_PORTE | GPIO_OUT | GPIO_PF | 8)
+Index: linux-2.6.27.13/arch/arm/mach-mx2/clock_imx27.c
+===================================================================
+--- linux-2.6.27.13.orig/arch/arm/mach-mx2/clock_imx27.c 2009-04-12 16:10:12.000000000 +0200
++++ linux-2.6.27.13/arch/arm/mach-mx2/clock_imx27.c 2009-04-12 16:06:29.000000000 +0200
+@@ -921,7 +921,7 @@ static struct clk pwm_clk[] = {
+ .parent = &per_clk[0],
+ .secondary = &pwm_clk[1],
+ }, {
+- .name = "pwm_clk",
++ .name = "pwm_ipg_clk",
+ .parent = &ipg_clk,
+ .enable = _clk_enable,
+ .enable_reg = CCM_PCCR0,
+
+
Deleted: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.13/321-apf27-armadeus-pengu_pwm_fix.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.13/321-apf27-armadeus-pengu_pwm_fix.patch 2009-04-14 15:03:56 UTC (rev 1220)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.13/321-apf27-armadeus-pengu_pwm_fix.patch 2009-04-14 17:36:32 UTC (rev 1221)
@@ -1,82 +0,0 @@
-Fix pwm clock
-Add pwm pin configuration
-Add pwm ressource
-
-Signed-off-by: Nicolas Colombain <nic...@ar...>
-Signed-off-by: Julien Boibessot <jul...@ar...>
-
-Index: linux-2.6.27.13/arch/arm/plat-mxc/include/mach/iomux-mx1-mx2.h
-===================================================================
---- linux-2.6.27.13.orig/arch/arm/plat-mxc/include/mach/iomux-mx1-mx2.h 2009-04-12 16:10:13.000000000 +0200
-+++ linux-2.6.27.13/arch/arm/plat-mxc/include/mach/iomux-mx1-mx2.h 2009-04-12 16:05:57.000000000 +0200
-@@ -372,8 +372,6 @@ extern void mxc_gpio_release_multiple(co
- #define PD23_PF_CSPI2_MISO (GPIO_PORTD | GPIO_IN | GPIO_PF | 23)
- #define PD24_PF_CSPI2_MOSI (GPIO_PORTD | GPIO_OUT | GPIO_PF | 24)
-
--
--
- #define PD25_PF_CSPI1_RDY (GPIO_PORTD | GPIO_OUT | GPIO_PF | 25)
- #define PD26_PF_CSPI1_SS2 (GPIO_PORTD | GPIO_OUT | GPIO_PF | 26)
- #define PD26_AF_USBH2_DATA5 (GPIO_PORTD | GPIO_AF | 26)
-@@ -388,6 +386,7 @@ extern void mxc_gpio_release_multiple(co
- #define PE2_PF_USBOTG_DIR (GPIO_PORTE | GPIO_OUT | GPIO_PF | 2)
- #define PE3_PF_UART2_CTS (GPIO_PORTE | GPIO_OUT | GPIO_PF | 3)
- #define PE4_PF_UART2_RTS (GPIO_PORTE | GPIO_IN | GPIO_PF | 4)
-+#define PE5_PF_PWM0 (GPIO_PORTE | GPIO_OUT | GPIO_PF | 5)
- #define PE6_PF_UART2_TXD (GPIO_PORTE | GPIO_OUT | GPIO_PF | 6)
- #define PE7_PF_UART2_RXD (GPIO_PORTE | GPIO_IN | GPIO_PF | 7)
- #define PE8_PF_UART3_TXD (GPIO_PORTE | GPIO_OUT | GPIO_PF | 8)
-Index: linux-2.6.27.13/arch/arm/mach-mx2/devices.c
-===================================================================
---- linux-2.6.27.13.orig/arch/arm/mach-mx2/devices.c 2009-04-12 16:10:13.000000000 +0200
-+++ linux-2.6.27.13/arch/arm/mach-mx2/devices.c 2009-04-12 16:04:25.000000000 +0200
-@@ -637,6 +637,25 @@ struct platform_device mxc_ehci2 = {
- .resource = mxc_ehci2_resources,
- };
-
-+static struct resource pwm_resources[] = {
-+ [0] = {
-+ .start = (PWM_BASE_ADDR),
-+ .end = (PWM_BASE_ADDR + 0x14),
-+ .flags = IORESOURCE_MEM,
-+ },
-+ [1] = {
-+ .start = (MXC_INT_PWM),
-+ .end = (MXC_INT_PWM),
-+ .flags = IORESOURCE_IRQ,
-+ },
-+};
-+
-+struct platform_device imx_pwm_device0 = {
-+ .name = "imx-pwm", // Should be the same as the driver name
-+ .id = 0,
-+ .num_resources = ARRAY_SIZE(pwm_resources),
-+ .resource = pwm_resources,
-+};
-
- /* GPIO port description */
- static struct mxc_gpio_port imx_gpio_ports[] = {
-Index: linux-2.6.27.13/arch/arm/mach-mx2/devices.h
-===================================================================
---- linux-2.6.27.13.orig/arch/arm/mach-mx2/devices.h 2009-04-12 16:10:13.000000000 +0200
-+++ linux-2.6.27.13/arch/arm/mach-mx2/devices.h 2009-04-12 16:05:02.000000000 +0200
-@@ -29,3 +29,4 @@ extern struct platform_device mxc_dam_de
- extern struct platform_device mxc_otg;
- extern struct platform_device mxc_ehci1;
- extern struct platform_device mxc_ehci2;
-+extern struct platform_device imx_pwm_device0;
-Index: linux-2.6.27.13/arch/arm/mach-mx2/clock_imx27.c
-===================================================================
---- linux-2.6.27.13.orig/arch/arm/mach-mx2/clock_imx27.c 2009-04-12 16:10:12.000000000 +0200
-+++ linux-2.6.27.13/arch/arm/mach-mx2/clock_imx27.c 2009-04-12 16:06:29.000000000 +0200
-@@ -921,7 +921,7 @@ static struct clk pwm_clk[] = {
- .parent = &per_clk[0],
- .secondary = &pwm_clk[1],
- }, {
-- .name = "pwm_clk",
-+ .name = "pwm_ipg_clk",
- .parent = &ipg_clk,
- .enable = _clk_enable,
- .enable_reg = CCM_PCCR0,
-
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
