{"id":816930,"url":"http://patchwork.ozlabs.org/api/patches/816930/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/patch/1506005496-8635-2-git-send-email-jjhiblot@ti.com/","project":{"id":18,"url":"http://patchwork.ozlabs.org/api/projects/18/?format=json","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":"<1506005496-8635-2-git-send-email-jjhiblot@ti.com>","list_archive_url":null,"date":"2017-09-21T14:51:32","name":"[U-Boot,v2,1/5] Revert \"omap_hsmmc: update struct hsmmc to accommodate omap3 from DT\"","commit_ref":"741726ae4cc9f75aa59ae7fd49d916a1dad313ff","pull_url":null,"state":"accepted","archived":false,"hash":"090f813b637b0d5e1ab3c8321b6a1869c43a6c90","submitter":{"id":70508,"url":"http://patchwork.ozlabs.org/api/people/70508/?format=json","name":"Jean-Jacques Hiblot","email":"jjhiblot@ti.com"},"delegate":{"id":3651,"url":"http://patchwork.ozlabs.org/api/users/3651/?format=json","username":"trini","first_name":"Tom","last_name":"Rini","email":"trini@ti.com"},"mbox":"http://patchwork.ozlabs.org/project/uboot/patch/1506005496-8635-2-git-send-email-jjhiblot@ti.com/mbox/","series":[{"id":4406,"url":"http://patchwork.ozlabs.org/api/series/4406/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/list/?series=4406","date":"2017-09-21T14:51:31","name":"mmc: omap_hsmmc: Add support for ADMA","version":2,"mbox":"http://patchwork.ozlabs.org/series/4406/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/816930/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/816930/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=lists.denx.de\n\t(client-ip=81.169.180.215; helo=lists.denx.de;\n\tenvelope-from=u-boot-bounces@lists.denx.de;\n\treceiver=)","ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ti.com header.i=@ti.com header.b=\"GHYTJIMj\";\n\tdkim-atps=neutral"],"Received":["from lists.denx.de (dione.denx.de [81.169.180.215])\n\tby ozlabs.org (Postfix) with ESMTP id 3xyflq01nNz9t3v\n\tfor ;\n\tFri, 22 Sep 2017 00:54:46 +1000 (AEST)","by lists.denx.de (Postfix, from userid 105)\n\tid A7F3FC21E3B; Thu, 21 Sep 2017 14:53:51 +0000 (UTC)","from lists.denx.de (localhost [IPv6:::1])\n\tby lists.denx.de (Postfix) with ESMTP id 8E44CC21FED;\n\tThu, 21 Sep 2017 14:53:49 +0000 (UTC)","by lists.denx.de (Postfix, from userid 105)\n\tid EB88FC22084; Thu, 21 Sep 2017 14:53:00 +0000 (UTC)","from fllnx209.ext.ti.com (fllnx209.ext.ti.com [198.47.19.16])\n\tby lists.denx.de (Postfix) with ESMTPS id 16B23C2200A\n\tfor ; Thu, 21 Sep 2017 14:52:55 +0000 (UTC)","from dflxv15.itg.ti.com ([128.247.5.124])\n\tby fllnx209.ext.ti.com (8.15.1/8.15.1) with ESMTP id v8LEprgZ004219; \n\tThu, 21 Sep 2017 09:51:53 -0500","from DFLE100.ent.ti.com (dfle100.ent.ti.com [10.64.6.21])\n\tby dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id v8LEpmkK027948;\n\tThu, 21 Sep 2017 09:51:48 -0500","from DFLE110.ent.ti.com (10.64.6.31) by DFLE100.ent.ti.com\n\t(10.64.6.21) with Microsoft SMTP Server (version=TLS1_2,\n\tcipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.845.34;\n\tThu, 21 Sep 2017 09:51:48 -0500","from dlep33.itg.ti.com (157.170.170.75) by DFLE110.ent.ti.com\n\t(10.64.6.31) with Microsoft SMTP Server (version=TLS1_0,\n\tcipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.845.34 via Frontend\n\tTransport; Thu, 21 Sep 2017 09:51:48 -0500","from localhost (ileax41-snat.itg.ti.com [10.172.224.153])\n\tby dlep33.itg.ti.com (8.14.3/8.13.8) with ESMTP id v8LEpk5U000449;\n\tThu, 21 Sep 2017 09:51:47 -0500"],"X-Spam-Checker-Version":"SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de","X-Spam-Level":"","X-Spam-Status":"No, score=0.0 required=5.0 tests=RCVD_IN_DNSWL_NONE,\n\tT_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ti.com;\n\ts=ti-com-17Q1; t=1506005513;\n\tbh=BphKTMo+KibXrvjAfgTPNWJlII0UzfSWWW82A3gs3WY=;\n\th=From:To:CC:Subject:Date:In-Reply-To:References;\n\tb=GHYTJIMjGdItiAaJxtchEpCd1tAVqbBa9cvmX8TY9P0rsd87U51b6uEmtPdwfdXkb\n\tmOAcUlF0pzKwqXqdRabifxC5k2QZAvWWQyodtmofGOUacbnGBoH+tasz31BxkpAQbh\n\tsq/r/9/0EySWEMCYy1nOodQka07wHh+z7B0avTjg=","From":"Jean-Jacques Hiblot ","To":", , ,\n\t","Date":"Thu, 21 Sep 2017 16:51:32 +0200","Message-ID":"<1506005496-8635-2-git-send-email-jjhiblot@ti.com>","X-Mailer":"git-send-email 1.9.1","In-Reply-To":"<1506005496-8635-1-git-send-email-jjhiblot@ti.com>","References":"<1506005496-8635-1-git-send-email-jjhiblot@ti.com>","MIME-Version":"1.0","X-EXCLAIMER-MD-CONFIG":"e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180","Cc":"u-boot@lists.denx.de","Subject":"[U-Boot] [PATCH v2 1/5] Revert \"omap_hsmmc: update struct hsmmc to\n\taccommodate omap3 from DT\"","X-BeenThere":"u-boot@lists.denx.de","X-Mailman-Version":"2.1.18","Precedence":"list","List-Id":"U-Boot discussion ","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"u-boot-bounces@lists.denx.de","Sender":"\"U-Boot\" "},"content":"This reverts commit 46831c1a4cda75d92f7ad18d4e2b1eb196c62b2f.\nThis reserved area at the beginning of struct hsmm, will be used later to\nsupport ADMA\n\nSigned-off-by: Jean-Jacques Hiblot \n---\n arch/arm/include/asm/omap_mmc.h | 3 +++\n drivers/mmc/omap_hsmmc.c | 35 ++++-------------------------------\n 2 files changed, 7 insertions(+), 31 deletions(-)","diff":"diff --git a/arch/arm/include/asm/omap_mmc.h b/arch/arm/include/asm/omap_mmc.h\nindex fd33408..297e6a7 100644\n--- a/arch/arm/include/asm/omap_mmc.h\n+++ b/arch/arm/include/asm/omap_mmc.h\n@@ -28,6 +28,9 @@\n #include \n \n struct hsmmc {\n+#ifdef CONFIG_DM_MMC\n+\tunsigned char res0[0x100];\n+#endif\n \tunsigned char res1[0x10];\n \tunsigned int sysconfig;\t\t/* 0x10 */\n \tunsigned int sysstatus;\t\t/* 0x14 */\ndiff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c\nindex efa4389..9f38687 100644\n--- a/drivers/mmc/omap_hsmmc.c\n+++ b/drivers/mmc/omap_hsmmc.c\n@@ -56,10 +56,6 @@ DECLARE_GLOBAL_DATA_PTR;\n #define SYSCTL_SRC\t(1 << 25)\n #define SYSCTL_SRD\t(1 << 26)\n \n-struct omap2_mmc_platform_config {\n-\tu32 reg_offset;\n-};\n-\n struct omap_hsmmc_data {\n \tstruct hsmmc *base_addr;\n #if !CONFIG_IS_ENABLED(DM_MMC)\n@@ -802,15 +798,13 @@ static int omap_hsmmc_ofdata_to_platdata(struct udevice *dev)\n {\n \tstruct omap_hsmmc_plat *plat = dev_get_platdata(dev);\n \tstruct mmc_config *cfg = &plat->cfg;\n-\tstruct omap2_mmc_platform_config *data =\n-\t\t(struct omap2_mmc_platform_config *)dev_get_driver_data(dev);\n \tconst void *fdt = gd->fdt_blob;\n \tint node = dev_of_offset(dev);\n \tint val;\n \n \tplat->base_addr = map_physmem(devfdt_get_addr(dev),\n \t\t\t\t sizeof(struct hsmmc *),\n-\t\t\t\t MAP_NOCACHE) + data->reg_offset;\n+\t\t\t\t MAP_NOCACHE);\n \n \tcfg->host_caps = MMC_MODE_HS_52MHz | MMC_MODE_HS;\n \tval = fdtdec_get_int(fdt, node, \"bus-width\", -1);\n@@ -886,31 +880,10 @@ static int omap_hsmmc_probe(struct udevice *dev)\n }\n \n #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)\n-static const struct omap2_mmc_platform_config omap3_mmc_pdata = {\n-\t.reg_offset = 0,\n-};\n-\n-static const struct omap2_mmc_platform_config am33xx_mmc_pdata = {\n-\t.reg_offset = 0x100,\n-};\n-\n-static const struct omap2_mmc_platform_config omap4_mmc_pdata = {\n-\t.reg_offset = 0x100,\n-};\n-\n static const struct udevice_id omap_hsmmc_ids[] = {\n-\t{\n-\t\t\t.compatible = \"ti,omap3-hsmmc\",\n-\t\t\t.data = (ulong)&omap3_mmc_pdata\n-\t},\n-\t{\n-\t\t\t.compatible = \"ti,omap4-hsmmc\",\n-\t\t\t.data = (ulong)&omap4_mmc_pdata\n-\t},\n-\t{\n-\t\t\t.compatible = \"ti,am33xx-hsmmc\",\n-\t\t\t.data = (ulong)&am33xx_mmc_pdata\n-\t},\n+\t{ .compatible = \"ti,omap3-hsmmc\" },\n+\t{ .compatible = \"ti,omap4-hsmmc\" },\n+\t{ .compatible = \"ti,am33xx-hsmmc\" },\n \t{ }\n };\n #endif\n","prefixes":["U-Boot","v2","1/5"]}