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>; +}; From patchwork Wed Jun 7 09:37:45 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: 103231 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp1842478qgd; Wed, 7 Jun 2017 02:40:49 -0700 (PDT) X-Received: by 10.84.218.134 with SMTP id r6mr26779996pli.288.1496828449357; Wed, 07 Jun 2017 02:40:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496828449; cv=none; d=google.com; s=arc-20160816; b=WESBMMFw3Xx9lRPOP5niSEVScNWfVyLQok7Qk9iik6L4G7tzTS5u4fLFxiTM29myzw 6Kvyu123dlaSC3fKJkm/L55cH2of7w72RwWL8DprZp71ijduMcX5DkjSWjTImTuvVI3l G9WlcBSCucgRUzN+ThnQ7gMiYX/hOg0t+3uFiRz8AsCeMzix00qG2z3+VMiDqXyt0K2M UoF5oQ5HPokNiA0b5WbtI3TotnzIL1INdcKmOX1/YeSU9le0Uvbuskux5viiKmSIAAIu 2crkFcyEuHvpM5JmQNh5QtEBKP031w9MwT0qM5IZBUQvaLecIvkAnIakXClnDpS2UkWT uQIA== 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=KMjTOSTjbtG+5K+HOUQXcTK31xr578o/R9JZCDsuIMg=; b=w5ajF/nQLuwnjm/XVZgS0FoLerPm8ngVfEhJrvQKj/TXZBaaOedxjrtawNs79LHlZ4 U+qCVRRwNOawj4yoEc5Z1zYB8ESoTfIIkAbOkrkKsUtKtLyCkuLVce+wu2b8BTOKyeL3 zlwlbtvC2c/3c28LCdbwoZpiJ0ko7+EhVe7zmDqaxnH6pdEHQomuiXiDp0ZGn3fgdWls zk96oijTSjt7R5K1SrxDmX771bjK1tVBD/H2Fjmzpz4CAky2JOH/LWV8+/D23tDsVysh FcpDJzUjTyGgAKbTY1ZqJZJsWqBXpvPWl+6wftQ/FAHIlfibgID8WEKDaUhA8wF3m03h 127w== 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 c19si1324730pfe.59.2017.06.07.02.40.49; Wed, 07 Jun 2017 02:40:49 -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 S1751861AbdFGJk0 (ORCPT + 25 others); Wed, 7 Jun 2017 05:40:26 -0400 Received: from lelnx193.ext.ti.com ([198.47.27.77]:37609 "EHLO lelnx193.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751501AbdFGJio (ORCPT ); Wed, 7 Jun 2017 05:38:44 -0400 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by lelnx193.ext.ti.com (8.15.1/8.15.1) with ESMTP id v579cDfw003088; Wed, 7 Jun 2017 04:38:13 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ti.com; s=ti-com-17Q1; t=1496828293; bh=cQOjAaxNvPoZbyhCWY7ERpVkEUAOO5dJytUKbMp5gls=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=NivMprzMS8s4qmDHl4mGO5pLeGTrBBOdx7uGYsRqTFngOvU1gvvlmfErzL8BRaiiM ejNz1CAC05tk3DUzs6T48xsK83iHSGmLHMBq92+nQQGmhc/35wI310rYKr9xRBx3Hl ++mCl48olzMnSqM0Bv4u57BHljDkRnaeoqqdctuQ= 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 v579cDdL019663; Wed, 7 Jun 2017 04:38:13 -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.3.294.0; Wed, 7 Jun 2017 04:38:12 -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 v579btKT001799; Wed, 7 Jun 2017 04:38:10 -0500 From: Kishon Vijay Abraham I To: Tony Lindgren , Rob Herring , CC: Ulf Hansson , Russell King , , , , , , Subject: [PATCH v2 4/8] ARM: dts: am57xx-beagle-x15-revb1: Fix supply name used for MMC1 IO lines Date: Wed, 7 Jun 2017 15:07:45 +0530 Message-ID: <20170607093749.15656-5-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 The dt binding documentation of omap-hsmmc recommends using "vmmc_aux" for IO supply lines. However commit 0af28cc92690d8c ("ARM: dts: am57xx-beagle-x15: Add support for rev B1") added it as "vmmc-aux". Now that anyways it needs to be fixed, use the generic "vqmmc" binding instead of the deprecated "vmmc_aux". Fixes: commit 0af28cc92690d8c ("ARM: dts: am57xx-beagle-x15: Add support for rev B1") Signed-off-by: Kishon Vijay Abraham I --- arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.11.0 diff --git a/arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts b/arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts index 39a92aff0a0d..578398c781b1 100644 --- a/arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts +++ b/arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts @@ -20,7 +20,7 @@ &mmc1 { vmmc-supply = <&vdd_3v3>; - vmmc-aux-supply = <&ldo1_reg>; + vqmmc-supply = <&ldo1_reg>; }; /* errata i880 "Ethernet RGMII2 Limited to 10/100 Mbps" */ From patchwork Wed Jun 7 09:37:46 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: 103230 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp1842287qgd; Wed, 7 Jun 2017 02:40:16 -0700 (PDT) X-Received: by 10.84.184.12 with SMTP id l12mr8009427plc.296.1496828415984; Wed, 07 Jun 2017 02:40:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496828415; cv=none; d=google.com; s=arc-20160816; b=Ld1pBjrU/WM7gM93SmZu8OB6v7LctcZ2pglmBPkMO6KJ+M+wVRgUcZWaycsbVY+Lcz fA0zw4dDJJk9hRkm6Y5bAKToUIzw7cZKf8LOFy+3ecHg+u8q46EQfjI67/48XXg/3dbE 3dtgSqkR9gCbFUiaYTdN+Zv+bva+MIN2gM6Trd4puRb1M5KGANC4maQ88UyJqN9AqkfH lpc/USwOS6CaUOAtfMKVCRXwuIW5RIPwJJH8RbqJrDIpzC7rS16t9D4aq/gCHLSwJORB /YpF9pNUg2l3TYfno/5iu8xYJqfeXbohmzEP1MPmLGv2yxpdSimmBTJJ4w5QJCYj9rmZ w35A== 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=4zxbkFpkHOMAAoGnoYqeHhSWm10/CQV/qocPng6mDMQ=; b=drvTiI05x5Z15OrmJOh4qZQrEkd4H9DrdKhzV69sZp3lUyelBO4P3d/C06r/Ge4mKn 1QfwPO5TxsmYho8il53P6RkyNjH3to0MAWmPfCChNmsivFqYGTU990rF/RAO0z8XDEjm 3NH/xfxadbpoCIkIfUwN3LQ3af7IJmt43xiRdeLrDiNZx0Xd0NOgLWiiTZxWI6uYOLhd piWl6uYlO2W3RfHB7gnUfgxR4qlPk4y8H4mpgpQx5d9K5yG4WUbu5L9uMY5vxYdP6uSC 742Rqs4XDBNy64OSkxKgyGhaTygMQMq7H43xVaqyvSXtvc3dhlFYoQ2b1hpxAKlGUnx2 ZdmQ== 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 t88si1310553pfg.349.2017.06.07.02.40.15; Wed, 07 Jun 2017 02:40:15 -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 S1751797AbdFGJj6 (ORCPT + 25 others); Wed, 7 Jun 2017 05:39:58 -0400 Received: from lelnx194.ext.ti.com ([198.47.27.80]:30465 "EHLO lelnx194.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751026AbdFGJiq (ORCPT ); Wed, 7 Jun 2017 05:38:46 -0400 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by lelnx194.ext.ti.com (8.15.1/8.15.1) with ESMTP id v579cHnf027213; Wed, 7 Jun 2017 04:38:17 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ti.com; s=ti-com-17Q1; t=1496828297; bh=UOPgsvCWgbYCfxPt1Ce4cq9BylwZ/FguWbnLkTUyT98=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=f4bUNmtf/RqVLEYha4xYir9Ia/A6Ns7aUTe2mIbPRxtFZEYSrSo5Wmnzb83AtQFVU t0eFwy4kNStPXOuKEJq07AOGZzlGa4axT+UwDaYZvjS+CQe10R1+Giua1sOFCNhp9P 2zWqEWJ6tbBoCy0OxxHCimOu1mMCkktmX9T3DMHo= 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 v579cHRj020018; Wed, 7 Jun 2017 04:38:17 -0500 Received: from dflp32.itg.ti.com (10.64.6.15) by DFLE72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.3.294.0; Wed, 7 Jun 2017 04:38:16 -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 v579btKU001799; Wed, 7 Jun 2017 04:38:13 -0500 From: Kishon Vijay Abraham I To: Tony Lindgren , Rob Herring , CC: Ulf Hansson , Russell King , , , , , , , Ravikumar Kattekola Subject: [PATCH v2 5/8] ARM: dts: dra7-evm: Correct the vmmc-supply for mmc2 Date: Wed, 7 Jun 2017 15:07:46 +0530 Message-ID: <20170607093749.15656-6-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 From: Ravikumar Kattekola On DRA75x EVM, MMC2 vdd/ios are connected to a common supply fixed at 1.8V not 3.3V Fixes: 6cf02dbb4b71 ("ARM: dts: dra7-evm: Add mmc2 node for eMMC support") Signed-off-by: Ravikumar Kattekola Signed-off-by: Sekhar Nori Signed-off-by: Kishon Vijay Abraham I --- arch/arm/boot/dts/dra7-evm.dts | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) -- 2.11.0 diff --git a/arch/arm/boot/dts/dra7-evm.dts b/arch/arm/boot/dts/dra7-evm.dts index 31a9e061ddd0..e5d7e7f5f645 100644 --- a/arch/arm/boot/dts/dra7-evm.dts +++ b/arch/arm/boot/dts/dra7-evm.dts @@ -25,6 +25,14 @@ stdout-path = &uart1; }; + evm_1v8_sw: fixedregulator-evm_1v8 { + compatible = "regulator-fixed"; + regulator-name = "evm_1v8"; + vin-supply = <&smps9_reg>; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + evm_3v3_sd: fixedregulator-sd { compatible = "regulator-fixed"; regulator-name = "evm_3v3_sd"; @@ -451,7 +459,7 @@ status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&mmc2_pins_default>; - vmmc-supply = <&evm_3v3_sw>; + vmmc-supply = <&evm_1v8_sw>; bus-width = <8>; }; From patchwork Wed Jun 7 09:37:47 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: 103227 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp1841917qgd; Wed, 7 Jun 2017 02:39:08 -0700 (PDT) X-Received: by 10.99.116.74 with SMTP id e10mr31458349pgn.149.1496828348800; Wed, 07 Jun 2017 02:39:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496828348; cv=none; d=google.com; s=arc-20160816; b=GzRF6qILTbshxo2vK48Gx0Mf7kmrTpDuRPreVFhruk2tnMWfYT4B1cRjpF9tIFLmIq s9iec6LKUkleFlCvGJQwWlFHqgjenADaJ3+hDInqxdVIl6lTG9l7l2z9DSF6PNvS2EbV Q2o51ic8veXbXOkf43OpVBZ+gKV82M3KlZ/TQ08BoK7kjqiDxxXGgRx///EdnRhPyhXX x1teP/P4n4RI5piokbU4l5cq86CvZIRkz0CuRoi8IvggtUKLwUgCqRCYu/9LVZ66j6K9 NEF48kUQLG6V+2un6x6ErXIjHSKfdvW8WS9KjK6kZbwc8MifBc7BOJjpg25KA+WH9vNP MdXA== 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=riTjMtpMxT9SzoLA7+ajOZdLrweJDcfZaNMNCSH0QrM=; b=lYtRJi0jMnUxEPZ9tidf511OD0ApCh/E8cdD+1zdAFnMBDtAUOgkHDtF6OpYQv7XUl jm+V2qxDc4degkGWMpIAZjoSRjqmciCqeOjOguRQOKbYWjx1IF04GX4LjZD9mfyC1G0Z pu0T4XJbUf1WNR2UQCTnEHrH0g7mtLiYZyyfegQBSNG0TaipViA24K5Zs+CZ5NOHHs35 6mSPETbS0V4SPVQyTaHEtzFHdwqb3bGeU6nN+yr3Wv7pJrMUIpSvGpY+c48Ecg72iDv8 8is3YK5lT/uB03I1LmOh9m5g2eX888FTCIaUpUzgHBPYPDo/6vuEsaoThJyud6Bc4QRl TT3Q== 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 91si1325022plb.204.2017.06.07.02.39.08; Wed, 07 Jun 2017 02:39:08 -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 S1751634AbdFGJix (ORCPT + 25 others); Wed, 7 Jun 2017 05:38:53 -0400 Received: from lelnx194.ext.ti.com ([198.47.27.80]:30469 "EHLO lelnx194.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751600AbdFGJiv (ORCPT ); Wed, 7 Jun 2017 05:38:51 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by lelnx194.ext.ti.com (8.15.1/8.15.1) with ESMTP id v579cLno027221; Wed, 7 Jun 2017 04:38:21 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ti.com; s=ti-com-17Q1; t=1496828301; bh=jXzTQwcHU+0ZZJjKaJHu4s0J5DLsTW2qArLNBKyGKAI=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=nc+kEGsTQzt7Umlp37NP1y+8pr3kMYTgKTcq7V50QgZkeLP+kpFfvn3ILw1EVrhlk MfDRO1TzPqwIueXfkSRVW5W5YV7GbV7WwBjxl/U8M3M1KsMb070a0ArcQb7ziEbyev JaXLNFKoKTDJskN8dJxc9d1ylMS4yxYGtK6vbijE= Received: from DLEE71.ent.ti.com (dlee71.ent.ti.com [157.170.170.114]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id v579cLHK004392; Wed, 7 Jun 2017 04:38:21 -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.3.294.0; Wed, 7 Jun 2017 04:38:19 -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 v579btKV001799; Wed, 7 Jun 2017 04:38:17 -0500 From: Kishon Vijay Abraham I To: Tony Lindgren , Rob Herring , CC: Ulf Hansson , Russell King , , , , , , Subject: [PATCH v2 6/8] ARM: dts: dra7: Add "max-frequency" property to MMC dt nodes Date: Wed, 7 Jun 2017 15:07:47 +0530 Message-ID: <20170607093749.15656-7-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 Add "max-frequency" property to MMC dt nodes and set the maximum frequency to 192MHz for MMC1/MMC2, 64MHz for MMC3 and 192MHz for MMC4. pdata quirks must be utilized to detect presence of rev 1.1/1.0 of silicon and adjust maximum frequencies as per restrictions documented in i843. Signed-off-by: Kishon Vijay Abraham I Signed-off-by: Sekhar Nori --- arch/arm/boot/dts/dra7.dtsi | 5 +++++ 1 file changed, 5 insertions(+) -- 2.11.0 diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi index e7144662af45..c09a91e77f53 100644 --- a/arch/arm/boot/dts/dra7.dtsi +++ b/arch/arm/boot/dts/dra7.dtsi @@ -1037,6 +1037,7 @@ dma-names = "tx", "rx"; status = "disabled"; pbias-supply = <&pbias_mmc_reg>; + max-frequency = <192000000>; }; mmc2: mmc@480b4000 { @@ -1048,6 +1049,7 @@ dmas = <&sdma_xbar 47>, <&sdma_xbar 48>; dma-names = "tx", "rx"; status = "disabled"; + max-frequency = <192000000>; }; mmc3: mmc@480ad000 { @@ -1059,6 +1061,8 @@ dmas = <&sdma_xbar 77>, <&sdma_xbar 78>; dma-names = "tx", "rx"; status = "disabled"; + /* Errata i887 limits max-frequency of MMC3 to 64 MHz */ + max-frequency = <64000000>; }; mmc4: mmc@480d1000 { @@ -1070,6 +1074,7 @@ dmas = <&sdma_xbar 57>, <&sdma_xbar 58>; dma-names = "tx", "rx"; status = "disabled"; + max-frequency = <192000000>; }; mmu0_dsp1: mmu@40d01000 { From patchwork Wed Jun 7 09:37:48 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: 103228 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp1841921qgd; Wed, 7 Jun 2017 02:39:09 -0700 (PDT) X-Received: by 10.84.232.199 with SMTP id x7mr27442399plm.193.1496828349607; Wed, 07 Jun 2017 02:39:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496828349; cv=none; d=google.com; s=arc-20160816; b=C6gd6oPzoBijY78OOBSEXH2Fg4CGz3wjErcno+q3xs3M1vNy408qxFzV2QcOflh1f6 uuLat70s05eG0Pj0xOtuETugUfYb2VDx+Vld79K4Z/CQqIfFHrIkiQ6rsFWZr9IeJIHF 5UOorHAZekaxgPXyMcUOq6XIGIk0o1DNfKZmqsy/LdfT4DNXomnRY15jfx2tNqWabIzh HPfUCChIjR0Rj4fgC+ARCNr7/tM0YJdzLedF2i7yAn0WNHkYclScO+A4in3Cu3RFbGmU Ki6tUdxGIcdrgQgahKZfHgx9Bq6OlY8edt6Jd3PO45WhzfGuWoXF9mGlIyF7FxmfBysA NDbw== 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=yx/sYnVgjXUGN6sMtmyICJHL9HRs+gNzVvIHy4IXKdQ=; b=Mqd5q1pnzr9aSi3uWzE3I6nw13sEb0SxdHOWO/9uIWJpJ1VpWwCGELKck7T10lwpn8 8g3W4LQOz04ipgEfjlt/Q9cE5R2UbFJxvYYDPpQd0UA9clHURDoZQr3C078VE5MIK+f1 AQ40Fi+sOtuXsrg6Nbjo4ujF5KZQneKQ2Rc2wtkPMIykAcI6aO+67InP5j+EMVTEmAAc 8GmxseaTdTOa8V6besSCpFC+7kUu5WeLYbKAvkBK6A1YJ9lvFMy7LEjey2UiNnSHA3fI 4jInGrMsRvtTPwTTJi1JLwe+e5nZOD4b9aSgL1kPj5pwIN42uuUcbSFTBca83EzdQKoc oiEw== 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 91si1325022plb.204.2017.06.07.02.39.09; Wed, 07 Jun 2017 02:39:09 -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 S1751683AbdFGJi6 (ORCPT + 25 others); Wed, 7 Jun 2017 05:38:58 -0400 Received: from lelnx193.ext.ti.com ([198.47.27.77]:37619 "EHLO lelnx193.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751639AbdFGJiz (ORCPT ); Wed, 7 Jun 2017 05:38:55 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by lelnx193.ext.ti.com (8.15.1/8.15.1) with ESMTP id v579cOf3003120; Wed, 7 Jun 2017 04:38:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ti.com; s=ti-com-17Q1; t=1496828304; bh=bDbAvNtistbxeV9Q8LsJVh882nh/y3HjLyhyltfogPo=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=fWUM81QlE7/T1BscyldelfhKEjtaFlMHwTPrrrgM3PCB7m+MAQCJL7ahrsCDE+pDK tI3za/SqNCT6obaljfh6gAEKOBbjASRgPiCpqErntfwHUFr4KySKM2fK43NMgwZRxR Mfy/JmEe4RkJn85TSYJtSqEErb0kXUGeuWlMMNL0= Received: from DFLE73.ent.ti.com (dfle73.ent.ti.com [128.247.5.110]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id v579cOHb004467; Wed, 7 Jun 2017 04:38:24 -0500 Received: from dflp32.itg.ti.com (10.64.6.15) by DFLE73.ent.ti.com (128.247.5.110) with Microsoft SMTP Server id 14.3.294.0; Wed, 7 Jun 2017 04:38:23 -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 v579btKW001799; Wed, 7 Jun 2017 04:38:21 -0500 From: Kishon Vijay Abraham I To: Tony Lindgren , Rob Herring , CC: Ulf Hansson , Russell King , , , , , , Subject: [PATCH v2 7/8] ARM: OMAP2+: Add pdata-quirks for MMC/SD on DRA74x EVM Date: Wed, 7 Jun 2017 15:07:48 +0530 Message-ID: <20170607093749.15656-8-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 From: Sekhar Nori DRA74x EVM Rev H EVM comes with revision 2.0 silicon. However, earlier versions of EVM can come with either revision 1.1 or revision 1.0 of silicon. The device-tree file is written to support rev 2.0 of silicon. pdata quirks are used to then override the settings needed for PG 1.1 silicon. PG 1.1 silicon has limitations w.r.t frequencies at which MMC1/2/3 can operate as well as different IOdelay numbers. Signed-off-by: Kishon Vijay Abraham I Signed-off-by: Sekhar Nori --- arch/arm/mach-omap2/pdata-quirks.c | 31 +++++++++++++++++++++++++++++++ include/linux/platform_data/hsmmc-omap.h | 3 +++ 2 files changed, 34 insertions(+) -- 2.11.0 diff --git a/arch/arm/mach-omap2/pdata-quirks.c b/arch/arm/mach-omap2/pdata-quirks.c index 9700a8ef0f16..6b433fce65a5 100644 --- a/arch/arm/mach-omap2/pdata-quirks.c +++ b/arch/arm/mach-omap2/pdata-quirks.c @@ -434,6 +434,26 @@ static void __init omap5_uevm_legacy_init(void) } #endif +#ifdef CONFIG_SOC_DRA7XX +static struct omap_hsmmc_platform_data dra7_hsmmc_data_mmc1; +static struct omap_hsmmc_platform_data dra7_hsmmc_data_mmc2; +static struct omap_hsmmc_platform_data dra7_hsmmc_data_mmc3; + +static void __init dra7x_evm_mmc_quirk(void) +{ + if (omap_rev() == DRA752_REV_ES1_1 || omap_rev() == DRA752_REV_ES1_0) { + dra7_hsmmc_data_mmc1.version = "rev11"; + dra7_hsmmc_data_mmc1.max_freq = 96000000; + + dra7_hsmmc_data_mmc2.version = "rev11"; + dra7_hsmmc_data_mmc2.max_freq = 48000000; + + dra7_hsmmc_data_mmc3.version = "rev11"; + dra7_hsmmc_data_mmc3.max_freq = 48000000; + } +} +#endif + static struct pcs_pdata pcs_pdata; void omap_pcs_legacy_init(int irq, void (*rearm)(void)) @@ -561,6 +581,14 @@ static struct of_dev_auxdata omap_auxdata_lookup[] __initdata = { OF_DEV_AUXDATA("ti,omap4-iommu", 0x55082000, "55082000.mmu", &omap4_iommu_pdata), #endif +#ifdef CONFIG_SOC_DRA7XX + OF_DEV_AUXDATA("ti,dra7-hsmmc", 0x4809c000, "4809c000.mmc", + &dra7_hsmmc_data_mmc1), + OF_DEV_AUXDATA("ti,dra7-hsmmc", 0x480b4000, "480b4000.mmc", + &dra7_hsmmc_data_mmc2), + OF_DEV_AUXDATA("ti,dra7-hsmmc", 0x480ad000, "480ad000.mmc", + &dra7_hsmmc_data_mmc3), +#endif /* Common auxdata */ OF_DEV_AUXDATA("pinctrl-single", 0, NULL, &pcs_pdata), { /* sentinel */ }, @@ -590,6 +618,9 @@ static struct pdata_init pdata_quirks[] __initdata = { #ifdef CONFIG_SOC_OMAP5 { "ti,omap5-uevm", omap5_uevm_legacy_init, }, #endif +#ifdef CONFIG_SOC_DRA7XX + { "ti,dra7-evm", dra7x_evm_mmc_quirk, }, +#endif { /* sentinel */ }, }; diff --git a/include/linux/platform_data/hsmmc-omap.h b/include/linux/platform_data/hsmmc-omap.h index 8e981be2e2c2..67bded22eae4 100644 --- a/include/linux/platform_data/hsmmc-omap.h +++ b/include/linux/platform_data/hsmmc-omap.h @@ -70,6 +70,9 @@ struct omap_hsmmc_platform_data { #define HSMMC_HAS_HSPE_SUPPORT (1 << 2) unsigned features; + /* string specifying a particular variant of hardware */ + char *version; + int gpio_cd; /* gpio (card detect) */ int gpio_cod; /* gpio (cover detect) */ int gpio_wp; /* gpio (write protect) */ From patchwork Wed Jun 7 09:37:49 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: 103229 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp1842014qgd; Wed, 7 Jun 2017 02:39:26 -0700 (PDT) X-Received: by 10.84.135.129 with SMTP id 1mr26329979plj.57.1496828366709; Wed, 07 Jun 2017 02:39:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496828366; cv=none; d=google.com; s=arc-20160816; b=MgWvc/AYegU4i32w442A7qvWiIPv+D73sMwEXQDazikah2SXD/hwJhQ2XTpSXUQ1ew bHMyrwZKXztqVPoy632UDFJhS+2ehN4yLSIP8sxTxCSdGZDrCjIc7suNyAqbf59j6zgw yYVHrSKonbw5z50sdI7TpRsbiKuLya0H3aW4+NGjfMrvHFhVyWMC3NZXBFFXIhxlVLBO k9EyUioEtACDz65zItkEYI4rsqeSWt9NC1dIlFML9Z5QmBTaKB3HZ3aGC5Moaxau/W9Z kohfRpgB2QNaYA5Tq8t39IBNNOE16Pwx0e7ska+EzSDVRWj4Mh31HA5iJ5nm3EwuClUV 9TbQ== 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=q427RpKEuoq2T4v5MGVXhlFH+wU7H2QHZs1AV6uzlwo=; b=t3Ol7nmLiv7HfERnGUT0x+u7LcQybuw6aHWOa8coUgpT80gQP/VQi6oq+yO2OLxemo DooDYf0kx1XzBzfEPWtc1PAAdVrnlhYW0aMlian0PgCXB67r8WLwuQC+743c/2tQMdrt +NeNtmgcFlFKWYUJL8KzixcBYfF+yBeRo+IMIm6XoiMTPYKa6IPQBUa99KcXReaAFKe2 nP+g4T7CXdCyUB2e2Ze4Gm56J7hNhSbsB1qESg1B0mXrGCFcomaSgOplljIq0MIGneLT MFJM/MuavbdNzkN/e8Z1RJI4Cq4NxOS7TZ0ZAeVqYP7BcHkuNgHA9+y/wdoVsW/4TZGW ECrA== 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 w1si1322030pfj.378.2017.06.07.02.39.26; Wed, 07 Jun 2017 02:39:26 -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 S1751712AbdFGJjG (ORCPT + 25 others); Wed, 7 Jun 2017 05:39:06 -0400 Received: from lelnx193.ext.ti.com ([198.47.27.77]:37620 "EHLO lelnx193.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751686AbdFGJjB (ORCPT ); Wed, 7 Jun 2017 05:39:01 -0400 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by lelnx193.ext.ti.com (8.15.1/8.15.1) with ESMTP id v579cSfv003129; Wed, 7 Jun 2017 04:38:28 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ti.com; s=ti-com-17Q1; t=1496828308; bh=+94ULXZN6BcbvdzWN5blrT/NhdFUyiYawrScPjrKsbo=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=IqODFsxUu/HyffJC0GVqSM0iOhLH/6qX4C8qgqqXYuBwf2UCer7BzzgB3gInFrMYF hhYhQmMp+INu25QTkjBfXZvlEtjZX+zWj/Kfcu5C6Dmtp4v3BQp3KBpjyskivZaum1 JlcLZVYAV9ti8vMbnTM1izUJBewR576O0t9K8rRk= 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 v579cReD020357; Wed, 7 Jun 2017 04:38:27 -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.3.294.0; Wed, 7 Jun 2017 04:38:26 -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 v579btKX001799; Wed, 7 Jun 2017 04:38:24 -0500 From: Kishon Vijay Abraham I To: Tony Lindgren , Rob Herring , CC: Ulf Hansson , Russell King , , , , , , Subject: [PATCH v2 8/8] ARM: dts: omap*: Replace deprecated "vmmc_aux" with "vqmmc" Date: Wed, 7 Jun 2017 15:07:49 +0530 Message-ID: <20170607093749.15656-9-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 Replace deprecated "vmmc_aux" with the generic "vqmmc" binding for MMC IO supply. Signed-off-by: Kishon Vijay Abraham I --- arch/arm/boot/dts/am572x-idk.dts | 2 +- arch/arm/boot/dts/dra7-evm.dts | 2 +- arch/arm/boot/dts/dra71-evm.dts | 2 +- arch/arm/boot/dts/dra72-evm-tps65917.dtsi | 2 +- arch/arm/boot/dts/omap3-beagle-xm.dts | 2 +- arch/arm/boot/dts/omap3-beagle.dts | 2 +- arch/arm/boot/dts/omap3-cm-t3517.dts | 2 +- arch/arm/boot/dts/omap3-cm-t3730.dts | 2 +- arch/arm/boot/dts/omap3-devkit8000-common.dtsi | 2 +- arch/arm/boot/dts/omap3-evm-common.dtsi | 2 +- arch/arm/boot/dts/omap3-n900.dts | 2 +- arch/arm/boot/dts/omap3-overo-base.dtsi | 3 +-- arch/arm/boot/dts/omap3-tao3530.dtsi | 2 +- arch/arm/boot/dts/omap3-zoom3.dts | 2 +- arch/arm/boot/dts/omap3430-sdp.dts | 2 +- 15 files changed, 15 insertions(+), 16 deletions(-) -- 2.11.0 diff --git a/arch/arm/boot/dts/am572x-idk.dts b/arch/arm/boot/dts/am572x-idk.dts index 8350b4b34b08..8d538f5d9a5f 100644 --- a/arch/arm/boot/dts/am572x-idk.dts +++ b/arch/arm/boot/dts/am572x-idk.dts @@ -79,7 +79,7 @@ &mmc1 { status = "okay"; vmmc-supply = <&v3_3d>; - vmmc_aux-supply = <&ldo1_reg>; + vqmmc-supply = <&ldo1_reg>; bus-width = <4>; cd-gpios = <&gpio6 27 0>; /* gpio 219 */ }; diff --git a/arch/arm/boot/dts/dra7-evm.dts b/arch/arm/boot/dts/dra7-evm.dts index e5d7e7f5f645..e4c4037e6314 100644 --- a/arch/arm/boot/dts/dra7-evm.dts +++ b/arch/arm/boot/dts/dra7-evm.dts @@ -446,7 +446,7 @@ pinctrl-names = "default"; pinctrl-0 = <&mmc1_pins_default>; vmmc-supply = <&evm_3v3_sd>; - vmmc_aux-supply = <&ldo1_reg>; + vqmmc-supply = <&ldo1_reg>; bus-width = <4>; /* * SDCD signal is not being used here - using the fact that GPIO mode diff --git a/arch/arm/boot/dts/dra71-evm.dts b/arch/arm/boot/dts/dra71-evm.dts index c7a56b6263a6..02c11e658810 100644 --- a/arch/arm/boot/dts/dra71-evm.dts +++ b/arch/arm/boot/dts/dra71-evm.dts @@ -172,7 +172,7 @@ }; &mmc1 { - vmmc_aux-supply = <&vpo_sd_1v8_3v3>; + vqmmc-supply = <&vpo_sd_1v8_3v3>; }; &mmc2 { diff --git a/arch/arm/boot/dts/dra72-evm-tps65917.dtsi b/arch/arm/boot/dts/dra72-evm-tps65917.dtsi index e6df676886c0..57bfe5caf5e4 100644 --- a/arch/arm/boot/dts/dra72-evm-tps65917.dtsi +++ b/arch/arm/boot/dts/dra72-evm-tps65917.dtsi @@ -146,5 +146,5 @@ }; &mmc1 { - vmmc_aux-supply = <&ldo1_reg>; + vqmmc-supply = <&ldo1_reg>; }; diff --git a/arch/arm/boot/dts/omap3-beagle-xm.dts b/arch/arm/boot/dts/omap3-beagle-xm.dts index 673cee2234b2..683b96a8f73e 100644 --- a/arch/arm/boot/dts/omap3-beagle-xm.dts +++ b/arch/arm/boot/dts/omap3-beagle-xm.dts @@ -299,7 +299,7 @@ &mmc1 { vmmc-supply = <&vmmc1>; - vmmc_aux-supply = <&vsim>; + vqmmc-supply = <&vsim>; bus-width = <8>; }; diff --git a/arch/arm/boot/dts/omap3-beagle.dts b/arch/arm/boot/dts/omap3-beagle.dts index 4be85ce59dd1..4d2eaf843fa9 100644 --- a/arch/arm/boot/dts/omap3-beagle.dts +++ b/arch/arm/boot/dts/omap3-beagle.dts @@ -283,7 +283,7 @@ &mmc1 { vmmc-supply = <&vmmc1>; - vmmc_aux-supply = <&vsim>; + vqmmc-supply = <&vsim>; bus-width = <8>; }; diff --git a/arch/arm/boot/dts/omap3-cm-t3517.dts b/arch/arm/boot/dts/omap3-cm-t3517.dts index 53ae04f9104d..3d293b345e99 100644 --- a/arch/arm/boot/dts/omap3-cm-t3517.dts +++ b/arch/arm/boot/dts/omap3-cm-t3517.dts @@ -129,7 +129,7 @@ pinctrl-names = "default"; pinctrl-0 = <&mmc2_pins>; vmmc-supply = <&wl12xx_vmmc2>; - vmmc_aux-supply = <&wl12xx_vaux2>; + vqmmc-supply = <&wl12xx_vaux2>; non-removable; bus-width = <4>; cap-power-off-card; diff --git a/arch/arm/boot/dts/omap3-cm-t3730.dts b/arch/arm/boot/dts/omap3-cm-t3730.dts index 2294f5b0aa10..bdf4b7fdda39 100644 --- a/arch/arm/boot/dts/omap3-cm-t3730.dts +++ b/arch/arm/boot/dts/omap3-cm-t3730.dts @@ -69,7 +69,7 @@ pinctrl-names = "default"; pinctrl-0 = <&mmc2_pins>; vmmc-supply = <&wl12xx_vmmc2>; - vmmc_aux-supply = <&wl12xx_vaux2>; + vqmmc-supply = <&wl12xx_vaux2>; non-removable; bus-width = <4>; cap-power-off-card; diff --git a/arch/arm/boot/dts/omap3-devkit8000-common.dtsi b/arch/arm/boot/dts/omap3-devkit8000-common.dtsi index f330c69cc683..4036cef4f9fc 100644 --- a/arch/arm/boot/dts/omap3-devkit8000-common.dtsi +++ b/arch/arm/boot/dts/omap3-devkit8000-common.dtsi @@ -149,7 +149,7 @@ &mmc1 { vmmc-supply = <&vmmc1>; - vmmc_aux-supply = <&vsim>; + vqmmc-supply = <&vsim>; bus-width = <8>; }; diff --git a/arch/arm/boot/dts/omap3-evm-common.dtsi b/arch/arm/boot/dts/omap3-evm-common.dtsi index 090475083c2f..b831f2ed1abc 100644 --- a/arch/arm/boot/dts/omap3-evm-common.dtsi +++ b/arch/arm/boot/dts/omap3-evm-common.dtsi @@ -98,7 +98,7 @@ &mmc1 { interrupts-extended = <&intc 83 &omap3_pmx_core 0x11a>; vmmc-supply = <&vmmc1>; - vmmc_aux-supply = <&vsim>; + vqmmc-supply = <&vsim>; bus-width = <8>; }; diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts index 49f37084e435..92c1f4ac4040 100644 --- a/arch/arm/boot/dts/omap3-n900.dts +++ b/arch/arm/boot/dts/omap3-n900.dts @@ -741,7 +741,7 @@ pinctrl-names = "default"; pinctrl-0 = <&mmc2_pins>; vmmc-supply = <&vaux3>; - vmmc_aux-supply = <&vsim>; + vqmmc-supply = <&vsim>; bus-width = <8>; non-removable; no-sdio; diff --git a/arch/arm/boot/dts/omap3-overo-base.dtsi b/arch/arm/boot/dts/omap3-overo-base.dtsi index 401fae838fe9..c11c86f9e09d 100644 --- a/arch/arm/boot/dts/omap3-overo-base.dtsi +++ b/arch/arm/boot/dts/omap3-overo-base.dtsi @@ -191,8 +191,7 @@ pinctrl-names = "default"; pinctrl-0 = <&mmc2_pins>; vmmc-supply = <&w3cbw003c_npoweron>; - vqmmc-supply = <&w3cbw003c_bt_nreset>; - vmmc_aux-supply = <&w3cbw003c_wifi_nreset>; + vqmmc-supply = <&w3cbw003c_wifi_nreset>; bus-width = <4>; cap-sdio-irq; non-removable; diff --git a/arch/arm/boot/dts/omap3-tao3530.dtsi b/arch/arm/boot/dts/omap3-tao3530.dtsi index dc80886b5329..ac6ff9b4db94 100644 --- a/arch/arm/boot/dts/omap3-tao3530.dtsi +++ b/arch/arm/boot/dts/omap3-tao3530.dtsi @@ -224,7 +224,7 @@ pinctrl-names = "default"; pinctrl-0 = <&mmc1_pins>; vmmc-supply = <&vmmc1>; - vmmc_aux-supply = <&vsim>; + vqmmc-supply = <&vsim>; cd-gpios = <&twl_gpio 0 GPIO_ACTIVE_HIGH>; bus-width = <8>; }; diff --git a/arch/arm/boot/dts/omap3-zoom3.dts b/arch/arm/boot/dts/omap3-zoom3.dts index 45e2ce0803de..96d0301a336a 100644 --- a/arch/arm/boot/dts/omap3-zoom3.dts +++ b/arch/arm/boot/dts/omap3-zoom3.dts @@ -174,7 +174,7 @@ &mmc1 { vmmc-supply = <&vmmc1>; - vmmc_aux-supply = <&vsim>; + vqmmc-supply = <&vsim>; bus-width = <4>; pinctrl-names = "default"; pinctrl-0 = <&mmc1_pins>; diff --git a/arch/arm/boot/dts/omap3430-sdp.dts b/arch/arm/boot/dts/omap3430-sdp.dts index abd6921143be..908951eb5943 100644 --- a/arch/arm/boot/dts/omap3430-sdp.dts +++ b/arch/arm/boot/dts/omap3430-sdp.dts @@ -33,7 +33,7 @@ &mmc1 { vmmc-supply = <&vmmc1>; - vmmc_aux-supply = <&vsim>; + vqmmc-supply = <&vsim>; /* * S6-3 must be in ON position for 8 bit mode to function * Else, use 4 bit mode