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: 9243075 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4D59460756 for ; Fri, 22 Jul 2016 07:26:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3276A26253 for ; Fri, 22 Jul 2016 07:26:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 274D427F9A; Fri, 22 Jul 2016 07:26:00 +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=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C071D26253 for ; Fri, 22 Jul 2016 07:25:59 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bQUoh-00030Z-1e; Fri, 22 Jul 2016 07:24:15 +0000 Received: from mail-wm0-x22e.google.com ([2a00:1450:400c:c09::22e]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bQUod-0002wP-A0 for linux-arm-kernel@lists.infradead.org; Fri, 22 Jul 2016 07:24:12 +0000 Received: by mail-wm0-x22e.google.com with SMTP id i5so52732948wmg.0 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=Fwzgf3cR0rbOmuSMX9sTI2PJkPNqrPw02K2QD4wEl+9+5KxiNr26sPeTmKbSdFfN0I IEqdA6bW4+nWXJakoYsrQdKozReUE+0CWSYkCvL38+JkmWqZXkSRqrOYijKum6pJpgHZ 2xCyl1sEtJCN0w8oVFFiHZjtQ6GRiyjUqdzSZOlr1CfolW+RRJ2+e5q831uBCsr4ORfo WfOGCTyx6OwBZCwYtDlYS3X3mvFK8KLWnPqYUeNF+FoEv5093kHV54z12ALKB4JdLkjd Mwvhf4+Ola1XhWAKKgfNpvJd9r9VAaslRz8kxCRh4MhIzxMkEl56zRCTJic3goKCcBnj kQ5w== X-Gm-Message-State: ALyK8tJM1UlfWpXliRYrwltGBbx1M0sF2Cbj/uRdw05sPx+U4OTfjexHC6HTkeUwmDT5Uw1s 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 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160722_002411_535680_7348B54F X-CRM114-Status: GOOD ( 10.17 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kernel@stlinux.com, airlied@linux.ie, Lee Jones , patrice.chotard@st.com, dri-devel@lists.freedesktop.org, benjamin.gaignard@linaro.org, vincent.abriou@st.com 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 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(-) 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);