From patchwork Mon Jun 3 08:12:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 165587 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp4156294ili; Mon, 3 Jun 2019 01:13:38 -0700 (PDT) X-Google-Smtp-Source: APXvYqxsgG5t9+rEEcsR6ZB2B7eQxJ1KcvgA4QwC2xinAN1dca+72SlDJtkr9Rs8UM33ewq1qUrE X-Received: by 2002:a63:161b:: with SMTP id w27mr26249148pgl.338.1559549618022; Mon, 03 Jun 2019 01:13:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559549618; cv=none; d=google.com; s=arc-20160816; b=nYmouQPk3AXS4u2ApmSxonPfM3fZ8c5xnItlDEwHCBiNROT5/LsYZARf4IzukIRIvi tUBcOospZb/48LE/JUrjsZZK9WpaSm5dTDQP6yP85gCANGHHF+HMKyjfMI6HoSkNHPaj tw03uPIObshN/bD5nPi60i6jmDtayfRFHKPBkciYJPzQ6dKBtAoSAo/zm+cuIS5tb3kY VCOh9BBj+xgM3vW01OeQ4GaGOMWop4PxZgJcvjofXEhVIzjFuJPOe7SZID+KiKPT+vTE /lFolmBULmZQ2qy2jLYFA6t2VMluOizBlKS5ruvFFv4i37mZFMzTcy+FC9mVUBU47NzF MfRA== 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=Yy6xaRVBbLuyh41FBcaoTVAl8eAfN9twm28AUEdXycQ=; b=Ywy4NIrapoXOfnei5kQXaDMJ2huzerKNYXvQC5/N/hY18d4Nl7x0PCfzITADCbvjV6 QHqGlE5Mbl3Zr8FcrBTR9vt4VYL9pybf4uuUYyso97CIDzNQDlGmrCBG1mdutdYYfml6 VNL/5dIUMb/ld50TU3ds/iFE14HrX/2r2iAqKCmSfL3WTFCLL/51vDAg9QYJ0me68Bgx dIpK/7MwjnykTV5tNcUkIze5zLsjXEm2X+qYCt17O3szj90q2o5WZQAILM+eK9gqUWj3 Ejp54/TAVMeCSJHkogBnNnDXCCkW+S8whh3+qo0FmMvXx5+tfH482c3ZJdTHXN0sLQ9d skDg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=MaKfWbk+; 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 i2si19429304pfb.7.2019.06.03.01.13.37; Mon, 03 Jun 2019 01:13:38 -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=MaKfWbk+; 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 S1727655AbfFCINh (ORCPT + 30 others); Mon, 3 Jun 2019 04:13:37 -0400 Received: from conuserg-08.nifty.com ([210.131.2.75]:56792 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726690AbfFCINc (ORCPT ); Mon, 3 Jun 2019 04:13:32 -0400 Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-08.nifty.com with ESMTP id x538Cdoq002048; Mon, 3 Jun 2019 17:12:40 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com x538Cdoq002048 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1559549561; bh=Yy6xaRVBbLuyh41FBcaoTVAl8eAfN9twm28AUEdXycQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MaKfWbk+u3wpVWJQJUa2yLnFBc1y42PpgtLUsd2euIuj4urVlPr7CF3pDUiVLQCfm cbghzAtofe1v71Lq3ofmfw0qnkxkiXQKGk5mGwn7i4uEAgWVVFhYLdhFjGeRHcL1ur lLrv45psTRB+gbNt6QpZmN25e2h++gW5cnhzbhTFNJvxKosyVvru1UC9SUsynILwR+ 9oEkSV/CyB2TQCjp7vJ8bnzEXO7sZIfTkbNGM9UHd3ACIO5UIyt8aZkvbKRmN++WD2 Er2T6UQhUw8yCG3IpINybHJn5qvZ2sdf8WY1y4a7g/Jy2q/rESAvpyp4PG62512ngZ DUL73jw+4r9gA== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: arm@kernel.org, Olof Johansson , Arnd Bergmann Cc: linux-arm-kernel@lists.infradead.org, Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [RESEND PATCH 1/2] memory: move jedec_ddr_data.c from lib/ to drivers/memory/ Date: Mon, 3 Jun 2019 17:12:32 +0900 Message-Id: <20190603081233.17394-2-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190603081233.17394-1-yamada.masahiro@socionext.com> References: <20190603081233.17394-1-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 3 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.17.1 diff --git a/drivers/memory/Kconfig b/drivers/memory/Kconfig index 392ad4f5c570..477f0f130e5b 100644 --- a/drivers/memory/Kconfig +++ b/drivers/memory/Kconfig @@ -8,6 +8,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 91ae4eb0e913..9d5c409a1591 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 90623a0e1942..e09b3e081a53 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -531,14 +531,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 fb7697031a79..cb66bc9c5b2f 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 Mon Jun 3 08:12:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 165586 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp4156235ili; Mon, 3 Jun 2019 01:13:34 -0700 (PDT) X-Google-Smtp-Source: APXvYqxG+1lKTBtnzpnC9OJzCWhPQp+X/vlDF/tbBRPq3KxtnsIkay8QATqWN/xgtxAqQUXakuBX X-Received: by 2002:a17:902:54f:: with SMTP id 73mr27809221plf.246.1559549613968; Mon, 03 Jun 2019 01:13:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559549613; cv=none; d=google.com; s=arc-20160816; b=h74NzQ798imBkDNbpL+1gH82v3CECFdVtfw0lvI+aVuztXzAgNA5xZI9y9xrdhVABB mE/WoDfGeTvH0F+xp0iQor9ZwxfZ8CGfFeODRsTfmhaTwPvgfyXN3rkOzx+qP0nAAdOU PNHdEN8kM5DxO6zSBeNhwZiBtV20QdQQf1qlWs+GqBHlZ1HULdal1+I149URb0dYVxNT ldl4lS7n0e6bdI/HzKwIzayppiT5NlkH9KrqVZOBZu2mOk6VXIqr6me0w+TkMixaL4ww CGnoDIC/8K057pNyzSPvlYHzQLNsiq/CM+7KIXvM54aoHHL5ZCOlRPi3dtVjsGl1A6d2 u79A== 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=p//No+hpKX3bBuChWljMBq7O7wxZpa31Ei+M+7TG65Q=; b=ay8q6h45wAYCkfsUpnLBfFYUYXqcHn4xcW9NnveDmqx0hveQJjRaZz1AZxLYOjoyUO 982oKbMW056aAHkkGqaBvBmfha3YJ+dABE93FliNYlrI72vFJ0ucgMc08L2mSQ3G4rC7 JFaxbMUicVHL7vZl2i6Q+Sxy+qIEHKzFhjo5P3qio3ImIbA5Sygi3zEedvsO3xoJVySz U4uxXzwTszFz5Yni9TQ1YatQIsvBiKg9b2ERqzD+MaOnaCHJnmk0N9eoO2ThLO6ZBdHG 1LmdvcOLH/Cqa+7TLUyZhJrFducOeTkQF3nFRBhLzXYun1V38MW3miSenApnJ+oP3tjv iqWA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=KqwWUkpS; 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 m1si16309553pjq.83.2019.06.03.01.13.33; Mon, 03 Jun 2019 01:13:33 -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=KqwWUkpS; 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 S1727645AbfFCINc (ORCPT + 30 others); Mon, 3 Jun 2019 04:13:32 -0400 Received: from conuserg-08.nifty.com ([210.131.2.75]:56807 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726826AbfFCINc (ORCPT ); Mon, 3 Jun 2019 04:13:32 -0400 Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-08.nifty.com with ESMTP id x538Cdor002048; Mon, 3 Jun 2019 17:12:42 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com x538Cdor002048 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1559549562; bh=p//No+hpKX3bBuChWljMBq7O7wxZpa31Ei+M+7TG65Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KqwWUkpSXMd92pSxF2HHBDB61ZSrRw+BjVwv+W5EF2BsU5V0Zx4yxckLK5wu6dE+n dRVMiWIZY96EGO5/vH0gbYT35oCsyXoUCY9Kpr42u8RlPCVh/3KJCKI2VhMnYaUxB1 XZpxXl4kBtiC217nMC6Vl1Y7NxryhBrUASviXra3ycmubs32Bn9W232B6RWK+SIjgy 7BzS3L/A4YZ9l2RU8rTu+NyCa6VVzQLfhojLBzhq3a5GQO4v8XAB6lfFWWkydl03do KSwEHwKwWDslw4Sx5OWy6HoRM40uKD+GrSika+cA1gZh3S07MZoQve2U9/ASMZmTGX fxSJlpmD2FtxA== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: arm@kernel.org, Olof Johansson , Arnd Bergmann Cc: linux-arm-kernel@lists.infradead.org, Masahiro Yamada , linux-kernel@vger.kernel.org, Santosh Shilimkar Subject: [RESEND PATCH 2/2] memory: move jedec_ddr.h from include/memory to drivers/memory/ Date: Mon, 3 Jun 2019 17:12:33 +0900 Message-Id: <20190603081233.17394-3-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190603081233.17394-1-yamada.masahiro@socionext.com> References: <20190603081233.17394-1-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/. The directory include/memory is now gone. 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.17.1 diff --git a/drivers/memory/emif.c b/drivers/memory/emif.c index 2f214440008c..32cad7540d78 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 ddad0f870e5d..a2094a9a588e 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 6d2cbf1d567f..1f9ca0f23407 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 12a61f558644..46539b27a3fb 100644 --- a/drivers/memory/of_memory.c +++ b/drivers/memory/of_memory.c @@ -10,8 +10,9 @@ #include #include #include -#include #include + +#include "jedec_ddr.h" #include "of_memory.h" /**