[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.0-12-gfda00d5
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.0-12-gfda00d5
|
From: Gwenhael Goavec-M. <gwe...@us...> - 2012-09-02 13:13:56
|
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 fda00d580f0c54b69ee30969ee7e702be2576235 (commit)
via 1d6fd529a8ac30dfcac835947e219ce6f84f5a5b (commit)
via d70cd9ffa9e12e64c20c3e1b424cec7c6eb58926 (commit)
via 889b7988eb7ea108ff5c15c3bc5b453098a97cfc (commit)
from 7b7c02ce26135023ba7ffed72b871ccb16da73f8 (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 fda00d580f0c54b69ee30969ee7e702be2576235
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date: Sun Sep 2 15:13:20 2012 +0200
[LINUX][3.5] apf28 config: selects GPMI NAND by default
commit 1d6fd529a8ac30dfcac835947e219ce6f84f5a5b
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date: Sun Sep 2 15:12:36 2012 +0200
[LINUX][3.5] imx28: suppress now useless 0001 patch
commit d70cd9ffa9e12e64c20c3e1b424cec7c6eb58926
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date: Sun Sep 2 15:12:00 2012 +0200
[LINUX][3.5] apf28 dts: add nand partitions definition
commit 889b7988eb7ea108ff5c15c3bc5b453098a97cfc
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date: Sun Sep 2 15:10:43 2012 +0200
[LINUX][3.5] imx28: renames gpmi-nand clock
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf28/apf28-linux-3.5.config | 1 +
...001-mtd-mxc_nand-use-32bit-copy-functions.patch | 122 --------------------
.../3.5/0403-armadeus-Add-apf28-dts-files.patch | 31 +++++-
...0405-armadeus-mx28_rename_gpmi_nand_clock.patch | 18 +++
4 files changed, 49 insertions(+), 123 deletions(-)
delete mode 100644 patches/linux/3.5/0001-mtd-mxc_nand-use-32bit-copy-functions.patch
create mode 100644 patches/linux/3.5/0405-armadeus-mx28_rename_gpmi_nand_clock.patch
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.5.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.5.config
index 2fbedd1..15f272c 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-linux-3.5.config
+++ b/buildroot/target/device/armadeus/apf28/apf28-linux-3.5.config
@@ -65,6 +65,7 @@ CONFIG_MTD_CMDLINE_PARTS=y
CONFIG_MTD_CHAR=y
CONFIG_MTD_BLOCK=y
CONFIG_MTD_NAND=y
+CONFIG_MTD_NAND_GPMI_NAND=y
CONFIG_MTD_UBI=y
CONFIG_EEPROM_AT24=y
CONFIG_EEPROM_AT25=y
diff --git a/patches/linux/3.5/0001-mtd-mxc_nand-use-32bit-copy-functions.patch b/patches/linux/3.5/0001-mtd-mxc_nand-use-32bit-copy-functions.patch
deleted file mode 100644
index a30b1b6..0000000
--- a/patches/linux/3.5/0001-mtd-mxc_nand-use-32bit-copy-functions.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-From 065af3d5c54df784b8262817d530c9341d84f2d6 Mon Sep 17 00:00:00 2001
-From: Sascha Hauer <s....@pe...>
-Date: Tue, 29 May 2012 10:16:09 +0200
-Subject: [PATCH 1/3] mtd mxc_nand: use 32bit copy functions
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The following commit changes the function used to copy from/to
-the hardware buffer to memcpy_[from|to]io. This does not work
-since the hardware cannot handle the byte accesses used by these
-functions. Instead of reverting this patch introduce 32bit
-correspondents of these functions.
-
-| commit 5775ba36ea9c760c2d7e697dac04f2f7fc95aa62
-| Author: Uwe Kleine-König <u.k...@pe...>
-| Date: Tue Apr 24 10:05:22 2012 +0200
-|
-| mtd: mxc_nand: fix several sparse warnings about incorrect address space
-|
-| Signed-off-by: Uwe Kleine-König <u.k...@pe...>
-| Signed-off-by: Artem Bityutskiy <art...@li...>
-
-Signed-off-by: Sascha Hauer <s....@pe...>
-Cc: Uwe Kleine-König <u.k...@pe...>
-tested-by: Philippe Reynes <tr...@ya...>
----
- drivers/mtd/nand/mxc_nand.c | 37 +++++++++++++++++++++++++++++--------
- 1 files changed, 29 insertions(+), 8 deletions(-)
-
-diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c
-index c58e6a9..6acc790 100644
---- a/drivers/mtd/nand/mxc_nand.c
-+++ b/drivers/mtd/nand/mxc_nand.c
-@@ -273,6 +273,26 @@ static struct nand_ecclayout nandv2_hw_eccoob_4k = {
-
- static const char *part_probes[] = { "RedBoot", "cmdlinepart", "ofpart", NULL };
-
-+static void memcpy32_fromio(void *trg, const void __iomem *src, size_t size)
-+{
-+ int i;
-+ u32 *t = trg;
-+ const __iomem u32 *s = src;
-+
-+ for (i = 0; i < (size >> 2); i++)
-+ *t++ = __raw_readl(s++);
-+}
-+
-+static void memcpy32_toio(void __iomem *trg, const void *src, int size)
-+{
-+ int i;
-+ u32 __iomem *t = trg;
-+ const u32 *s = src;
-+
-+ for (i = 0; i < (size >> 2); i++)
-+ __raw_writel(*s++, t++);
-+}
-+
- static int check_int_v3(struct mxc_nand_host *host)
- {
- uint32_t tmp;
-@@ -519,7 +539,7 @@ static void send_read_id_v3(struct mxc_nand_host *host)
-
- wait_op_done(host, true);
-
-- memcpy_fromio(host->data_buf, host->main_area0, 16);
-+ memcpy32_fromio(host->data_buf, host->main_area0, 16);
- }
-
- /* Request the NANDFC to perform a read of the NAND device ID. */
-@@ -535,7 +555,7 @@ static void send_read_id_v1_v2(struct mxc_nand_host *host)
- /* Wait for operation to complete */
- wait_op_done(host, true);
-
-- memcpy_fromio(host->data_buf, host->main_area0, 16);
-+ memcpy32_fromio(host->data_buf, host->main_area0, 16);
-
- if (this->options & NAND_BUSWIDTH_16) {
- /* compress the ID info */
-@@ -797,16 +817,16 @@ static void copy_spare(struct mtd_info *mtd, bool bfrom)
-
- if (bfrom) {
- for (i = 0; i < n - 1; i++)
-- memcpy_fromio(d + i * j, s + i * t, j);
-+ memcpy32_fromio(d + i * j, s + i * t, j);
-
- /* the last section */
-- memcpy_fromio(d + i * j, s + i * t, mtd->oobsize - i * j);
-+ memcpy32_fromio(d + i * j, s + i * t, mtd->oobsize - i * j);
- } else {
- for (i = 0; i < n - 1; i++)
-- memcpy_toio(&s[i * t], &d[i * j], j);
-+ memcpy32_toio(&s[i * t], &d[i * j], j);
-
- /* the last section */
-- memcpy_toio(&s[i * t], &d[i * j], mtd->oobsize - i * j);
-+ memcpy32_toio(&s[i * t], &d[i * j], mtd->oobsize - i * j);
- }
- }
-
-@@ -1070,7 +1090,8 @@ static void mxc_nand_command(struct mtd_info *mtd, unsigned command,
-
- host->devtype_data->send_page(mtd, NFC_OUTPUT);
-
-- memcpy_fromio(host->data_buf, host->main_area0, mtd->writesize);
-+ memcpy32_fromio(host->data_buf, host->main_area0,
-+ mtd->writesize);
- copy_spare(mtd, true);
- break;
-
-@@ -1086,7 +1107,7 @@ static void mxc_nand_command(struct mtd_info *mtd, unsigned command,
- break;
-
- case NAND_CMD_PAGEPROG:
-- memcpy_toio(host->main_area0, host->data_buf, mtd->writesize);
-+ memcpy32_toio(host->main_area0, host->data_buf, mtd->writesize);
- copy_spare(mtd, false);
- host->devtype_data->send_page(mtd, NFC_INPUT);
- host->devtype_data->send_cmd(host, command, true);
---
-1.7.1
-
diff --git a/patches/linux/3.5/0403-armadeus-Add-apf28-dts-files.patch b/patches/linux/3.5/0403-armadeus-Add-apf28-dts-files.patch
index 12173ab..92a36bb 100644
--- a/patches/linux/3.5/0403-armadeus-Add-apf28-dts-files.patch
+++ b/patches/linux/3.5/0403-armadeus-Add-apf28-dts-files.patch
@@ -2,7 +2,7 @@ Index: linux-3.5/arch/arm/boot/dts/imx28-apf28.dts
===================================================================
--- /dev/null
+++ linux-3.5/arch/arm/boot/dts/imx28-apf28.dts
-@@ -0,0 +1,53 @@
+@@ -0,0 +1,82 @@
+/*
+ * Copyright 2012 Armadeus Systems - <su...@ar...>
+ *
@@ -34,6 +34,35 @@ Index: linux-3.5/arch/arm/boot/dts/imx28-apf28.dts
+ pinctrl-names = "default";
+ pinctrl-0 = <&gpmi_pins_a &gpmi_status_cfg>;
+ status = "okay";
++
++ partition@0 {
++ label = "u-boot";
++ reg = <0x0 0x300000>;
++ };
++ partition@1 {
++ label = "env";
++ reg = <0x300000 0x80000>;
++ };
++ partition@2 {
++ label = "env2";
++ reg = <0x380000 0x20000>;
++ };
++ partition@3 {
++ label = "dtb";
++ reg = <0x400000 0x80000>;
++ };
++ partition@4 {
++ label = "splash";
++ reg = <0x480000 0x20000>;
++ };
++ partition@5 {
++ label = "kernel";
++ reg = <0x500000 0x800000>;
++ };
++ partition@6 {
++ label = "rootfs";
++ reg = <0xd00000 0xf300000>;
++ };
+ };
+ };
+
diff --git a/patches/linux/3.5/0405-armadeus-mx28_rename_gpmi_nand_clock.patch b/patches/linux/3.5/0405-armadeus-mx28_rename_gpmi_nand_clock.patch
new file mode 100644
index 0000000..d3220aa
--- /dev/null
+++ b/patches/linux/3.5/0405-armadeus-mx28_rename_gpmi_nand_clock.patch
@@ -0,0 +1,18 @@
+Renames gpmi-nand clock dev_id according to the driver.
+
+Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
+---
+
+Index: linux-3.5/drivers/clk/mxs/clk-imx28.c
+===================================================================
+--- linux-3.5.orig/drivers/clk/mxs/clk-imx28.c
++++ linux-3.5/drivers/clk/mxs/clk-imx28.c
+@@ -174,7 +174,7 @@ static struct clk_lookup lcdif_lookups[]
+
+ static struct clk_lookup gpmi_lookups[] = {
+ { .dev_id = "imx28-gpmi-nand", },
+- { .dev_id = "8000c000.gpmi", },
++ { .dev_id = "8000c000.gpmi-nand", },
+ };
+
+ static struct clk_lookup fec_lookups[] = {
hooks/post-receive
--
armadeus
|
