From patchwork Wed Jul 26 19:06:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 108792 Delivered-To: patches@linaro.org Received: by 10.140.101.44 with SMTP id t41csp1156021qge; Wed, 26 Jul 2017 12:06:37 -0700 (PDT) X-Received: by 10.99.37.194 with SMTP id l185mr1838359pgl.408.1501095997079; Wed, 26 Jul 2017 12:06:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501095997; cv=none; d=google.com; s=arc-20160816; b=pxwp8wnfKwnkq4gEbcJ6kd/dHZJpSciMpIdizxg21UcpNvEL+msDKYV+0QqhS2C7nw nQ/QoDNwPiKzZ2lOugw461xUs2zklQgQRWITPfgf6+ryVNfuKrfZmQDL8dVyjK7dZcSx HR4dD+is7elO5/c1fAuqiNt/Ag2H6QohgXcOokdXqcQ0J8I1hjhsKgV7XxqXndLkR74h Q4AggJIyhcLIGNHXgCem5fvBFAEnK0aNRLNwVQdBpMEmpIAPWkV38IPrp3ZYeVTB8NCs Mk+ZC03ZzjllLksSj9eZpGDgDzv9H6jz1PEGDybD/MZmQs0oUBd1jz8f7H+0cN1V1MAu NJow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=iwrv60jbH0p3zoPIpKup00F5sVMsGg6VxUPCUdjzrjU=; b=EcPskmctCZ+PucnrrwG9ELgQQQ7dZ0QtDJ18F54UFX6yCSP66pb6OpSo70zVqo555d ForNDvRQAizYu1RRy3VVRND+3o7ZfmF0YLNhRFRxm1q9m+rd7mSs07OtXFTwA4eW5KOD 0xDt/BuDAJmEhYaOb38o8u38vZshozD8tOuUVYWNPTee7GSURNH0Q+BlQ2goNcbP4H2q KIS+Fbq51LIBaAe3wCi29y1ArCTj9076oKojXIDjzArZDt4G65hPiGKinYA/WjnTTTqj RE/qgGfuQtcJrONHy6jl4O8ELHaOXBNo71++O2SCj2au6Z9uJBu+6fy4h5//2N1rm/w/ ke5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.b=bdLGUrP9; spf=pass (google.com: domain of john.stultz@linaro.org designates 2607:f8b0:400e:c05::233 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-pg0-x233.google.com (mail-pg0-x233.google.com. [2607:f8b0:400e:c05::233]) by mx.google.com with ESMTPS id a33si10560415pld.209.2017.07.26.12.06.36 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 26 Jul 2017 12:06:36 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 2607:f8b0:400e:c05::233 as permitted sender) client-ip=2607:f8b0:400e:c05::233; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.b=bdLGUrP9; spf=pass (google.com: domain of john.stultz@linaro.org designates 2607:f8b0:400e:c05::233 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by mail-pg0-x233.google.com with SMTP id y129so87882165pgy.4 for ; Wed, 26 Jul 2017 12:06:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=iwrv60jbH0p3zoPIpKup00F5sVMsGg6VxUPCUdjzrjU=; b=bdLGUrP9DL3lXXtAYecrUOTEfj8wKicECNqZA4vjIfh4OFLGh6l6diVUEY+KVnF2ux xnTxTB+RsJEckz1RYWd+BN0GvnShxrD7yIZa6IPMAIavTilY+M9t8tCiYHhFxbfnLDPN b9IGRFBwqsCFidhLw+aNV5Fq4jEONDzYQRz1E= 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=iwrv60jbH0p3zoPIpKup00F5sVMsGg6VxUPCUdjzrjU=; b=tgvRRdbsG1BzexAH+qrLwGQU18/L1StSUHnTzRaDkkg/QjyAGH21zVRU4gHX3ckrMk ux914wbRABBgpfSY6kbVD4HEyWkqrsO/Qkn58QTbkUtr/85Ue5n1N+WKp1ojBEy9EnCz Yu33QT8vWLUsB3B00sukK7QbNirnoeCnypt1VvyOZX2epj6eRaTGWVI0tJPhAAVAxlZI aKpbMwnbDaO5hzdlpuU5AkOZrr463+pckNiAwzfBt6Ctfs2CBGk5EXwdVtDp7jZTUpj7 L5vryPBqM/VEoTe/gTzIIraAJRnOtBzFjQatVOcT0BiTCYIRGlhJ1V0N6FlABTFI3Tl5 piLA== X-Gm-Message-State: AIVw111OI7Fc5ZIywvYkp5q+Tt7yb0I0ZOeeCLfkJRe0aFHm34M1LVc5 9d2GJGL5szBCEG0I0JQ= X-Received: by 10.84.163.75 with SMTP id n11mr1953035plg.475.1501095996738; Wed, 26 Jul 2017 12:06:36 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:1002:83f0:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id f64sm529212pfb.83.2017.07.26.12.06.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 26 Jul 2017 12:06:36 -0700 (PDT) From: John Stultz To: Guodong Xu Cc: John Stultz Subject: [PATCH] mmc: dw_mmc-k3: Move reset code to hi3660 init code Date: Wed, 26 Jul 2017 12:06:33 -0700 Message-Id: <1501095993-7511-1-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 The reset code, added to support hi3660 here was causing warnings on the original hikey, so move the added code to hi3660 specific initialization. Signed-off-by: John Stultz --- drivers/mmc/host/dw_mmc-k3.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) -- 2.7.4 diff --git a/drivers/mmc/host/dw_mmc-k3.c b/drivers/mmc/host/dw_mmc-k3.c index 919fd33..a581a22d 100644 --- a/drivers/mmc/host/dw_mmc-k3.c +++ b/drivers/mmc/host/dw_mmc-k3.c @@ -269,6 +269,13 @@ static void dw_mci_hs_set_timing(struct dw_mci *host, int timing, static int dw_mci_hi3660_init(struct dw_mci *host) { + struct reset_control *rst; + + rst = devm_reset_control_get(host->dev, NULL); + if (!IS_ERR(rst)) + reset_control_reset(rst); + + mci_writel(host, CDTHRCTL, SDMMC_SET_THLD(SDCARD_RD_THRESHOLD, SDMMC_CARD_RD_THR_EN)); @@ -465,11 +472,6 @@ static int dw_mci_k3_probe(struct platform_device *pdev) { const struct dw_mci_drv_data *drv_data; const struct of_device_id *match; - struct reset_control *rst; - - rst = devm_reset_control_get(&pdev->dev, NULL); - if (!IS_ERR(rst)) - reset_control_reset(rst); match = of_match_node(dw_mci_k3_match, pdev->dev.of_node); drv_data = match->data;