From patchwork Tue Sep 24 07:28:26 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Poddar, Sourav" X-Patchwork-Id: 2931841 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D72EDBFF05 for ; Tue, 24 Sep 2013 07:28:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 786E7202EA for ; Tue, 24 Sep 2013 07:28:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0E01820272 for ; Tue, 24 Sep 2013 07:28:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750742Ab3IXH2d (ORCPT ); Tue, 24 Sep 2013 03:28:33 -0400 Received: from arroyo.ext.ti.com ([192.94.94.40]:48711 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750724Ab3IXH2c (ORCPT ); Tue, 24 Sep 2013 03:28:32 -0400 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id r8O7SUoE015446; Tue, 24 Sep 2013 02:28:30 -0500 Received: from DLEE71.ent.ti.com (dlee71.ent.ti.com [157.170.170.114]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id r8O7SUxE022752; Tue, 24 Sep 2013 02:28:30 -0500 Received: from dflp32.itg.ti.com (10.64.6.15) by DLEE71.ent.ti.com (157.170.170.114) with Microsoft SMTP Server id 14.2.342.3; Tue, 24 Sep 2013 02:28:30 -0500 Received: from a0131647.apr.dhcp.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp32.itg.ti.com (8.14.3/8.13.8) with ESMTP id r8O7SSOO011034; Tue, 24 Sep 2013 02:28:28 -0500 From: Sourav Poddar To: , CC: , , , Sourav Poddar Subject: [PATCHv2] arm: dts: omap5: Add status parameter. Date: Tue, 24 Sep 2013 12:58:26 +0530 Message-ID: <1380007706-24062-1-git-send-email-sourav.poddar@ti.com> X-Mailer: git-send-email 1.7.1 MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-9.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 This patch disables devices initially(status = "disabled"). Devices will only be probed, if the devices are present in the board file(status = "okay"). Signed-off-by: Sourav Poddar --- v1->v2: change approach to disabling devices in dtsi and enable it in respective board file. arch/arm/boot/dts/omap5-uevm.dts | 43 ++++++++++++++++++++----------------- arch/arm/boot/dts/omap5.dtsi | 24 +++++++++++++++++++++ 2 files changed, 47 insertions(+), 20 deletions(-) diff --git a/arch/arm/boot/dts/omap5-uevm.dts b/arch/arm/boot/dts/omap5-uevm.dts index 65d7b60..08d6bc1 100644 --- a/arch/arm/boot/dts/omap5-uevm.dts +++ b/arch/arm/boot/dts/omap5-uevm.dts @@ -235,30 +235,26 @@ }; &mmc1 { + status = "okay"; vmmc-supply = <&ldo9_reg>; bus-width = <4>; }; &mmc2 { + status = "okay"; vmmc-supply = <&vmmcsd_fixed>; bus-width = <8>; ti,non-removable; }; &mmc3 { + status = "okay"; bus-width = <4>; ti,non-removable; }; -&mmc4 { - status = "disabled"; -}; - -&mmc5 { - status = "disabled"; -}; - &i2c1 { + status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&i2c1_pins>; @@ -451,14 +447,19 @@ }; &i2c5 { + status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&i2c5_pins>; clock-frequency = <400000>; }; -&mcbsp3 { - status = "disabled"; +&mcbsp1 { + status = "okay"; +}; + +&mcbsp2 { + status = "okay"; }; &usbhshost { @@ -470,36 +471,38 @@ phys = <0 &hsusb2_phy &hsusb3_phy>; }; -&mcspi1 { - -}; - &mcspi2 { + status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&mcspi2_pins>; }; &mcspi3 { + status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&mcspi3_pins>; }; &mcspi4 { + status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&mcspi4_pins>; }; &uart1 { - pinctrl-names = "default"; - pinctrl-0 = <&uart1_pins>; + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&uart1_pins>; }; &uart3 { - pinctrl-names = "default"; - pinctrl-0 = <&uart3_pins>; + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&uart3_pins>; }; &uart5 { - pinctrl-names = "default"; - pinctrl-0 = <&uart5_pins>; + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&uart5_pins>; }; diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi index 8500beb..96aa7ba 100644 --- a/arch/arm/boot/dts/omap5.dtsi +++ b/arch/arm/boot/dts/omap5.dtsi @@ -259,6 +259,7 @@ ti,hwmods = "i2c1"; clocks = <&func_96m_fclk>; clock-names = "fck"; + status = "disabled"; }; i2c2: i2c@48072000 { @@ -270,6 +271,7 @@ ti,hwmods = "i2c2"; clocks = <&func_96m_fclk>; clock-names = "fck"; + status = "disabled"; }; i2c3: i2c@48060000 { @@ -281,6 +283,7 @@ ti,hwmods = "i2c3"; clocks = <&func_96m_fclk>; clock-names = "fck"; + status = "disabled"; }; i2c4: i2c@4807a000 { @@ -292,6 +295,7 @@ ti,hwmods = "i2c4"; clocks = <&func_96m_fclk>; clock-names = "fck"; + status = "disabled"; }; i2c5: i2c@4807c000 { @@ -303,6 +307,7 @@ ti,hwmods = "i2c5"; clocks = <&func_96m_fclk>; clock-names = "fck"; + status = "disabled"; }; mcspi1: spi@48098000 { @@ -325,6 +330,7 @@ <&sdma 42>; dma-names = "tx0", "rx0", "tx1", "rx1", "tx2", "rx2", "tx3", "rx3"; + status = "disabled"; }; mcspi2: spi@4809a000 { @@ -342,6 +348,7 @@ <&sdma 45>, <&sdma 46>; dma-names = "tx0", "rx0", "tx1", "rx1"; + status = "disabled"; }; mcspi3: spi@480b8000 { @@ -356,6 +363,7 @@ ti,spi-num-cs = <2>; dmas = <&sdma 15>, <&sdma 16>; dma-names = "tx0", "rx0"; + status = "disabled"; }; mcspi4: spi@480ba000 { @@ -370,6 +378,7 @@ ti,spi-num-cs = <1>; dmas = <&sdma 70>, <&sdma 71>; dma-names = "tx0", "rx0"; + status = "disabled"; }; uart1: serial@4806a000 { @@ -380,6 +389,7 @@ clocks = <&func_48m_fclk>; clock-names = "fck"; clock-frequency = <48000000>; + status = "disabled"; }; uart2: serial@4806c000 { @@ -390,6 +400,7 @@ clocks = <&func_48m_fclk>; clock-names = "fck"; clock-frequency = <48000000>; + status = "disabled"; }; uart3: serial@48020000 { @@ -400,6 +411,7 @@ clocks = <&func_48m_fclk>; clock-names = "fck"; clock-frequency = <48000000>; + status = "disabled"; }; uart4: serial@4806e000 { @@ -410,6 +422,7 @@ clocks = <&func_48m_fclk>; clock-names = "fck"; clock-frequency = <48000000>; + status = "disabled"; }; uart5: serial@48066000 { @@ -420,6 +433,7 @@ clocks = <&func_48m_fclk>; clock-names = "fck"; clock-frequency = <48000000>; + status = "disabled"; }; uart6: serial@48068000 { @@ -430,6 +444,7 @@ clocks = <&func_48m_fclk>; clock-names = "fck"; clock-frequency = <48000000>; + status = "disabled"; }; mmc1: mmc@4809c000 { @@ -443,6 +458,7 @@ ti,needs-special-reset; dmas = <&sdma 61>, <&sdma 62>; dma-names = "tx", "rx"; + status = "disabled"; }; mmc2: mmc@480b4000 { @@ -455,6 +471,7 @@ ti,needs-special-reset; dmas = <&sdma 47>, <&sdma 48>; dma-names = "tx", "rx"; + status = "disabled"; }; mmc3: mmc@480ad000 { @@ -467,6 +484,7 @@ ti,needs-special-reset; dmas = <&sdma 77>, <&sdma 78>; dma-names = "tx", "rx"; + status = "disabled"; }; mmc4: mmc@480d1000 { @@ -479,6 +497,7 @@ ti,needs-special-reset; dmas = <&sdma 57>, <&sdma 58>; dma-names = "tx", "rx"; + status = "disabled"; }; mmc5: mmc@480d5000 { @@ -491,6 +510,7 @@ ti,needs-special-reset; dmas = <&sdma 59>, <&sdma 60>; dma-names = "tx", "rx"; + status = "disabled"; }; keypad: keypad@4ae1c000 { @@ -499,6 +519,7 @@ ti,hwmods = "kbd"; clocks = <&sys_32k_ck>; clock-names = "fck"; + status = "disabled"; }; mcpdm: mcpdm@40132000 { @@ -542,6 +563,7 @@ dmas = <&sdma 33>, <&sdma 34>; dma-names = "tx", "rx"; + status = "disabled"; }; mcbsp2: mcbsp@40124000 { @@ -558,6 +580,7 @@ dmas = <&sdma 17>, <&sdma 18>; dma-names = "tx", "rx"; + status = "disabled"; }; mcbsp3: mcbsp@40126000 { @@ -574,6 +597,7 @@ dmas = <&sdma 19>, <&sdma 20>; dma-names = "tx", "rx"; + status = "disabled"; }; mailbox: mailbox@4a0f4000 {