[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.0-1-g91404b7
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.0-1-g91404b7
|
From: jorasse <jo...@us...> - 2012-08-14 14:12:43
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 91404b72c0a48bd2f078bc69ed84759aa8ddee1b (commit)
from 615f7adffd99bf9e91183078664a9099551f5b93 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 91404b72c0a48bd2f078bc69ed84759aa8ddee1b
Author: Eric Jarrige <eri...@ar...>
Date: Tue Aug 14 16:16:09 2012 +0200
[LINUX] apf28: cleanup USB patchwork
-----------------------------------------------------------------------
Summary of changes:
.../450-armadeus-add_apf28_module_support.patch | 19 -------------------
.../452-armadeus-mxs-fixes_USB_freescale_bsp.patch | 15 ++++++---------
2 files changed, 6 insertions(+), 28 deletions(-)
diff --git a/patches/linux/2.6.35/450-armadeus-add_apf28_module_support.patch b/patches/linux/2.6.35/450-armadeus-add_apf28_module_support.patch
index 9d60244..e06dc08 100644
--- a/patches/linux/2.6.35/450-armadeus-add_apf28_module_support.patch
+++ b/patches/linux/2.6.35/450-armadeus-add_apf28_module_support.patch
@@ -744,22 +744,3 @@ Index: linux-2.6.35.3/arch/arm/tools/mach-types
saarb_mg1 MACH_SAARB_MG1 SAARB_MG1 3091
callisto MACH_CALLISTO CALLISTO 3092
+apf28 MACH_APF28 APF28 3845
-Index: linux-2.6.35.3/arch/arm/mach-mx28/usb_dr.c
-===================================================================
---- linux-2.6.35.3.orig/arch/arm/mach-mx28/usb_dr.c 2012-02-01 11:40:57.000000000 +0100
-+++ linux-2.6.35.3/arch/arm/mach-mx28/usb_dr.c 2012-02-01 11:45:29.000000000 +0100
-@@ -52,12 +52,14 @@
- void fsl_phy_set_power(struct fsl_xcvr_ops *this,
- struct fsl_usb2_platform_data *pdata, int on)
- {
-+#if defined(CONFIG_MACH_MX28EVK)
- /* USB_POWER_ENABLE_PIN have request at pin init*/
- if (pdata->phy_regs != USBPHY1_PHYS_ADDR) {
- pr_debug("%s: on is %d\n", __func__, on);
- gpio_direction_output(USB_POWER_ENABLE, on);
- gpio_set_value(USB_POWER_ENABLE, on);
- }
-+#endif
- }
-
- static void usb_host_phy_resume(struct fsl_usb2_platform_data *plat)
diff --git a/patches/linux/2.6.35/452-armadeus-mxs-fixes_USB_freescale_bsp.patch b/patches/linux/2.6.35/452-armadeus-mxs-fixes_USB_freescale_bsp.patch
index 752bb41..dd696fc 100644
--- a/patches/linux/2.6.35/452-armadeus-mxs-fixes_USB_freescale_bsp.patch
+++ b/patches/linux/2.6.35/452-armadeus-mxs-fixes_USB_freescale_bsp.patch
@@ -4,8 +4,8 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: linux-2.6.35.3/arch/arm/mach-mx28/usb_dr.c
===================================================================
---- linux-2.6.35.3.orig/arch/arm/mach-mx28/usb_dr.c 2012-02-03 12:57:41.000000000 +0100
-+++ linux-2.6.35.3/arch/arm/mach-mx28/usb_dr.c 2012-02-03 12:57:55.000000000 +0100
+--- linux-2.6.35.3/arch/arm/mach-mx28/usb_dr.c
++++ linux-2.6.35.3/arch/arm/mach-mx28/usb_dr.c
@@ -29,7 +29,13 @@
#include <mach/arc_otg.h>
#include "usb.h"
@@ -28,11 +28,10 @@ Index: linux-2.6.35.3/arch/arm/mach-mx28/usb_dr.c
void fsl_phy_usb_utmi_init(struct fsl_xcvr_ops *this)
{
-@@ -58,14 +65,20 @@ void fsl_phy_usb_utmi_uninit(struct fsl_
+@@ -58,11 +65,19 @@ void fsl_phy_usb_utmi_uninit(struct fsl_
void fsl_phy_set_power(struct fsl_xcvr_ops *this,
struct fsl_usb2_platform_data *pdata, int on)
{
--#if defined(CONFIG_MACH_MX28EVK)
- /* USB_POWER_ENABLE_PIN have request at pin init*/
- if (pdata->phy_regs != USBPHY1_PHYS_ADDR) {
- pr_debug("%s: on is %d\n", __func__, on);
@@ -52,11 +51,9 @@ Index: linux-2.6.35.3/arch/arm/mach-mx28/usb_dr.c
+ gpio_set_value(USB_POWER_ENABLE, on);
+ }
}
--#endif
}
- static void usb_host_phy_resume(struct fsl_usb2_platform_data *plat)
-@@ -365,6 +378,7 @@ static struct fsl_usb2_platform_data __m
+@@ -363,6 +378,7 @@ static struct fsl_usb2_platform_data __m
.platform_resume = usb_host_phy_resume,
.transceiver = "utmi",
.phy_regs = USBPHY0_PHYS_ADDR,
@@ -64,7 +61,7 @@ Index: linux-2.6.35.3/arch/arm/mach-mx28/usb_dr.c
};
/*
-@@ -459,6 +473,18 @@ static struct fsl_usb2_wakeup_platform_d
+@@ -457,6 +473,18 @@ static struct fsl_usb2_wakeup_platform_d
.usb_clock_for_pm = usbotg_clock_gate,
};
@@ -83,7 +80,7 @@ Index: linux-2.6.35.3/arch/arm/mach-mx28/usb_dr.c
static int __init usb_dr_init(void)
{
struct platform_device *pdev;
-@@ -474,6 +500,13 @@ static int __init usb_dr_init(void)
+@@ -472,6 +500,13 @@ static int __init usb_dr_init(void)
dr_utmi_config.irq_delay = 0;
dr_utmi_config.wakeup_pdata = &usbdr_wakeup_config;
hooks/post-receive
--
armadeus
|
