From patchwork Sat Jan 28 13:31:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henrik Grimler X-Patchwork-Id: 49857 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1342020wrn; Sat, 28 Jan 2023 05:33:14 -0800 (PST) X-Google-Smtp-Source: AMrXdXu1laHAh0wnm22OfRGZ51gYkZL/KIW/rW7pXct5pXWHO4+jMqTOK06pJU9U7Sq//X5cyTHW X-Received: by 2002:a05:6a20:4407:b0:b8:66f6:6263 with SMTP id ce7-20020a056a20440700b000b866f66263mr61539133pzb.23.1674912794565; Sat, 28 Jan 2023 05:33:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674912794; cv=none; d=google.com; s=arc-20160816; b=Mb9QTSLsVb+m7bCWyIFBXBZ8vF5pPYPBR7kRXPVFv6DbXvrZkFPG/vitWVKx4cJInJ miOMI9yCLk4jgLrY4lo7jmT1CKZUlbQASz9qHGrJN/hEmDWMxQdq0CcGuXoV/PKx+4NN W8q0jdsyFWHBGVpYDsbRj9MGVqDuP8y4zMAc+YEC9FyVUOj1UIFgk5Lc725PYXnSJj5J ev2FFJjV5oq8zxhM39cvpVsQXITG+gZenFm1ZpbhsHyNfw5LmcdzjEcUb5lB3oUi/OQQ mANNLr9nUxVuHBlcrr2UNDgqusbzILxL88RwmE91PJ9315Pk8hRBk44G/RTS94KGe4Vx G0Mw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=faNgDxicPnolPKGeqPG46tJAmGJItTu7gNpxYxG5i8Y=; b=FwnJPG6GCJcL1DWadaWdvsqzP8IU0gQ06OnO5I9iVohjB7+apNAkQRsQY0Nc9naNYi 2HInTIxcMx6/kgLhi2L8CtNM4MM16BOykRRG36gsSLYxXWdJzQHcGi6IYadOnm3DM2LT ggHbzpBIUJWKv/WWHbNs1z7kN3yvXVygDCvtvBTqWV213jj0gNhQJwjW87V8aPzQUhZW 4DHgiUzC5iQF8CV+NvTEtzqq5wNU4W6ruuGpUiR5qtwLckeUW2wk0gW7842+LWjcrp4N CW3fnNN2e07RnKc25TMDqGTfOBEHgQ/w762XlrTfPtyikMg8iu/eeIrCu3WMLSbVD5RF 3XHg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@grimler.se header.s=key1 header.b=IuYUhBjh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=grimler.se Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p19-20020a637f53000000b004e1b5fb0683si3783631pgn.486.2023.01.28.05.33.00; Sat, 28 Jan 2023 05:33:14 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@grimler.se header.s=key1 header.b=IuYUhBjh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=grimler.se Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230103AbjA1NcM (ORCPT + 99 others); Sat, 28 Jan 2023 08:32:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35760 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233744AbjA1NcJ (ORCPT ); Sat, 28 Jan 2023 08:32:09 -0500 Received: from out-130.mta0.migadu.com (out-130.mta0.migadu.com [IPv6:2001:41d0:1004:224b::82]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4E64B611DC for ; Sat, 28 Jan 2023 05:32:07 -0800 (PST) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=grimler.se; s=key1; t=1674912725; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=faNgDxicPnolPKGeqPG46tJAmGJItTu7gNpxYxG5i8Y=; b=IuYUhBjhKuJBOOIAjuiCfCHtoDa2uJrhTEYLLCM3abywMz8gzYB5xzuGsEwJrEKR8PtGfH A7+1VRnrVp53n8lwzh2twV3rAbgB+rG94EG1+5w+M479dTLOIZoACTiicOmnK7dd401AYW nDTR66DahsH9Smh07gmfvpJh5KKafTc= From: Henrik Grimler To: robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, alim.akhtar@samsung.com, m.szyprowski@samsung.com, jenneron@protonmail.com, markuss.broks@gmail.com, martin.juecker@gmail.com, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org, phone-devel@vger.kernel.org, ~postmarketos/upstreaming@lists.sr.ht Cc: Henrik Grimler Subject: [PATCH v2 1/2] ARM: dts: exynos: drop mshc aliases Date: Sat, 28 Jan 2023 14:31:50 +0100 Message-Id: <20230128133151.29471-2-henrik@grimler.se> In-Reply-To: <20230128133151.29471-1-henrik@grimler.se> References: <20230128133151.29471-1-henrik@grimler.se> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756273358218910302?= X-GMAIL-MSGID: =?utf-8?q?1756273358218910302?= They are no longer needed after commit a13e8ef6008d ("mmc: dw_mmc: exynos: use common_caps"). Signed-off-by: Henrik Grimler Tested-by: Marek Szyprowski --- arch/arm/boot/dts/exynos3250.dtsi | 3 --- arch/arm/boot/dts/exynos4412.dtsi | 1 - arch/arm/boot/dts/exynos5250.dtsi | 4 ---- arch/arm/boot/dts/exynos5420.dtsi | 3 --- 4 files changed, 11 deletions(-) diff --git a/arch/arm/boot/dts/exynos3250.dtsi b/arch/arm/boot/dts/exynos3250.dtsi index 54bb323186e4..2d7771c1043b 100644 --- a/arch/arm/boot/dts/exynos3250.dtsi +++ b/arch/arm/boot/dts/exynos3250.dtsi @@ -28,9 +28,6 @@ / { aliases { pinctrl0 = &pinctrl_0; pinctrl1 = &pinctrl_1; - mshc0 = &mshc_0; - mshc1 = &mshc_1; - mshc2 = &mshc_2; spi0 = &spi_0; spi1 = &spi_1; i2c0 = &i2c_0; diff --git a/arch/arm/boot/dts/exynos4412.dtsi b/arch/arm/boot/dts/exynos4412.dtsi index 7b4e2c442888..9e97b42638e9 100644 --- a/arch/arm/boot/dts/exynos4412.dtsi +++ b/arch/arm/boot/dts/exynos4412.dtsi @@ -28,7 +28,6 @@ aliases { pinctrl3 = &pinctrl_3; fimc-lite0 = &fimc_lite_0; fimc-lite1 = &fimc_lite_1; - mshc0 = &mshc_0; }; cpus { diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi index 97e89859ba3d..6ea8a090f602 100644 --- a/arch/arm/boot/dts/exynos5250.dtsi +++ b/arch/arm/boot/dts/exynos5250.dtsi @@ -30,10 +30,6 @@ aliases { gsc1 = &gsc_1; gsc2 = &gsc_2; gsc3 = &gsc_3; - mshc0 = &mmc_0; - mshc1 = &mmc_1; - mshc2 = &mmc_2; - mshc3 = &mmc_3; i2c4 = &i2c_4; i2c5 = &i2c_5; i2c6 = &i2c_6; diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi index b1051a7d07af..6862cbabc172 100644 --- a/arch/arm/boot/dts/exynos5420.dtsi +++ b/arch/arm/boot/dts/exynos5420.dtsi @@ -19,9 +19,6 @@ / { compatible = "samsung,exynos5420", "samsung,exynos5"; aliases { - mshc0 = &mmc_0; - mshc1 = &mmc_1; - mshc2 = &mmc_2; pinctrl0 = &pinctrl_0; pinctrl1 = &pinctrl_1; pinctrl2 = &pinctrl_2; From patchwork Sat Jan 28 13:31:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henrik Grimler X-Patchwork-Id: 49858 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1342069wrn; Sat, 28 Jan 2023 05:33:23 -0800 (PST) X-Google-Smtp-Source: AK7set8SsV5KuQchq08UijUZ8TYUBRrryKHuM7qbqTFDilbTTuIhKBAJsGO2km+bjxFTP7BiWpbx X-Received: by 2002:a05:6a20:9388:b0:bc:8c17:32a9 with SMTP id x8-20020a056a20938800b000bc8c1732a9mr2559836pzh.4.1674912802926; Sat, 28 Jan 2023 05:33:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674912802; cv=none; d=google.com; s=arc-20160816; b=LSgU4jNnXDgXUZHAcqjldIbJlhMMKzND/ssNe87EPu1pAdnEcBHVbgQRgpiKe0fUH1 KXDiDpR7Fm7rjTsy7fa33FroZAJJYdOM9+aX+o41KaDzVsfQ9LppfHQuUsBsG571SOeO EP+bmmVzRfBTqoHkoAyLeucLE0JaJZKe6sQ2dYC4JjrlGxJITWQgB4TJQcQ5S/gl1tLM PGU+WV2AMnP2iL4irbPVOnhY1J/+NWX126wBdHdrAIxUu8nMEjIyuhzM4ve0wM3koM6w Rj9T8fNEnCxHXDH1FZIob869d4qMCn6dQwoldWypC6hiBTqxwsJvR3VFO3v0mbgrnRIc nVXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=feuA0KJ6YbvLfUa3ntr338vV6ZkldyLDXJH7jPPqBJ0=; b=Ql4gMfCkRU/3o7DjjNHHRnJXgwP++7CF64rVYjxYWkW4wsNwf52QjoO6dCowAMBD/K bHIjrlhTZlX5W9GmTBWseaVpuEzupv6JLvpfCiHA01T9KuJGSsNOCiajnkFW86gDKUA6 cNPltHX6sd+UBmoxL+zfZrUNl3NiISpj7WHOdypPOMOZRQCVohx1O+RNaYsHW6mvE3gB p7MY8YJ4sL34Ec7vCQ0LewyLHhnrrWsYKXCfBXXewuP6JKUwRTCfpUYyZ8Mo0roeNr3c 59g561ayZLCOFqZZk3icdeUorZao2/apMy5haEBgtoK7QT+KQ9XptdosBu+Ev8ZLrebq 14PA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@grimler.se header.s=key1 header.b=bkjWwlJb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=grimler.se Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bt23-20020a056a00439700b0058dbe627fc2si7450709pfb.336.2023.01.28.05.33.10; Sat, 28 Jan 2023 05:33:22 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@grimler.se header.s=key1 header.b=bkjWwlJb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=grimler.se Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234389AbjA1NcQ (ORCPT + 99 others); Sat, 28 Jan 2023 08:32:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35762 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234309AbjA1NcM (ORCPT ); Sat, 28 Jan 2023 08:32:12 -0500 Received: from out-92.mta0.migadu.com (out-92.mta0.migadu.com [IPv6:2001:41d0:1004:224b::5c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 856394E51E for ; Sat, 28 Jan 2023 05:32:10 -0800 (PST) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=grimler.se; s=key1; t=1674912726; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=feuA0KJ6YbvLfUa3ntr338vV6ZkldyLDXJH7jPPqBJ0=; b=bkjWwlJbPQnvV/sl9npGuxlkdN9oYfarjOBDIOpl/3XTjdC8AruJpMeXhhSXwLA8e8xjH7 AfOMXgYrM1TQXe48tNioHQBupMuGz94cx+dG/m6Pw/dxZLnVDeVB1htSkKnytMEdSv2YXh o78z/tBJwLJkPHNbrN70peCHQzA7lvA= From: Henrik Grimler To: robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, alim.akhtar@samsung.com, m.szyprowski@samsung.com, jenneron@protonmail.com, markuss.broks@gmail.com, martin.juecker@gmail.com, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org, phone-devel@vger.kernel.org, ~postmarketos/upstreaming@lists.sr.ht Cc: Henrik Grimler , Valentine Iourine Subject: [PATCH v2 2/2] ARM: dts: exynos: add mmc aliases Date: Sat, 28 Jan 2023 14:31:51 +0100 Message-Id: <20230128133151.29471-3-henrik@grimler.se> In-Reply-To: <20230128133151.29471-1-henrik@grimler.se> References: <20230128133151.29471-1-henrik@grimler.se> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756273367553911687?= X-GMAIL-MSGID: =?utf-8?q?1756273367553911687?= Add aliases for eMMC, SD card and WiFi where applicable, so that assigned mmcblk numbers are always the same. Co-developed-by: Anton Bambura Signed-off-by: Anton Bambura [ Tested on exynos5800-peach-pi ] Tested-by: Valentine Iourine Signed-off-by: Henrik Grimler Tested-by: Marek Szyprowski --- arch/arm/boot/dts/exynos3250-artik5-eval.dts | 5 +++++ arch/arm/boot/dts/exynos3250-artik5.dtsi | 5 +++++ arch/arm/boot/dts/exynos3250-monk.dts | 1 + arch/arm/boot/dts/exynos3250-rinato.dts | 2 ++ arch/arm/boot/dts/exynos4210-i9100.dts | 6 ++++++ arch/arm/boot/dts/exynos4210-origen.dts | 5 +++++ arch/arm/boot/dts/exynos4210-smdkv310.dts | 4 ++++ arch/arm/boot/dts/exynos4210-trats.dts | 6 ++++++ arch/arm/boot/dts/exynos4210-universal_c210.dts | 6 ++++++ arch/arm/boot/dts/exynos4412-itop-elite.dts | 5 +++++ arch/arm/boot/dts/exynos4412-midas.dtsi | 3 +++ arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 5 +++++ arch/arm/boot/dts/exynos4412-origen.dts | 5 +++++ arch/arm/boot/dts/exynos4412-p4note.dtsi | 6 ++++++ arch/arm/boot/dts/exynos4412-smdk4412.dts | 4 ++++ arch/arm/boot/dts/exynos4412-tiny4412.dts | 4 ++++ arch/arm/boot/dts/exynos5250-arndale.dts | 5 +++++ arch/arm/boot/dts/exynos5250-smdk5250.dts | 2 ++ arch/arm/boot/dts/exynos5250-snow-common.dtsi | 3 +++ arch/arm/boot/dts/exynos5250-spring.dts | 5 +++++ arch/arm/boot/dts/exynos5260-xyref5260.dts | 5 +++++ arch/arm/boot/dts/exynos5410-odroidxu.dts | 2 ++ arch/arm/boot/dts/exynos5410-smdk5410.dts | 5 +++++ arch/arm/boot/dts/exynos5420-arndale-octa.dts | 5 +++++ arch/arm/boot/dts/exynos5420-galaxy-tab-common.dtsi | 5 +++++ arch/arm/boot/dts/exynos5420-peach-pit.dts | 3 +++ arch/arm/boot/dts/exynos5420-smdk5420.dts | 5 +++++ arch/arm/boot/dts/exynos5422-odroid-core.dtsi | 5 +++++ arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 4 ++++ arch/arm/boot/dts/exynos5422-samsung-k3g.dts | 4 ++++ arch/arm/boot/dts/exynos5800-peach-pi.dts | 3 +++ 31 files changed, 133 insertions(+) diff --git a/arch/arm/boot/dts/exynos3250-artik5-eval.dts b/arch/arm/boot/dts/exynos3250-artik5-eval.dts index a1e22f630638..83266a66124b 100644 --- a/arch/arm/boot/dts/exynos3250-artik5-eval.dts +++ b/arch/arm/boot/dts/exynos3250-artik5-eval.dts @@ -16,6 +16,11 @@ / { model = "Samsung ARTIK5 evaluation board"; compatible = "samsung,artik5-eval", "samsung,artik5", "samsung,exynos3250", "samsung,exynos3"; + + aliases { + mmc2 = &mshc_2; + }; + }; &mshc_2 { diff --git a/arch/arm/boot/dts/exynos3250-artik5.dtsi b/arch/arm/boot/dts/exynos3250-artik5.dtsi index 0ac3f284fbb8..a6e2f46917a8 100644 --- a/arch/arm/boot/dts/exynos3250-artik5.dtsi +++ b/arch/arm/boot/dts/exynos3250-artik5.dtsi @@ -17,6 +17,11 @@ / { compatible = "samsung,artik5", "samsung,exynos3250", "samsung,exynos3"; + aliases { + mmc0 = &mshc_0; + mmc1 = &mshc_1; + }; + chosen { stdout-path = &serial_2; }; diff --git a/arch/arm/boot/dts/exynos3250-monk.dts b/arch/arm/boot/dts/exynos3250-monk.dts index 80d90fe7fad1..a68e5f81404c 100644 --- a/arch/arm/boot/dts/exynos3250-monk.dts +++ b/arch/arm/boot/dts/exynos3250-monk.dts @@ -22,6 +22,7 @@ / { aliases { i2c7 = &i2c_max77836; + mmc0 = &mshc_0; }; memory@40000000 { diff --git a/arch/arm/boot/dts/exynos3250-rinato.dts b/arch/arm/boot/dts/exynos3250-rinato.dts index 1f9cba0607e1..f0fb6890e4a8 100644 --- a/arch/arm/boot/dts/exynos3250-rinato.dts +++ b/arch/arm/boot/dts/exynos3250-rinato.dts @@ -23,6 +23,8 @@ / { aliases { i2c7 = &i2c_max77836; + mmc0 = &mshc_0; + mmc1 = &mshc_1; }; chosen { diff --git a/arch/arm/boot/dts/exynos4210-i9100.dts b/arch/arm/boot/dts/exynos4210-i9100.dts index bba85011ecc9..7051e2c4b391 100644 --- a/arch/arm/boot/dts/exynos4210-i9100.dts +++ b/arch/arm/boot/dts/exynos4210-i9100.dts @@ -25,6 +25,12 @@ memory@40000000 { reg = <0x40000000 0x40000000>; }; + aliases { + mmc0 = &sdhci_0; + mmc2 = &sdhci_2; + mmc3 = &sdhci_3; + }; + chosen { stdout-path = "serial2:115200n8"; }; diff --git a/arch/arm/boot/dts/exynos4210-origen.dts b/arch/arm/boot/dts/exynos4210-origen.dts index 5f37b751f700..41c73ee0d556 100644 --- a/arch/arm/boot/dts/exynos4210-origen.dts +++ b/arch/arm/boot/dts/exynos4210-origen.dts @@ -30,6 +30,11 @@ memory@40000000 { 0x70000000 0x10000000>; }; + aliases { + mmc0 = &sdhci_0; + mmc2 = &sdhci_2; + }; + chosen { bootargs = "root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M init=/linuxrc"; stdout-path = "serial2:115200n8"; diff --git a/arch/arm/boot/dts/exynos4210-smdkv310.dts b/arch/arm/boot/dts/exynos4210-smdkv310.dts index a5dfd7fd49b3..2b8141f2912e 100644 --- a/arch/arm/boot/dts/exynos4210-smdkv310.dts +++ b/arch/arm/boot/dts/exynos4210-smdkv310.dts @@ -25,6 +25,10 @@ memory@40000000 { reg = <0x40000000 0x80000000>; }; + aliases { + mmc2 = &sdhci_2; + }; + chosen { bootargs = "root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M init=/linuxrc"; stdout-path = "serial1:115200n8"; diff --git a/arch/arm/boot/dts/exynos4210-trats.dts b/arch/arm/boot/dts/exynos4210-trats.dts index b8e9dd23fc51..b6b0c116016c 100644 --- a/arch/arm/boot/dts/exynos4210-trats.dts +++ b/arch/arm/boot/dts/exynos4210-trats.dts @@ -26,6 +26,12 @@ memory@40000000 { 0x70000000 0x10000000>; }; + aliases { + mmc0 = &sdhci_0; + mmc2 = &sdhci_2; + mmc3 = &sdhci_3; + }; + chosen { bootargs = "root=/dev/mmcblk0p5 rootwait earlyprintk panic=5"; stdout-path = "serial2:115200n8"; diff --git a/arch/arm/boot/dts/exynos4210-universal_c210.dts b/arch/arm/boot/dts/exynos4210-universal_c210.dts index 62bf335d5bed..2135a6843511 100644 --- a/arch/arm/boot/dts/exynos4210-universal_c210.dts +++ b/arch/arm/boot/dts/exynos4210-universal_c210.dts @@ -24,6 +24,12 @@ memory@40000000 { 0x50000000 0x10000000>; }; + aliases { + mmc0 = &sdhci_0; + mmc2 = &sdhci_2; + mmc3 = &sdhci_3; + }; + chosen { bootargs = "root=/dev/mmcblk0p5 rw rootwait earlyprintk panic=5 maxcpus=1"; stdout-path = "serial2:115200n8"; diff --git a/arch/arm/boot/dts/exynos4412-itop-elite.dts b/arch/arm/boot/dts/exynos4412-itop-elite.dts index b596e997e451..c0132e537663 100644 --- a/arch/arm/boot/dts/exynos4412-itop-elite.dts +++ b/arch/arm/boot/dts/exynos4412-itop-elite.dts @@ -20,6 +20,11 @@ / { model = "TOPEET iTop 4412 Elite board based on Exynos4412"; compatible = "topeet,itop4412-elite", "samsung,exynos4412", "samsung,exynos4"; + aliases { + mmc0 = &mshc_0; + mmc2 = &sdhci_2; + }; + chosen { bootargs = "root=/dev/mmcblk0p2 rw rootfstype=ext4 rootdelay=1 rootwait"; stdout-path = "serial2:115200n8"; diff --git a/arch/arm/boot/dts/exynos4412-midas.dtsi b/arch/arm/boot/dts/exynos4412-midas.dtsi index d5074fa57142..56382bb07939 100644 --- a/arch/arm/boot/dts/exynos4412-midas.dtsi +++ b/arch/arm/boot/dts/exynos4412-midas.dtsi @@ -25,6 +25,9 @@ / { aliases { i2c11 = &i2c_max77693; i2c12 = &i2c_max77693_fuel; + mmc0 = &mshc_0; + mmc2 = &sdhci_2; + mmc3 = &sdhci_3; }; chosen { diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi index 7c2780d3e37c..4bfbe960be43 100644 --- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi +++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi @@ -13,6 +13,11 @@ #include "exynos-mfc-reserved-memory.dtsi" / { + aliases { + mmc0 = &mshc_0; + mmc2 = &sdhci_2; + }; + chosen { stdout-path = &serial_1; }; diff --git a/arch/arm/boot/dts/exynos4412-origen.dts b/arch/arm/boot/dts/exynos4412-origen.dts index ea9fd284386d..2e25415aa2d4 100644 --- a/arch/arm/boot/dts/exynos4412-origen.dts +++ b/arch/arm/boot/dts/exynos4412-origen.dts @@ -25,6 +25,11 @@ memory@40000000 { reg = <0x40000000 0x40000000>; }; + aliases { + mmc0 = &mshc_0; + mmc2 = &sdhci_2; + }; + chosen { stdout-path = "serial2:115200n8"; }; diff --git a/arch/arm/boot/dts/exynos4412-p4note.dtsi b/arch/arm/boot/dts/exynos4412-p4note.dtsi index 3e05a49f29ff..a21440062b1e 100644 --- a/arch/arm/boot/dts/exynos4412-p4note.dtsi +++ b/arch/arm/boot/dts/exynos4412-p4note.dtsi @@ -26,6 +26,12 @@ memory@40000000 { reg = <0x40000000 0x80000000>; }; + aliases { + mmc0 = &mshc_0; + mmc2 = &sdhci_2; + mmc3 = &sdhci_3; + }; + chosen { stdout-path = &serial_2; }; diff --git a/arch/arm/boot/dts/exynos4412-smdk4412.dts b/arch/arm/boot/dts/exynos4412-smdk4412.dts index a40ff394977c..6296a5a06630 100644 --- a/arch/arm/boot/dts/exynos4412-smdk4412.dts +++ b/arch/arm/boot/dts/exynos4412-smdk4412.dts @@ -22,6 +22,10 @@ memory@40000000 { reg = <0x40000000 0x40000000>; }; + aliases { + mmc2 = &sdhci_2; + }; + chosen { bootargs = "root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M init=/linuxrc"; stdout-path = "serial1:115200n8"; diff --git a/arch/arm/boot/dts/exynos4412-tiny4412.dts b/arch/arm/boot/dts/exynos4412-tiny4412.dts index e0b6162d2e2a..e010b75a9d49 100644 --- a/arch/arm/boot/dts/exynos4412-tiny4412.dts +++ b/arch/arm/boot/dts/exynos4412-tiny4412.dts @@ -17,6 +17,10 @@ / { model = "FriendlyARM TINY4412 board based on Exynos4412"; compatible = "friendlyarm,tiny4412", "samsung,exynos4412", "samsung,exynos4"; + aliases { + mmc2 = &sdhci_2; + }; + chosen { stdout-path = &serial_0; }; diff --git a/arch/arm/boot/dts/exynos5250-arndale.dts b/arch/arm/boot/dts/exynos5250-arndale.dts index 71c0e87d3a1d..3ef04e59939e 100644 --- a/arch/arm/boot/dts/exynos5250-arndale.dts +++ b/arch/arm/boot/dts/exynos5250-arndale.dts @@ -23,6 +23,11 @@ memory@40000000 { reg = <0x40000000 0x80000000>; }; + aliases { + mmc0 = &mmc_0; + mmc2 = &mmc_2; + }; + chosen { stdout-path = "serial2:115200n8"; }; diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts index 71293749ac48..e8087d7d6305 100644 --- a/arch/arm/boot/dts/exynos5250-smdk5250.dts +++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts @@ -17,6 +17,8 @@ / { compatible = "samsung,smdk5250", "samsung,exynos5250", "samsung,exynos5"; aliases { + mmc0 = &mmc_0; + mmc2 = &mmc_2; }; memory@40000000 { diff --git a/arch/arm/boot/dts/exynos5250-snow-common.dtsi b/arch/arm/boot/dts/exynos5250-snow-common.dtsi index 3d84b9c6dea3..cdf1ebff11db 100644 --- a/arch/arm/boot/dts/exynos5250-snow-common.dtsi +++ b/arch/arm/boot/dts/exynos5250-snow-common.dtsi @@ -15,6 +15,9 @@ / { aliases { i2c104 = &i2c_104; + mmc0 = &mmc_0; /* eMMC */ + mmc1 = &mmc_2; /* SD */ + mmc2 = &mmc_3; /* WiFi */ }; memory@40000000 { diff --git a/arch/arm/boot/dts/exynos5250-spring.dts b/arch/arm/boot/dts/exynos5250-spring.dts index 5eca10ecd550..96050fea93f8 100644 --- a/arch/arm/boot/dts/exynos5250-spring.dts +++ b/arch/arm/boot/dts/exynos5250-spring.dts @@ -23,6 +23,11 @@ memory@40000000 { reg = <0x40000000 0x80000000>; }; + aliases { + mmc0 = &mmc_0; + mmc1 = &mmc_1; + }; + chosen { bootargs = "console=tty1"; stdout-path = "serial3:115200n8"; diff --git a/arch/arm/boot/dts/exynos5260-xyref5260.dts b/arch/arm/boot/dts/exynos5260-xyref5260.dts index 387b8494f18f..1e2f6af6d311 100644 --- a/arch/arm/boot/dts/exynos5260-xyref5260.dts +++ b/arch/arm/boot/dts/exynos5260-xyref5260.dts @@ -18,6 +18,11 @@ memory@20000000 { reg = <0x20000000 0x80000000>; }; + aliases { + mmc0 = &mmc_0; + mmc2 = &mmc_2; + }; + chosen { stdout-path = "serial2:115200n8"; }; diff --git a/arch/arm/boot/dts/exynos5410-odroidxu.dts b/arch/arm/boot/dts/exynos5410-odroidxu.dts index 232561620da2..f495514d88b3 100644 --- a/arch/arm/boot/dts/exynos5410-odroidxu.dts +++ b/arch/arm/boot/dts/exynos5410-odroidxu.dts @@ -21,6 +21,8 @@ / { aliases { ethernet = ðernet; + mmc0 = &mmc_0; + mmc2 = &mmc_2; }; memory@40000000 { diff --git a/arch/arm/boot/dts/exynos5410-smdk5410.dts b/arch/arm/boot/dts/exynos5410-smdk5410.dts index b8f953c41c73..1d3d220f3fcc 100644 --- a/arch/arm/boot/dts/exynos5410-smdk5410.dts +++ b/arch/arm/boot/dts/exynos5410-smdk5410.dts @@ -18,6 +18,11 @@ memory@40000000 { reg = <0x40000000 0x80000000>; }; + aliases { + mmc0 = &mmc_0; + mmc2 = &mmc_2; + }; + chosen { stdout-path = "serial2:115200n8"; }; diff --git a/arch/arm/boot/dts/exynos5420-arndale-octa.dts b/arch/arm/boot/dts/exynos5420-arndale-octa.dts index 55b7759682a9..54398db244ad 100644 --- a/arch/arm/boot/dts/exynos5420-arndale-octa.dts +++ b/arch/arm/boot/dts/exynos5420-arndale-octa.dts @@ -23,6 +23,11 @@ memory@20000000 { reg = <0x20000000 0x80000000>; }; + aliases { + mmc0 = &mmc_0; + mmc2 = &mmc_2; + }; + chosen { stdout-path = "serial3:115200n8"; }; diff --git a/arch/arm/boot/dts/exynos5420-galaxy-tab-common.dtsi b/arch/arm/boot/dts/exynos5420-galaxy-tab-common.dtsi index 63675fe189cd..18874125ac64 100644 --- a/arch/arm/boot/dts/exynos5420-galaxy-tab-common.dtsi +++ b/arch/arm/boot/dts/exynos5420-galaxy-tab-common.dtsi @@ -28,6 +28,11 @@ / { * for more details. */ + aliases { + mmc0 = &mmc_0; + mmc2 = &mmc_2; + }; + chosen { stdout-path = "serial2:115200n8"; }; diff --git a/arch/arm/boot/dts/exynos5420-peach-pit.dts b/arch/arm/boot/dts/exynos5420-peach-pit.dts index 9e2123470cad..8b2bbeb7f64f 100644 --- a/arch/arm/boot/dts/exynos5420-peach-pit.dts +++ b/arch/arm/boot/dts/exynos5420-peach-pit.dts @@ -31,6 +31,9 @@ / { aliases { /* Assign 20 so we don't get confused w/ builtin ones */ i2c20 = &i2c_tunnel; + mmc0 = &mmc_0; /* eMMC */ + mmc1 = &mmc_2; /* uSD */ + mmc2 = &mmc_1; /* WiFi */ }; backlight: backlight { diff --git a/arch/arm/boot/dts/exynos5420-smdk5420.dts b/arch/arm/boot/dts/exynos5420-smdk5420.dts index 4d7b6d9008a7..134ed8931ba7 100644 --- a/arch/arm/boot/dts/exynos5420-smdk5420.dts +++ b/arch/arm/boot/dts/exynos5420-smdk5420.dts @@ -21,6 +21,11 @@ memory@20000000 { reg = <0x20000000 0x80000000>; }; + aliases { + mmc0 = &mmc_0; + mmc2 = &mmc_2; + }; + chosen { bootargs = "init=/linuxrc"; stdout-path = "serial2:115200n8"; diff --git a/arch/arm/boot/dts/exynos5422-odroid-core.dtsi b/arch/arm/boot/dts/exynos5422-odroid-core.dtsi index 30fc677d8bac..9f2ec636436e 100644 --- a/arch/arm/boot/dts/exynos5422-odroid-core.dtsi +++ b/arch/arm/boot/dts/exynos5422-odroid-core.dtsi @@ -19,6 +19,11 @@ memory@40000000 { reg = <0x40000000 0x7ea00000>; }; + aliases { + mmc2 = &mmc_2; + }; + + chosen { stdout-path = "serial2:115200n8"; }; diff --git a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi index a6961ff24030..55fd2b94be3f 100644 --- a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi +++ b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi @@ -13,6 +13,10 @@ #include "exynos5422-odroid-core.dtsi" / { + aliases { + mmc0 = &mmc_0; + }; + gpio-keys { compatible = "gpio-keys"; pinctrl-names = "default"; diff --git a/arch/arm/boot/dts/exynos5422-samsung-k3g.dts b/arch/arm/boot/dts/exynos5422-samsung-k3g.dts index df41723d56d4..4a0c8f29ccbc 100644 --- a/arch/arm/boot/dts/exynos5422-samsung-k3g.dts +++ b/arch/arm/boot/dts/exynos5422-samsung-k3g.dts @@ -24,6 +24,10 @@ memory@20000000 { reg = <0x20000000 0x80000000>; /* 2 GiB */ }; + aliases { + mmc0 = &mmc_0; + }; + fixed-rate-clocks { oscclk { compatible = "samsung,exynos5420-oscclk"; diff --git a/arch/arm/boot/dts/exynos5800-peach-pi.dts b/arch/arm/boot/dts/exynos5800-peach-pi.dts index 0ebcb66c6319..50e9e884c51f 100644 --- a/arch/arm/boot/dts/exynos5800-peach-pi.dts +++ b/arch/arm/boot/dts/exynos5800-peach-pi.dts @@ -29,6 +29,9 @@ / { aliases { /* Assign 20 so we don't get confused w/ builtin ones */ i2c20 = &i2c_tunnel; + mmc0 = &mmc_0; /* eMMC */ + mmc1 = &mmc_2; /* SD */ + mmc2 = &mmc_1; /* WiFi */ }; backlight: backlight {