From patchwork Fri May 11 16:20:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 912064 Return-Path: X-Original-To: incoming-dt@patchwork.ozlabs.org Delivered-To: patchwork-incoming-dt@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=devicetree-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=bgdev-pl.20150623.gappssmtp.com header.i=@bgdev-pl.20150623.gappssmtp.com header.b="RWhgBF2b"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40jFjZ4mBsz9s1p for ; Sat, 12 May 2018 02:22:10 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752250AbeEKQVz (ORCPT ); Fri, 11 May 2018 12:21:55 -0400 Received: from mail-wr0-f195.google.com ([209.85.128.195]:36692 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752243AbeEKQVw (ORCPT ); Fri, 11 May 2018 12:21:52 -0400 Received: by mail-wr0-f195.google.com with SMTP id p4-v6so5914387wrh.3 for ; Fri, 11 May 2018 09:21:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=DahAdSlzgc7DeiUSxkEimltI3pxa0xtlyVdWzMrvjGU=; b=RWhgBF2bpcE0B5hLyDslTLTAx8lknLzTfPXFV7YnRpG43rjtSVgpBDzMl4k4ESIlRk DoJCNNVPa6TS1Qt2Y2eMbIj9Er1EGJjXeaprzqCRbpa0ReP5ovz3mP6wYH+BVXALSYQR zBy4/73hjjMmLXIJ5f5h1TJO1xMTQvTJGF49IN3I/kZrujsbIlg1F/cXJTT0UYW4UAbl 8iU8y242fUkNVddVyw8I7oo71GRAE5XulbONTaQSM8XEfSI4oixBCxOOPSkMvBbVgMo+ Ke/29vcBOiANY9dAgbdMMIpAmLn69N2vmm5lC3+TiKZEcW9+fq3x0IM49muVYmDkq85b tvrg== 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=DahAdSlzgc7DeiUSxkEimltI3pxa0xtlyVdWzMrvjGU=; b=am3EvKHIfBqBo9U2Q5ebDh2Ja1enM4OqYUyvlR75BcMirDikDeM9MNy3JjVPzjKDz2 q72lTU0YMvIEb6koLhqq4XMQOWM/fR6EGvjNWMfEXQQW/OrTXobW7Va75/7OIRlMLJlB tASI/AqsL70C22XzbjjpikLLUtI8lS3GcbbgsePY/oeyRzebOPVreA49dCph2WOJEanO maKtMwz9UWbwPDZp+5zAmpcgmZCgfYJu5j7aBmqEiRO4i1YNUBE20fUPBr8uNyjJL1Y1 fo4nwSQgEb2IVb6V5zBIjfQE6rVal9/zgy2USdmFp+6meTJHHQL92VbrPGSwYWqVn1R7 f6Gw== X-Gm-Message-State: ALKqPwdpDNo+eZ8k7p2QYS5wL8wG6wiOqEekd+y0r+VZiQd35eI4csGT wndkEXtb5FUXS+MnMEqXNWiQ2g== X-Google-Smtp-Source: AB8JxZoMok5oqILkdW/GUzAGliKmgXox7uRFpKKRqn/Sa7lBSzLlDWjn2YZHiW8PLATYBJ6vmJOx4g== X-Received: by 2002:adf:df02:: with SMTP id y2-v6mr5252392wrl.92.1526055711301; Fri, 11 May 2018 09:21:51 -0700 (PDT) Received: from brgl-bgdev.baylibre.local ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id q17-v6sm1429523wmf.3.2018.05.11.09.21.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 May 2018 09:21:50 -0700 (PDT) From: Bartosz Golaszewski To: Sekhar Nori , Kevin Hilman , David Lechner , Michael Turquette , Stephen Boyd , Arnd Bergmann , Greg Kroah-Hartman , Mark Rutland , Yoshinori Sato , Rich Felker , Andy Shevchenko , Marc Zyngier , "Rafael J . Wysocki" , Peter Rosin , Jiri Slaby , Thomas Gleixner , Daniel Lezcano , Geert Uytterhoeven , Magnus Damm , Johan Hovold , Rob Herring , Frank Rowand Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-arch@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH 12/12] of/platform: make the OF code aware of early platform drivers Date: Fri, 11 May 2018 18:20:28 +0200 Message-Id: <20180511162028.20616-13-brgl@bgdev.pl> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180511162028.20616-1-brgl@bgdev.pl> References: <20180511162028.20616-1-brgl@bgdev.pl> Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org From: Bartosz Golaszewski Check the relevant flag in the device node and skip the allocation part for devices that were populated early. Signed-off-by: Bartosz Golaszewski --- drivers/of/platform.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/drivers/of/platform.c b/drivers/of/platform.c index 0e554fe1f325..91760e2d3dc7 100644 --- a/drivers/of/platform.c +++ b/drivers/of/platform.c @@ -21,6 +21,7 @@ #include #include #include +#include const struct of_device_id of_default_bus_match_table[] = { { .compatible = "simple-bus", }, @@ -196,9 +197,17 @@ static struct platform_device *of_platform_device_create_pdata( of_node_test_and_set_flag(np, OF_POPULATED)) return NULL; - dev = of_device_alloc(np, bus_id, parent); - if (!dev) - goto err_clear_flag; + if (of_node_check_flag(np, OF_POPULATED_EARLY)) { + dev = of_early_to_platform_device(np); + if (IS_ERR(dev)) + goto err_clear_flag; + + of_device_init(dev, np, bus_id, parent); + } else { + dev = of_device_alloc(np, bus_id, parent); + if (!dev) + goto err_clear_flag; + } dev->dev.bus = &platform_bus_type; dev->dev.platform_data = platform_data;