From patchwork Fri Nov 2 15:03:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 992352 X-Patchwork-Delegate: van.freenix@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="U7WSFhth"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 42mlhN3ptxzB4WZ for ; Sat, 3 Nov 2018 02:03:48 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 37BE1C22586; Fri, 2 Nov 2018 15:03:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id B3297C22535; Fri, 2 Nov 2018 15:03:43 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id DC24CC22561; Fri, 2 Nov 2018 15:03:41 +0000 (UTC) Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by lists.denx.de (Postfix) with ESMTPS id CCBB6C22535 for ; Fri, 2 Nov 2018 15:03:40 +0000 (UTC) Received: by mail-wm1-f68.google.com with SMTP id l2-v6so2164293wmh.3 for ; Fri, 02 Nov 2018 08:03:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=RV3U3VwjfmPt7GkqAin2SgWrcqkMASKlKGLTqyucXN0=; b=U7WSFhthkzWMv+dN7DAMfDeZ4xLq59jgWHWTpjZnDYvxeB/zxmvNKoSLzFldzONSO4 wsyWo9sCSBTD8Q/eFAL6WILOnPDXnCeT0vJoZ1WVedwyxGNNE+ZAO5OYB57FfMY/YZP0 kSt23nBOzvpUP2pr/2iT41dxXP4s9tkPMTc9AZO9mq+A9yvx4SD/q77a1BgPutwADz9x wXyXKb/GGfS6/8IYannhmMbJ6oWXO20ZMTyQbqe2ATIrVJQTq4C4lq/Zu5hqaKltmIBs n+NoSHDOaMf3kII5qfWYasoN8PEYZkbCjkwSmv4ScyQMl+6YR6uX+caF9fPolphaX1gb HESA== 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; bh=RV3U3VwjfmPt7GkqAin2SgWrcqkMASKlKGLTqyucXN0=; b=BIEDtcKacqamg34q65LqdlSNQkbzMfdYvft9Vjcvv6fU5aZAHygfC925Vl0vdO1FDC PbYw4/GdvtZhuwGm5Zni9uocgOTNRn+Je8hL0gTAgVGkk38+qwkrEl4BKBtQpdS/Bqlg VRJt0Q52eEE8Ii3AxUlZ7/w03Ju7yhKQUV45tjG6Vhd17pBhPu8jQa2p1W40JY24Kzs9 r9oH2qWOwDWvP3U3RU+KQZLqLENOGXUmta5IHygq5pWJf/t462GUXFnDrc0aK8BJhTqW oO9xbgJMaFgUBYPtR6W/LiBwzdonFZIuhtgKm58sO1T6NOk/q4lsdJ3VS3aUbLKby24M Qg+g== X-Gm-Message-State: AGRZ1gIQyTiu/BxeoXSGdxoV4pUF0kgtqZZ0fRCmhmb+GvCrAwkY74pi k4euC8gR/padFOhyRjxAoJnhhsZ1 X-Google-Smtp-Source: AJdET5csm3QyaLPZsqzXls4Yai5PhwpfjFXfTSEWKU24yT4WKWRnJGpqQUIyf8HpsnGYizRaPC/f7g== X-Received: by 2002:a1c:85c5:: with SMTP id h188-v6mr48687wmd.59.1541171019990; Fri, 02 Nov 2018 08:03:39 -0700 (PDT) Received: from kurokawa.lan (ip-86-49-110-70.net.upcbroadband.cz. [86.49.110.70]) by smtp.gmail.com with ESMTPSA id l67-v6sm60125880wma.20.2018.11.02.08.03.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Nov 2018 08:03:39 -0700 (PDT) From: Marek Vasut X-Google-Original-From: Marek Vasut To: u-boot@lists.denx.de Date: Fri, 2 Nov 2018 16:03:16 +0100 Message-Id: <20181102150328.21972-1-marek.vasut+renesas@gmail.com> X-Mailer: git-send-email 2.18.0 Cc: Marek Vasut Subject: [U-Boot] [PATCH V3 01/13] mmc: tmio: Simplify pinmux handling X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" The SD UHS SDR12, SDR25, SDR50, SDR104, DDR50 and MMC HS200, HS400 modes all use 1.8V signaling, while all the legacy modes use 3.3V signaling. While there are extra modes which use 1.2V signaling, the existing hardware does not support those. Simplify the pinmux such that 3.3V signaling implies legacy mode pinmux and the rest implies UHS mode pinmux. This prevents the massive case statement from growing further. Moreover, it fixes an edge case where during SD 1.8V switch, the bus mode is still set to default while the signaling is already set to 1.8V, which results in an attempt to communicate with a 1.8V card using pins in 3.3V mode and thus communication failure. Signed-off-by: Marek Vasut Cc: Masahiro Yamada --- V2: No change V3: No change --- drivers/mmc/tmio-common.c | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/drivers/mmc/tmio-common.c b/drivers/mmc/tmio-common.c index 138de59470..5f927c6150 100644 --- a/drivers/mmc/tmio-common.c +++ b/drivers/mmc/tmio-common.c @@ -622,26 +622,10 @@ static void tmio_sd_set_pins(struct udevice *dev) #endif #ifdef CONFIG_PINCTRL - switch (mmc->selected_mode) { - case MMC_LEGACY: - case SD_LEGACY: - case MMC_HS: - case SD_HS: - case MMC_HS_52: - case MMC_DDR_52: - pinctrl_select_state(dev, "default"); - break; - case UHS_SDR12: - case UHS_SDR25: - case UHS_SDR50: - case UHS_DDR50: - case UHS_SDR104: - case MMC_HS_200: + if (mmc->signal_voltage == MMC_SIGNAL_VOLTAGE_180) pinctrl_select_state(dev, "state_uhs"); - break; - default: - break; - } + else + pinctrl_select_state(dev, "default"); #endif }