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" /**