From patchwork Tue Oct 7 19:48:16 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tthayer@opensource.altera.com X-Patchwork-Id: 5048911 Return-Path: X-Original-To: patchwork-linux-spi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id DCD569F349 for ; Tue, 7 Oct 2014 19:56:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0CFAF2021F for ; Tue, 7 Oct 2014 19:56:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 219EE201F4 for ; Tue, 7 Oct 2014 19:56:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755203AbaJGT4E (ORCPT ); Tue, 7 Oct 2014 15:56:04 -0400 Received: from mail-bn1on0059.outbound.protection.outlook.com ([157.56.110.59]:42240 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754998AbaJGT4D (ORCPT ); Tue, 7 Oct 2014 15:56:03 -0400 Received: from dinh-ubuntu.altera.com (64.129.157.38) by BN1PR03MB121.namprd03.prod.outlook.com (10.255.201.16) with Microsoft SMTP Server (TLS) id 15.0.1044.10; Tue, 7 Oct 2014 19:41:14 +0000 From: To: , , , , , , , CC: , , , , , , , , Subject: [PATCH 1/2] spi: dw: Initialize of_node to discover DT node children Date: Tue, 7 Oct 2014 14:48:16 -0500 Message-ID: <1412711297-31857-2-git-send-email-tthayer@opensource.altera.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1412711297-31857-1-git-send-email-tthayer@opensource.altera.com> References: <1412711297-31857-1-git-send-email-tthayer@opensource.altera.com> MIME-Version: 1.0 X-Originating-IP: [64.129.157.38] X-ClientProxiedBy: BN1PR08CA0023.namprd08.prod.outlook.com (10.242.217.151) To BN1PR03MB121.namprd03.prod.outlook.com (10.255.201.16) X-Microsoft-Antispam: UriScan:; X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:;SRVR:BN1PR03MB121; X-Exchange-Antispam-Report-Test: UriScan:; X-Forefront-PRVS: 035748864E X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(189002)(199003)(85852003)(69596002)(19580395003)(19580405001)(53416004)(50226001)(89996001)(33646002)(4396001)(42186005)(122386002)(76176999)(104166001)(87976001)(88136002)(31966008)(50986999)(80022003)(20776003)(66066001)(120916001)(46102003)(97736003)(101416001)(64706001)(92726001)(2201001)(92566001)(50466002)(81156004)(102836001)(105586002)(106356001)(95666004)(86152002)(99396003)(86362001)(47776003)(87286001)(77096002)(77156001)(93916002)(85306004)(107046002)(76482002)(229853001)(62966002)(48376002)(21056001)(575784001)(40100002); DIR:OUT; SFP:1101; SCL:1; SRVR:BN1PR03MB121; H:dinh-ubuntu.altera.com; FPR:; MLV:sfv; PTR:InfoNoRecords; MX:1; A:0; LANG:en; X-OriginatorOrg: opensource.altera.com Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Thor Thayer 1. The of_node element must be initialized to enable discovery of node children. The discovery takes place in the of_register_spi_devices() function. 2. Grabbing the bus-num from the device tree. 3. Update the SOCFPGA configuration. Signed-off-by: Thor Thayer --- arch/arm/configs/socfpga_defconfig | 1 + drivers/spi/spi-dw-mmio.c | 5 ++++- drivers/spi/spi-dw.c | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/arch/arm/configs/socfpga_defconfig b/arch/arm/configs/socfpga_defconfig index d7a5855..54f3540 100644 --- a/arch/arm/configs/socfpga_defconfig +++ b/arch/arm/configs/socfpga_defconfig @@ -52,6 +52,7 @@ CONFIG_CAN_C_CAN_PLATFORM=y CONFIG_CAN_DEBUG_DEVICES=y CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y CONFIG_PROC_DEVICETREE=y CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=2 diff --git a/drivers/spi/spi-dw-mmio.c b/drivers/spi/spi-dw-mmio.c index 21ce0e3..b8483057 100644 --- a/drivers/spi/spi-dw-mmio.c +++ b/drivers/spi/spi-dw-mmio.c @@ -82,7 +82,10 @@ static int dw_spi_mmio_probe(struct platform_device *pdev) dws->num_cs = num_cs; if (pdev->dev.of_node) { - int i; + int i, prop; + + if (!of_property_read_u32(pdev->dev.of_node, "bus-num", &prop)) + dws->bus_num = prop; for (i = 0; i < dws->num_cs; i++) { int cs_gpio = of_get_named_gpio(pdev->dev.of_node, diff --git a/drivers/spi/spi-dw.c b/drivers/spi/spi-dw.c index 0dd0623..d8be9f9 100644 --- a/drivers/spi/spi-dw.c +++ b/drivers/spi/spi-dw.c @@ -671,6 +671,9 @@ int dw_spi_add_host(struct device *dev, struct dw_spi *dws) master->cleanup = dw_spi_cleanup; master->transfer_one_message = dw_spi_transfer_one_message; master->max_speed_hz = dws->max_freq; +#if defined(CONFIG_OF) + master->dev.of_node = dev->of_node; +#endif /* Basic HW init */ spi_hw_init(dws);