From patchwork Fri Mar 3 10:34:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 9602511 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 569CD6016C for ; Fri, 3 Mar 2017 10:37:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 49E3427F60 for ; Fri, 3 Mar 2017 10:37:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3EA1328485; Fri, 3 Mar 2017 10:37:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DD45727F60 for ; Fri, 3 Mar 2017 10:37:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751805AbdCCKfJ (ORCPT ); Fri, 3 Mar 2017 05:35:09 -0500 Received: from mail-lf0-f66.google.com ([209.85.215.66]:36415 "EHLO mail-lf0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751676AbdCCKel (ORCPT ); Fri, 3 Mar 2017 05:34:41 -0500 Received: by mail-lf0-f66.google.com with SMTP id g70so6713013lfh.3 for ; Fri, 03 Mar 2017 02:34:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OyRbE3XW0YGrt7K8cGs5zHiyflTUVWMuCC/23zoGLE0=; b=kX0C3GJUEX4iTVIqjjf6vqNR+CVRtB/DxQ/OSASiAzRDV8rOVnbs50keGa0ZPUxVC+ hUbLOJ014PYO4FN8ukHkrQ2ZdpByytHS+80I/FUBLNa2HWW3U5b1vDUpghEPtTxz9J9B h2zfbmU1gBeay/z/Ct6i7l2ojOe+zN+DAW9vGMxkC6wI7tWXb7A7Wjl6Es+sPqrcC0Nx nunBlU5ZWHuFYucb4J5sD7vMc34qgID9gYdXRKhIR0VoB46eI5qnH17PwOKH9gilp1Rr K9oeAt7K6soXyVDjg3D5pijybBAxc0fx+AUoNiLXSAwLqH6Ul5loNOlWqSRFYjkPGrr8 EKjA== 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:mime-version:content-transfer-encoding; bh=OyRbE3XW0YGrt7K8cGs5zHiyflTUVWMuCC/23zoGLE0=; b=kW3Den29brAszG/IzlwTfeg9E8GytfMmP+PZobZ6WyIFE2iqC/Nn2mSqMBqmIqnldL RYBG7z8H7ARtUsGZQ7+dvRi40/U6/udvj9dPrU1G/sHfo6iVoUT4oQ08LKHnWQu+N/8R 4Slm7O0bfkLrfC9V8vQ5hiEbvEfX0X7h99/Gs2P7gwBsddVZxl1oP4fKgjg2U5yu9pv9 KEzGQNIt+HojGYQ3frvmwtlJ5WsWqqpPlIT3ZZVH+eO9cxTzMRN4+VhQqdBJIvfoNhJM PGrSaHvjCCyb2oI3pR/3hpz93vEpP8sQEQ7zWgHZ2KvYeS3FCngYngL6IS1RxvzGNgSZ X0nw== X-Gm-Message-State: AMke39lqkGokKurzgjFspPFsKTT8FRPnVtKeVD7GUJ5z1Xa9AzQ3DfHP6XYi5Gz2T5y7+Q== X-Received: by 10.46.80.27 with SMTP id e27mr701070ljb.36.1488537264597; Fri, 03 Mar 2017 02:34:24 -0800 (PST) Received: from linux-samsung.lan (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by smtp.gmail.com with ESMTPSA id y29sm2227970ljd.41.2017.03.03.02.34.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Mar 2017 02:34:24 -0800 (PST) From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= To: Kalle Valo , linux-wireless@vger.kernel.org Cc: Hauke Mehrtens , =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Subject: [PATCH 4.12 2/2] bcma: fill core OF info independently of bus type Date: Fri, 3 Mar 2017 11:34:15 +0100 Message-Id: <20170303103415.5188-2-zajec5@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170303103415.5188-1-zajec5@gmail.com> References: <20170303103415.5188-1-zajec5@gmail.com> MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Rafał Miłecki PCI devices can be described in DT as well so we should always execute relevant code. This will make bcma e.g. set of_node for cores described in DT. Signed-off-by: Rafał Miłecki --- drivers/bcma/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/bcma/main.c b/drivers/bcma/main.c index 4f88821c1b2a..2da7fe1d20a7 100644 --- a/drivers/bcma/main.c +++ b/drivers/bcma/main.c @@ -243,6 +243,8 @@ void bcma_prepare_core(struct bcma_bus *bus, struct bcma_device *core) core->dev.bus = &bcma_bus_type; dev_set_name(&core->dev, "bcma%d:%d", bus->num, core->core_index); core->dev.parent = bcma_bus_get_host_dev(bus); + if (core->dev.parent) + bcma_of_fill_device(core->dev.parent, core); switch (bus->hosttype) { case BCMA_HOSTTYPE_PCI: @@ -252,8 +254,6 @@ void bcma_prepare_core(struct bcma_bus *bus, struct bcma_device *core) case BCMA_HOSTTYPE_SOC: if (IS_ENABLED(CONFIG_OF) && bus->host_pdev) { core->dma_dev = &bus->host_pdev->dev; - if (core->dev.parent) - bcma_of_fill_device(core->dev.parent, core); } else { core->dev.dma_mask = &core->dev.coherent_dma_mask; core->dma_dev = &core->dev;