From patchwork Thu Sep 24 14:26:43 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tero Kristo X-Patchwork-Id: 54095 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f199.google.com (mail-wi0-f199.google.com [209.85.212.199]) by patches.linaro.org (Postfix) with ESMTPS id 5772522DC2 for ; Thu, 24 Sep 2015 14:27:22 +0000 (UTC) Received: by wicmn1 with SMTP id mn1sf41924874wic.1 for ; Thu, 24 Sep 2015 07:27:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-type:sender:precedence :list-id:x-original-sender:x-original-authentication-results :mailing-list:list-post:list-help:list-archive:list-unsubscribe; bh=jbNthUGMUwFLeGguPoT8zA/OuiihFrkbiFDafXHJc7g=; b=cdQZnNAPBor0vXH3WpztI7iVLNR55RZW8jwFQXsXcIO6KjQiCUJf7YOJFuaFoXhnfL ewTz9G9/WUUh+p9nCXqNdT6OoYEb/bD+R9SnukDlBbGLA8cW5dP6t3hYUkrrGRc2shph BK6yQcKNEesDL8bjJ0fm3UhCk9WztrJONfSv3e4ascBuIDD/8wtzenshpxrzmF0TYh+o +pc/mMeaFsZ+aSMtx0PmZ+jueg583tauv9uinfigd7x0lduiP+fJfSgTPM1y5tLrtDlX TSIPkPVB9/te4jQv42Ug4BMVECt1q0SIyjId7YFcP14OvR3id27ELLv3Udfen7+4V+Zq pH2A== X-Gm-Message-State: ALoCoQn7J4XxcUUCb0Yl++7dwzThmB8hGyhqISyWnSLjJ5qWdpXcloUelcNZrM6BAo7xil5ptvlH X-Received: by 10.112.198.33 with SMTP id iz1mr1328lbc.8.1443104841593; Thu, 24 Sep 2015 07:27:21 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.25.15.40 with SMTP id e40ls163132lfi.14.gmail; Thu, 24 Sep 2015 07:27:21 -0700 (PDT) X-Received: by 10.25.20.80 with SMTP id k77mr5109271lfi.117.1443104841450; Thu, 24 Sep 2015 07:27:21 -0700 (PDT) Received: from mail-la0-f46.google.com (mail-la0-f46.google.com. [209.85.215.46]) by mx.google.com with ESMTPS id kw12si6714599lac.70.2015.09.24.07.27.21 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Sep 2015 07:27:21 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.46 as permitted sender) client-ip=209.85.215.46; Received: by lacao8 with SMTP id ao8so65583664lac.3 for ; Thu, 24 Sep 2015 07:27:21 -0700 (PDT) X-Received: by 10.112.146.104 with SMTP id tb8mr13671987lbb.35.1443104841215; Thu, 24 Sep 2015 07:27:21 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.59.35 with SMTP id w3csp378526lbq; Thu, 24 Sep 2015 07:27:20 -0700 (PDT) X-Received: by 10.66.236.10 with SMTP id uq10mr22283122pac.55.1443104840171; Thu, 24 Sep 2015 07:27:20 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ou3si18845730pbb.11.2015.09.24.07.27.19; Thu, 24 Sep 2015 07:27:20 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752260AbbIXO1T (ORCPT + 5 others); Thu, 24 Sep 2015 10:27:19 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:60419 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752132AbbIXO1S (ORCPT ); Thu, 24 Sep 2015 10:27:18 -0400 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id t8OEQsBU021556; Thu, 24 Sep 2015 09:26:54 -0500 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id t8OEQsFC011605; Thu, 24 Sep 2015 09:26:54 -0500 Received: from dflp33.itg.ti.com (10.64.6.16) by DFLE72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.3.224.2; Thu, 24 Sep 2015 09:26:54 -0500 Received: from localhost.localdomain (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp33.itg.ti.com (8.14.3/8.13.8) with ESMTP id t8OEQjRR012528; Thu, 24 Sep 2015 09:26:52 -0500 From: Tero Kristo To: , , , CC: Subject: [PATCH 02/17] ARM: OMAP2+: hwmod: parse also soc hierarchy for hwmod compatible nodes Date: Thu, 24 Sep 2015 17:26:43 +0300 Message-ID: <1443104818-993-3-git-send-email-t-kristo@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1443104818-993-1-git-send-email-t-kristo@ti.com> References: <1443104818-993-1-git-send-email-t-kristo@ti.com> MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: t-kristo@ti.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.46 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Previously the code was only parsing ocp hierarchy, which misses mpu and iva/dsp nodes at least, which still contain hwmod support. Parse also the soc hierarchy to include these. Signed-off-by: Tero Kristo --- arch/arm/mach-omap2/omap_hwmod.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c index cc8a987..f53ebc6 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c @@ -2467,15 +2467,24 @@ static int __init _init(struct omap_hwmod *oh, void *data) if (of_have_populated_dt()) { struct device_node *bus; + struct device_node *soc; bus = of_find_node_by_name(NULL, "ocp"); if (!bus) return -ENODEV; r = of_dev_hwmod_lookup(bus, oh, &index, &np); - if (r) - pr_debug("omap_hwmod: %s missing dt data\n", oh->name); - else if (np && index) + if (r) { + soc = of_find_node_by_name(NULL, "soc"); + if (soc) + r = of_dev_hwmod_lookup(soc, oh, &index, &np); + + if (r) + pr_debug("omap_hwmod: %s missing dt data\n", + oh->name); + } + + if (np && index) pr_warn("omap_hwmod: %s using broken dt data from %s\n", oh->name, np->name); }