Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/107678/?format=api
{ "id": 107678, "url": "http://patchwork.ozlabs.org/api/patches/107678/?format=api", "web_url": "http://patchwork.ozlabs.org/project/uboot/patch/1312180253-30879-1-git-send-email-aneesh@ti.com/", "project": { "id": 18, "url": "http://patchwork.ozlabs.org/api/projects/18/?format=api", "name": "U-Boot", "link_name": "uboot", "list_id": "u-boot.lists.denx.de", "list_email": "u-boot@lists.denx.de", "web_url": null, "scm_url": null, "webscm_url": null, "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<1312180253-30879-1-git-send-email-aneesh@ti.com>", "list_archive_url": null, "date": "2011-08-01T06:30:53", "name": "[U-Boot] omap: fix gpio related build breaks", "commit_ref": "080a46eaf1c2a51cc4df1a4cd3ff2578e64c46b6", "pull_url": null, "state": "accepted", "archived": false, "hash": "64212ac5f40b332f03de6d31955ad5ef389cce90", "submitter": { "id": 6298, "url": "http://patchwork.ozlabs.org/api/people/6298/?format=api", "name": "Aneesh V", "email": "aneesh@ti.com" }, "delegate": { "id": 1694, "url": "http://patchwork.ozlabs.org/api/users/1694/?format=api", "username": "aaribaud", "first_name": "Albert", "last_name": "ARIBAUD", "email": "albert.aribaud@free.fr" }, "mbox": "http://patchwork.ozlabs.org/project/uboot/patch/1312180253-30879-1-git-send-email-aneesh@ti.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/107678/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/107678/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<u-boot-bounces@lists.denx.de>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@bilbo.ozlabs.org", "Received": [ "from theia.denx.de (theia.denx.de [85.214.87.163])\n\tby ozlabs.org (Postfix) with ESMTP id 5D669B6F8E\n\tfor <incoming@patchwork.ozlabs.org>;\n\tMon, 1 Aug 2011 16:35:06 +1000 (EST)", "from localhost (localhost [127.0.0.1])\n\tby theia.denx.de (Postfix) with ESMTP id A76DE281A2;\n\tMon, 1 Aug 2011 08:35:04 +0200 (CEST)", "from theia.denx.de ([127.0.0.1])\n\tby localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id dqqqX+IE1SEl; Mon, 1 Aug 2011 08:35:04 +0200 (CEST)", "from theia.denx.de (localhost [127.0.0.1])\n\tby theia.denx.de (Postfix) with ESMTP id 72F1C28196;\n\tMon, 1 Aug 2011 08:35:03 +0200 (CEST)", "from localhost (localhost [127.0.0.1])\n\tby theia.denx.de (Postfix) with ESMTP id 7948828196\n\tfor <u-boot@lists.denx.de>; Mon, 1 Aug 2011 08:35:00 +0200 (CEST)", "from theia.denx.de ([127.0.0.1])\n\tby localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id GFDQ4U3H-7pE for <u-boot@lists.denx.de>;\n\tMon, 1 Aug 2011 08:34:58 +0200 (CEST)", "from comal.ext.ti.com (comal.ext.ti.com [198.47.26.152])\n\tby theia.denx.de (Postfix) with ESMTPS id 36B7328173\n\tfor <u-boot@lists.denx.de>; Mon, 1 Aug 2011 08:34:56 +0200 (CEST)", "from dbdp20.itg.ti.com ([172.24.170.38])\n\tby comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id p716YiGi015331\n\t(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);\n\tMon, 1 Aug 2011 01:34:47 -0500", "from dbde70.ent.ti.com (localhost [127.0.0.1])\n\tby dbdp20.itg.ti.com (8.13.8/8.13.8) with ESMTP id p716YgIs011717;\n\tMon, 1 Aug 2011 12:04:43 +0530 (IST)", "from dbdp31.itg.ti.com (172.24.170.98) by DBDE70.ent.ti.com\n\t(172.24.170.148) with Microsoft SMTP Server id 8.3.106.1;\n\tMon, 1 Aug 2011 12:04:42 +0530", "from localhost (a0393566pc.apr.dhcp.ti.com [172.24.137.55])\tby\n\tdbdp31.itg.ti.com (8.13.8/8.13.8) with ESMTP id p716YeWF021950;\n\tMon, 1 Aug 2011 12:04:41 +0530 (IST)" ], "X-Virus-Scanned": [ "Debian amavisd-new at theia.denx.de", "Debian amavisd-new at theia.denx.de" ], "X-policyd-weight": "NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5\n\tNOT_IN_BL_NJABL=-1.5 (only DNSBL check requested)", "From": "Aneesh V <aneesh@ti.com>", "To": "<u-boot@lists.denx.de>", "Date": "Mon, 1 Aug 2011 12:00:53 +0530", "Message-ID": "<1312180253-30879-1-git-send-email-aneesh@ti.com>", "X-Mailer": "git-send-email 1.7.0.4", "In-Reply-To": "<1311958990-546-1-git-send-email-aneesh@ti.com>", "References": "<1311958990-546-1-git-send-email-aneesh@ti.com>", "MIME-Version": [ "1.0", "1.0" ], "Cc": "albert.u.boot@aribaud.net, santosh.shilimkar@ti.com", "Subject": "[U-Boot] [PATCH] omap: fix gpio related build breaks", "X-BeenThere": "u-boot@lists.denx.de", "X-Mailman-Version": "2.1.9", "Precedence": "list", "List-Id": "U-Boot discussion <u-boot.lists.denx.de>", "List-Unsubscribe": "<http://lists.denx.de/mailman/listinfo/u-boot>,\n\t<mailto:u-boot-request@lists.denx.de?subject=unsubscribe>", "List-Archive": "<http://lists.denx.de/pipermail/u-boot>", "List-Post": "<mailto:u-boot@lists.denx.de>", "List-Help": "<mailto:u-boot-request@lists.denx.de?subject=help>", "List-Subscribe": "<http://lists.denx.de/mailman/listinfo/u-boot>,\n\t<mailto:u-boot-request@lists.denx.de?subject=subscribe>", "Content-Type": "multipart/mixed; boundary=\"===============1173303391==\"", "Mime-version": [ "1.0", "1.0" ], "Sender": "u-boot-bounces@lists.denx.de", "Errors-To": "u-boot-bounces@lists.denx.de" }, "content": "Signed-off-by: Aneesh V <aneesh@ti.com>\n---\nHi Sandeep,\nThis is an incremental patch to fix the build issues created\nby \"[PATCH 3/5] omap: reuse omap3 gpio support in omap4\"\nin the omap4460 series.\n---\n arch/arm/cpu/armv7/omap-common/gpio.c | 2 +-\n arch/arm/cpu/armv7/omap3/board.c | 2 +-\n arch/arm/cpu/armv7/omap4/board.c | 2 +-\n arch/arm/include/asm/arch-omap3/gpio.h | 50 +++++++++++++++++++++++++++++++\n arch/arm/include/asm/arch-omap3/omap3.h | 8 -----\n arch/arm/include/asm/arch-omap4/gpio.h | 50 +++++++++++++++++++++++++++++++\n arch/arm/include/asm/arch-omap4/omap4.h | 8 -----\n board/pandora/pandora.c | 1 +\n 8 files changed, 104 insertions(+), 19 deletions(-)\n create mode 100644 arch/arm/include/asm/arch-omap3/gpio.h\n create mode 100644 arch/arm/include/asm/arch-omap4/gpio.h", "diff": "diff --git a/arch/arm/cpu/armv7/omap-common/gpio.c b/arch/arm/cpu/armv7/omap-common/gpio.c\nindex f4c3479..2fcaf5a 100644\n--- a/arch/arm/cpu/armv7/omap-common/gpio.c\n+++ b/arch/arm/cpu/armv7/omap-common/gpio.c\n@@ -36,7 +36,7 @@\n * published by the Free Software Foundation.\n */\n #include <common.h>\n-#include <asm/omap_gpio.h>\n+#include <asm/arch/gpio.h>\n #include <asm/io.h>\n #include <asm/errno.h>\n \ndiff --git a/arch/arm/cpu/armv7/omap3/board.c b/arch/arm/cpu/armv7/omap3/board.c\nindex 4aaf97b..bce3ee6 100644\n--- a/arch/arm/cpu/armv7/omap3/board.c\n+++ b/arch/arm/cpu/armv7/omap3/board.c\n@@ -38,7 +38,7 @@\n #include <asm/arch/mem.h>\n #include <asm/cache.h>\n #include <asm/armv7.h>\n-#include <asm/omap_gpio.h>\n+#include <asm/arch/gpio.h>\n \n /* Declarations */\n extern omap3_sysinfo sysinfo;\ndiff --git a/arch/arm/cpu/armv7/omap4/board.c b/arch/arm/cpu/armv7/omap4/board.c\nindex 5943d61..8e90545 100644\n--- a/arch/arm/cpu/armv7/omap4/board.c\n+++ b/arch/arm/cpu/armv7/omap4/board.c\n@@ -33,7 +33,7 @@\n #include <asm/arch/sys_proto.h>\n #include <asm/sizes.h>\n #include <asm/arch/emif.h>\n-#include <asm/omap_gpio.h>\n+#include <asm/arch/gpio.h>\n #include \"omap4_mux_data.h\"\n \n DECLARE_GLOBAL_DATA_PTR;\ndiff --git a/arch/arm/include/asm/arch-omap3/gpio.h b/arch/arm/include/asm/arch-omap3/gpio.h\nnew file mode 100644\nindex 0000000..8bba3b0\n--- /dev/null\n+++ b/arch/arm/include/asm/arch-omap3/gpio.h\n@@ -0,0 +1,50 @@\n+/*\n+ * Copyright (c) 2009 Wind River Systems, Inc.\n+ * Tom Rix <Tom.Rix@windriver.com>\n+ *\n+ * This program is free software; you can redistribute it and/or\n+ * modify it under the terms of the GNU General Public License as\n+ * published by the Free Software Foundation; either version 2 of\n+ * the License, or (at your option) any later version.\n+ *\n+ * This program is distributed in the hope that it will be useful,\n+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\n+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n+ * GNU General Public License for more details.\n+ *\n+ * You should have received a copy of the GNU General Public License\n+ * along with this program; if not, write to the Free Software\n+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,\n+ * MA 02111-1307 USA\n+ *\n+ * This work is derived from the linux 2.6.27 kernel source\n+ * To fetch, use the kernel repository\n+ * git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git\n+ * Use the v2.6.27 tag.\n+ *\n+ * Below is the original's header including its copyright\n+ *\n+ * linux/arch/arm/plat-omap/gpio.c\n+ *\n+ * Support functions for OMAP GPIO\n+ *\n+ * Copyright (C) 2003-2005 Nokia Corporation\n+ * Written by Juha Yrjölä <juha.yrjola@nokia.com>\n+ *\n+ * This program is free software; you can redistribute it and/or modify\n+ * it under the terms of the GNU General Public License version 2 as\n+ * published by the Free Software Foundation.\n+ */\n+#ifndef _GPIO_OMAP3_H\n+#define _GPIO_OMAP3_H\n+\n+#include <asm/omap_gpio.h>\n+\n+#define OMAP34XX_GPIO1_BASE\t\t0x48310000\n+#define OMAP34XX_GPIO2_BASE\t\t0x49050000\n+#define OMAP34XX_GPIO3_BASE\t\t0x49052000\n+#define OMAP34XX_GPIO4_BASE\t\t0x49054000\n+#define OMAP34XX_GPIO5_BASE\t\t0x49056000\n+#define OMAP34XX_GPIO6_BASE\t\t0x49058000\n+\n+#endif /* _GPIO_OMAP3_H */\ndiff --git a/arch/arm/include/asm/arch-omap3/omap3.h b/arch/arm/include/asm/arch-omap3/omap3.h\nindex d9d49da..230eaad 100644\n--- a/arch/arm/include/asm/arch-omap3/omap3.h\n+++ b/arch/arm/include/asm/arch-omap3/omap3.h\n@@ -100,14 +100,6 @@ struct s32ktimer {\n \n #endif /* __ASSEMBLY__ */\n \n-/* OMAP3 GPIO registers */\n-#define OMAP34XX_GPIO1_BASE\t\t0x48310000\n-#define OMAP34XX_GPIO2_BASE\t\t0x49050000\n-#define OMAP34XX_GPIO3_BASE\t\t0x49052000\n-#define OMAP34XX_GPIO4_BASE\t\t0x49054000\n-#define OMAP34XX_GPIO5_BASE\t\t0x49056000\n-#define OMAP34XX_GPIO6_BASE\t\t0x49058000\n-\n #ifndef __ASSEMBLY__\n struct gpio {\n \tunsigned char res1[0x34];\ndiff --git a/arch/arm/include/asm/arch-omap4/gpio.h b/arch/arm/include/asm/arch-omap4/gpio.h\nnew file mode 100644\nindex 0000000..26f19d1\n--- /dev/null\n+++ b/arch/arm/include/asm/arch-omap4/gpio.h\n@@ -0,0 +1,50 @@\n+/*\n+ * Copyright (c) 2009 Wind River Systems, Inc.\n+ * Tom Rix <Tom.Rix@windriver.com>\n+ *\n+ * This program is free software; you can redistribute it and/or\n+ * modify it under the terms of the GNU General Public License as\n+ * published by the Free Software Foundation; either version 2 of\n+ * the License, or (at your option) any later version.\n+ *\n+ * This program is distributed in the hope that it will be useful,\n+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\n+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n+ * GNU General Public License for more details.\n+ *\n+ * You should have received a copy of the GNU General Public License\n+ * along with this program; if not, write to the Free Software\n+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,\n+ * MA 02111-1307 USA\n+ *\n+ * This work is derived from the linux 2.6.27 kernel source\n+ * To fetch, use the kernel repository\n+ * git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git\n+ * Use the v2.6.27 tag.\n+ *\n+ * Below is the original's header including its copyright\n+ *\n+ * linux/arch/arm/plat-omap/gpio.c\n+ *\n+ * Support functions for OMAP GPIO\n+ *\n+ * Copyright (C) 2003-2005 Nokia Corporation\n+ * Written by Juha Yrjölä <juha.yrjola@nokia.com>\n+ *\n+ * This program is free software; you can redistribute it and/or modify\n+ * it under the terms of the GNU General Public License version 2 as\n+ * published by the Free Software Foundation.\n+ */\n+#ifndef _GPIO_OMAP4_H\n+#define _GPIO_OMAP4_H\n+\n+#include <asm/omap_gpio.h>\n+\n+#define OMAP44XX_GPIO1_BASE\t\t0x4A310000\n+#define OMAP44XX_GPIO2_BASE\t\t0x48055000\n+#define OMAP44XX_GPIO3_BASE\t\t0x48057000\n+#define OMAP44XX_GPIO4_BASE\t\t0x48059000\n+#define OMAP44XX_GPIO5_BASE\t\t0x4805B000\n+#define OMAP44XX_GPIO6_BASE\t\t0x4805D000\n+\n+#endif /* _GPIO_OMAP4_H */\ndiff --git a/arch/arm/include/asm/arch-omap4/omap4.h b/arch/arm/include/asm/arch-omap4/omap4.h\nindex 9aad0e6..7ff46d7 100644\n--- a/arch/arm/include/asm/arch-omap4/omap4.h\n+++ b/arch/arm/include/asm/arch-omap4/omap4.h\n@@ -153,12 +153,4 @@ struct s32ktimer {\n #define DEV_DATA_PTR_OFFSET\t0x18\n #define BOOT_MODE_OFFSET\t0x8\n \n-/* GPIO */\n-#define OMAP44XX_GPIO1_BASE\t\t0x4A310000\n-#define OMAP44XX_GPIO2_BASE\t\t0x48055000\n-#define OMAP44XX_GPIO3_BASE\t\t0x48057000\n-#define OMAP44XX_GPIO4_BASE\t\t0x48059000\n-#define OMAP44XX_GPIO5_BASE\t\t0x4805B000\n-#define OMAP44XX_GPIO6_BASE\t\t0x4805D000\n-\n #endif\ndiff --git a/board/pandora/pandora.c b/board/pandora/pandora.c\nindex 992e9f7..0df4570 100644\n--- a/board/pandora/pandora.c\n+++ b/board/pandora/pandora.c\n@@ -33,6 +33,7 @@\n #include <twl4030.h>\n #include <asm/io.h>\n #include <asm/arch/mux.h>\n+#include <asm/arch/gpio.h>\n #include <asm/arch/sys_proto.h>\n #include <asm/mach-types.h>\n #include \"pandora.h\"\n", "prefixes": [ "U-Boot" ] }