From patchwork Fri Jan 5 23:20:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 123565 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp1402161qgn; Fri, 5 Jan 2018 15:21:06 -0800 (PST) X-Google-Smtp-Source: ACJfBos4oTGSG/ZL2cibVKGfDlUOrn7fwqlHlR1Wzp3d5OcbZ8kpI2K/Tw/VmVkBDwBJjlrShknh X-Received: by 10.98.253.16 with SMTP id p16mr4289004pfh.22.1515194466339; Fri, 05 Jan 2018 15:21:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515194466; cv=none; d=google.com; s=arc-20160816; b=wN7X3EQipDBGDY2NyW1V9m4WL5jSUWDY424Pl3LNZtuhZMuZueAshon2BzJXFY1v1+ I3Hy7PU6+YjJg7/oNmKe34WunXt/394Vm5ruE73I3jJEckm608of6QNpl7rCtQfGjn9y fZ6KvNt8uNts+a1FvYxedXcgYBYmzInwJFNuR2BWcKksH6zKdIqGFT8GKkyGiE8BTSXm RVp05jRmfO2UqQKs1s63hQlJRPgjMhwIe8YTMksN54cOyBzoIt91WNMBNNQYC/c/hpZC o6rgLI7nFFPQGhqOtDMbied0wd47qTy19uthf5Q0CYtc4i+JYUnTDKwVn9XoioRqlNt0 j6mw== 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:arc-authentication-results; bh=whwEHyrGToQrUN6ilQxTtgOn8ybQ4k1vwPlUBUMHdiQ=; b=YBNkQUBlKuzK8UELoQsOdWFQG1pLU8pYCxCqX+RJWFVZJH+XIZslPhOmhZAi6ad3qU mvFtM45Jfad/zjTCeBMNOFb+C9OmnRO6KLIG56aYU3C/5my9ybNuGTBAYdAWP75SrQWk 7VF9borvZsyKb107Ey9KpM+83ZvkvUXqFlwip4FURDIraorlqg2wOdA47+sAxqGHec3d 4rpaTgc1tYAQ7OgRTEcSExOuVsK3wWnNQIu83X7tCK8wr1+9xVni+oqJxoL36X3TuLuE dPWJbPUDjaA1a1JJkx0L13cVc2sgFg4XJZ1odjK4lXaLmHD90sOPf9uReF/zaCnX7YBZ qaPg== ARC-Authentication-Results: i=1; mx.google.com; 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 v77si4711446pfa.223.2018.01.05.15.21.06; Fri, 05 Jan 2018 15:21:06 -0800 (PST) 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; 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 S1753076AbeAEXVD (ORCPT + 28 others); Fri, 5 Jan 2018 18:21:03 -0500 Received: from mail-ot0-f193.google.com ([74.125.82.193]:35724 "EHLO mail-ot0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752928AbeAEXVA (ORCPT ); Fri, 5 Jan 2018 18:21:00 -0500 Received: by mail-ot0-f193.google.com with SMTP id q5so5186930oth.2; Fri, 05 Jan 2018 15:21:00 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=whwEHyrGToQrUN6ilQxTtgOn8ybQ4k1vwPlUBUMHdiQ=; b=B6jzm/Uihvl8pEhWDjgylC1EYLvlKE5Xjf/7NzbUcIylNSSPs4gYO8XtF1moq4pHjk wXP4qyJGbsO0Ce0sLIcrpWKaPphKOw1TKSrXn/To1gE/3m6jU8R2JfZoT9fNxFrTiow4 fWDDGpxgjyI08l3szI8bSARMfxH7dzqGlNScvBoPUt05OJOXPOGsfqgQnWFgmjm4Uliy 93kBAHa5CvM8ZFKpEDMd6pqOQoTqnHmnFfdNZU5h5HHZH7x2C1utHZskkCbCRa4q+9/a 3yNMgCIRSQl5NZ0Sn3bOsopsNItdQH4TPyFHrCquKx1n2kcPkWpdWNdYUEEmFTP3oj6n F1BQ== X-Gm-Message-State: AKwxytdkA/rGqk1Py2Zbna84QNEgK31fHaPYULhZzd7GleboD3qPcq81 gNk3uMerDK88zGOq3VxtpSt92PY= X-Received: by 10.157.88.9 with SMTP id r9mr2896735oth.93.1515194459980; Fri, 05 Jan 2018 15:20:59 -0800 (PST) Received: from xps15.usacommunications.tv (216-188-254-6.dyn.grandenetworks.net. [216.188.254.6]) by smtp.googlemail.com with ESMTPSA id u1sm1969998otc.3.2018.01.05.15.20.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Jan 2018 15:20:59 -0800 (PST) From: Rob Herring To: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Frank Rowand , Mikael Starvik , Jesper Nilsson , linux-cris-kernel@axis.com Subject: [PATCH 2/7] cris: remove arch specific early DT functions Date: Fri, 5 Jan 2018 17:20:49 -0600 Message-Id: <20180105232054.27394-3-robh@kernel.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180105232054.27394-1-robh@kernel.org> References: <20180105232054.27394-1-robh@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now that the DT core code handles bootmem arches, we can remove the cris specific early_init_dt_alloc_memory_arch function. As the default early_init_dt_add_memory_arch just does a WARN, we can just remove the entire devicetree.c file. Cc: Mikael Starvik Cc: Jesper Nilsson Cc: linux-cris-kernel@axis.com Signed-off-by: Rob Herring --- This is dependent on patch 1. Please ack and I'll take or apply after 4.16-rc1. arch/cris/kernel/Makefile | 19 ------------------- arch/cris/kernel/devicetree.c | 15 --------------- 2 files changed, 34 deletions(-) delete mode 100644 arch/cris/kernel/devicetree.c -- 2.14.1 diff --git a/arch/cris/kernel/Makefile b/arch/cris/kernel/Makefile index af075a5fb9aa..e69de29bb2d1 100644 --- a/arch/cris/kernel/Makefile +++ b/arch/cris/kernel/Makefile @@ -1,19 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -# $Id: Makefile,v 1.12 2004/10/19 13:07:43 starvik Exp $ -# -# Makefile for the linux kernel. -# - -CPPFLAGS_vmlinux.lds := -DDRAM_VIRTUAL_BASE=0x$(CONFIG_ETRAX_DRAM_VIRTUAL_BASE) -extra-y := vmlinux.lds - -obj-y := process.o traps.o irq.o ptrace.o setup.o time.o sys_cris.o -obj-y += devicetree.o -obj-y += stacktrace.o - -obj-$(CONFIG_MODULES) += crisksyms.o -obj-$(CONFIG_MODULES) += module.o -obj-$(CONFIG_SYSTEM_PROFILER) += profile.o - -clean: - diff --git a/arch/cris/kernel/devicetree.c b/arch/cris/kernel/devicetree.c deleted file mode 100644 index 36e1c658229f..000000000000 --- a/arch/cris/kernel/devicetree.c +++ /dev/null @@ -1,15 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -#include -#include -#include - -void __init early_init_dt_add_memory_arch(u64 base, u64 size) -{ - pr_err("%s(%llx, %llx)\n", - __func__, base, size); -} - -void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align) -{ - return alloc_bootmem_align(size, align); -}