[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-134-gd923f53

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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  d923f5351dc0ba6793842022e95a226ac3597387 (commit)
       via  d978ef40c26de7ea6f1a7f8af14e1b17e455e6bb (commit)
       via  20182a0af88055418b56d57b0b21d582ed2136d6 (commit)
       via  87018708ee8d9f11ffe618d5a66520e09bf39315 (commit)
      from  c01aa961bcb22f9105131c3dacf9729480e09e68 (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 d923f5351dc0ba6793842022e95a226ac3597387
Merge: d978ef4 c01aa96
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date:   Sun Jan 27 14:23:23 2013 +0100

    Merge branch 'master' of ssh://git.code.sf.net/p/armadeus/code

commit d978ef40c26de7ea6f1a7f8af14e1b17e455e6bb
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date:   Sun Jan 27 14:23:05 2013 +0100

    [LINUX][3.8] suppress now mainlined patches 0206 and 0207

commit 20182a0af88055418b56d57b0b21d582ed2136d6
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date:   Sun Jan 27 14:22:15 2013 +0100

    [LINUX][3.8] adapt patch 0203

commit 87018708ee8d9f11ffe618d5a66520e09bf39315
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date:   Sun Jan 27 14:21:43 2013 +0100

    [LINUX] 3.8: move rc4 support to rc5

-----------------------------------------------------------------------

Summary of changes:
 ...x-3.8-rc4.config => apf27-linux-3.8-rc5.config} |    0
 ...x-3.8-rc4.config => apf28-linux-3.8-rc5.config} |    0
 ...x-3.8-rc4.config => apf51-linux-3.8-rc5.config} |    0
 ...3.8-rc4.config => apf9328-linux-3.8-rc5.config} |    0
 patches/linux/{3.8-rc4 => 3.8-rc5}                 |    0
 ...armadeus-mx27-ehci-mxc-add_per_clk_enable.patch |   16 ++++++------
 ...mx27-framebuffer-fix_platform_device_name.patch |   19 --------------
 .../3.8/0207-armadeus-imxfb-fix_devtype_set.patch  |   27 --------------------
 8 files changed, 8 insertions(+), 54 deletions(-)
 rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.8-rc4.config => apf27-linux-3.8-rc5.config} (100%)
 rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.8-rc4.config => apf28-linux-3.8-rc5.config} (100%)
 rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.8-rc4.config => apf51-linux-3.8-rc5.config} (100%)
 rename buildroot/target/device/armadeus/apf9328/{apf9328-linux-3.8-rc4.config => apf9328-linux-3.8-rc5.config} (100%)
 rename patches/linux/{3.8-rc4 => 3.8-rc5} (100%)
 delete mode 100644 patches/linux/3.8/0206-armadeus-mx27-framebuffer-fix_platform_device_name.patch
 delete mode 100644 patches/linux/3.8/0207-armadeus-imxfb-fix_devtype_set.patch

diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.8-rc4.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.8-rc5.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.8-rc4.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.8-rc5.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.8-rc4.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.8-rc5.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.8-rc4.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.8-rc5.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.8-rc4.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.8-rc5.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.8-rc4.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.8-rc5.config
diff --git a/buildroot/target/device/armadeus/apf9328/apf9328-linux-3.8-rc4.config b/buildroot/target/device/armadeus/apf9328/apf9328-linux-3.8-rc5.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf9328/apf9328-linux-3.8-rc4.config
rename to buildroot/target/device/armadeus/apf9328/apf9328-linux-3.8-rc5.config
diff --git a/patches/linux/3.8-rc4 b/patches/linux/3.8-rc5
similarity index 100%
rename from patches/linux/3.8-rc4
rename to patches/linux/3.8-rc5
diff --git a/patches/linux/3.8/0203-armadeus-mx27-ehci-mxc-add_per_clk_enable.patch b/patches/linux/3.8/0203-armadeus-mx27-ehci-mxc-add_per_clk_enable.patch
index cba4fd7..29df863 100644
--- a/patches/linux/3.8/0203-armadeus-mx27-ehci-mxc-add_per_clk_enable.patch
+++ b/patches/linux/3.8/0203-armadeus-mx27-ehci-mxc-add_per_clk_enable.patch
@@ -3,20 +3,20 @@ EHCI PER clock (aka usb_div) must be enabled to have EHCI driver working.
 Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
 ---
 
-Index: linux-3.8-rc1/drivers/usb/host/ehci-mxc.c
+Index: linux-3.8-rc5/drivers/usb/host/ehci-mxc.c
 ===================================================================
---- linux-3.8-rc1.orig/drivers/usb/host/ehci-mxc.c	2012-12-22 02:19:00.000000000 +0100
-+++ linux-3.8-rc1/drivers/usb/host/ehci-mxc.c	2013-01-01 21:19:57.000000000 +0100
-@@ -31,7 +31,7 @@
+--- linux-3.8-rc5.orig/drivers/usb/host/ehci-mxc.c
++++ linux-3.8-rc5/drivers/usb/host/ehci-mxc.c
+@@ -42,7 +42,7 @@ static const char hcd_name[] = "ehci-mxc
  #define ULPI_VIEWPORT_OFFSET	0x170
  
  struct ehci_mxc_priv {
 -	struct clk *usbclk, *ahbclk, *phyclk;
 +	struct clk *usbclk, *ahbclk, *perclk, *phyclk;
- 	struct usb_hcd *hcd;
  };
  
-@@ -150,6 +150,13 @@
+ static struct hc_driver __read_mostly ehci_mxc_hc_driver;
+@@ -111,6 +111,13 @@ static int ehci_mxc_drv_probe(struct pla
  	}
  	clk_prepare_enable(priv->ahbclk);
  
@@ -30,7 +30,7 @@ Index: linux-3.8-rc1/drivers/usb/host/ehci-mxc.c
  	/* "dr" device has its own clock on i.MX51 */
  	priv->phyclk = devm_clk_get(&pdev->dev, "phy");
  	if (IS_ERR(priv->phyclk))
-@@ -233,6 +240,8 @@
+@@ -191,6 +198,8 @@ err_init:
  	if (priv->phyclk)
  		clk_disable_unprepare(priv->phyclk);
  
@@ -39,7 +39,7 @@ Index: linux-3.8-rc1/drivers/usb/host/ehci-mxc.c
  	clk_disable_unprepare(priv->ahbclk);
  err_clk_ahb:
  	clk_disable_unprepare(priv->usbclk);
-@@ -259,6 +268,7 @@
+@@ -216,6 +225,7 @@ static int __exit ehci_mxc_drv_remove(st
  
  	clk_disable_unprepare(priv->usbclk);
  	clk_disable_unprepare(priv->ahbclk);
diff --git a/patches/linux/3.8/0206-armadeus-mx27-framebuffer-fix_platform_device_name.patch b/patches/linux/3.8/0206-armadeus-mx27-framebuffer-fix_platform_device_name.patch
deleted file mode 100644
index 3299e41..0000000
--- a/patches/linux/3.8/0206-armadeus-mx27-framebuffer-fix_platform_device_name.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Framebuffer platform device is now identified by a device id (imx1-fb or
-imx21-fb) instead of by driver name (imx-fb).
-
-Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
----
-
-Index: linux-3.8-rc2/arch/arm/mach-imx/devices/platform-imx-fb.c
-===================================================================
---- linux-3.8-rc2.orig/arch/arm/mach-imx/devices/platform-imx-fb.c
-+++ linux-3.8-rc2/arch/arm/mach-imx/devices/platform-imx-fb.c
-@@ -54,7 +54,7 @@ struct platform_device *__init imx_add_i
- 			.flags = IORESOURCE_IRQ,
- 		},
- 	};
--	return imx_add_platform_device_dmamask("imx-fb", 0,
-+	return imx_add_platform_device_dmamask(data->devid, 0,
- 			res, ARRAY_SIZE(res),
- 			pdata, sizeof(*pdata), DMA_BIT_MASK(32));
- }
diff --git a/patches/linux/3.8/0207-armadeus-imxfb-fix_devtype_set.patch b/patches/linux/3.8/0207-armadeus-imxfb-fix_devtype_set.patch
deleted file mode 100644
index db33d95..0000000
--- a/patches/linux/3.8/0207-armadeus-imxfb-fix_devtype_set.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-The devtype field for fbi (struct imxfb_info) must be set after memset call to avoid
-some wrong behaviour (pixel size).
-
-Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
----
-
-Index: linux-3.8-rc2/drivers/video/imxfb.c
-===================================================================
---- linux-3.8-rc2.orig/drivers/video/imxfb.c
-+++ linux-3.8-rc2/drivers/video/imxfb.c
-@@ -729,6 +729,8 @@ static int __init imxfb_init_fbinfo(stru
- 
- 	memset(fbi, 0, sizeof(struct imxfb_info));
- 
-+	fbi->devtype = pdev->id_entry->driver_data;
-+
- 	strlcpy(info->fix.id, IMX_NAME, sizeof(info->fix.id));
- 
- 	info->fix.type			= FB_TYPE_PACKED_PIXELS;
-@@ -790,7 +792,6 @@ static int __init imxfb_probe(struct pla
- 		return -ENOMEM;
- 
- 	fbi = info->par;
--	fbi->devtype = pdev->id_entry->driver_data;
- 
- 	if (!fb_mode)
- 		fb_mode = pdata->mode[0].mode.name;


hooks/post-receive
-- 
armadeus


