From patchwork Fri Nov 16 20:18:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 151373 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp862162ljp; Fri, 16 Nov 2018 12:18:25 -0800 (PST) X-Google-Smtp-Source: AJdET5dWxKM+CeH6L1jI+/JYIlksRhyJQ16fvKBFZh+bO33GS6Zu0+ZU2420btmP36WUcRG442n7 X-Received: by 2002:a17:902:e01:: with SMTP id 1-v6mr11927586plw.251.1542399504936; Fri, 16 Nov 2018 12:18:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542399504; cv=none; d=google.com; s=arc-20160816; b=GIf2G3QtPpULjd3oievhIywPHlAER4ox3x7LVDkHFTWU9P72STiRW581ekpnM2m+2e LESIlPEampo5inM3HtBAPbivlrzLL1mBzvleFGrPgI0J1xQsIOWFw0Fh/RtJ3wFTZjca KUPZb4+IN9UQ22x7ykQ8/GKIwgoETnkSwqhs5xUSVNWpaWLhrpsSyr+TAdm99VLnKW8G Qn5hlpT/GFTZ0/5s0SwVcsREkqa9KmmmXr4iOjyPqqsH9q20qBBUpROaTLbQadEdODIt U4GV66IiEGo9hI2OdialdeKFE2ZZKuA5i85t+cJyxdT/HX2pePWkT1MvBTQPlOFrTyFP EPfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=ckIGt+t31hqc36+/zUIB6Q7DzmOj5anOWtQImTp00WU=; b=esmMZcv6pqAbfk2aPlNQ4MP1HZO3A7TjbT6G5zxpGDRpkwObusI1+lgJEZj+DCOein WeKxLCDNLRoRcX79Mp/YsRv+wepe/n4Od5MAPFUvpcpOUTCAe/1Y/tJXLNv5/nJCrVZC vAmB9wPC57MbeQF32Ao5y8L+jtcutDemmezc/ebVb6eqA+eJX+2+yPpVlpdD4Rz01Pk+ IoIKNknRFV/QQHkj06FAD8pSB344S+quwsxFtXvM/KxWdTnOcFGoOxgbBjdeHNAjNltD wtByDGCJWCuq6wO+XihbHHhndpqvUsE3Dg4pZ7KCSCNm9mzpr/QZPlKpq7mPA3zMHPQI dEvA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e5-v6si4195847pfe.27.2018.11.16.12.18.24; Fri, 16 Nov 2018 12:18:24 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of devicetree-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 devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725804AbeKQGcO (ORCPT + 6 others); Sat, 17 Nov 2018 01:32:14 -0500 Received: from mail-oi1-f196.google.com ([209.85.167.196]:46187 "EHLO mail-oi1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725763AbeKQGcO (ORCPT ); Sat, 17 Nov 2018 01:32:14 -0500 Received: by mail-oi1-f196.google.com with SMTP id x202so9264479oif.13; Fri, 16 Nov 2018 12:18:23 -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:mime-version :content-transfer-encoding; bh=ckIGt+t31hqc36+/zUIB6Q7DzmOj5anOWtQImTp00WU=; b=IBG2FwaOWy37ctVgOwdh5buBtrX/tqmgdXmIij4VE57VIzIVAuuBXyCZySd3h96pzh 5aMSEYOB2gQPfv1/7OijlZi8dPO2LGjdPpxQ1Ps6AQwoPiaypffkElHEDGHPejPdwUdn KYoQwg/GU0jtavR/6iISVcZCT+WixF6ECsDlNfpXcGFseafyZdtz7VgQy3GioMIT3pdk Sb4/DLmQb9Ee1QTJAY8zaLYpZFHoFKf7uXYYQfP/c1NsOBCEK7AVTu+5Ejw6n9JtJ0sy eQLT0K/O56H8nZhpvkDMCoMXieDVl/nh71H3DQNeeVBqN+ZU+rFgWNmg2Vk2SL6I3Hwk di4g== X-Gm-Message-State: AGRZ1gI51nXywH4514yZ/lSHbDkvyDWjV+yd4wHKKaLyUyLCypwb2L94 sMIyDFAxaddBKbCok+606w== X-Received: by 2002:aca:f1d6:: with SMTP id p205-v6mr1887737oih.332.1542399503021; Fri, 16 Nov 2018 12:18:23 -0800 (PST) Received: from localhost.localdomain (mobile-166-173-62-28.mycingular.net. [166.173.62.28]) by smtp.googlemail.com with ESMTPSA id l18sm27348235otb.68.2018.11.16.12.18.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Nov 2018 12:18:22 -0800 (PST) From: Rob Herring To: x86@kernel.org Cc: linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Lubomir Rintel , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" Subject: [PATCH] x86: olpc: Remove calling of_platform_bus_probe Date: Fri, 16 Nov 2018 14:18:20 -0600 Message-Id: <20181116201820.10065-1-robh@kernel.org> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org The DT core will probe the DT by default now, so the OLPC platform code calling of_platform_bus_probe is not necessary. The algorithm for what nodes are probed is a little different in how compatible is handled, but since OLPC uses compatible strings for matching it is not affected by this difference. Also, only the battery node located at the root level gets a device created as the dcon is a PCI device and the RTC device is created in olpc-xo1-rtc.c. Cc: Thomas Gleixner Cc: Ingo Molnar Cc: "H. Peter Anvin" Cc: x86@kernel.org Signed-off-by: Rob Herring --- arch/x86/platform/olpc/olpc_dt.c | 18 ------------------ 1 file changed, 18 deletions(-) -- 2.19.1 diff --git a/arch/x86/platform/olpc/olpc_dt.c b/arch/x86/platform/olpc/olpc_dt.c index 24d2175a9480..b4ab779f1d47 100644 --- a/arch/x86/platform/olpc/olpc_dt.c +++ b/arch/x86/platform/olpc/olpc_dt.c @@ -19,7 +19,6 @@ #include #include #include -#include #include #include #include @@ -285,20 +284,3 @@ void __init olpc_dt_build_devicetree(void) pr_info("PROM DT: Built device tree with %u bytes of memory.\n", prom_early_allocated); } - -/* A list of DT node/bus matches that we want to expose as platform devices */ -static struct of_device_id __initdata of_ids[] = { - { .compatible = "olpc,xo1-battery" }, - { .compatible = "olpc,xo1-dcon" }, - { .compatible = "olpc,xo1-rtc" }, - {}, -}; - -static int __init olpc_create_platform_devices(void) -{ - if (machine_is_olpc()) - return of_platform_bus_probe(NULL, of_ids, NULL); - else - return 0; -} -device_initcall(olpc_create_platform_devices);