From patchwork Wed May 15 15:04:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 164304 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp869382ili; Wed, 15 May 2019 08:04:30 -0700 (PDT) X-Google-Smtp-Source: APXvYqyXVTZWtrVokQIJJ1AAIzf4rgBRNyg25QCiKIsA1d0m2psbb2856ikpO6qrsWwyLgevItfk X-Received: by 2002:a17:902:b602:: with SMTP id b2mr44676565pls.293.1557932670438; Wed, 15 May 2019 08:04:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557932670; cv=none; d=google.com; s=arc-20160816; b=Fs9VDDSR/mqlWUDx/UNGBuMhAVgITjG6AgVF/Av3HmmGF8YjcpleZUDp2THz2LuWYO 5r7ki8u/W+MyuqnEoBL0y9/oBKL+SCAF+ef5Eqo4KiCBYvF9RA0g48+UMYGlv8QrquPf p+9folTNqrOsHKwhL83GmSWrpLu7sb8083QccdvEcl7L9uuUm0FxGGnLBh5ZDtlwzLlV s8N59HWIo9xQNIbJzan4hNeU4ITjJIUcDcAnEjCV6vDlYKsomhQLlfvr1d5x7MdtZvCQ 78f2apifxdbWuPwFKdF5QJJohMOih4LnMii4sy2pCr12wSGM21IxUSN9X/LezY+BEZCf liRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter; bh=u9dXgGIsSlr/2UJfZm4Hi8PQBr56poeSbRgpr/KP1sc=; b=nui9jZwV2kJF3XzP3LO3aqON6ZPIS9O2xnqyAZNTvOwA7oZRFiwk0qfK3EDz2x8In8 1tnihh7lwEmkeme6s06WKhWXFfB18wLlJsXLMGDBMy9cpH0dqfyNBkH/Tz4pA6c8xv4y pVvBgimC2EW8Yg404f1WwqQJ9Klyn1NciRJ3QPBf0MPmDWZ8/T0iOmY2Ib4z/i0tjMvy 1qo0Zm9OXGL5QvrwmeGZH6R2MT1lYlpl7bzalNymHDNiF2C5LuO/7rMYGdDuKmh6ewPu kC96ZlkWCudmHEMQEeRxoV25Wm5e2v2FOM28Fh2pjimSrfCb1669DhZ+l8t5muLnHvdg n0fw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=J8N5T92J; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x10si1908203plo.422.2019.05.15.08.04.30; Wed, 15 May 2019 08:04:30 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=J8N5T92J; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727444AbfEOPE3 (ORCPT + 30 others); Wed, 15 May 2019 11:04:29 -0400 Received: from conuserg-12.nifty.com ([210.131.2.79]:43647 "EHLO conuserg-12.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726583AbfEOPEX (ORCPT ); Wed, 15 May 2019 11:04:23 -0400 Received: from grover.flets-west.jp (softbank126125154139.bbtec.net [126.125.154.139]) (authenticated) by conuserg-12.nifty.com with ESMTP id x4FF488S014964; Thu, 16 May 2019 00:04:08 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com x4FF488S014964 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1557932648; bh=u9dXgGIsSlr/2UJfZm4Hi8PQBr56poeSbRgpr/KP1sc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=J8N5T92J5aYJbYx1PB3wAD1wutBLjTXl2mu+Rz24c3UpWk0LZ1E3ZS2nS4ixlTYu0 XLZlnU/y9btpPKAG3D2drBKiU9URyd9OpvkqzNGbS0IBFALRUkWhKDA4bOIhyYEK6w 5jRzJdV6BVrM8uWCix8WitP2sNvCv+OfCt3b+7zLdh8QfnnXR1AgPZQXB1Ll51uKX7 HY8TL9wxXpC5gngryyFd12KL8FlENWlD3Ya7cAdVlnr6WQWMeMU5T1proDMFKm0LbQ Ca3oPbwIVD3nArtT2aGJTwGLXeHErNSG8SafL0WGHX5ap2ea7IGgcIVQcGvRuOHqBH /oXNiXnFZfsWQ== X-Nifty-SrcIP: [126.125.154.139] From: Masahiro Yamada To: Santosh Shilimkar Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 1/2] memory: move jedec_ddr_data.c from lib/ to drivers/memory/ Date: Thu, 16 May 2019 00:04:05 +0900 Message-Id: <1557932646-29752-2-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1557932646-29752-1-git-send-email-yamada.masahiro@socionext.com> References: <1557932646-29752-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org jedec_ddr_data.c exports the lpddr2_jedec_* symbols, and all of them are only referenced from drivers/memory/{emif.c,of_memory.c} drivers/memory/ is a better location than lib/. I removed the Kconfig prompt "JEDEC DDR data" because it is only select'ed by TI_EMIF, and there is no other user. There is no good reason in making it a user-configurable CONFIG option. Signed-off-by: Masahiro Yamada --- drivers/memory/Kconfig | 8 ++++++++ drivers/memory/Makefile | 1 + {lib => drivers/memory}/jedec_ddr_data.c | 0 lib/Kconfig | 8 -------- lib/Makefile | 2 -- 5 files changed, 9 insertions(+), 10 deletions(-) rename {lib => drivers/memory}/jedec_ddr_data.c (100%) -- 2.7.4 diff --git a/drivers/memory/Kconfig b/drivers/memory/Kconfig index 2d91b00..fa17b3e 100644 --- a/drivers/memory/Kconfig +++ b/drivers/memory/Kconfig @@ -7,6 +7,14 @@ menuconfig MEMORY if MEMORY +config DDR + bool + help + Data from JEDEC specs for DDR SDRAM memories, + particularly the AC timing parameters and addressing + information. This data is useful for drivers handling + DDR SDRAM controllers. + config ARM_PL172_MPMC tristate "ARM PL172 MPMC driver" depends on ARM_AMBA && OF diff --git a/drivers/memory/Makefile b/drivers/memory/Makefile index 91ae4eb..9d5c409 100644 --- a/drivers/memory/Makefile +++ b/drivers/memory/Makefile @@ -3,6 +3,7 @@ # Makefile for memory devices # +obj-$(CONFIG_DDR) += jedec_ddr_data.o ifeq ($(CONFIG_DDR),y) obj-$(CONFIG_OF) += of_memory.o endif diff --git a/lib/jedec_ddr_data.c b/drivers/memory/jedec_ddr_data.c similarity index 100% rename from lib/jedec_ddr_data.c rename to drivers/memory/jedec_ddr_data.c diff --git a/lib/Kconfig b/lib/Kconfig index 3577609..473f937 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -530,14 +530,6 @@ config LRU_CACHE config CLZ_TAB bool -config DDR - bool "JEDEC DDR data" - help - Data from JEDEC specs for DDR SDRAM memories, - particularly the AC timing parameters and addressing - information. This data is useful for drivers handling - DDR SDRAM controllers. - config IRQ_POLL bool "IRQ polling library" help diff --git a/lib/Makefile b/lib/Makefile index fb76970..cb66bc9 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -206,8 +206,6 @@ obj-$(CONFIG_SIGNATURE) += digsig.o lib-$(CONFIG_CLZ_TAB) += clz_tab.o -obj-$(CONFIG_DDR) += jedec_ddr_data.o - obj-$(CONFIG_GENERIC_STRNCPY_FROM_USER) += strncpy_from_user.o obj-$(CONFIG_GENERIC_STRNLEN_USER) += strnlen_user.o From patchwork Wed May 15 15:04:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 164305 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp869426ili; Wed, 15 May 2019 08:04:32 -0700 (PDT) X-Google-Smtp-Source: APXvYqzin0yAmdfcupS9cV4EK8uTWE5BA1/7mdBKY5yrGf1b5mca+pFEZVffKDs8xrl6T19mBUOa X-Received: by 2002:a63:6841:: with SMTP id d62mr45278690pgc.17.1557932672130; Wed, 15 May 2019 08:04:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557932672; cv=none; d=google.com; s=arc-20160816; b=NRJQxt/xqiLU1jRQ/nvGf+TD4vffrChwE3MekFPqKZYuGf9Tg4VtiAE1DTaSJX9VuV FygLxWG4gzwdYHl0npyN40BcZkhMGVe34rWHPmtYEUmy3UflSEjBAVNzppj92Qv3RbDz 6QlrFyoLExDaamiq1E/zdyubybzIwOz/qmtJIUpIU3V76D01faxoiN+R6AGIlXjQ1HyP KTC9TbhiMmncnzFPRhEQ++nA0W68SfVL++27FDofEDmN2tv+QToh82BlM3sxCSGr+Xsm m1PMiquKd3XGykMebjbm8PAPEWRl1wO4o3PnOcp6l+pnRohbpIGVgIeNL0K/2P0ZcGpP pSwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter; bh=ITVoB4ARtru8MvDGlH7GHuPioR1vApBXy9yDov2equA=; b=QzgYTUaIKJAaCEJBxIiP1hS+j/AmM56KMrXlqignqanIgAc22rwJmsKQNCnV9p+Jba p/641TLyXUPAPpCemweX6RBUNdCH+tyYeHsZHyo7GgMDx9fz37VP6y2tKU83+4VWTaXc 5WzYm0P2HJx2RGjqFhmmqZeOAumJbSPXOT7YVRbNfJYn+n8sHa/pXliLSIsXAlz/ES8U x1nc6vFPn4s4Q6IvigP3t9MgicgmT2IeMbIzh7OLW73Z36V8ZoRhHiziNCpQPeS+sm44 1HJpqG8ZlbDsRKbTaY4DJ+pRP1uBK9PNQ8ZeNex9K35EVe0KVP+f9GSqNRR8/nrpVyE9 GM/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=u1ihwE4e; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x10si1908203plo.422.2019.05.15.08.04.31; Wed, 15 May 2019 08:04:32 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=u1ihwE4e; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727330AbfEOPE0 (ORCPT + 30 others); Wed, 15 May 2019 11:04:26 -0400 Received: from conuserg-12.nifty.com ([210.131.2.79]:43646 "EHLO conuserg-12.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725939AbfEOPEX (ORCPT ); Wed, 15 May 2019 11:04:23 -0400 Received: from grover.flets-west.jp (softbank126125154139.bbtec.net [126.125.154.139]) (authenticated) by conuserg-12.nifty.com with ESMTP id x4FF488T014964; Thu, 16 May 2019 00:04:09 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com x4FF488T014964 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1557932649; bh=ITVoB4ARtru8MvDGlH7GHuPioR1vApBXy9yDov2equA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=u1ihwE4en+5gK6+cbg2gHlR8n2Kqc2lvY2RubMwCn8WV9dsT9K4SYLSwIBPCnmoNt ypytTe5EEa6WYAEkid/YL+0qFbbImEBE6qoTqFcr94yxhDbuAgOg45Ojj/NTaaKCVW XuoCwo6c0GChF+i22gQEIKSeXEDdQemKp9p2VfnaVFxQvClcDWU9CWWlkL7XOVBQJr ckoP1iLXsc6rhir4l8sougeXH8+Aqkg8VouU4j4SVJz7l7c7L3VW1/HOfPPogo4zJ1 Tp+8b47bEr2U6yo9Vwp0qqdWzRDWWhOuvHyV6FsYDEsd1GJY1p/0I/cngvdYTyfhuZ jABIOoo1Rnwlg== X-Nifty-SrcIP: [126.125.154.139] From: Masahiro Yamada To: Santosh Shilimkar Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 2/2] memory: move jedec_ddr.h from include/memory to drivers/memory/ Date: Thu, 16 May 2019 00:04:06 +0900 Message-Id: <1557932646-29752-3-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1557932646-29752-1-git-send-email-yamada.masahiro@socionext.com> References: <1557932646-29752-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now that jedec_ddr_data.c was moved from lib/ to drivers/memory/, is included only from drivers/memory/. Make it a local header of drivers/memory/. While I am here, I also changed #include to . Because CONFIG_DDR is bool, jedec_ddr_data.c is never compiled as a module. Signed-off-by: Masahiro Yamada --- drivers/memory/emif.c | 3 ++- {include => drivers}/memory/jedec_ddr.h | 6 +++--- drivers/memory/jedec_ddr_data.c | 5 +++-- drivers/memory/of_memory.c | 3 ++- 4 files changed, 10 insertions(+), 7 deletions(-) rename {include => drivers}/memory/jedec_ddr.h (97%) -- 2.7.4 diff --git a/drivers/memory/emif.c b/drivers/memory/emif.c index 2f21444..32cad75 100644 --- a/drivers/memory/emif.c +++ b/drivers/memory/emif.c @@ -26,8 +26,9 @@ #include #include #include -#include + #include "emif.h" +#include "jedec_ddr.h" #include "of_memory.h" /** diff --git a/include/memory/jedec_ddr.h b/drivers/memory/jedec_ddr.h similarity index 97% rename from include/memory/jedec_ddr.h rename to drivers/memory/jedec_ddr.h index ddad0f8..a2094a9 100644 --- a/include/memory/jedec_ddr.h +++ b/drivers/memory/jedec_ddr.h @@ -9,8 +9,8 @@ * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ -#ifndef __LINUX_JEDEC_DDR_H -#define __LINUX_JEDEC_DDR_H +#ifndef __JEDEC_DDR_H +#define __JEDEC_DDR_H #include @@ -172,4 +172,4 @@ extern const struct lpddr2_timings lpddr2_jedec_timings[NUM_DDR_TIMING_TABLE_ENTRIES]; extern const struct lpddr2_min_tck lpddr2_jedec_min_tck; -#endif /* __LINUX_JEDEC_DDR_H */ +#endif /* __JEDEC_DDR_H */ diff --git a/drivers/memory/jedec_ddr_data.c b/drivers/memory/jedec_ddr_data.c index 6d2cbf1..1f9ca0f 100644 --- a/drivers/memory/jedec_ddr_data.c +++ b/drivers/memory/jedec_ddr_data.c @@ -10,8 +10,9 @@ * published by the Free Software Foundation. */ -#include -#include +#include + +#include "jedec_ddr.h" /* LPDDR2 addressing details from JESD209-2 section 2.4 */ const struct lpddr2_addressing diff --git a/drivers/memory/of_memory.c b/drivers/memory/of_memory.c index 2f5ed73..2190b8e 100644 --- a/drivers/memory/of_memory.c +++ b/drivers/memory/of_memory.c @@ -14,8 +14,9 @@ #include #include #include -#include #include + +#include "jedec_ddr.h" #include "of_memory.h" /**