From patchwork Tue Oct 2 08:43:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 10623253 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 023DF14BD for ; Tue, 2 Oct 2018 08:47:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D181A2875C for ; Tue, 2 Oct 2018 08:47:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C591D2876E; Tue, 2 Oct 2018 08:47:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7F2FB2875C for ; Tue, 2 Oct 2018 08:47:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=EL1fpWRcjwQg6eSBr5rouGLoSsU66J0d0E9BI1qzbtk=; b=I67KdleqvISY83ermq5oHokw3l bdGOxVZiIX+TvR3WQyf/bqlOItzkJWNVmUtBP/suehJrKUQsJC0Epe5pAY+gdMDGbrRlmqhQIv2Lx NZi0CnVqfmdtYZ0/q+fE/ymIKdo+nEfBaHGOqgEvOlZD+/Xt1xBuwlyL0AK2xh60v+tqd//yq9Y+q loFdvnHA18bmaxh+UArgfz7Is96TH1JhTIe3QlzOc5sqIAzOGEWBxJUUsRJj85dGKUdVL6Pyzl0Ob 7Vf+o7vc13iQzvDTluUOSeqQ6vTks/4TV27RDJFN12fIJScwCytzdxKfE/Rxug4qcg3Eg3Ex6PUZ8 l2abivqg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1g7GKs-000746-CV; Tue, 02 Oct 2018 08:47:18 +0000 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1g7GHi-0004OY-01 for linux-arm-kernel@lists.infradead.org; Tue, 02 Oct 2018 08:44:26 +0000 Received: by mail-wm1-x341.google.com with SMTP id o18-v6so1320357wmc.0 for ; Tue, 02 Oct 2018 01:43:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=pS2sZN7Q59sh8X96tfZBc9kwSl+jTGdPA860nux7XN0=; b=n9FCU1qrVBmX7yQKuZcBMhPsby8uQzkk+ojuTq/SFgxuu6NPb2zoa3vE4XHhcgRms+ olYdwqBSKooS9Q4hrHr4cLBOQ5EkmJLtZF99+aY1ujTvDGbo2W55Usl8WO8DDdB7MXhs Df2r9szSKDED1Xma6c3UMECAAAgpGSZ7wVs8Co+KwJKPMO9BJYl3gjZ08A7ouMZhoqud qJi7sYzursU0sy016mGXEfMOSnSYv+RuZt4K51AMNEEHhSZe1QrIyVHLdJ6nqTzc+sft FIlLtno66u+z3hFFV+g3HgRfeyRdfmpJTmUA5Gt32axzchALFVDj5u7hpetZ4t7wjPDX iKdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=pS2sZN7Q59sh8X96tfZBc9kwSl+jTGdPA860nux7XN0=; b=Ty84czV/mcCCoNENiBgNRMHBcGu2FB1EohzVCzf/T08/qHjZ297sWoAT7+dqu7h5Pv ab5QTIHtIfC9Qs8jokS1bF8vrUHA2BzRX2Lk759P9EYYMvV7AcEBuSvJnS6+bztRRRKA klVFW+0tKvIPPhUa2NxQ7KjepP9RzF4CnJOfHW83/Wf4f+Gh6R7c3Pp0pbukRZH6Di8u 7FYgTqa9iGQXQyNpszAZUXpUQ1ScSphWoARG8LcNdpHRYvIiMiFFKoNbUH1SItNXsO/j QXXEKoKudGuR3yFifrY7cb8dKg+qw3jquk13KDPEgNQPi/mtClJIY+x5J/60TFeVqfYa zolQ== X-Gm-Message-State: ABuFfohAdlvMDT/Kb29703O69YdNC8i+rnct2/TOZGwXG5oMO3Ez39Ei YaDxmnsx5D6sPjZRVkHO5IqHpg== X-Google-Smtp-Source: ACcGV63mYUMTBIi0NSP36N+RoVqQeqbagJzAMl0E9Z5fc/GEubQa/FkjDz/DllZtDciSweHeggHEfA== X-Received: by 2002:a1c:a015:: with SMTP id j21-v6mr1211791wme.78.1538469830094; Tue, 02 Oct 2018 01:43:50 -0700 (PDT) Received: from boomer.baylibre.local ([2a01:e34:eeb6:4690:3146:aafc:91d9:4b96]) by smtp.googlemail.com with ESMTPSA id 198-v6sm16162298wmm.0.2018.10.02.01.43.48 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 02 Oct 2018 01:43:49 -0700 (PDT) From: Jerome Brunet To: Kevin Hilman , Carlo Caione Subject: [PATCH 1/2] arm64: dts: meson-axg: s400: add missing emmc pwrseq Date: Tue, 2 Oct 2018 10:43:40 +0200 Message-Id: <20181002084341.5487-2-jbrunet@baylibre.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181002084341.5487-1-jbrunet@baylibre.com> References: <20181002084341.5487-1-jbrunet@baylibre.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181002_014402_109818_04239EBE X-CRM114-Status: GOOD ( 12.76 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Jerome Brunet MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP eMMC pwrseq is defined in the s400 dts but not used in the emmc node. This is probably just a copy/paste error Fixes: 221cf34bac54 ("ARM64: dts: meson-axg: enable the eMMC controller") Signed-off-by: Jerome Brunet --- arch/arm64/boot/dts/amlogic/meson-axg-s400.dts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts index d6467ac333ec..166ab598395e 100644 --- a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts +++ b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts @@ -493,6 +493,8 @@ mmc-ddr-1_8v; mmc-hs200-1_8v; + mmc-pwrseq = <&emmc_pwrseq>; + vmmc-supply = <&vcc_3v3>; vqmmc-supply = <&vddio_boot>; }; From patchwork Tue Oct 2 08:43:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 10623247 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DDD7D14BD for ; Tue, 2 Oct 2018 08:46:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B91482875C for ; Tue, 2 Oct 2018 08:46:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ACDB52876E; Tue, 2 Oct 2018 08:46:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 25DA12875C for ; Tue, 2 Oct 2018 08:46:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=Sq8114pqVCfF31YLnCN0suIHD4f7+FyFjXbz/H05xEg=; b=jpBxmczpsJ61b7RwDj3Fd3MXIc M7mJny8miWx1hJGvbS2z5c7Mi+dfMODhzRD6p75KpyfgCSrZSUOrF9JaBPVXM0CJhrohNiutnrQ8W C6uQOwnLTrCaBmy+UgpofaWTAwk0Kt1m+E/lhdSTlKhgQkpAZq59lNd+aALLCXMbbqbcdGknFEhXX AE1dC859+Jqxe+muAmwO82HTWs8ESCd+KwVgYkzhm+PbtClv27PGBiYmAvBgV6fQgLlvPH0Zyj56C yk30M6yP82PlDs5XEd4Ed2Rm/+BijVknNwRQjz28z6u1I5LWQ2MhlYYUwfFudKTXuzCqoSHciVLjz 0xdAQ5Iw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1g7GJx-0006im-6M; Tue, 02 Oct 2018 08:46:21 +0000 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1g7GHh-0004Oh-Se for linux-arm-kernel@lists.infradead.org; Tue, 02 Oct 2018 08:44:23 +0000 Received: by mail-wm1-x342.google.com with SMTP id y140-v6so4348424wmd.0 for ; Tue, 02 Oct 2018 01:43:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=PKzH8oYKZ82Z9TWd7i02OlmOTFAJUgwk8t5GyaIR3Bc=; b=Fi/eYR8pwykHWHOKpYSmKoc+0Wmlao7S1/rdIXXxB/GD9s7jVvZJ/5YovtSwd6Susj 6qPpJLPAat6p/M925sKVHsJ7RlM1rEdqOsIcEReJoHeXe8ee+vWhFA9ufBhrGzD12hgz FNWa4ZQjWu9hoIaYqSJDrYcCbFD4pqTa6hkkSCqxys29pNh0wuJ7tnuSvaFA8X/CfL6K mj+pyzR8NmAKsWveqZamci3eG932H1eUYbOu2f+QQYlYrYrU0ueUYphxwwS9r1/ds0nU 1V1zWZT3IPOf0jFgiSW0o3KxaWOq5E/MxzsRmAMqSjM8W6Fv7cXpzF9ThNqKOIJ9PYkV +EKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=PKzH8oYKZ82Z9TWd7i02OlmOTFAJUgwk8t5GyaIR3Bc=; b=Du20VQvixlzOUcGRN/OkIFR6RrT68r5eyUpIpMgOqMiyRgM/QLhDADDp6gVLaPteKn uWkQBYdDCMZRd/ANiYK4MWoJlj1YRfEsSVZ8Vum69XbHUlBMYiE83TApj74IfZcVTzCm UtFKgtv5VrmIcczdl08ZxHa0bwqrHzM774hOUaTBve54Gl3Tl593NR2Vne66UKRvjbd+ pHqQ6kabryPBrCFy+LYO/Qcmp1+f2R+HZrw7uyL1X2r64ok+L94QA8WkLAIECfm9sotk cka3ICv2XKS3BwPfm3Eea7ksAXPmt6JIb9lcRisKkUoOQDSEebssWAJGuA8ed4bCSqbM U47w== X-Gm-Message-State: ABuFfogBWEZNG05AIKYmi/9lLt9wWkLrmkDB+avWftKzvrPev4D3kQqs +xQ4tS5k0Z8QZ4GdO1si1vlaJA== X-Google-Smtp-Source: ACcGV623DtWlOgdp/InigkmS4w1yiXL61w0NCjABKQqR/Iw2XTwnXTqxSHuU7fvpyC8nKrNCv8wWPg== X-Received: by 2002:a1c:ee0c:: with SMTP id m12-v6mr1209010wmh.112.1538469831403; Tue, 02 Oct 2018 01:43:51 -0700 (PDT) Received: from boomer.baylibre.local ([2a01:e34:eeb6:4690:3146:aafc:91d9:4b96]) by smtp.googlemail.com with ESMTPSA id 198-v6sm16162298wmm.0.2018.10.02.01.43.50 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 02 Oct 2018 01:43:50 -0700 (PDT) From: Jerome Brunet To: Kevin Hilman , Carlo Caione Subject: [PATCH 2/2] arm64: dts: meson-axg: s400: disable emmc Date: Tue, 2 Oct 2018 10:43:41 +0200 Message-Id: <20181002084341.5487-3-jbrunet@baylibre.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181002084341.5487-1-jbrunet@baylibre.com> References: <20181002084341.5487-1-jbrunet@baylibre.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181002_014401_946448_BD9123C0 X-CRM114-Status: GOOD ( 16.36 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Jerome Brunet MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP While it is possible to rework the s400 board to solder an eMMC on it, it is not the default option and most boards are fitted with a NAND instead. Let's disable the emmc device by default to reflect this. The board equipped with an eMMC will just have to alter the DT in the bootloader, like we do for the reserved memory regions. Signed-off-by: Jerome Brunet --- arch/arm64/boot/dts/amlogic/meson-axg-s400.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts index 166ab598395e..c74ff1efebb8 100644 --- a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts +++ b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts @@ -479,7 +479,7 @@ /* emmc storage */ &sd_emmc_c { - status = "okay"; + status = "disabled"; pinctrl-0 = <&emmc_pins>; pinctrl-1 = <&emmc_clk_gate_pins>; pinctrl-names = "default", "clk-gate";