From patchwork Tue Oct 1 18:29:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 174928 Delivered-To: patches@linaro.org Received: by 2002:ac9:19ad:0:0:0:0:0 with SMTP id d45csp8492781oce; Tue, 1 Oct 2019 11:29:40 -0700 (PDT) X-Received: by 2002:a63:61d5:: with SMTP id v204mr19111527pgb.311.1569954580258; Tue, 01 Oct 2019 11:29:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569954580; cv=none; d=google.com; s=arc-20160816; b=THay90NA+4apUxJbrxyUk38odCwvkAGgTRYM7EkLW0Ff0qBvNXol7JYoyaSVK3t+sU vw78BkpxsYjoE0ukStcdDJI0ID4v24lVvS5bfsUSGRq6I4Jzc2X6phnmD3+u38u631uL eDXIGRkmS6apywpDAjtj8YrGjNUvCCBU9H68Fbx5vv6uCIrldUFJUsYJBI1pZEPuNUBr lbPpb4hMU1oiMSUMn6Qo1TQ+RrETiC+jrhfPZ+D6dYAELu2J5SsNPGrQw0xmd98vzAoX G2RJDmVIccOWxH+Nxj12Sd1QNKIHiWFPiCp+5dq359qySQPKWGcu+zvxs/mEYPoA326w Mt6A== 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; bh=xnyZjNCbO2ap2oxzis7QRBMw3/itYSPcHMr8ypFsW4s=; b=q5Qt6kKpGQuUTGZ5oGW7gu4C9WHbYo2zBC9DECU0kfs7RIuRTwV2jWygFIeHolfNEK /F4W5VCXJBB2+P7jZ21jFiCbxt/nPz0TiZd/oEGWuXFz6oLaUpbH8g+5PCLbbXW5Vspj JmeaNivQj7RO9a2DjEYEHQGPU7eOrJyD4hl0fvAKb0ASNMKIWRwi7Qej4SIOCqlNXvMY /Hf1e05zKqsbP7X8Wp+MgdoeUfmwm4XUzC2LmXkenqhj08Mo4HcuTBfVf76V6hCh6P0n lx7o49NO5Nx38pEZ5AUbIPCPPofYYHbgvGgeK2x5bdx51t75kUnN4HQnqcySQMVr48sJ DnzA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=EDl7kJK+; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 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-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id x20sor18349635plm.51.2019.10.01.11.29.40 for (Google Transport Security); Tue, 01 Oct 2019 11:29:40 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=EDl7kJK+; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=xnyZjNCbO2ap2oxzis7QRBMw3/itYSPcHMr8ypFsW4s=; b=EDl7kJK+Gu6PPzl7r1r30j5jzkLc7XveE/hrfDIc7KKwn7fy7suEKGSogHMdKjOd00 yzcV94dCp+XLbLJis3rCbnPcYAS711/Ww8/+QjGhEg0kSJZ5iz/d5tdK6bX9JBBoUX9O yc4DDEUpP8g1EQg/LtRUKyG10i2hRG9v/Ap4b2HKb+/JnAuNq0Mk+/OYuuTIes0uU1Lf rEtVzLU3kBNTfc4URdkmz5wkQd50NZqtmJVf0z6lIEhKfOQV5WM9QmYblnsbcJfLVIH1 SIa1r+a+Ujn/fcA1PgwtC/5T80nlbwOZi0CVKOBHlBjdcJJFRGu7rPo84QIE0r31U2Gx mS0Q== 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=xnyZjNCbO2ap2oxzis7QRBMw3/itYSPcHMr8ypFsW4s=; b=sug/o4aexZaqQiIBAQ9Fqp070zjzI9hVIpyRZyUlbKHGh01Lczdnh1b+mAvxBC694l R0qGFRkgGJ2XTXPq/FepaFKm5ONH8/nfsZxTsoxnTulNzGXw5d/ErFa94WBazVFxKaXh OXtd5sPUzNCbGmJ60pTqckz6gsmwx3naYDV6sIWb0gZ4PP+SZDwVZjuarwaatKJ/QE1J xfHtMSlMS+iLLr5B0n33PaqN53fi9neKR8rUU63wskdkF+TJ9EaFFWOt3V9f1x1bxGdL EVoo4b+q/ZiG5IVR3bIG0e1bppm7anyPBK4IDEsyW5tBm3mp8iPjOuELKNw33zGihqyS IwyA== X-Gm-Message-State: APjAAAUgFLF09Wk6xVxSYF1q6rjvgyPZNQPECLKkD+H0SPK2TMpiknD2 4xiHlm5blazRyi78GMOSBrfRjtg6uhF5EA== X-Google-Smtp-Source: APXvYqyRbXISq3SO34OqGRk8drfBkKPU3mD55VSiIQPo3ZwrS0eL4A9EHXkMC5c+SdGyZCp4LNxRBQ== X-Received: by 2002:a17:902:a413:: with SMTP id p19mr25389237plq.210.1569954579845; Tue, 01 Oct 2019 11:29:39 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:692:26ff:feda:3a81]) by smtp.gmail.com with ESMTPSA id e10sm18189221pfh.77.2019.10.01.11.29.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Oct 2019 11:29:39 -0700 (PDT) From: John Stultz To: lkml Cc: Peter Griffin , Qiang Yu , David Airlie , Daniel Vetter , dri-devel@lists.freedesktop.org, lima@lists.freedesktop.org, John Stultz Subject: [PATCH] drm: lima: Add support for multiple reset lines Date: Tue, 1 Oct 2019 18:29:27 +0000 Message-Id: <20191001182927.70448-1-john.stultz@linaro.org> X-Mailer: git-send-email 2.17.1 From: Peter Griffin Some SoCs like HiKey have 2 reset lines, so update to use the devm_reset_control_array_* variant of the API so that multiple resets can be specified in DT. Cc: Qiang Yu Cc: David Airlie Cc: Daniel Vetter Cc: dri-devel@lists.freedesktop.org Cc: lima@lists.freedesktop.org Signed-off-by: Peter Griffin Signed-off-by: John Stultz --- drivers/gpu/drm/lima/lima_device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.17.1 diff --git a/drivers/gpu/drm/lima/lima_device.c b/drivers/gpu/drm/lima/lima_device.c index d86b8d81a483..e3e0ca11382e 100644 --- a/drivers/gpu/drm/lima/lima_device.c +++ b/drivers/gpu/drm/lima/lima_device.c @@ -105,7 +105,8 @@ static int lima_clk_init(struct lima_device *dev) if (err) goto error_out0; - dev->reset = devm_reset_control_get_optional(dev->dev, NULL); + dev->reset = devm_reset_control_array_get_optional_shared(dev->dev); + if (IS_ERR(dev->reset)) { err = PTR_ERR(dev->reset); if (err != -EPROBE_DEFER)