From patchwork Fri Jul 22 07:22:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 72598 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp853130qga; Fri, 22 Jul 2016 00:23:55 -0700 (PDT) X-Received: by 10.98.91.197 with SMTP id p188mr3941194pfb.101.1469172235264; Fri, 22 Jul 2016 00:23:55 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id hl3si14401279pac.241.2016.07.22.00.23.54; Fri, 22 Jul 2016 00:23:55 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753180AbcGVHXw (ORCPT + 29 others); Fri, 22 Jul 2016 03:23:52 -0400 Received: from mail-wm0-f41.google.com ([74.125.82.41]:38140 "EHLO mail-wm0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752023AbcGVHXu (ORCPT ); Fri, 22 Jul 2016 03:23:50 -0400 Received: by mail-wm0-f41.google.com with SMTP id o80so52770340wme.1 for ; Fri, 22 Jul 2016 00:23:50 -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=oAy/KLMz/efJE7ApUTLqfFr+uGo4Tc4SO8Na6YVgiwo=; b=O2Dx89bGV0jC1D+HTM8dtkjoPLydexkExMf/l8CX9V/KeF6WDjtI76v1nZbqXUqVxw 4kmkQMDxpalxLiLUIn7timpG6qAGCeZ+xtbJKgC279knkXKOhHuse8xmYGabcR2dnRxX /4Hw2ye7S9W8Ua2pT0r+tqN1loe3mmRGzBFbw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=oAy/KLMz/efJE7ApUTLqfFr+uGo4Tc4SO8Na6YVgiwo=; b=AhXlWMmqxLMl/QfpNOjSU4ztt6TjmQaMlkdMD1S5PFYE08gFiwu9l8GTiYthCjerBG 6O38r5udwp2ZycabATbaNP/9N3atWgkKcIG8Qhaj2Z3m+IwwgkaSh7XQPFkFg1MYmVoh EGwvGzMKWh72wHFgDZhRK40x2i3xSmV9yW9yABSgrVLQo67Q06Lh0OEV93U3qJ/g2X3h AaVWLjUWlEi3Dawd4xt+rtmSEhuJgnFoO6ma6Cbc0YnXfZ4rXjLVSPM8PB8ueLdE2fZD ej6Vl4410YlN4CO7lJb4E92cJobz6sPWyHw7gn8ApI/FpPm46nJYtvu3Kl4tvURYr7bW k+ow== X-Gm-Message-State: ALyK8tLur44gI2cmNbL63AK7UUzF+Fnrp+9QVvTYfKS0yCGGihg3M7ubs6fQu5iwvT3xmzoC X-Received: by 10.28.30.1 with SMTP id e1mr24517243wme.77.1469172228635; Fri, 22 Jul 2016 00:23:48 -0700 (PDT) Received: from localhost.localdomain (host81-129-170-195.range81-129.btcentralplus.com. [81.129.170.195]) by smtp.gmail.com with ESMTPSA id a203sm11060803wma.0.2016.07.22.00.23.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Jul 2016 00:23:47 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: kernel@stlinux.com, patrice.chotard@st.com, benjamin.gaignard@linaro.org, vincent.abriou@st.com, airlied@linux.ie, dri-devel@lists.freedesktop.org, Lee Jones Subject: [PATCH 1/1] drm/sti: use new Reset API Date: Fri, 22 Jul 2016 08:22:54 +0100 Message-Id: <20160722072254.20397-1-lee.jones@linaro.org> X-Mailer: git-send-email 2.9.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Since 0b52297f228 ("reset: Add support for shared reset controls") the new Reset API now demands consumers choose either an *_exclusive or a *_shared line when requesting reset lines. Signed-off-by: Lee Jones --- drivers/gpu/drm/sti/sti_compositor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.9.0 diff --git a/drivers/gpu/drm/sti/sti_compositor.c b/drivers/gpu/drm/sti/sti_compositor.c index 3d2fa3a..c2ace02 100644 --- a/drivers/gpu/drm/sti/sti_compositor.c +++ b/drivers/gpu/drm/sti/sti_compositor.c @@ -234,12 +234,12 @@ static int sti_compositor_probe(struct platform_device *pdev) } /* Get reset resources */ - compo->rst_main = devm_reset_control_get(dev, "compo-main"); + compo->rst_main = devm_reset_control_get_shared(dev, "compo-main"); /* Take compo main out of reset */ if (!IS_ERR(compo->rst_main)) reset_control_deassert(compo->rst_main); - compo->rst_aux = devm_reset_control_get(dev, "compo-aux"); + compo->rst_aux = devm_reset_control_get_shared(dev, "compo-aux"); /* Take compo aux out of reset */ if (!IS_ERR(compo->rst_aux)) reset_control_deassert(compo->rst_aux);