Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/2194728/?format=api
{ "id": 2194728, "url": "http://patchwork.ozlabs.org/api/patches/2194728/?format=api", "web_url": "http://patchwork.ozlabs.org/project/uboot/patch/20260209183219.34250-6-clamor95@gmail.com/", "project": { "id": 18, "url": "http://patchwork.ozlabs.org/api/projects/18/?format=api", "name": "U-Boot", "link_name": "uboot", "list_id": "u-boot.lists.denx.de", "list_email": "u-boot@lists.denx.de", "web_url": null, "scm_url": null, "webscm_url": null, "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20260209183219.34250-6-clamor95@gmail.com>", "list_archive_url": null, "date": "2026-02-09T18:32:18", "name": "[v1,5/6] ARM: tegra: rename sdhci nodes to mmc", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "eff198b799bc177e36f343fbe090bf25db5719b3", "submitter": { "id": 84146, "url": "http://patchwork.ozlabs.org/api/people/84146/?format=api", "name": "Svyatoslav Ryhel", "email": "clamor95@gmail.com" }, "delegate": { "id": 4092, "url": "http://patchwork.ozlabs.org/api/users/4092/?format=api", "username": "tagr", "first_name": "Thierry", "last_name": "Reding", "email": "treding@nvidia.com" }, "mbox": "http://patchwork.ozlabs.org/project/uboot/patch/20260209183219.34250-6-clamor95@gmail.com/mbox/", "series": [ { "id": 491549, "url": "http://patchwork.ozlabs.org/api/series/491549/?format=api", "web_url": "http://patchwork.ozlabs.org/project/uboot/list/?series=491549", "date": "2026-02-09T18:32:13", "name": "ARM: tegra: various fixes", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/491549/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2194728/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2194728/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<u-boot-bounces@lists.denx.de>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@legolas.ozlabs.org", "Authentication-Results": [ "legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256\n header.s=20230601 header.b=cp+4BuDl;\n\tdkim-atps=neutral", "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de\n (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de;\n envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org)", "phobos.denx.de;\n dmarc=pass (p=none dis=none) header.from=gmail.com", "phobos.denx.de;\n spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de", "phobos.denx.de;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=gmail.com header.i=@gmail.com header.b=\"cp+4BuDl\";\n\tdkim-atps=neutral", "phobos.denx.de;\n dmarc=pass (p=none dis=none) header.from=gmail.com", "phobos.denx.de;\n spf=pass smtp.mailfrom=clamor95@gmail.com" ], "Received": [ "from phobos.denx.de (phobos.denx.de\n [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4f8tcM57Csz1xtr\n\tfor <incoming@patchwork.ozlabs.org>; Tue, 10 Feb 2026 05:33:23 +1100 (AEDT)", "from h2850616.stratoserver.net (localhost [IPv6:::1])\n\tby phobos.denx.de (Postfix) with ESMTP id 46DA283D0B;\n\tMon, 9 Feb 2026 19:32:37 +0100 (CET)", "by phobos.denx.de (Postfix, from userid 109)\n id AA170805D7; Mon, 9 Feb 2026 19:32:34 +0100 (CET)", "from mail-lj1-x22b.google.com (mail-lj1-x22b.google.com\n [IPv6:2a00:1450:4864:20::22b])\n (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits))\n (No client certificate requested)\n by phobos.denx.de (Postfix) with ESMTPS id BA45280325\n for <u-boot@lists.denx.de>; Mon, 9 Feb 2026 19:32:31 +0100 (CET)", "by mail-lj1-x22b.google.com with SMTP id\n 38308e7fff4ca-38305d006faso40616121fa.3\n for <u-boot@lists.denx.de>; Mon, 09 Feb 2026 10:32:31 -0800 (PST)", "from xeon ([188.163.112.51]) by smtp.gmail.com with ESMTPSA id\n 2adb3069b0e04-59e44d299ffsm2815391e87.55.2026.02.09.10.32.29\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Mon, 09 Feb 2026 10:32:30 -0800 (PST)" ], "X-Spam-Checker-Version": "SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de", "X-Spam-Level": "", "X-Spam-Status": "No, score=-0.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,\n DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_GMAIL_RCVD,\n FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM,RCVD_IN_DNSWL_BLOCKED,\n SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.2", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=gmail.com; s=20230601; t=1770661951; x=1771266751; darn=lists.denx.de;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:from:to:cc:subject:date\n :message-id:reply-to;\n bh=mwNOx3qaUH5Lgm9K74bGju095uYLpEKWi8xYFZqaZSM=;\n b=cp+4BuDlzuyP/MGGPILpHxV9+jH0D1Kd0Y6KyjLL4nI8D8jeRZt9SJc0s8xRXwmBH3\n WtkMSFAeWyh/8BxN40LFI9PZD9NPdGNsntF1BviLf0GGB5hsky7GPzxtrWoHl2dnQO63\n YM5j2XXV8rIx0ncHUqcqb0BPzOqa5lGvunDxhXILcdUxj4f05X31wOlRUG8pfogL7eCu\n s6Gj2qvyEXzxRvfXqqhynPEn4Nf8mTF1RwW3lX1dXMi5lNKqixvx1DAbrI1KchOHUBhk\n Ddl88nCUlm2OOkhWp2Zct1VpHvg3SfF+fSahqKHYcqgBl/KkTWYshcc3VfcOZtKYJJ6Q\n cHKg==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20230601; t=1770661951; x=1771266751;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from\n :to:cc:subject:date:message-id:reply-to;\n bh=mwNOx3qaUH5Lgm9K74bGju095uYLpEKWi8xYFZqaZSM=;\n b=gHx9jlcbDAhqdRQZA7NL2ua8+/PinoG8KT+AR2NyD8jH+UL/eXVCsVhY3PcI1hCZEW\n IDiCCJtmJdhQYgRuMyCBl2e3aF1f2pKH2LMqKjwpCs/qyDQ/DfZMjQQTj6WLczfCP9l4\n qMfHX2TGyaFGmWSsG68NjPswSK8p67+eHB+zenq8s52JjXPLxa2OrqP+zUmG7dpeqfau\n rP2AS4hBJilSu4iyGyropNvcciZDVU/xphLTY6C8BQSbjxn/N6Gl00rL4IcBN4kLBOy9\n hKWpXro7B6d6cOFQdqKdbsvTw/QWpt4vVcIv6VXPdxMVCnMDgZ7662zKHtIJf27tGMKs\n usHA==", "X-Gm-Message-State": "AOJu0YzRf1kyk1dGFE2nHa1aZSzhoNWEilJOJ57p8s6Se/TS1MN1OHM8\n 9s3z7lyskuMhuIZIV1bf6K7HoAL/LsSYSbKN3O6M/R5VCjOr0fwQe0Cf", "X-Gm-Gg": "AZuq6aLEFCrymvXdg8uUMVvt1DZSn2EmVa/HlrlCBdGJ+vETVbXmDby3Dd9Bo07oLqi\n Dar/QIdovXKdZWX9r3882feqfdlflTJhYLFK2cViYdm7q6QJUZJI7Y8ojwrT+o/4OPl+EUSxw0q\n 3lQUehPbun1wAWYAfZc0lP3jmWMwoPLynf3ZVXLSmcb6lTF+SoZ3gluRZwINjNNDRiqRxYYH0Yo\n ttTLyESlNLm9fp7LFgp6uP7VKMIF2E5ktp6nz8gpkumVTi1sdlZuVN1EhgJY/VdE7A4TNi0IHNf\n uFUhWZ8no5qrdvvH9regIKJH4fLa03A7JFdokGkce8n/bNOcuBfIyE0PXXCLDIejDp+9hi/sAFa\n Kj1clhsK6mNRzySi2NBbETNCx0KYofbzW0IwOGHKSrB1na07j1HzPYbKk3twi5M1GB2BNW9TTTi\n Fx", "X-Received": "by 2002:a05:6512:1307:b0:59e:2a7:4055 with SMTP id\n 2adb3069b0e04-59e4515bfdamr3790799e87.32.1770661950592;\n Mon, 09 Feb 2026 10:32:30 -0800 (PST)", "From": "Svyatoslav Ryhel <clamor95@gmail.com>", "To": "Thierry Reding <treding@nvidia.com>,\n Svyatoslav Ryhel <clamor95@gmail.com>, Tom Rini <trini@konsulko.com>,\n\t=?utf-8?q?Jonas_Schw=C3=B6bel?= <jonasschwoebel@yahoo.de>,\n Ion Agorria <ion@agorria.com>, Peter Robinson <pbrobinson@gmail.com>,\n Peter Geis <pgwipeout@gmail.com>", "Cc": "u-boot@lists.denx.de", "Subject": "[PATCH v1 5/6] ARM: tegra: rename sdhci nodes to mmc", "Date": "Mon, 9 Feb 2026 20:32:18 +0200", "Message-ID": "<20260209183219.34250-6-clamor95@gmail.com>", "X-Mailer": "git-send-email 2.51.0", "In-Reply-To": "<20260209183219.34250-1-clamor95@gmail.com>", "References": "<20260209183219.34250-1-clamor95@gmail.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "X-BeenThere": "u-boot@lists.denx.de", "X-Mailman-Version": "2.1.39", "Precedence": "list", "List-Id": "U-Boot discussion <u-boot.lists.denx.de>", "List-Unsubscribe": "<https://lists.denx.de/options/u-boot>,\n <mailto:u-boot-request@lists.denx.de?subject=unsubscribe>", "List-Archive": "<https://lists.denx.de/pipermail/u-boot/>", "List-Post": "<mailto:u-boot@lists.denx.de>", "List-Help": "<mailto:u-boot-request@lists.denx.de?subject=help>", "List-Subscribe": "<https://lists.denx.de/listinfo/u-boot>,\n <mailto:u-boot-request@lists.denx.de?subject=subscribe>", "Errors-To": "u-boot-bounces@lists.denx.de", "Sender": "\"U-Boot\" <u-boot-bounces@lists.denx.de>", "X-Virus-Scanned": "clamav-milter 0.103.8 at phobos.denx.de", "X-Virus-Status": "Clean" }, "content": "Align with existing Linux Tegra device trees to simplify using U-Boot\ndevice trees as a base for future Linux adaptations.\n\nSigned-off-by: Svyatoslav Ryhel <clamor95@gmail.com>\n---\n arch/arm/dts/tegra114-asus-tf701t.dts | 4 ++--\n arch/arm/dts/tegra114-dalmore.dts | 8 ++++----\n .../arm/dts/tegra114-microsoft-surface-2-common.dtsi | 4 ++--\n arch/arm/dts/tegra114-nvidia-tegratab.dts | 4 ++--\n arch/arm/dts/tegra114.dtsi | 8 ++++----\n arch/arm/dts/tegra124-apalis.dts | 12 ++++++------\n arch/arm/dts/tegra124-cei-tk1-som.dts | 8 ++++----\n arch/arm/dts/tegra124-jetson-tk1.dts | 8 ++++----\n arch/arm/dts/tegra124-nyan-big.dts | 6 +++---\n arch/arm/dts/tegra124-nyan.dtsi | 6 +++---\n arch/arm/dts/tegra124-venice2.dts | 8 ++++----\n arch/arm/dts/tegra124-xiaomi-mocha.dts | 4 ++--\n arch/arm/dts/tegra124.dtsi | 8 ++++----\n arch/arm/dts/tegra186-p2771-0000-000.dts | 2 +-\n arch/arm/dts/tegra186-p2771-0000-500.dts | 2 +-\n arch/arm/dts/tegra186-p2771-0000.dtsi | 8 ++++----\n arch/arm/dts/tegra186.dtsi | 4 ++--\n arch/arm/dts/tegra20-acer-a500-picasso.dts | 4 ++--\n arch/arm/dts/tegra20-asus-transformer.dtsi | 4 ++--\n arch/arm/dts/tegra20-colibri.dts | 4 ++--\n arch/arm/dts/tegra20-harmony.dts | 8 ++++----\n arch/arm/dts/tegra20-lg-star.dts | 4 ++--\n arch/arm/dts/tegra20-medcom-wide.dts | 2 +-\n arch/arm/dts/tegra20-motorola-mot.dtsi | 4 ++--\n arch/arm/dts/tegra20-paz00.dts | 8 ++++----\n arch/arm/dts/tegra20-plutux.dts | 2 +-\n arch/arm/dts/tegra20-samsung-bose.dts | 2 +-\n arch/arm/dts/tegra20-samsung-n1-common.dtsi | 4 ++--\n arch/arm/dts/tegra20-samsung-n1.dts | 2 +-\n arch/arm/dts/tegra20-seaboard.dts | 10 +++++-----\n arch/arm/dts/tegra20-tamonten.dtsi | 2 +-\n arch/arm/dts/tegra20-tec.dts | 2 +-\n arch/arm/dts/tegra20-trimslice.dts | 8 ++++----\n arch/arm/dts/tegra20-ventana.dts | 10 +++++-----\n arch/arm/dts/tegra20.dtsi | 8 ++++----\n arch/arm/dts/tegra210-p2371-0000.dts | 8 ++++----\n arch/arm/dts/tegra210-p2371-2180.dts | 8 ++++----\n arch/arm/dts/tegra210-p2571.dts | 8 ++++----\n arch/arm/dts/tegra210-p3450-0000.dts | 8 ++++----\n arch/arm/dts/tegra210.dtsi | 8 ++++----\n arch/arm/dts/tegra30-apalis.dts | 12 ++++++------\n arch/arm/dts/tegra30-asus-grouper-common.dtsi | 2 +-\n arch/arm/dts/tegra30-asus-p1801-t.dts | 4 ++--\n arch/arm/dts/tegra30-asus-tf600t.dts | 4 ++--\n arch/arm/dts/tegra30-asus-transformer.dtsi | 4 ++--\n arch/arm/dts/tegra30-beaver.dts | 8 ++++----\n arch/arm/dts/tegra30-cardhu.dts | 8 ++++----\n arch/arm/dts/tegra30-colibri.dts | 8 ++++----\n arch/arm/dts/tegra30-htc-endeavoru.dts | 2 +-\n arch/arm/dts/tegra30-lenovo-ideapad-yoga-11.dts | 4 ++--\n arch/arm/dts/tegra30-lg-p880.dts | 2 +-\n arch/arm/dts/tegra30-lg-x3.dtsi | 2 +-\n arch/arm/dts/tegra30-microsoft-surface-rt.dts | 4 ++--\n arch/arm/dts/tegra30-ouya.dts | 2 +-\n arch/arm/dts/tegra30-pegatron-chagall.dts | 4 ++--\n arch/arm/dts/tegra30-tamonten.dtsi | 10 +++++-----\n arch/arm/dts/tegra30-tec-ng.dts | 2 +-\n arch/arm/dts/tegra30-wexler-qc750.dts | 4 ++--\n arch/arm/dts/tegra30.dtsi | 8 ++++----\n 59 files changed, 163 insertions(+), 163 deletions(-)", "diff": "diff --git a/arch/arm/dts/tegra114-asus-tf701t.dts b/arch/arm/dts/tegra114-asus-tf701t.dts\nindex 2505b9bb726..bd43a80a208 100644\n--- a/arch/arm/dts/tegra114-asus-tf701t.dts\n+++ b/arch/arm/dts/tegra114-asus-tf701t.dts\n@@ -1151,7 +1151,7 @@\n \t\t};\n \t};\n \n-\tsdmmc3: sdhci@78000400 {\n+\tsdmmc3: mmc@78000400 {\n \t\tstatus = \"okay\";\n \t\tbus-width = <4>;\n \n@@ -1165,7 +1165,7 @@\n \t\tvqmmc-supply = <&vddio_usd>;\n \t};\n \n-\tsdmmc4: sdhci@78000600 {\n+\tsdmmc4: mmc@78000600 {\n \t\tstatus = \"okay\";\n \t\tbus-width = <8>;\n \t\tnon-removable;\ndiff --git a/arch/arm/dts/tegra114-dalmore.dts b/arch/arm/dts/tegra114-dalmore.dts\nindex 18bcb75fafa..48708f37246 100644\n--- a/arch/arm/dts/tegra114-dalmore.dts\n+++ b/arch/arm/dts/tegra114-dalmore.dts\n@@ -16,8 +16,8 @@\n \t\ti2c2 = \"/i2c@7000c400\";\n \t\ti2c3 = \"/i2c@7000c500\";\n \t\ti2c4 = \"/i2c@7000c700\";\n-\t\tmmc0 = \"/sdhci@78000600\";\n-\t\tmmc1 = \"/sdhci@78000400\";\n+\t\tmmc0 = \"/mmc@78000600\";\n+\t\tmmc1 = \"/mmc@78000400\";\n \t\tusb0 = \"/usb@7d000000\";\n \t\tusb1 = \"/usb@7d008000\";\n \t};\n@@ -57,13 +57,13 @@\n \t\tspi-max-frequency = <25000000>;\n \t};\n \n-\tsdhci@78000400 {\n+\tmmc@78000400 {\n \t\tcd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;\n \t\tbus-width = <4>;\n \t\tstatus = \"okay\";\n \t};\n \n-\tsdhci@78000600 {\n+\tmmc@78000600 {\n \t\tbus-width = <8>;\n \t\tstatus = \"okay\";\n \t\tnon-removable;\ndiff --git a/arch/arm/dts/tegra114-microsoft-surface-2-common.dtsi b/arch/arm/dts/tegra114-microsoft-surface-2-common.dtsi\nindex 79369753a17..f735f5060ce 100644\n--- a/arch/arm/dts/tegra114-microsoft-surface-2-common.dtsi\n+++ b/arch/arm/dts/tegra114-microsoft-surface-2-common.dtsi\n@@ -814,7 +814,7 @@\n \t\t};\n \t};\n \n-\tsdmmc3: sdhci@78000400 {\n+\tsdmmc3: mmc@78000400 {\n \t\tstatus = \"okay\";\n \t\tbus-width = <4>;\n \n@@ -827,7 +827,7 @@\n \t\tvqmmc-supply = <&vddio_usd>;\n \t};\n \n-\tsdmmc4: sdhci@78000600 {\n+\tsdmmc4: mmc@78000600 {\n \t\tstatus = \"okay\";\n \t\tbus-width = <8>;\n \t\tnon-removable;\ndiff --git a/arch/arm/dts/tegra114-nvidia-tegratab.dts b/arch/arm/dts/tegra114-nvidia-tegratab.dts\nindex f65772a8e01..6ff2850b911 100644\n--- a/arch/arm/dts/tegra114-nvidia-tegratab.dts\n+++ b/arch/arm/dts/tegra114-nvidia-tegratab.dts\n@@ -953,7 +953,7 @@\n \t\t};\n \t};\n \n-\tsdmmc3: sdhci@78000400 {\n+\tsdmmc3: mmc@78000400 {\n \t\tstatus = \"okay\";\n \t\tbus-width = <4>;\n \n@@ -967,7 +967,7 @@\n \t\tvqmmc-supply = <&vddio_usd>;\n \t};\n \n-\tsdmmc4: sdhci@78000600 {\n+\tsdmmc4: mmc@78000600 {\n \t\tstatus = \"okay\";\n \t\tbus-width = <8>;\n \t\tnon-removable;\ndiff --git a/arch/arm/dts/tegra114.dtsi b/arch/arm/dts/tegra114.dtsi\nindex 250d692f6bf..0a783fbc95d 100644\n--- a/arch/arm/dts/tegra114.dtsi\n+++ b/arch/arm/dts/tegra114.dtsi\n@@ -631,7 +631,7 @@\n \t\t#nvidia,mipi-calibrate-cells = <1>;\n \t};\n \n-\tsdhci@78000000 {\n+\tmmc@78000000 {\n \t\tcompatible = \"nvidia,tegra114-sdhci\", \"nvidia,tegra30-sdhci\";\n \t\treg = <0x78000000 0x200>;\n \t\tinterrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;\n@@ -641,7 +641,7 @@\n \t\tstatus = \"disabled\";\n \t};\n \n-\tsdhci@78000200 {\n+\tmmc@78000200 {\n \t\tcompatible = \"nvidia,tegra114-sdhci\", \"nvidia,tegra30-sdhci\";\n \t\treg = <0x78000200 0x200>;\n \t\tinterrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;\n@@ -651,7 +651,7 @@\n \t\tstatus = \"disabled\";\n \t};\n \n-\tsdhci@78000400 {\n+\tmmc@78000400 {\n \t\tcompatible = \"nvidia,tegra114-sdhci\", \"nvidia,tegra30-sdhci\";\n \t\treg = <0x78000400 0x200>;\n \t\tinterrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;\n@@ -661,7 +661,7 @@\n \t\tstatus = \"disabled\";\n \t};\n \n-\tsdhci@78000600 {\n+\tmmc@78000600 {\n \t\tcompatible = \"nvidia,tegra114-sdhci\", \"nvidia,tegra30-sdhci\";\n \t\treg = <0x78000600 0x200>;\n \t\tinterrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;\ndiff --git a/arch/arm/dts/tegra124-apalis.dts b/arch/arm/dts/tegra124-apalis.dts\nindex 08184ab3ac2..5ac08037a92 100644\n--- a/arch/arm/dts/tegra124-apalis.dts\n+++ b/arch/arm/dts/tegra124-apalis.dts\n@@ -54,9 +54,9 @@\n \t\ti2c1 = \"/i2c@7000c000\";\n \t\ti2c2 = \"/i2c@7000c400\";\n \t\ti2c3 = \"/i2c@7000c500\";\n-\t\tmmc0 = \"/sdhci@700b0600\";\n-\t\tmmc1 = \"/sdhci@700b0000\";\n-\t\tmmc2 = \"/sdhci@700b0400\";\n+\t\tmmc0 = \"/mmc@700b0600\";\n+\t\tmmc1 = \"/mmc@700b0000\";\n+\t\tmmc2 = \"/mmc@700b0400\";\n \t\trtc0 = \"/i2c@7000c000/rtc@68\";\n \t\trtc1 = \"/i2c@7000d000/pmic@40\";\n \t\trtc2 = \"/rtc@7000e000\";\n@@ -1958,7 +1958,7 @@\n \t};\n \n \t/* Apalis MMC1 */\n-\tsdhci@700b0000 {\n+\tmmc@700b0000 {\n \t\tstatus = \"okay\";\n \t\t/* MMC1_CD# */\n \t\tcd-gpios = <&gpio TEGRA_GPIO(V, 3) GPIO_ACTIVE_LOW>;\n@@ -1967,7 +1967,7 @@\n \t};\n \n \t/* Apalis SD1 */\n-\tsdhci@700b0400 {\n+\tmmc@700b0400 {\n \t\tstatus = \"okay\";\n \t\t/* SD1_CD# */\n \t\tcd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;\n@@ -1976,7 +1976,7 @@\n \t};\n \n \t/* eMMC */\n-\tsdhci@700b0600 {\n+\tmmc@700b0600 {\n \t\tstatus = \"okay\";\n \t\tbus-width = <8>;\n \t\tnon-removable;\ndiff --git a/arch/arm/dts/tegra124-cei-tk1-som.dts b/arch/arm/dts/tegra124-cei-tk1-som.dts\nindex e5b41f3183c..59901a3439b 100644\n--- a/arch/arm/dts/tegra124-cei-tk1-som.dts\n+++ b/arch/arm/dts/tegra124-cei-tk1-som.dts\n@@ -16,8 +16,8 @@\n \t\ti2c2 = \"/i2c@7000c400\";\n \t\ti2c3 = \"/i2c@7000c500\";\n \t\ti2c4 = \"/i2c@7000c700\";\n-\t\tmmc0 = \"/sdhci@700b0600\";\n-\t\tmmc1 = \"/sdhci@700b0400\";\n+\t\tmmc0 = \"/mmc@700b0600\";\n+\t\tmmc1 = \"/mmc@700b0400\";\n \t\tspi0 = \"/spi@7000d400\";\n \t\tspi1 = \"/spi@7000da00\";\n \t\tusb0 = \"/usb@7d000000\";\n@@ -297,7 +297,7 @@\n \t\t};\n \t};\n \n-\tsdhci@700b0400 {\n+\tmmc@700b0400 {\n \t\tstatus = \"okay\";\n \t\tcd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;\n \t\tpower-gpios = <&gpio TEGRA_GPIO(R, 0) GPIO_ACTIVE_HIGH>;\n@@ -305,7 +305,7 @@\n \t\tbus-width = <4>;\n \t};\n \n-\tsdhci@700b0600 {\n+\tmmc@700b0600 {\n \t\tstatus = \"okay\";\n \t\tbus-width = <8>;\n \t};\ndiff --git a/arch/arm/dts/tegra124-jetson-tk1.dts b/arch/arm/dts/tegra124-jetson-tk1.dts\nindex 59e080a8af6..7d19a25e278 100644\n--- a/arch/arm/dts/tegra124-jetson-tk1.dts\n+++ b/arch/arm/dts/tegra124-jetson-tk1.dts\n@@ -16,8 +16,8 @@\n \t\ti2c2 = \"/i2c@7000c400\";\n \t\ti2c3 = \"/i2c@7000c500\";\n \t\ti2c4 = \"/i2c@7000c700\";\n-\t\tmmc0 = \"/sdhci@700b0600\";\n-\t\tmmc1 = \"/sdhci@700b0400\";\n+\t\tmmc0 = \"/mmc@700b0600\";\n+\t\tmmc1 = \"/mmc@700b0400\";\n \t\tspi0 = \"/spi@7000d400\";\n \t\tspi1 = \"/spi@7000da00\";\n \t\tusb0 = \"/usb@7d000000\";\n@@ -301,7 +301,7 @@\n \t\t};\n \t};\n \n-\tsdhci@700b0400 {\n+\tmmc@700b0400 {\n \t\tstatus = \"okay\";\n \t\tcd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;\n \t\tpower-gpios = <&gpio TEGRA_GPIO(R, 0) GPIO_ACTIVE_HIGH>;\n@@ -309,7 +309,7 @@\n \t\tbus-width = <4>;\n \t};\n \n-\tsdhci@700b0600 {\n+\tmmc@700b0600 {\n \t\tstatus = \"okay\";\n \t\tbus-width = <8>;\n \t\tnon-removable;\ndiff --git a/arch/arm/dts/tegra124-nyan-big.dts b/arch/arm/dts/tegra124-nyan-big.dts\nindex f1c97052a84..b942d92e900 100644\n--- a/arch/arm/dts/tegra124-nyan-big.dts\n+++ b/arch/arm/dts/tegra124-nyan-big.dts\n@@ -16,8 +16,8 @@\n \t\ti2c5 = \"/i2c@7000d100\";\n \t\trtc0 = \"/i2c@7000d000/pmic@40\";\n \t\trtc1 = \"/rtc@7000e000\";\n-\t\tmmc0 = \"/sdhci@700b0600\";\n-\t\tmmc1 = \"/sdhci@700b0400\";\n+\t\tmmc0 = \"/mmc@700b0600\";\n+\t\tmmc1 = \"/mmc@700b0400\";\n \t\tspi0 = \"/spi@7000d400\";\n \t\tspi1 = \"/spi@7000da00\";\n \t\tusb0 = \"/usb@7d000000\";\n@@ -59,7 +59,7 @@\n \t\tddc-i2c-bus = <&dpaux>;\n \t};\n \n-\tsdhci@700b0400 { /* SD Card on this bus */\n+\tmmc@700b0400 { /* SD Card on this bus */\n \t\twp-gpios = <&gpio TEGRA_GPIO(Q, 4) GPIO_ACTIVE_LOW>;\n \t};\n \ndiff --git a/arch/arm/dts/tegra124-nyan.dtsi b/arch/arm/dts/tegra124-nyan.dtsi\nindex 2b28fe14970..7b465c601af 100644\n--- a/arch/arm/dts/tegra124-nyan.dtsi\n+++ b/arch/arm/dts/tegra124-nyan.dtsi\n@@ -370,7 +370,7 @@\n \t\treset-gpios = <&gpio TEGRA_GPIO(X, 7) GPIO_ACTIVE_LOW>;\n \t};\n \n-\tsdhci@700b0000 { /* WiFi/BT on this bus */\n+\tmmc@700b0000 { /* WiFi/BT on this bus */\n \t\tstatus = \"okay\";\n \t\tpower-gpios = <&gpio TEGRA_GPIO(X, 7) GPIO_ACTIVE_HIGH>;\n \t\tbus-width = <4>;\n@@ -382,7 +382,7 @@\n \t\tkeep-power-in-suspend;\n \t};\n \n-\tsdhci@700b0400 { /* SD Card on this bus */\n+\tmmc@700b0400 { /* SD Card on this bus */\n \t\tstatus = \"okay\";\n \t\tcd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;\n \t\tpower-gpios = <&gpio TEGRA_GPIO(R, 0) GPIO_ACTIVE_HIGH>;\n@@ -392,7 +392,7 @@\n \t\tvqmmc-supply = <&vddio_sdmmc3>;\n \t};\n \n-\tsdhci@700b0600 { /* eMMC on this bus */\n+\tmmc@700b0600 { /* eMMC on this bus */\n \t\tstatus = \"okay\";\n \t\tbus-width = <8>;\n \t\tno-1-8-v;\ndiff --git a/arch/arm/dts/tegra124-venice2.dts b/arch/arm/dts/tegra124-venice2.dts\nindex 7e9c6aa1839..0e855d8bc30 100644\n--- a/arch/arm/dts/tegra124-venice2.dts\n+++ b/arch/arm/dts/tegra124-venice2.dts\n@@ -17,8 +17,8 @@\n \t\ti2c3 = \"/i2c@7000c500\";\n \t\ti2c4 = \"/i2c@7000c700\";\n \t\ti2c5 = \"/i2c@7000d100\";\n-\t\tmmc0 = \"/sdhci@700b0600\";\n-\t\tmmc1 = \"/sdhci@700b0400\";\n+\t\tmmc0 = \"/mmc@700b0600\";\n+\t\tmmc1 = \"/mmc@700b0400\";\n \t\tspi0 = \"/spi@7000d400\";\n \t\tspi1 = \"/spi@7000da00\";\n \t\tusb0 = \"/usb@7d000000\";\n@@ -70,7 +70,7 @@\n \t\tspi-max-frequency = <25000000>;\n \t};\n \n-\tsdhci@700b0400 {\n+\tmmc@700b0400 {\n \t\tstatus = \"okay\";\n \t\tcd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_HIGH>;\n \t\tpower-gpios = <&gpio TEGRA_GPIO(R, 0) GPIO_ACTIVE_HIGH>;\n@@ -78,7 +78,7 @@\n \t\tbus-width = <4>;\n \t};\n \n-\tsdhci@700b0600 {\n+\tmmc@700b0600 {\n \t\tstatus = \"okay\";\n \t\tbus-width = <8>;\n \t\tnon-removable;\ndiff --git a/arch/arm/dts/tegra124-xiaomi-mocha.dts b/arch/arm/dts/tegra124-xiaomi-mocha.dts\nindex 64386f2b7b7..09b5c1eea05 100644\n--- a/arch/arm/dts/tegra124-xiaomi-mocha.dts\n+++ b/arch/arm/dts/tegra124-xiaomi-mocha.dts\n@@ -476,7 +476,7 @@\n \t\t};\n \t};\n \n-\tsdmmc3: sdhci@700b0400 {\n+\tsdmmc3: mmc@700b0400 {\n \t\tstatus = \"okay\";\n \t\tbus-width = <4>;\n \n@@ -487,7 +487,7 @@\n \t\tvqmmc-supply = <&vddio_usd>;\n \t};\n \n-\tsdmmc4: sdhci@700b0600 {\n+\tsdmmc4: mmc@700b0600 {\n \t\tstatus = \"okay\";\n \t\tbus-width = <8>;\n \t\tnon-removable;\ndiff --git a/arch/arm/dts/tegra124.dtsi b/arch/arm/dts/tegra124.dtsi\nindex cac9b112302..1c62d1f6e7b 100644\n--- a/arch/arm/dts/tegra124.dtsi\n+++ b/arch/arm/dts/tegra124.dtsi\n@@ -717,7 +717,7 @@\n \t\t#phy-cells = <1>;\n \t};\n \n-\tsdhci@700b0000 {\n+\tmmc@700b0000 {\n \t\tcompatible = \"nvidia,tegra124-sdhci\";\n \t\treg = <0x700b0000 0x200>;\n \t\tinterrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;\n@@ -727,7 +727,7 @@\n \t\tstatus = \"disabled\";\n \t};\n \n-\tsdhci@700b0200 {\n+\tmmc@700b0200 {\n \t\tcompatible = \"nvidia,tegra124-sdhci\";\n \t\treg = <0x700b0200 0x200>;\n \t\tinterrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;\n@@ -737,7 +737,7 @@\n \t\tstatus = \"disabled\";\n \t};\n \n-\tsdhci@700b0400 {\n+\tmmc@700b0400 {\n \t\tcompatible = \"nvidia,tegra124-sdhci\";\n \t\treg = <0x700b0400 0x200>;\n \t\tinterrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;\n@@ -747,7 +747,7 @@\n \t\tstatus = \"disabled\";\n \t};\n \n-\tsdhci@700b0600 {\n+\tmmc@700b0600 {\n \t\tcompatible = \"nvidia,tegra124-sdhci\";\n \t\treg = <0x700b0600 0x200>;\n \t\tinterrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;\ndiff --git a/arch/arm/dts/tegra186-p2771-0000-000.dts b/arch/arm/dts/tegra186-p2771-0000-000.dts\nindex 84e850d6fca..39076058bfb 100644\n--- a/arch/arm/dts/tegra186-p2771-0000-000.dts\n+++ b/arch/arm/dts/tegra186-p2771-0000-000.dts\n@@ -6,7 +6,7 @@\n \tmodel = \"NVIDIA P2771-0000-000\";\n \tcompatible = \"nvidia,p2771-0000-000\", \"nvidia,p2771-0000\", \"nvidia,tegra186\";\n \n-\tsdhci@3400000 {\n+\tmmc@3400000 {\n \t\tcd-gpios = <&gpio_main TEGRA_MAIN_GPIO(P, 6) GPIO_ACTIVE_LOW>;\n \t\tpower-gpios = <&gpio_main TEGRA_MAIN_GPIO(P, 5) GPIO_ACTIVE_HIGH>;\n \t};\ndiff --git a/arch/arm/dts/tegra186-p2771-0000-500.dts b/arch/arm/dts/tegra186-p2771-0000-500.dts\nindex 1ac8ab431e9..cb36dae80e5 100644\n--- a/arch/arm/dts/tegra186-p2771-0000-500.dts\n+++ b/arch/arm/dts/tegra186-p2771-0000-500.dts\n@@ -6,7 +6,7 @@\n \tmodel = \"NVIDIA P2771-0000-500\";\n \tcompatible = \"nvidia,p2771-0000-500\", \"nvidia,p2771-0000\", \"nvidia,tegra186\";\n \n-\tsdhci@3400000 {\n+\tmmc@3400000 {\n \t\tcd-gpios = <&gpio_main TEGRA_MAIN_GPIO(P, 5) GPIO_ACTIVE_LOW>;\n \t\tpower-gpios = <&gpio_main TEGRA_MAIN_GPIO(P, 6) GPIO_ACTIVE_HIGH>;\n \t};\ndiff --git a/arch/arm/dts/tegra186-p2771-0000.dtsi b/arch/arm/dts/tegra186-p2771-0000.dtsi\nindex 7cda0b41f74..7bbf81fe2bf 100644\n--- a/arch/arm/dts/tegra186-p2771-0000.dtsi\n+++ b/arch/arm/dts/tegra186-p2771-0000.dtsi\n@@ -10,8 +10,8 @@\n \n \taliases {\n \t\tethernet = \"/ethernet@2490000\";\n-\t\tmmc0 = \"/sdhci@3460000\";\n-\t\tmmc1 = \"/sdhci@3400000\";\n+\t\tmmc0 = \"/mmc@3460000\";\n+\t\tmmc1 = \"/mmc@3400000\";\n \t\ti2c0 = \"/bpmp/i2c\";\n \t\ti2c1 = \"/i2c@3160000\";\n \t\ti2c2 = \"/i2c@c240000\";\n@@ -48,13 +48,13 @@\n \t\tstatus = \"okay\";\n \t};\n \n-\tsdhci@3400000 {\n+\tmmc@3400000 {\n \t\tstatus = \"okay\";\n \t\twp-gpios = <&gpio_main TEGRA_MAIN_GPIO(P, 4) GPIO_ACTIVE_HIGH>;\n \t\tbus-width = <4>;\n \t};\n \n-\tsdhci@3460000 {\n+\tmmc@3460000 {\n \t\tstatus = \"okay\";\n \t\tbus-width = <8>;\n \t\tnon-removable;\ndiff --git a/arch/arm/dts/tegra186.dtsi b/arch/arm/dts/tegra186.dtsi\nindex edcb7aacb8e..0cabf608a9e 100644\n--- a/arch/arm/dts/tegra186.dtsi\n+++ b/arch/arm/dts/tegra186.dtsi\n@@ -136,7 +136,7 @@\n \t\tstatus = \"disabled\";\n \t};\n \n-\tsdhci@3400000 {\n+\tmmc@3400000 {\n \t\tcompatible = \"nvidia,tegra186-sdhci\";\n \t\treg = <0x0 0x03400000 0x0 0x200>;\n \t\tresets = <&bpmp TEGRA186_RESET_SDMMC1>;\n@@ -146,7 +146,7 @@\n \t\tstatus = \"disabled\";\n \t};\n \n-\tsdhci@3460000 {\n+\tmmc@3460000 {\n \t\tcompatible = \"nvidia,tegra186-sdhci\";\n \t\treg = <0x0 0x03460000 0x0 0x200>;\n \t\tresets = <&bpmp TEGRA186_RESET_SDMMC4>;\ndiff --git a/arch/arm/dts/tegra20-acer-a500-picasso.dts b/arch/arm/dts/tegra20-acer-a500-picasso.dts\nindex 4afde766330..d8d2d10a48a 100644\n--- a/arch/arm/dts/tegra20-acer-a500-picasso.dts\n+++ b/arch/arm/dts/tegra20-acer-a500-picasso.dts\n@@ -400,7 +400,7 @@\n \t\tnvidia,xcvr-lsrslew = <2>;\n \t};\n \n-\tsdmmc3: sdhci@c8000400 {\n+\tsdmmc3: mmc@c8000400 {\n \t\tstatus = \"okay\";\n \t\tbus-width = <4>;\n \n@@ -412,7 +412,7 @@\n \t\tvqmmc-supply = <&vdd_3v3_sys>;\n \t};\n \n-\tsdmmc4: sdhci@c8000600 {\n+\tsdmmc4: mmc@c8000600 {\n \t\tstatus = \"okay\";\n \t\tbus-width = <8>;\n \t\tnon-removable;\ndiff --git a/arch/arm/dts/tegra20-asus-transformer.dtsi b/arch/arm/dts/tegra20-asus-transformer.dtsi\nindex df078a6fcdc..db6bed3e5d2 100644\n--- a/arch/arm/dts/tegra20-asus-transformer.dtsi\n+++ b/arch/arm/dts/tegra20-asus-transformer.dtsi\n@@ -437,7 +437,7 @@\n \t\tstatus = \"okay\";\n \t};\n \n-\tsdmmc3: sdhci@c8000400 {\n+\tsdmmc3: mmc@c8000400 {\n \t\tstatus = \"okay\";\n \t\tbus-width = <4>;\n \n@@ -449,7 +449,7 @@\n \t\tvqmmc-supply = <&vdd_3v3_sys>;\n \t};\n \n-\tsdmmc4: sdhci@c8000600 {\n+\tsdmmc4: mmc@c8000600 {\n \t\tstatus = \"okay\";\n \t\tbus-width = <8>;\n \t\tnon-removable;\ndiff --git a/arch/arm/dts/tegra20-colibri.dts b/arch/arm/dts/tegra20-colibri.dts\nindex 11023968f41..776491a515e 100644\n--- a/arch/arm/dts/tegra20-colibri.dts\n+++ b/arch/arm/dts/tegra20-colibri.dts\n@@ -14,7 +14,7 @@\n \t\ti2c0 = \"/i2c@7000d000\";\n \t\ti2c1 = \"/i2c@7000c000\";\n \t\ti2c2 = \"/i2c@7000c400\";\n-\t\tmmc0 = \"/sdhci@c8000600\";\n+\t\tmmc0 = \"/mmc@c8000600\";\n \t\tusb0 = \"/usb@c5000000\";\n \t\tusb1 = \"/usb@c5004000\"; /* On-module only, for ASIX */\n \t\tusb2 = \"/usb@c5008000\";\n@@ -106,7 +106,7 @@\n \t\tnvidia,vbus-gpio = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_LOW>;\n \t};\n \n-\tsdhci@c8000600 {\n+\tmmc@c8000600 {\n \t\tstatus = \"okay\";\n \t\tbus-width = <4>;\n \t\tcd-gpios = <&gpio TEGRA_GPIO(C, 7) GPIO_ACTIVE_LOW>;\ndiff --git a/arch/arm/dts/tegra20-harmony.dts b/arch/arm/dts/tegra20-harmony.dts\nindex 7fe7d52096c..60cc7b32bb0 100644\n--- a/arch/arm/dts/tegra20-harmony.dts\n+++ b/arch/arm/dts/tegra20-harmony.dts\n@@ -18,8 +18,8 @@\n \t\tusb0 = \"/usb@c5000000\";\n \t\tusb1 = \"/usb@c5004000\";\n \t\tusb2 = \"/usb@c5008000\";\n-\t\tmmc0 = \"/sdhci@c8000600\";\n-\t\tmmc1 = \"/sdhci@c8000200\";\n+\t\tmmc0 = \"/mmc@c8000600\";\n+\t\tmmc1 = \"/mmc@c8000200\";\n \t};\n \n \tmemory {\n@@ -645,7 +645,7 @@\n \t\tstatus = \"okay\";\n \t};\n \n-\tsdhci@c8000200 {\n+\tmmc@c8000200 {\n \t\tstatus = \"okay\";\n \t\tcd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;\n \t\twp-gpios = <&gpio TEGRA_GPIO(H, 1) GPIO_ACTIVE_HIGH>;\n@@ -653,7 +653,7 @@\n \t\tbus-width = <4>;\n \t};\n \n-\tsdhci@c8000600 {\n+\tmmc@c8000600 {\n \t\tstatus = \"okay\";\n \t\tcd-gpios = <&gpio TEGRA_GPIO(H, 2) GPIO_ACTIVE_LOW>;\n \t\twp-gpios = <&gpio TEGRA_GPIO(H, 3) GPIO_ACTIVE_HIGH>;\ndiff --git a/arch/arm/dts/tegra20-lg-star.dts b/arch/arm/dts/tegra20-lg-star.dts\nindex 8012b57e5bb..912c0b6051b 100644\n--- a/arch/arm/dts/tegra20-lg-star.dts\n+++ b/arch/arm/dts/tegra20-lg-star.dts\n@@ -413,7 +413,7 @@\n \t\tvbus-supply = <&avdd_3v3_usb>;\n \t};\n \n-\tsdmmc3: sdhci@c8000400 {\n+\tsdmmc3: mmc@c8000400 {\n \t\tstatus = \"okay\";\n \t\tbus-width = <4>;\n \n@@ -423,7 +423,7 @@\n \t\tvqmmc-supply = <&vdd_1v8_vio>;\n \t};\n \n-\tsdmmc4: sdhci@c8000600 {\n+\tsdmmc4: mmc@c8000600 {\n \t\tstatus = \"okay\";\n \t\tbus-width = <8>;\n \t\tnon-removable;\ndiff --git a/arch/arm/dts/tegra20-medcom-wide.dts b/arch/arm/dts/tegra20-medcom-wide.dts\nindex 1c79d757467..00e9272541a 100644\n--- a/arch/arm/dts/tegra20-medcom-wide.dts\n+++ b/arch/arm/dts/tegra20-medcom-wide.dts\n@@ -12,7 +12,7 @@\n \n \taliases {\n \t\tusb0 = \"/usb@c5008000\";\n-\t\tmmc0 = \"/sdhci@c8000600\";\n+\t\tmmc0 = \"/mmc@c8000600\";\n \t};\n \n \tmemory {\ndiff --git a/arch/arm/dts/tegra20-motorola-mot.dtsi b/arch/arm/dts/tegra20-motorola-mot.dtsi\nindex 5a9f58ff17f..b3c0e36340d 100644\n--- a/arch/arm/dts/tegra20-motorola-mot.dtsi\n+++ b/arch/arm/dts/tegra20-motorola-mot.dtsi\n@@ -425,7 +425,7 @@\n \t\tvbus-supply = <&avdd_3v3_periph>;\n \t};\n \n-\tsdmmc3: sdhci@c8000400 {\n+\tsdmmc3: mmc@c8000400 {\n \t\tstatus = \"okay\";\n \t\tbus-width = <4>;\n \n@@ -435,7 +435,7 @@\n \t\tvqmmc-supply = <&vddio_usd>;\n \t};\n \n-\tsdmmc4: sdhci@c8000600 {\n+\tsdmmc4: mmc@c8000600 {\n \t\tstatus = \"okay\";\n \t\tbus-width = <8>;\n \t\tnon-removable;\ndiff --git a/arch/arm/dts/tegra20-paz00.dts b/arch/arm/dts/tegra20-paz00.dts\nindex f851767a55f..91799518412 100644\n--- a/arch/arm/dts/tegra20-paz00.dts\n+++ b/arch/arm/dts/tegra20-paz00.dts\n@@ -19,8 +19,8 @@\n \t\tusb0 = \"/usb@c5000000\";\n \t\tusb1 = \"/usb@c5004000\";\n \t\tusb2 = \"/usb@c5008000\";\n-\t\tmmc0 = \"/sdhci@c8000600\";\n-\t\tmmc1 = \"/sdhci@c8000000\";\n+\t\tmmc0 = \"/mmc@c8000600\";\n+\t\tmmc1 = \"/mmc@c8000000\";\n \t};\n \n \tmemory {\n@@ -485,7 +485,7 @@\n \t\tstatus = \"okay\";\n \t};\n \n-\tsdhci@c8000000 {\n+\tmmc@c8000000 {\n \t\tstatus = \"okay\";\n \t\tcd-gpios = <&gpio TEGRA_GPIO(V, 5) GPIO_ACTIVE_LOW>;\n \t\twp-gpios = <&gpio TEGRA_GPIO(H, 1) GPIO_ACTIVE_HIGH>;\n@@ -493,7 +493,7 @@\n \t\tbus-width = <4>;\n \t};\n \n-\tsdhci@c8000600 {\n+\tmmc@c8000600 {\n \t\tstatus = \"okay\";\n \t\tbus-width = <8>;\n \t\tnon-removable;\ndiff --git a/arch/arm/dts/tegra20-plutux.dts b/arch/arm/dts/tegra20-plutux.dts\nindex 1b642be9928..8d8672da23d 100644\n--- a/arch/arm/dts/tegra20-plutux.dts\n+++ b/arch/arm/dts/tegra20-plutux.dts\n@@ -12,7 +12,7 @@\n \n \taliases {\n \t\tusb0 = \"/usb@c5008000\";\n-\t\tmmc0 = \"/sdhci@c8000600\";\n+\t\tmmc0 = \"/mmc@c8000600\";\n \t};\n \n \tmemory {\ndiff --git a/arch/arm/dts/tegra20-samsung-bose.dts b/arch/arm/dts/tegra20-samsung-bose.dts\nindex 5bb9a33adf2..64cf8489707 100644\n--- a/arch/arm/dts/tegra20-samsung-bose.dts\n+++ b/arch/arm/dts/tegra20-samsung-bose.dts\n@@ -92,7 +92,7 @@\n \t\t};\n \t};\n \n-\tsdhci@c8000400 {\n+\tmmc@c8000400 {\n \t\tbroken-cd;\n \t};\n \ndiff --git a/arch/arm/dts/tegra20-samsung-n1-common.dtsi b/arch/arm/dts/tegra20-samsung-n1-common.dtsi\nindex 7225047caba..b82e6464248 100644\n--- a/arch/arm/dts/tegra20-samsung-n1-common.dtsi\n+++ b/arch/arm/dts/tegra20-samsung-n1-common.dtsi\n@@ -365,7 +365,7 @@\n \t\tvbus-supply = <&usb_phy_reg>;\n \t};\n \n-\tsdmmc3: sdhci@c8000400 {\n+\tsdmmc3: mmc@c8000400 {\n \t\tstatus = \"okay\";\n \t\tbus-width = <4>;\n \n@@ -373,7 +373,7 @@\n \t\tvqmmc-supply = <&vdd_3v3_sys>;\n \t};\n \n-\tsdmmc4: sdhci@c8000600 {\n+\tsdmmc4: mmc@c8000600 {\n \t\tstatus = \"okay\";\n \t\tbus-width = <8>;\n \t\tnon-removable;\ndiff --git a/arch/arm/dts/tegra20-samsung-n1.dts b/arch/arm/dts/tegra20-samsung-n1.dts\nindex 930a3195aa0..82b337973b9 100644\n--- a/arch/arm/dts/tegra20-samsung-n1.dts\n+++ b/arch/arm/dts/tegra20-samsung-n1.dts\n@@ -151,7 +151,7 @@\n \t\t};\n \t};\n \n-\tsdhci@c8000400 {\n+\tmmc@c8000400 {\n \t\t/* battery blocks the sdcard slot and the device lacks CD pin */\n \t\tnon-removable;\n \t};\ndiff --git a/arch/arm/dts/tegra20-seaboard.dts b/arch/arm/dts/tegra20-seaboard.dts\nindex 341c7f35836..dbb2e49962e 100644\n--- a/arch/arm/dts/tegra20-seaboard.dts\n+++ b/arch/arm/dts/tegra20-seaboard.dts\n@@ -19,8 +19,8 @@\n \t\trtc0 = \"/i2c@7000d000/tps6586x@34\";\n \t\trtc1 = \"/rtc@7000e000\";\n \t\tserial0 = &uartd;\n-\t\tmmc0 = \"/sdhci@c8000600\";\n-\t\tmmc1 = \"/sdhci@c8000400\";\n+\t\tmmc0 = \"/mmc@c8000600\";\n+\t\tmmc1 = \"/mmc@c8000400\";\n \t};\n \n \tchosen {\n@@ -803,14 +803,14 @@\n \t\tstatus = \"okay\";\n \t};\n \n-\tsdhci@c8000000 {\n+\tmmc@c8000000 {\n \t\tstatus = \"okay\";\n \t\tpower-gpios = <&gpio TEGRA_GPIO(K, 6) GPIO_ACTIVE_HIGH>;\n \t\tbus-width = <4>;\n \t\tkeep-power-in-suspend;\n \t};\n \n-\tsdhci@c8000400 {\n+\tmmc@c8000400 {\n \t\tstatus = \"okay\";\n \t\tcd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;\n \t\twp-gpios = <&gpio TEGRA_GPIO(H, 1) GPIO_ACTIVE_HIGH>;\n@@ -818,7 +818,7 @@\n \t\tbus-width = <4>;\n \t};\n \n-\tsdhci@c8000600 {\n+\tmmc@c8000600 {\n \t\tstatus = \"okay\";\n \t\tbus-width = <8>;\n \t\tnon-removable;\ndiff --git a/arch/arm/dts/tegra20-tamonten.dtsi b/arch/arm/dts/tegra20-tamonten.dtsi\nindex f13ef4d05a8..98fa51bed30 100644\n--- a/arch/arm/dts/tegra20-tamonten.dtsi\n+++ b/arch/arm/dts/tegra20-tamonten.dtsi\n@@ -476,7 +476,7 @@\n \t\tstatus = \"okay\";\n \t};\n \n-\tsdhci@c8000600 {\n+\tmmc@c8000600 {\n \t\tcd-gpios = <&gpio TEGRA_GPIO(H, 2) GPIO_ACTIVE_LOW>;\n \t\twp-gpios = <&gpio TEGRA_GPIO(H, 3) GPIO_ACTIVE_HIGH>;\n \t\tbus-width = <4>;\ndiff --git a/arch/arm/dts/tegra20-tec.dts b/arch/arm/dts/tegra20-tec.dts\nindex 4733c813490..b26979496c6 100644\n--- a/arch/arm/dts/tegra20-tec.dts\n+++ b/arch/arm/dts/tegra20-tec.dts\n@@ -12,7 +12,7 @@\n \n \taliases {\n \t\tusb0 = \"/usb@c5008000\";\n-\t\tmmc0 = \"/sdhci@c8000600\";\n+\t\tmmc0 = \"/mmc@c8000600\";\n \t};\n \n \tmemory {\ndiff --git a/arch/arm/dts/tegra20-trimslice.dts b/arch/arm/dts/tegra20-trimslice.dts\nindex fa942d26078..9542eb6c41b 100644\n--- a/arch/arm/dts/tegra20-trimslice.dts\n+++ b/arch/arm/dts/tegra20-trimslice.dts\n@@ -12,8 +12,8 @@\n \n \taliases {\n \t\tusb0 = \"/usb@c5000000\";\n-\t\tmmc0 = \"/sdhci@c8000600\";\n-\t\tmmc1 = \"/sdhci@c8000000\";\n+\t\tmmc0 = \"/mmc@c8000600\";\n+\t\tmmc1 = \"/mmc@c8000000\";\n \t\tspi0 = \"/spi@7000c380\";\n \t};\n \n@@ -55,12 +55,12 @@\n \t\tnvidia,vbus-gpio = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_HIGH>;\n \t};\n \n-\tsdhci@c8000000 {\n+\tmmc@c8000000 {\n \t\tstatus = \"okay\";\n \t\tbus-width = <4>;\n \t};\n \n-\tsdhci@c8000600 {\n+\tmmc@c8000600 {\n \t\tstatus = \"okay\";\n \t\tcd-gpios = <&gpio TEGRA_GPIO(P, 1) GPIO_ACTIVE_LOW>;\n \t\twp-gpios = <&gpio TEGRA_GPIO(P, 2) GPIO_ACTIVE_HIGH>;\ndiff --git a/arch/arm/dts/tegra20-ventana.dts b/arch/arm/dts/tegra20-ventana.dts\nindex 85cd1e39bda..50cf78e4170 100644\n--- a/arch/arm/dts/tegra20-ventana.dts\n+++ b/arch/arm/dts/tegra20-ventana.dts\n@@ -18,8 +18,8 @@\n \t\tusb0 = \"/usb@c5000000\";\n \t\tusb1 = \"/usb@c5004000\";\n \t\tusb2 = \"/usb@c5008000\";\n-\t\tmmc0 = \"/sdhci@c8000600\";\n-\t\tmmc1 = \"/sdhci@c8000400\";\n+\t\tmmc0 = \"/mmc@c8000600\";\n+\t\tmmc1 = \"/mmc@c8000400\";\n \t};\n \n \tmemory {\n@@ -576,14 +576,14 @@\n \t\tstatus = \"okay\";\n \t};\n \n-\tsdhci@c8000000 {\n+\tmmc@c8000000 {\n \t\tstatus = \"okay\";\n \t\tpower-gpios = <&gpio TEGRA_GPIO(K, 6) GPIO_ACTIVE_HIGH>;\n \t\tbus-width = <4>;\n \t\tkeep-power-in-suspend;\n \t};\n \n-\tsdhci@c8000400 {\n+\tmmc@c8000400 {\n \t\tstatus = \"okay\";\n \t\tcd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;\n \t\twp-gpios = <&gpio TEGRA_GPIO(H, 1) GPIO_ACTIVE_HIGH>;\n@@ -591,7 +591,7 @@\n \t\tbus-width = <4>;\n \t};\n \n-\tsdhci@c8000600 {\n+\tmmc@c8000600 {\n \t\tstatus = \"okay\";\n \t\tbus-width = <8>;\n \t\tnon-removable;\ndiff --git a/arch/arm/dts/tegra20.dtsi b/arch/arm/dts/tegra20.dtsi\nindex 4a40edfdfbe..430df19b8b7 100644\n--- a/arch/arm/dts/tegra20.dtsi\n+++ b/arch/arm/dts/tegra20.dtsi\n@@ -766,7 +766,7 @@\n \t\tstatus = \"disabled\";\n \t};\n \n-\tsdhci@c8000000 {\n+\tmmc@c8000000 {\n \t\tcompatible = \"nvidia,tegra20-sdhci\";\n \t\treg = <0xc8000000 0x200>;\n \t\tinterrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;\n@@ -776,7 +776,7 @@\n \t\tstatus = \"disabled\";\n \t};\n \n-\tsdhci@c8000200 {\n+\tmmc@c8000200 {\n \t\tcompatible = \"nvidia,tegra20-sdhci\";\n \t\treg = <0xc8000200 0x200>;\n \t\tinterrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;\n@@ -786,7 +786,7 @@\n \t\tstatus = \"disabled\";\n \t};\n \n-\tsdhci@c8000400 {\n+\tmmc@c8000400 {\n \t\tcompatible = \"nvidia,tegra20-sdhci\";\n \t\treg = <0xc8000400 0x200>;\n \t\tinterrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;\n@@ -796,7 +796,7 @@\n \t\tstatus = \"disabled\";\n \t};\n \n-\tsdhci@c8000600 {\n+\tmmc@c8000600 {\n \t\tcompatible = \"nvidia,tegra20-sdhci\";\n \t\treg = <0xc8000600 0x200>;\n \t\tinterrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;\ndiff --git a/arch/arm/dts/tegra210-p2371-0000.dts b/arch/arm/dts/tegra210-p2371-0000.dts\nindex 539e7cef93b..e5e9d68651a 100644\n--- a/arch/arm/dts/tegra210-p2371-0000.dts\n+++ b/arch/arm/dts/tegra210-p2371-0000.dts\n@@ -12,8 +12,8 @@\n \n \taliases {\n \t\ti2c0 = \"/i2c@7000d000\";\n-\t\tmmc0 = \"/sdhci@700b0600\";\n-\t\tmmc1 = \"/sdhci@700b0000\";\n+\t\tmmc0 = \"/mmc@700b0600\";\n+\t\tmmc1 = \"/mmc@700b0000\";\n \t\tusb0 = \"/usb@7d000000\";\n \t};\n \n@@ -21,14 +21,14 @@\n \t\treg = <0x0 0x80000000 0x0 0xc0000000>;\n \t};\n \n-\tsdhci@700b0000 {\n+\tmmc@700b0000 {\n \t\tstatus = \"okay\";\n \t\tcd-gpios = <&gpio TEGRA_GPIO(Z, 1) GPIO_ACTIVE_LOW>;\n \t\tpower-gpios = <&gpio TEGRA_GPIO(Z, 4) GPIO_ACTIVE_HIGH>;\n \t\tbus-width = <4>;\n \t};\n \n-\tsdhci@700b0600 {\n+\tmmc@700b0600 {\n \t\tstatus = \"okay\";\n \t\tbus-width = <8>;\n \t\tnon-removable;\ndiff --git a/arch/arm/dts/tegra210-p2371-2180.dts b/arch/arm/dts/tegra210-p2371-2180.dts\nindex 649c163152e..a619b2475eb 100644\n--- a/arch/arm/dts/tegra210-p2371-2180.dts\n+++ b/arch/arm/dts/tegra210-p2371-2180.dts\n@@ -14,8 +14,8 @@\n \t\ti2c0 = \"/i2c@7000d000\";\n \t\ti2c2 = \"/i2c@7000c400\";\n \t\ti2c3 = \"/i2c@7000c500\";\n-\t\tmmc0 = \"/sdhci@700b0600\";\n-\t\tmmc1 = \"/sdhci@700b0000\";\n+\t\tmmc0 = \"/mmc@700b0600\";\n+\t\tmmc1 = \"/mmc@700b0000\";\n \t\tusb0 = \"/usb@7d000000\";\n \t};\n \n@@ -73,7 +73,7 @@\n \t\t};\n \t};\n \n-\tsdhci@700b0000 {\n+\tmmc@700b0000 {\n \t\tstatus = \"okay\";\n \t\tcd-gpios = <&gpio TEGRA_GPIO(Z, 1) GPIO_ACTIVE_LOW>;\n \t\tpower-gpios = <&gpio TEGRA_GPIO(Z, 3) GPIO_ACTIVE_HIGH>;\n@@ -81,7 +81,7 @@\n \t\tbus-width = <4>;\n \t};\n \n-\tsdhci@700b0600 {\n+\tmmc@700b0600 {\n \t\tstatus = \"okay\";\n \t\tbus-width = <8>;\n \t\tnon-removable;\ndiff --git a/arch/arm/dts/tegra210-p2571.dts b/arch/arm/dts/tegra210-p2571.dts\nindex 16370c596e0..f48ce4d662f 100644\n--- a/arch/arm/dts/tegra210-p2571.dts\n+++ b/arch/arm/dts/tegra210-p2571.dts\n@@ -17,8 +17,8 @@\n \t\ti2c3 = \"/i2c@7000c500\";\n \t\ti2c4 = \"/i2c@7000c700\";\n \t\ti2c5 = \"/i2c@7000d100\";\n-\t\tmmc0 = \"/sdhci@700b0600\";\n-\t\tmmc1 = \"/sdhci@700b0000\";\n+\t\tmmc0 = \"/mmc@700b0600\";\n+\t\tmmc1 = \"/mmc@700b0000\";\n \t\tspi0 = \"/spi@7000d400\";\n \t\tspi1 = \"/spi@7000da00\";\n \t\tspi2 = \"/spi@70410000\";\n@@ -74,14 +74,14 @@\n \t\tspi-max-frequency = <24000000>;\n \t};\n \n-\tsdhci@700b0000 {\n+\tmmc@700b0000 {\n \t\tstatus = \"okay\";\n \t\tcd-gpios = <&gpio TEGRA_GPIO(Z, 1) GPIO_ACTIVE_LOW>;\n \t\tpower-gpios = <&gpio TEGRA_GPIO(Z, 4) GPIO_ACTIVE_HIGH>;\n \t\tbus-width = <4>;\n \t};\n \n-\tsdhci@700b0600 {\n+\tmmc@700b0600 {\n \t\tstatus = \"okay\";\n \t\tbus-width = <8>;\n \t\tnon-removable;\ndiff --git a/arch/arm/dts/tegra210-p3450-0000.dts b/arch/arm/dts/tegra210-p3450-0000.dts\nindex ddeeb232de2..333060a4ec7 100644\n--- a/arch/arm/dts/tegra210-p3450-0000.dts\n+++ b/arch/arm/dts/tegra210-p3450-0000.dts\n@@ -20,8 +20,8 @@\n \t\ti2c2 = \"/i2c@7000c400\";\n \t\ti2c3 = \"/i2c@7000c500\";\n \t\ti2c4 = \"/i2c@7000c700\";\n-\t\tmmc0 = \"/sdhci@700b0600\";\n-\t\tmmc1 = \"/sdhci@700b0000\";\n+\t\tmmc0 = \"/mmc@700b0600\";\n+\t\tmmc1 = \"/mmc@700b0000\";\n \t\tspi0 = \"/spi@70410000\";\n \t\tusb0 = \"/usb@7d000000\";\n \t};\n@@ -89,14 +89,14 @@\n \t\t};\n \t};\n \n-\tsdhci@700b0000 {\n+\tmmc@700b0000 {\n \t\tstatus = \"okay\";\n \t\tcd-gpios = <&gpio TEGRA_GPIO(Z, 1) GPIO_ACTIVE_LOW>;\n \t\tpower-gpios = <&gpio TEGRA_GPIO(Z, 3) GPIO_ACTIVE_HIGH>;\n \t\tbus-width = <4>;\n \t};\n \n-\tsdhci@700b0600 {\n+\tmmc@700b0600 {\n \t\tstatus = \"okay\";\n \t\tbus-width = <8>;\n \t\tnon-removable;\ndiff --git a/arch/arm/dts/tegra210.dtsi b/arch/arm/dts/tegra210.dtsi\nindex 92eb4f67bf5..45b1ca9a041 100644\n--- a/arch/arm/dts/tegra210.dtsi\n+++ b/arch/arm/dts/tegra210.dtsi\n@@ -696,7 +696,7 @@\n \t\t#phy-cells = <1>;\n \t};\n \n-\tsdhci@700b0000 {\n+\tmmc@700b0000 {\n \t\tcompatible = \"nvidia,tegra210-sdhci\", \"nvidia,tegra124-sdhci\";\n \t\treg = <0x0 0x700b0000 0x0 0x200>;\n \t\tinterrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;\n@@ -709,7 +709,7 @@\n \t\tstatus = \"disabled\";\n \t};\n \n-\tsdhci@700b0200 {\n+\tmmc@700b0200 {\n \t\tcompatible = \"nvidia,tegra210-sdhci\", \"nvidia,tegra124-sdhci\";\n \t\treg = <0x0 0x700b0200 0x0 0x200>;\n \t\tinterrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;\n@@ -722,7 +722,7 @@\n \t\tstatus = \"disabled\";\n \t};\n \n-\tsdhci@700b0400 {\n+\tmmc@700b0400 {\n \t\tcompatible = \"nvidia,tegra210-sdhci\", \"nvidia,tegra124-sdhci\";\n \t\treg = <0x0 0x700b0400 0x0 0x200>;\n \t\tinterrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;\n@@ -735,7 +735,7 @@\n \t\tstatus = \"disabled\";\n \t};\n \n-\tsdhci@700b0600 {\n+\tmmc@700b0600 {\n \t\tcompatible = \"nvidia,tegra210-sdhci\", \"nvidia,tegra124-sdhci\";\n \t\treg = <0x0 0x700b0600 0x0 0x200>;\n \t\tinterrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;\ndiff --git a/arch/arm/dts/tegra30-apalis.dts b/arch/arm/dts/tegra30-apalis.dts\nindex 77502dfdb47..19553d14fb1 100644\n--- a/arch/arm/dts/tegra30-apalis.dts\n+++ b/arch/arm/dts/tegra30-apalis.dts\n@@ -15,9 +15,9 @@\n \t\ti2c1 = \"/i2c@7000c000\";\n \t\ti2c2 = \"/i2c@7000c500\";\n \t\ti2c3 = \"/i2c@7000c700\";\n-\t\tmmc0 = \"/sdhci@78000600\";\n-\t\tmmc1 = \"/sdhci@78000400\";\n-\t\tmmc2 = \"/sdhci@78000000\";\n+\t\tmmc0 = \"/mmc@78000600\";\n+\t\tmmc1 = \"/mmc@78000400\";\n+\t\tmmc2 = \"/mmc@78000000\";\n \t\tspi0 = \"/spi@7000d400\";\n \t\tspi1 = \"/spi@7000dc00\";\n \t\tspi2 = \"/spi@7000de00\";\n@@ -246,21 +246,21 @@\n \t\tspi-max-frequency = <25000000>;\n \t};\n \n-\tsdhci@78000000 {\n+\tmmc@78000000 {\n \t\tstatus = \"okay\";\n \t\tbus-width = <4>;\n \t\t/* SD1_CD# */\n \t\tcd-gpios = <&gpio TEGRA_GPIO(CC, 5) GPIO_ACTIVE_LOW>;\n \t};\n \n-\tsdhci@78000400 {\n+\tmmc@78000400 {\n \t\tstatus = \"okay\";\n \t\tbus-width = <8>;\n \t\t/* MMC1_CD# */\n \t\tcd-gpios = <&gpio TEGRA_GPIO(V, 3) GPIO_ACTIVE_LOW>;\n \t};\n \n-\tsdhci@78000600 {\n+\tmmc@78000600 {\n \t\tstatus = \"okay\";\n \t\tbus-width = <8>;\n \t\tnon-removable;\ndiff --git a/arch/arm/dts/tegra30-asus-grouper-common.dtsi b/arch/arm/dts/tegra30-asus-grouper-common.dtsi\nindex ddacdbb85c8..8eb36eb8164 100644\n--- a/arch/arm/dts/tegra30-asus-grouper-common.dtsi\n+++ b/arch/arm/dts/tegra30-asus-grouper-common.dtsi\n@@ -773,7 +773,7 @@\n \t\tclock-frequency = <400000>;\n \t};\n \n-\tsdmmc4: sdhci@78000600 {\n+\tsdmmc4: mmc@78000600 {\n \t\tstatus = \"okay\";\n \t\tbus-width = <8>;\n \t\tnon-removable;\ndiff --git a/arch/arm/dts/tegra30-asus-p1801-t.dts b/arch/arm/dts/tegra30-asus-p1801-t.dts\nindex 31cbef1b93c..2d6b4aba016 100644\n--- a/arch/arm/dts/tegra30-asus-p1801-t.dts\n+++ b/arch/arm/dts/tegra30-asus-p1801-t.dts\n@@ -1100,7 +1100,7 @@\n \t\t};\n \t};\n \n-\tsdmmc1: sdhci@78000000 {\n+\tsdmmc1: mmc@78000000 {\n \t\tstatus = \"okay\";\n \t\tbus-width = <4>;\n \n@@ -1111,7 +1111,7 @@\n \t\tvqmmc-supply = <&vddio_usd>;\n \t};\n \n-\tsdmmc4: sdhci@78000600 {\n+\tsdmmc4: mmc@78000600 {\n \t\tstatus = \"okay\";\n \t\tbus-width = <8>;\n \t\tnon-removable;\ndiff --git a/arch/arm/dts/tegra30-asus-tf600t.dts b/arch/arm/dts/tegra30-asus-tf600t.dts\nindex e622ba78d2e..51d82f942f4 100644\n--- a/arch/arm/dts/tegra30-asus-tf600t.dts\n+++ b/arch/arm/dts/tegra30-asus-tf600t.dts\n@@ -1064,7 +1064,7 @@\n \t\t};\n \t};\n \n-\tsdmmc1: sdhci@78000000 {\n+\tsdmmc1: mmc@78000000 {\n \t\tstatus = \"okay\";\n \t\tbus-width = <4>;\n \n@@ -1075,7 +1075,7 @@\n \t\tvqmmc-supply = <&vddio_usd>;\n \t};\n \n-\tsdmmc4: sdhci@78000600 {\n+\tsdmmc4: mmc@78000600 {\n \t\tstatus = \"okay\";\n \t\tbus-width = <8>;\n \t\tnon-removable;\ndiff --git a/arch/arm/dts/tegra30-asus-transformer.dtsi b/arch/arm/dts/tegra30-asus-transformer.dtsi\nindex c2a9e04901d..6bb24ea62e9 100644\n--- a/arch/arm/dts/tegra30-asus-transformer.dtsi\n+++ b/arch/arm/dts/tegra30-asus-transformer.dtsi\n@@ -1093,7 +1093,7 @@\n \t\t};\n \t};\n \n-\tsdmmc1: sdhci@78000000 {\n+\tsdmmc1: mmc@78000000 {\n \t\tstatus = \"okay\";\n \t\tbus-width = <4>;\n \n@@ -1104,7 +1104,7 @@\n \t\tvqmmc-supply = <&vddio_usd>;\n \t};\n \n-\tsdmmc4: sdhci@78000600 {\n+\tsdmmc4: mmc@78000600 {\n \t\tstatus = \"okay\";\n \t\tbus-width = <8>;\n \t\tnon-removable;\ndiff --git a/arch/arm/dts/tegra30-beaver.dts b/arch/arm/dts/tegra30-beaver.dts\nindex 9bb097b0813..b78982edd1a 100644\n--- a/arch/arm/dts/tegra30-beaver.dts\n+++ b/arch/arm/dts/tegra30-beaver.dts\n@@ -16,8 +16,8 @@\n \t\ti2c2 = \"/i2c@7000c400\";\n \t\ti2c3 = \"/i2c@7000c500\";\n \t\ti2c4 = \"/i2c@7000c700\";\n-\t\tmmc0 = \"/sdhci@78000600\";\n-\t\tmmc1 = \"/sdhci@78000000\";\n+\t\tmmc0 = \"/mmc@78000600\";\n+\t\tmmc1 = \"/mmc@78000000\";\n \t\tspi0 = \"/spi@7000da00\";\n \t\tusb0 = \"/usb@7d000000\";\n \t\tusb1 = \"/usb@7d008000\";\n@@ -191,7 +191,7 @@\n \t\t};\n \t};\n \n-\tsdhci@78000000 {\n+\tmmc@78000000 {\n \t\tstatus = \"okay\";\n \t\tcd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;\n \t\twp-gpios = <&gpio TEGRA_GPIO(T, 3) GPIO_ACTIVE_HIGH>;\n@@ -199,7 +199,7 @@\n \t\tbus-width = <4>;\n \t};\n \n-\tsdhci@78000600 {\n+\tmmc@78000600 {\n \t\tstatus = \"okay\";\n \t\tbus-width = <8>;\n \t\tnon-removable;\ndiff --git a/arch/arm/dts/tegra30-cardhu.dts b/arch/arm/dts/tegra30-cardhu.dts\nindex 7534861e40d..299ba7ef371 100644\n--- a/arch/arm/dts/tegra30-cardhu.dts\n+++ b/arch/arm/dts/tegra30-cardhu.dts\n@@ -16,8 +16,8 @@\n \t\ti2c2 = \"/i2c@7000c400\";\n \t\ti2c3 = \"/i2c@7000c500\";\n \t\ti2c4 = \"/i2c@7000c700\";\n-\t\tmmc0 = \"/sdhci@78000600\";\n-\t\tmmc1 = \"/sdhci@78000000\";\n+\t\tmmc0 = \"/mmc@78000600\";\n+\t\tmmc1 = \"/mmc@78000000\";\n \t\tspi0 = \"/spi@7000da00\";\n \t\tusb0 = \"/usb@7d008000\";\n \t};\n@@ -183,7 +183,7 @@\n \t\tspi-max-frequency = <25000000>;\n \t};\n \n-\tsdhci@78000000 {\n+\tmmc@78000000 {\n \t\tstatus = \"okay\";\n \t\tcd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;\n \t\twp-gpios = <&gpio TEGRA_GPIO(T, 3) GPIO_ACTIVE_HIGH>;\n@@ -191,7 +191,7 @@\n \t\tbus-width = <4>;\n \t};\n \n-\tsdhci@78000600 {\n+\tmmc@78000600 {\n \t\tstatus = \"okay\";\n \t\tbus-width = <8>;\n \t\tnon-removable;\ndiff --git a/arch/arm/dts/tegra30-colibri.dts b/arch/arm/dts/tegra30-colibri.dts\nindex 38afe7819c7..075a35f1c9a 100644\n--- a/arch/arm/dts/tegra30-colibri.dts\n+++ b/arch/arm/dts/tegra30-colibri.dts\n@@ -14,8 +14,8 @@\n \t\ti2c0 = \"/i2c@7000d000\";\n \t\ti2c1 = \"/i2c@7000c000\";\n \t\ti2c2 = \"/i2c@7000c700\";\n-\t\tmmc0 = \"/sdhci@78000600\";\n-\t\tmmc1 = \"/sdhci@78000200\";\n+\t\tmmc0 = \"/mmc@78000600\";\n+\t\tmmc1 = \"/mmc@78000200\";\n \t\tspi0 = \"/spi@7000d400\";\n \t\tusb0 = \"/usb@7d000000\";\n \t\tusb1 = \"/usb@7d004000\"; /* on module only, for ASIX */\n@@ -61,13 +61,13 @@\n \t\tspi-max-frequency = <25000000>;\n \t};\n \n-\tsdhci@78000200 {\n+\tmmc@78000200 {\n \t\tstatus = \"okay\";\n \t\tbus-width = <4>;\n \t\tcd-gpios = <&gpio TEGRA_GPIO(C, 7) GPIO_ACTIVE_LOW>; /* MMCD */\n \t};\n \n-\tsdhci@78000600 {\n+\tmmc@78000600 {\n \t\tstatus = \"okay\";\n \t\tbus-width = <8>;\n \t\tnon-removable;\ndiff --git a/arch/arm/dts/tegra30-htc-endeavoru.dts b/arch/arm/dts/tegra30-htc-endeavoru.dts\nindex 79f423bd22a..e67d335f73c 100644\n--- a/arch/arm/dts/tegra30-htc-endeavoru.dts\n+++ b/arch/arm/dts/tegra30-htc-endeavoru.dts\n@@ -1246,7 +1246,7 @@\n \t\t};\n \t};\n \n-\tsdmmc4: sdhci@78000600 {\n+\tsdmmc4: mmc@78000600 {\n \t\tstatus = \"okay\";\n \t\tbus-width = <8>;\n \t\tnon-removable;\ndiff --git a/arch/arm/dts/tegra30-lenovo-ideapad-yoga-11.dts b/arch/arm/dts/tegra30-lenovo-ideapad-yoga-11.dts\nindex 53f42089d30..2d96d6867e6 100644\n--- a/arch/arm/dts/tegra30-lenovo-ideapad-yoga-11.dts\n+++ b/arch/arm/dts/tegra30-lenovo-ideapad-yoga-11.dts\n@@ -1119,7 +1119,7 @@\n \t\t>;\n \t};\n \n-\tsdmmc1: sdhci@78000000 {\n+\tsdmmc1: mmc@78000000 {\n \t\tstatus = \"okay\";\n \t\tbus-width = <4>;\n \n@@ -1129,7 +1129,7 @@\n \t\tvqmmc-supply = <&vddio_usd>;\n \t};\n \n-\tsdmmc4: sdhci@78000600 {\n+\tsdmmc4: mmc@78000600 {\n \t\tstatus = \"okay\";\n \t\tbus-width = <8>;\n \t\tnon-removable;\ndiff --git a/arch/arm/dts/tegra30-lg-p880.dts b/arch/arm/dts/tegra30-lg-p880.dts\nindex ab5993150b2..84b6dc1f95a 100644\n--- a/arch/arm/dts/tegra30-lg-p880.dts\n+++ b/arch/arm/dts/tegra30-lg-p880.dts\n@@ -126,7 +126,7 @@\n \t\t};\n \t};\n \n-\tsdmmc3: sdhci@78000400 {\n+\tsdmmc3: mmc@78000400 {\n \t\tstatus = \"okay\";\n \t\tbus-width = <4>;\n \ndiff --git a/arch/arm/dts/tegra30-lg-x3.dtsi b/arch/arm/dts/tegra30-lg-x3.dtsi\nindex e5effe132b0..6e1e25b7cfa 100644\n--- a/arch/arm/dts/tegra30-lg-x3.dtsi\n+++ b/arch/arm/dts/tegra30-lg-x3.dtsi\n@@ -1037,7 +1037,7 @@\n \t\t};\n \t};\n \n-\tsdmmc4: sdhci@78000600 {\n+\tsdmmc4: mmc@78000600 {\n \t\tstatus = \"okay\";\n \t\tbus-width = <8>;\n \t\tnon-removable;\ndiff --git a/arch/arm/dts/tegra30-microsoft-surface-rt.dts b/arch/arm/dts/tegra30-microsoft-surface-rt.dts\nindex 2d22d3e0bb1..77cd79cb0d6 100644\n--- a/arch/arm/dts/tegra30-microsoft-surface-rt.dts\n+++ b/arch/arm/dts/tegra30-microsoft-surface-rt.dts\n@@ -946,7 +946,7 @@\n \t\t};\n \t};\n \n-\tsdmmc1: sdhci@78000000 {\n+\tsdmmc1: mmc@78000000 {\n \t\tstatus = \"okay\";\n \t\tbus-width = <4>;\n \n@@ -956,7 +956,7 @@\n \t\tvqmmc-supply = <&vddio_usd>;\n \t};\n \n-\tsdmmc4: sdhci@78000600 {\n+\tsdmmc4: mmc@78000600 {\n \t\tstatus = \"okay\";\n \t\tbus-width = <8>;\n \t\tnon-removable;\ndiff --git a/arch/arm/dts/tegra30-ouya.dts b/arch/arm/dts/tegra30-ouya.dts\nindex e6b2824d783..4911c802a51 100644\n--- a/arch/arm/dts/tegra30-ouya.dts\n+++ b/arch/arm/dts/tegra30-ouya.dts\n@@ -1970,7 +1970,7 @@\n \t\t};\n \t};\n \n-\tsdmmc4: sdhci@78000600 {\n+\tsdmmc4: mmc@78000600 {\n \t\tstatus = \"okay\";\n \t\tbus-width = <8>;\n \t\tnon-removable;\ndiff --git a/arch/arm/dts/tegra30-pegatron-chagall.dts b/arch/arm/dts/tegra30-pegatron-chagall.dts\nindex 98eb369f7a8..1ff53b7c54b 100644\n--- a/arch/arm/dts/tegra30-pegatron-chagall.dts\n+++ b/arch/arm/dts/tegra30-pegatron-chagall.dts\n@@ -1121,7 +1121,7 @@\n \t\t};\n \t};\n \n-\tsdmmc1: sdhci@78000000 {\n+\tsdmmc1: mmc@78000000 {\n \t\tstatus = \"okay\";\n \t\tbus-width = <4>;\n \n@@ -1131,7 +1131,7 @@\n \t\tvqmmc-supply = <&vddio_usd>;\n \t};\n \n-\tsdmmc4: sdhci@78000600 {\n+\tsdmmc4: mmc@78000600 {\n \t\tstatus = \"okay\";\n \t\tbus-width = <8>;\n \t\tnon-removable;\ndiff --git a/arch/arm/dts/tegra30-tamonten.dtsi b/arch/arm/dts/tegra30-tamonten.dtsi\nindex 33da1754d30..0240568cd94 100644\n--- a/arch/arm/dts/tegra30-tamonten.dtsi\n+++ b/arch/arm/dts/tegra30-tamonten.dtsi\n@@ -18,9 +18,9 @@\n \t\ti2c2 = \"/i2c@7000c400\";\n \t\ti2c3 = \"/i2c@7000c500\";\n \t\ti2c4 = \"/i2c@7000d000\";\n-\t\tmmc0 = \"/sdhci@78000600\";\n-\t\tmmc1 = \"/sdhci@78000400\";\n-\t\tmmc2 = \"/sdhci@78000000\";\n+\t\tmmc0 = \"/mmc@78000600\";\n+\t\tmmc1 = \"/mmc@78000400\";\n+\t\tmmc2 = \"/mmc@78000000\";\n \t\tusb0 = \"/usb@7d008000\";\n \t};\n \n@@ -54,14 +54,14 @@\n \t};\n \n \t/* SD slot on the base board */\n-\tsdhci@78000400 {\n+\tmmc@78000400 {\n \t\tcd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;\n \t\twp-gpios = <&gpio TEGRA_GPIO(I, 3) GPIO_ACTIVE_HIGH>;\n \t\tbus-width = <4>;\n \t};\n \n \t/* EMMC on the COM module */\n-\tsdhci@78000600 {\n+\tmmc@78000600 {\n \t\tstatus = \"okay\";\n \t\tbus-width = <8>;\n \t\tnon-removable;\ndiff --git a/arch/arm/dts/tegra30-tec-ng.dts b/arch/arm/dts/tegra30-tec-ng.dts\nindex f2a49b8cbe2..444a390ba58 100644\n--- a/arch/arm/dts/tegra30-tec-ng.dts\n+++ b/arch/arm/dts/tegra30-tec-ng.dts\n@@ -16,7 +16,7 @@\n \t};\n \n \t/* SD card slot */\n-\tsdhci@78000400 {\n+\tmmc@78000400 {\n \t\tstatus = \"okay\";\n \t};\n };\ndiff --git a/arch/arm/dts/tegra30-wexler-qc750.dts b/arch/arm/dts/tegra30-wexler-qc750.dts\nindex ededbf579fd..c310a22f56f 100644\n--- a/arch/arm/dts/tegra30-wexler-qc750.dts\n+++ b/arch/arm/dts/tegra30-wexler-qc750.dts\n@@ -985,7 +985,7 @@\n \t\t};\n \t};\n \n-\tsdmmc1: sdhci@78000000 {\n+\tsdmmc1: mmc@78000000 {\n \t\tstatus = \"okay\";\n \t\tbus-width = <4>;\n \n@@ -996,7 +996,7 @@\n \t\tvqmmc-supply = <&vddio_usd>;\n \t};\n \n-\tsdmmc4: sdhci@78000600 {\n+\tsdmmc4: mmc@78000600 {\n \t\tstatus = \"okay\";\n \t\tbus-width = <8>;\n \t\tnon-removable;\ndiff --git a/arch/arm/dts/tegra30.dtsi b/arch/arm/dts/tegra30.dtsi\nindex 82e843d05be..cf772338b55 100644\n--- a/arch/arm/dts/tegra30.dtsi\n+++ b/arch/arm/dts/tegra30.dtsi\n@@ -803,7 +803,7 @@\n \t\t};\n \t};\n \n-\tsdhci@78000000 {\n+\tmmc@78000000 {\n \t\tcompatible = \"nvidia,tegra30-sdhci\", \"nvidia,tegra20-sdhci\";\n \t\treg = <0x78000000 0x200>;\n \t\tinterrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;\n@@ -813,7 +813,7 @@\n \t\tstatus = \"disabled\";\n \t};\n \n-\tsdhci@78000200 {\n+\tmmc@78000200 {\n \t\tcompatible = \"nvidia,tegra30-sdhci\", \"nvidia,tegra20-sdhci\";\n \t\treg = <0x78000200 0x200>;\n \t\tinterrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;\n@@ -823,7 +823,7 @@\n \t\tstatus = \"disabled\";\n \t};\n \n-\tsdhci@78000400 {\n+\tmmc@78000400 {\n \t\tcompatible = \"nvidia,tegra30-sdhci\", \"nvidia,tegra20-sdhci\";\n \t\treg = <0x78000400 0x200>;\n \t\tinterrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;\n@@ -833,7 +833,7 @@\n \t\tstatus = \"disabled\";\n \t};\n \n-\tsdhci@78000600 {\n+\tmmc@78000600 {\n \t\tcompatible = \"nvidia,tegra30-sdhci\", \"nvidia,tegra20-sdhci\";\n \t\treg = <0x78000600 0x200>;\n \t\tinterrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;\n", "prefixes": [ "v1", "5/6" ] }