From patchwork Wed Jun 7 09:37:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kishon Vijay Abraham I X-Patchwork-Id: 103232 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp1842574qgd; Wed, 7 Jun 2017 02:41:04 -0700 (PDT) X-Received: by 10.99.117.11 with SMTP id q11mr31527888pgc.179.1496828464194; Wed, 07 Jun 2017 02:41:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496828464; cv=none; d=google.com; s=arc-20160816; b=nd7hzc4Jq1HurSJPn+Vuftn3HufO3jzN5wCXnUAOJR13QIVQ3NEXlTf3nXrdY0eCWW U3li2ZRufbwQwHD4tO2sLyaoAezYGZsUwuzey21lfv7Zti3r0G4j/mBf6aBD2dy8elcg mo0D01QEhANvrTCDyZVZsotSnH6SryUpaDJiTnv75lPFnFc0khtCCuDI/8qhoqCDxQZF LRT+pIXxLwgAwplyN0kJOSNBVtcGBR5jzH8TyLnz/09FtTIQY8hioDhkY5a3NHfML0R5 YSPgRH5wY7drPYbbLT9CTpb4lOTNtCIhE+G5xY+8yI/MhQ4behsx47UCQ4BOMYRWF57e YPFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=n/wp8hT3t0GQEa072RQ99MnFurKhPHAENsJDXC6kh8A=; b=k2PAge13Jt8/wMibZ6rIoCMe0ZoiL7GjX9N4aFCPZMh22GTt+mo40XTLI3UoWyTgwO ij+eN1vigYbt+gvZBx/74qOYYCE+Z98s03PUCMwNnh5f0wT+GKb/aQ3lKiFHkIKVTiby ZnG1MuDr+qCSqV/4YP076rSiBWV4E5BCqbZp8G2Wdd/y6mkOHSWH7g+c/FQ+mGkGMvF2 0/hrokmwAIUHs5nl8YyJ5MU9BkrgGIkKy01g6GKNGxbvXdn1JjiHvsxyVEq8l3zXzEVi +3kSWHBuHt0RDwrLFK2l7EZXJyNTVFHfHXLB2p5UdKmJwufaWxcyRL9Iv7sODeypQZWs 5+rQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p19si1141049pgd.257.2017.06.07.02.41.03; Wed, 07 Jun 2017 02:41:04 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751751AbdFGJkX (ORCPT + 25 others); Wed, 7 Jun 2017 05:40:23 -0400 Received: from fllnx210.ext.ti.com ([198.47.19.17]:46108 "EHLO fllnx210.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751517AbdFGJio (ORCPT ); Wed, 7 Jun 2017 05:38:44 -0400 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by fllnx210.ext.ti.com (8.15.1/8.15.1) with ESMTP id v579c3HW017791; Wed, 7 Jun 2017 04:38:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ti.com; s=ti-com-17Q1; t=1496828283; bh=E45pxIdyo32FfkgTD4sTI1nHqE2GbNY+Oz93bduo/L0=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=zMKK78DJfaW5aM+A5luJ5vHpDCTPW36gFQ17iZguB4oBziQQ0jQPS1QuyEdKJh8hM h+AEN5LHWERsmV3axuzjHF+Gg9bbuamcSq6fQVWAKoVQ+WUfSrapKydQgMycP7WyJ/ cKMBitH+7lXxGPEMTPMbfWAFYY3iXQrE9lWTWiQU= Received: from DLEE70.ent.ti.com (dlee70.ent.ti.com [157.170.170.113]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id v579c2Tw019026; Wed, 7 Jun 2017 04:38:03 -0500 Received: from dflp32.itg.ti.com (10.64.6.15) by DLEE70.ent.ti.com (157.170.170.113) with Microsoft SMTP Server id 14.3.294.0; Wed, 7 Jun 2017 04:38:02 -0500 Received: from a0393678ub.india.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 v579btKQ001799; Wed, 7 Jun 2017 04:37:59 -0500 From: Kishon Vijay Abraham I To: Tony Lindgren , Rob Herring , CC: Ulf Hansson , Russell King , , , , , , , Ravikumar Kattekola Subject: [PATCH v2 1/8] ARM: dts: dra72-evm-common: Correct vmmc-supply for mmc2 Date: Wed, 7 Jun 2017 15:07:42 +0530 Message-ID: <20170607093749.15656-2-kishon@ti.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170607093749.15656-1-kishon@ti.com> References: <20170607093749.15656-1-kishon@ti.com> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On dra72/dra71 evms, mmc2 vdd/ios are connected to a common 1.8V supply not 3.3V. Also the regulator that supplies 1.8V is different on dra71-evm so move the supply property from common dtsi to evm specific dts files. Fixes: a4240d3af677 ("ARM: dts: Add support for dra72-evm rev C (SR2.0)") Signed-off-by: Ravikumar Kattekola Signed-off-by: Sekhar Nori Signed-off-by: Kishon Vijay Abraham I --- arch/arm/boot/dts/dra71-evm.dts | 14 ++++++++++++++ arch/arm/boot/dts/dra72-evm-common.dtsi | 2 -- arch/arm/boot/dts/dra72-evm-revc.dts | 14 ++++++++++++++ arch/arm/boot/dts/dra72-evm.dts | 14 ++++++++++++++ 4 files changed, 42 insertions(+), 2 deletions(-) -- 2.11.0 diff --git a/arch/arm/boot/dts/dra71-evm.dts b/arch/arm/boot/dts/dra71-evm.dts index 4d57a55473af..c7a56b6263a6 100644 --- a/arch/arm/boot/dts/dra71-evm.dts +++ b/arch/arm/boot/dts/dra71-evm.dts @@ -32,6 +32,16 @@ 3000000 0x1>; }; + evm_1v8_sw: fixedregulator-evm_1v8 { + compatible = "regulator-fixed"; + regulator-name = "evm_1v8"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + vin-supply = <&lp8732_buck0_reg>; + regulator-always-on; + regulator-boot-on; + }; + poweroff: gpio-poweroff { compatible = "gpio-poweroff"; gpios = <&gpio7 30 GPIO_ACTIVE_HIGH>; @@ -165,6 +175,10 @@ vmmc_aux-supply = <&vpo_sd_1v8_3v3>; }; +&mmc2 { + vmmc-supply = <&evm_1v8_sw>; +}; + &mac { mode-gpios = <&pcf_gpio_21 4 GPIO_ACTIVE_LOW>, <&pcf_hdmi 9 GPIO_ACTIVE_LOW>, /* P11 */ diff --git a/arch/arm/boot/dts/dra72-evm-common.dtsi b/arch/arm/boot/dts/dra72-evm-common.dtsi index ad24544adf0f..d97370217eff 100644 --- a/arch/arm/boot/dts/dra72-evm-common.dtsi +++ b/arch/arm/boot/dts/dra72-evm-common.dtsi @@ -418,8 +418,6 @@ status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&mmc2_pins_default>; - - vmmc-supply = <&evm_3v3_sw>; bus-width = <8>; ti,non-removable; max-frequency = <192000000>; diff --git a/arch/arm/boot/dts/dra72-evm-revc.dts b/arch/arm/boot/dts/dra72-evm-revc.dts index 3ecac56bf504..47dcd527ec58 100644 --- a/arch/arm/boot/dts/dra72-evm-revc.dts +++ b/arch/arm/boot/dts/dra72-evm-revc.dts @@ -15,6 +15,16 @@ device_type = "memory"; reg = <0x0 0x80000000 0x0 0x80000000>; /* 2GB */ }; + + evm_1v8_sw: fixedregulator-evm_1v8 { + compatible = "regulator-fixed"; + regulator-name = "evm_1v8"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + vin-supply = <&smps4_reg>; + regulator-always-on; + regulator-boot-on; + }; }; &i2c1 { @@ -82,3 +92,7 @@ interrupts = <16 IRQ_TYPE_EDGE_FALLING>; }; }; + +&mmc2 { + vmmc-supply = <&evm_1v8_sw>; +}; diff --git a/arch/arm/boot/dts/dra72-evm.dts b/arch/arm/boot/dts/dra72-evm.dts index cd9c4ff12654..adbcc570eba9 100644 --- a/arch/arm/boot/dts/dra72-evm.dts +++ b/arch/arm/boot/dts/dra72-evm.dts @@ -13,6 +13,16 @@ device_type = "memory"; reg = <0x0 0x80000000 0x0 0x40000000>; /* 1024 MB */ }; + + evm_1v8_sw: fixedregulator-evm_1v8 { + compatible = "regulator-fixed"; + regulator-name = "evm_1v8"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + vin-supply = <&smps4_reg>; + regulator-always-on; + regulator-boot-on; + }; }; &i2c1 { @@ -43,3 +53,7 @@ phy_id = <&davinci_mdio>, <3>; phy-mode = "rgmii"; }; + +&mmc2 { + vmmc-supply = <&evm_1v8_sw>; +};