From patchwork Fri Jan 5 23:14:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 123560 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp1397252qgn; Fri, 5 Jan 2018 15:14:39 -0800 (PST) X-Google-Smtp-Source: ACJfBotejAv8RgSkpxlo1ZIf3Y0LgP5txreUbfNH5BbjOpelp6ExA+/q9UMG5Yrqjes1BvVh/3Zk X-Received: by 10.101.82.205 with SMTP id z13mr3867766pgp.134.1515194079839; Fri, 05 Jan 2018 15:14:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515194079; cv=none; d=google.com; s=arc-20160816; b=suPj9c44YHBGbY04iOGgw5BKQRVRqaKffrIhzfzYYvmTU/0gfCIsBiPkhktC+WFZka cgrTt5zbEoo2VC+INKX7GKCmsmepygGITGM8wbvK+gH4fIpfsl5OYU64wkia8MIdngka Z89fZP6OJMfMNr/0tHhVRKxYqCMPJTy2POVvbemCdH0G1nIpfDQadlf03GSBoed3kIwi DeexIWdLeQBMdLVYJ51XCuupwKbukJCo8a8BPwXYAgfhYxxSAyPUchV/ChQSZNP0Z2tr sCyFx4pPtlgvSsSxg3lQSdMlUMwAzjIWCG+w9GcW6TfVUKIiSE4eOucFD2Ng4G7BGoOu N+mQ== 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=HJvSApGoZqnknPR6ACKV33U6/RnTZaFWP2oESO95F1x1ebI7cRY4Rcow4nzx6DKuYL hbxbjZyrwSI8mqc8kJjc4mfacp4mvMnNAasxaJWwL7eb4p5is9S9RKEhoC5T4zCXPBTt FV6UIraymdDiUQejtRzyyAxJ3Phdn0EW27nh5eOiupquTzyJpzMQ88LfIe51cm/lwIou 4GiB3IdZMGDv04qoq9N3P5D4aft0WKtZo1YBjCfMrup63Iuvry8WyA7+cHQAwwKgH/Zx CSwTQdoR4eHy0HFk/m2f4vqgPrBMEEgkQ5+TS+a33mIp5uRGYrssN1r0U/5xXIobHn/T 2AZg== 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 n1si4627561pld.462.2018.01.05.15.14.39; Fri, 05 Jan 2018 15:14:39 -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 S1753297AbeAEXOg (ORCPT + 28 others); Fri, 5 Jan 2018 18:14:36 -0500 Received: from mail-ot0-f196.google.com ([74.125.82.196]:36744 "EHLO mail-ot0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752913AbeAEXO2 (ORCPT ); Fri, 5 Jan 2018 18:14:28 -0500 Received: by mail-ot0-f196.google.com with SMTP id w4so5160793otg.3; Fri, 05 Jan 2018 15:14:28 -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=kCwohJuxs8MsJNZYVla+ZIdangsKswdwHXItJzaMSf+jU2tN/hfnc+SRNcBy4SykYx gfQULZnzRX1SNGqg8nKAeJTpd59ZSDwdtikVZ9K7/+Q0EgO2ttoDKVG/tWjbzkeYglNC Dp4IVlkG3s9W2HTNGxu4LFogJ1DKwjnwowBUwLy1KmW+0i884M3dg62t7zd0vIApdErM BwyVqX1rpXz0RF9pvcUF8OXcFGZSVNBerBXbg93k+p4BiOE6xHx9AHEqlkFYhDjGyLnu Gg5mQPpTUyxfcQSdPbIv/+uXM/4NJTQjs2qieL7ulZP6W5mE/XJ4Ejafos8VwriXj2be sCPQ== X-Gm-Message-State: AKwxytcV6fLVxKMlEdxO+w3bYxDXiEMEut5r1cK/BUkPPaW9YYYOoaie HxGnWoo8QRpzwiZackFsr6ln8JE= X-Received: by 10.157.35.78 with SMTP id k14mr2940417otd.338.1515194067385; Fri, 05 Jan 2018 15:14:27 -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 p24sm2824627oie.54.2018.01.05.15.14.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Jan 2018 15:14:26 -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:14:19 -0600 Message-Id: <20180105231424.19247-3-robh@kernel.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180105231424.19247-1-robh@kernel.org> References: <20180105231424.19247-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); -}