From patchwork Mon Mar 18 19:38:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Griffin X-Patchwork-Id: 10858451 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C25E714DE for ; Mon, 18 Mar 2019 19:41:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 968CE28EEF for ; Mon, 18 Mar 2019 19:41:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8ABD629230; Mon, 18 Mar 2019 19:41:15 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 32AA929378 for ; Mon, 18 Mar 2019 19:41:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=xv0pn8SLRcvHOW/c034Hvd5Tzjn5Lls1HN5iPIsxtCs=; b=syZAXBpZ0wvl8Dd05HsnGo1whd U5kCoN+ow19ROsKPRTm5mZ/SAPSgcm7nZ6+hS7jMGEClI+g65KD7a6Mp4fcEPN0oWUGcTDV06ubyW davrNkRzUbDzuEpuMSI2M4z1XY4tHxHRpprve9mXbewTc8RZoFq3U+z5Cru6NgQuYcWro7rfUihn8 8pUGATIWD3I2OOIvFunZtup/9Uxc4f3eNY5o5CZokgDuEAD+JP293kC6JfRSRXgBEpEorqf/9V9+Y kVZ8MyYKnYm7BBBNTAH827XlrKgbkrGbkiW5CiwqBDlJDuOZnWo1nR0PUT5VPvwf+/I1uAPJc1g95 cvjv79/g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1h5y8I-0005i3-Ae; Mon, 18 Mar 2019 19:41:14 +0000 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h5y82-0005OO-Jq for linux-arm-kernel@lists.infradead.org; Mon, 18 Mar 2019 19:40:59 +0000 Received: by mail-wr1-x441.google.com with SMTP id y15so18447939wro.4 for ; Mon, 18 Mar 2019 12:40:56 -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:in-reply-to:references; bh=2JfdqFXp8iuXVye70C9d3w4ZqFPTHaTQ8J8t0YbTu9k=; b=DReQPySjh1iT14vrYdRq4k3rIyvb6ERMHn3nqWL0HTq09GVLAv0G0gIjD3mxbB5Dit qCApTZeJ+pGl5N2sdueVX8z3nbxMFb3ltjhLZ/rYxJK239l0nmJNea86Cwr5A8XFcM9m SvwzHiEaAXmps68lAl2cxzYxdKnShZ2M+7UEzig1iGpBmVJWulrTs6WJJUEB4SbKFtGV oMvk6Zr6Yuz0Jji0hhfCUgcR/xYUR32T5AQ/wRSLpwGjLrKbefgjQ+NfzuN8bNGzlhuv JDDXZkAubo30r1UZ9AuybQjawrtlU5xuic0VyQ1pALbcXmvQHr2dfauKwxr8mizI3FUQ 28PQ== 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:in-reply-to :references; bh=2JfdqFXp8iuXVye70C9d3w4ZqFPTHaTQ8J8t0YbTu9k=; b=q4jmFWv3bjPAGZBnB2MpxvliJqEd4zDyyuQL5XmsUsXCApkBF1xKYnAoUc9rDuFGld t7CAV4nHahMT3ang7x/VIMShvAzE/zyTn0p7+jhxBAuQZwE6Y6/MFpG+hC/FVYXkzfIC DswJWktb0sl19p983LRNPAItrzYP6JkRvIVNbu98AaJ0Aif0msMLWT496AC0kV74UQL4 /kvnId5c1loo9f8CiabxPFLYfnbuZ70eWeENisNCXvQKmBIHBVkhgGp4SNCWXqPsfYdt kDK7lTLBzbCKtoFG5MO4Zw3FHmXoYMO25B8ciiu+3b/3L10o+JpFtDoZq2GIo+1GUXKf K7Xg== X-Gm-Message-State: APjAAAXisHsWc88G1KmzglUPy7vJBeac0OPakTVw7gK+IlbjTSX5cDyt AQInih6qA3HEKK8He7KS0zj78z+xY2M= X-Google-Smtp-Source: APXvYqxtxld460gm3Iezg2jFI+vIsB9NvFYgb/CFpti9a13qJNEW/TIzlkiMMuX4yFJh5Bjdh3OKYQ== X-Received: by 2002:adf:f846:: with SMTP id d6mr14198160wrq.53.1552938054999; Mon, 18 Mar 2019 12:40:54 -0700 (PDT) Received: from localhost.localdomain (cpc89244-aztw30-2-0-cust4998.18-1.cable.virginm.net. [86.31.179.135]) by smtp.gmail.com with ESMTPSA id s10sm4583941wrv.56.2019.03.18.12.40.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 18 Mar 2019 12:40:54 -0700 (PDT) From: Peter Griffin To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, airlied@linux.ie, daniel@ffwll.ch, robh+dt@kernel.org, mark.rutland@arm.com, p.zabel@pengutronix.de, xuwei5@hisilicon.com, mturquette@baylibre.com, sboyd@kernel.org Subject: [PATCH v1 1/6] dt-bindings: gpu: mali-utgard: add hisilicon, hi6220-mali compatible Date: Mon, 18 Mar 2019 19:38:46 +0000 Message-Id: <1552937931-23050-2-git-send-email-peter.griffin@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1552937931-23050-1-git-send-email-peter.griffin@linaro.org> References: <1552937931-23050-1-git-send-email-peter.griffin@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190318_124058_649654_4A19FD1C X-CRM114-Status: GOOD ( 11.41 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, john.stultz@linaro.org, linux-clk@vger.kernel.org, dri-devel@lists.freedesktop.org, yuq825@gmail.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 The Hisilicon hi6220 uses a Mali-450MP4 with 4 PPs, so add a compatible for it. Signed-off-by: Peter Griffin Reviewed-by: Rob Herring --- Documentation/devicetree/bindings/gpu/arm,mali-utgard.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Documentation/devicetree/bindings/gpu/arm,mali-utgard.txt b/Documentation/devicetree/bindings/gpu/arm,mali-utgard.txt index ae63f09..936a20a 100644 --- a/Documentation/devicetree/bindings/gpu/arm,mali-utgard.txt +++ b/Documentation/devicetree/bindings/gpu/arm,mali-utgard.txt @@ -23,6 +23,7 @@ Required properties: + rockchip,rk3228-mali + rockchip,rk3328-mali + stericsson,db8500-mali + + hisilicon,hi6220-mali - reg: Physical base address and length of the GPU registers @@ -97,6 +98,10 @@ to specify one more vendor-specific compatible, among: * interrupt-names and interrupts: + combined: combined interrupt of all of the above lines + - hisilicon,hi6220-mali + Required properties: + * resets: phandles to the reset lines for the GPU + Example: mali: gpu@1c40000 { From patchwork Mon Mar 18 19:38:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Griffin X-Patchwork-Id: 10858463 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 18EE714DE for ; Mon, 18 Mar 2019 19:41:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EDB6329065 for ; Mon, 18 Mar 2019 19:41:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E2247294B1; Mon, 18 Mar 2019 19:41:42 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 99C982949C for ; Mon, 18 Mar 2019 19:41:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=m0xTjuWnAS8pfat0J5laXK2nNdQhBidAAalK2nCnHZU=; b=Vw0TY/rr6UT/75P+JcIUZeQegX xZnW5kKydVXojS9o94mu/nOcEz25n9NQzv5/0FKUDbGNRtHgRqwiaoDQPzIW6rSs0D3Gib5F49aIl AFWlFTFtd8y2tQxqnREMy7t5NtBZopMX2hY3wBql/zIUv1XpKGvhGzOxYGG6lTVUNedg5k3qvta7C I6f3Y21hY02+UT1LPiJG28h4yK6s/f5mKRYFTcX2bUR6GW/nw9YFZaxa73NnTuvhMWJ6PGrI5Mobf Ot+kzJjTVD2IjLKWafzD4HsWFO7xV8dvg5QCbpp3so51YY9hX5W45cTU2uh2+mfvS8e6XpoSwEktx IX6EEeog==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1h5y8b-00067n-UI; Mon, 18 Mar 2019 19:41:33 +0000 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h5y82-0005OU-NN for linux-arm-kernel@lists.infradead.org; Mon, 18 Mar 2019 19:41:00 +0000 Received: by mail-wm1-x341.google.com with SMTP id a188so14081313wmf.3 for ; Mon, 18 Mar 2019 12:40:58 -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:in-reply-to:references; bh=WEK+MgheKchhg0QX3P2gNwOnQXfun2RSNYUOC8zRsk4=; b=dsiYe/yZUBe6lSW+iEdRvlktkI7Q0wuP9+i4Z28M8UccRbAv375XO4fZA3IYCwPLJN xwiSuVAzT/fahbzoBmW7k4AB1AT23dm0+U/gkLFdiqtuj5nqbxzAmC7U+obVy29+yYkS cLM1Ev696VSbFSeDvc3SAJAs9pCXzunpjN0ruWPtH4TPr4FISyjtqd5LxG2JaP4n/avj ohRSUCEzPnABA6yqCOFnkw3+301dfhNBhR4wtX4io9eMdv5gbYwJ/QVeIX2deziFdP+R 1QAsdokHa7+G/xjbeOBNVbIO20V0GuzUrDGIgS1iykxPr8vWE8e4unsMs+Y+KlG/Vv4/ Z1Zw== 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:in-reply-to :references; bh=WEK+MgheKchhg0QX3P2gNwOnQXfun2RSNYUOC8zRsk4=; b=Y6y/23Vpfncg32kjcbKUWpJtQGl5ZjqlGFNtrZFC2xzCV0I6c7697ozt65p9mxR+29 1sAtHciviLLwjHOGcZ8JoZqPKLfZNiPKSdWGWSOi4g7xQFzMpmJdyZ1xWQjLPiL9cPzf pdt7KFf5gHFDbXm3njPFfyg+PuWQczAMwobj0Wddh9SHj00hV7jKoye2uiGi4OadTHUK EKvMGo5Dq6nbfbS8e0mXCWSsw/WcbczTc9Zc0rSUPM4J5tRXCC1R6/lk4wScfW2Dhkp4 PZgzkE+4DadFiYVUuQJTcQdf9qN43MwBce6ZjA047sBh9ymvLHGhj3+T6epbYiuBYjJf pRwQ== X-Gm-Message-State: APjAAAVV3tzqAevTLSbrc2rr0skXqvblhp8pLuMXIiqfZxsxfMSlb+iz IzfGs9g630a9wRk66KwfRhpnjbuxY1c= X-Google-Smtp-Source: APXvYqwJZbk+OcjkXCuV+3ZFHBV8lbxBg9HSXosLaS4d3bZyL3B4C/f1ZmmVqWQLq+L/YAYYsDPdFA== X-Received: by 2002:a1c:f914:: with SMTP id x20mr393705wmh.62.1552938056210; Mon, 18 Mar 2019 12:40:56 -0700 (PDT) Received: from localhost.localdomain (cpc89244-aztw30-2-0-cust4998.18-1.cable.virginm.net. [86.31.179.135]) by smtp.gmail.com with ESMTPSA id s10sm4583941wrv.56.2019.03.18.12.40.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 18 Mar 2019 12:40:55 -0700 (PDT) From: Peter Griffin To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, airlied@linux.ie, daniel@ffwll.ch, robh+dt@kernel.org, mark.rutland@arm.com, p.zabel@pengutronix.de, xuwei5@hisilicon.com, mturquette@baylibre.com, sboyd@kernel.org Subject: [PATCH v1 2/6] dt-bindings: reset: hisilicon: Update compatible documentation Date: Mon, 18 Mar 2019 19:38:47 +0000 Message-Id: <1552937931-23050-3-git-send-email-peter.griffin@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1552937931-23050-1-git-send-email-peter.griffin@linaro.org> References: <1552937931-23050-1-git-send-email-peter.griffin@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190318_124058_780393_D4232E95 X-CRM114-Status: GOOD ( 11.73 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, john.stultz@linaro.org, linux-clk@vger.kernel.org, dri-devel@lists.freedesktop.org, yuq825@gmail.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 The reset driver now supports the ao reset controller, so update the documentation to match. Signed-off-by: Peter Griffin Reviewed-by: Rob Herring --- Documentation/devicetree/bindings/reset/hisilicon,hi6220-reset.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/reset/hisilicon,hi6220-reset.txt b/Documentation/devicetree/bindings/reset/hisilicon,hi6220-reset.txt index c25da39..ea0a6a9 100644 --- a/Documentation/devicetree/bindings/reset/hisilicon,hi6220-reset.txt +++ b/Documentation/devicetree/bindings/reset/hisilicon,hi6220-reset.txt @@ -11,6 +11,7 @@ Required properties: - compatible: should be one of the following: - "hisilicon,hi6220-sysctrl", "syscon" : For peripheral reset controller. - "hisilicon,hi6220-mediactrl", "syscon" : For media reset controller. + - "hisilicon,hi6220-aoctrl", "syscon" : For ao reset controller. - reg: should be register base and length as documented in the datasheet - #reset-cells: 1, see below From patchwork Mon Mar 18 19:38:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Griffin X-Patchwork-Id: 10858455 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 18A9F14DE for ; Mon, 18 Mar 2019 19:41:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DFACE2846F for ; Mon, 18 Mar 2019 19:41:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DD00229143; Mon, 18 Mar 2019 19:41:27 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 72C1A28FFB for ; Mon, 18 Mar 2019 19:41:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=2Gq7wsMxqArigJvq+epF8GkKol8kw6p+6vtQQRSNljs=; b=bHfIWL0hh9UrQ4h8cElzJAEH3N 1KqydwNc4TcUawrNxbpWdkwq8NMKQopshBf5rmHgjmfoxjyJs8lV/g3DiAzb91wJZ53iGH8wVWp14 H8FSDeZHPTuuI9d2eNblzVqoWsY3reJuTjpjhnVolkc4bp1DCXeEoYnDRXBNS2SYlinsCD1i+oVOy bQYkDw5IGMptcsF+l9GZetQyxl1E+bIOAlvKpG7u1M0YaY7MbJroTVVgtEtmeQZQTQZAbFVEiL0SK X3di3f39xRxvXFN7YBG6+WsUGdRZv1ef+s2J4mCVeC2yUAOdU1vkXQSe+hzM3C+pSOLI0VZeCzFzL N9kJrTZQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1h5y8S-0005rk-8d; Mon, 18 Mar 2019 19:41:24 +0000 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h5y83-0005Oj-CG for linux-arm-kernel@lists.infradead.org; Mon, 18 Mar 2019 19:41:00 +0000 Received: by mail-wr1-x444.google.com with SMTP id y13so13937681wrd.3 for ; Mon, 18 Mar 2019 12:40:58 -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:in-reply-to:references; bh=iYcbdw0SobNZ1DKEtyOsg/AhnPu/CmThFhgWWs7DOwA=; b=Zave381f6F6eYXUT5XE8kYOOwujnnpASeD67mm7RFLbGbsjITUf2fUwDUipX5c2jSj OdBWKis4xAPiNst8Ut6f2EcApUFinBFLLvGPFIek6CrwuelpHoRJH6duE1Dfo7TJhHm2 CJOqQcxCdoFUrwYGKNQrH/vbpe/xWMNezLEF4kSfh3W/iDg9dhwnlpdlW1X75ZGOEr7m w3E95sEwUSUYTj09Y8A5xGWJIBnxdEIF7/Y66RxxUyimmX44WKgcxB2ew1LndlqGWUnP 7H/WiI+WTpwDcLdDE+1vABKwGIMnoAMpMrPxqu1gP1/9qD/x/XtFwjcwoWdDHMNSKs6e H37g== 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:in-reply-to :references; bh=iYcbdw0SobNZ1DKEtyOsg/AhnPu/CmThFhgWWs7DOwA=; b=gKcPIiZ/YVTUBMl/Mm9I/sLPBku/vk8pyxWj3u170H5xrFiH1Zjbnd487aXtyn3SQH X+AqvaccjwN8XN9ybG66o/hQZj44hmiAdT4QXuh5j5E174kBhmppTCMa/wkRgasOd9Gm rY6q5QLXZYT6iPI3CVXMQ/C1zjAkFuqStgeAlzaV2L9hKTnlcz45u64Ln3hsS3vVvLEF 7zhx+qfnwCL7OHQAPrxjoP02ZUUOapCCdBLFNUkbTiCvFUgmRGiwqELEiKqHe0oUdT7w +Xt+EbJH1DhxZaASRZRGChRDcYUn/YtRekEDeYsbsBgBSBOXR/RqnmBnTdtIsw3IGMke Hh4w== X-Gm-Message-State: APjAAAVFRb+dBy6GFDwNjcGGejBF1KQBJZhWOFbraN47+OVITmoOR8yA xyZsYxXy4fxaW6bHhOkcEiP/rqts/DI= X-Google-Smtp-Source: APXvYqxDhFz9Mg6jRME+Pb5JgnyOr8wtDzca5R7ayCiHcrg9EPTTNaVUtjBUnOW4nepUdFmTI19jkA== X-Received: by 2002:adf:e2ca:: with SMTP id d10mr13102295wrj.250.1552938057398; Mon, 18 Mar 2019 12:40:57 -0700 (PDT) Received: from localhost.localdomain (cpc89244-aztw30-2-0-cust4998.18-1.cable.virginm.net. [86.31.179.135]) by smtp.gmail.com with ESMTPSA id s10sm4583941wrv.56.2019.03.18.12.40.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 18 Mar 2019 12:40:56 -0700 (PDT) From: Peter Griffin To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, airlied@linux.ie, daniel@ffwll.ch, robh+dt@kernel.org, mark.rutland@arm.com, p.zabel@pengutronix.de, xuwei5@hisilicon.com, mturquette@baylibre.com, sboyd@kernel.org Subject: [PATCH v1 3/6] arm64: dts: hisilicon: Add Mali-450 MP4 GPU DT entry Date: Mon, 18 Mar 2019 19:38:48 +0000 Message-Id: <1552937931-23050-4-git-send-email-peter.griffin@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1552937931-23050-1-git-send-email-peter.griffin@linaro.org> References: <1552937931-23050-1-git-send-email-peter.griffin@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190318_124059_417763_52157B29 X-CRM114-Status: GOOD ( 11.72 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, john.stultz@linaro.org, linux-clk@vger.kernel.org, dri-devel@lists.freedesktop.org, yuq825@gmail.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 hi6220 has a Mali450 MP4 so lets add it into the DT. Signed-off-by: Peter Griffin --- arch/arm64/boot/dts/hisilicon/hi6220.dtsi | 38 +++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi index 108e2a4..2072b63 100644 --- a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi +++ b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi @@ -260,6 +260,7 @@ compatible = "hisilicon,hi6220-aoctrl", "syscon"; reg = <0x0 0xf7800000 0x0 0x2000>; #clock-cells = <1>; + #reset-cells = <1>; }; sys_ctrl: sys_ctrl@f7030000 { @@ -1021,6 +1022,43 @@ clock-names = "apb_pclk"; cpu = <&cpu7>; }; + + mali: gpu@f4080000 { + compatible = "hisilicon,hi6220-mali", "arm,mali-450"; + reg = <0x0 0xf4080000 0x0 0x00040000>; + interrupt-parent = <&gic>; + interrupts = , + , + , + , + , + , + , + , + , + , + ; + + interrupt-names = "gp", + "gpmmu", + "pp", + "pp0", + "ppmmu0", + "pp1", + "ppmmu1", + "pp2", + "ppmmu2", + "pp3", + "ppmmu3"; + clocks = <&media_ctrl HI6220_G3D_CLK>, + <&media_ctrl HI6220_G3D_PCLK>; + clock-names = "core", "bus"; + assigned-clocks = <&media_ctrl HI6220_G3D_CLK>, + <&media_ctrl HI6220_G3D_PCLK>; + assigned-clock-rates = <500000000>, <144000000>; + reset-names = "ao_g3d", "media_g3d"; + resets = <&ao_ctrl AO_G3D>, <&media_ctrl MEDIA_G3D>; + }; }; }; From patchwork Mon Mar 18 19:38:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Griffin X-Patchwork-Id: 10858465 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9F6D31575 for ; Mon, 18 Mar 2019 19:41:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 80044294B0 for ; Mon, 18 Mar 2019 19:41:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7E14029346; Mon, 18 Mar 2019 19:41:50 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2B4742907B for ; Mon, 18 Mar 2019 19:41:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=m2bpurCx03Vi25edLdfCfjlwrPnsdHjIUzwjh3R4kW8=; b=cal4M5AiTlxCEL3l8nIXm9P8QU TRQWuI0fhvNMpJDZCvWEFByymNXnOfEBWRqpeGz1gx6GGV5qXmmE5OXpcujnpq95B9DJez7SKzwmz P1Y0TjuG7UZrdERrXR32yx+y1oe//kcHnDJqA2MtK3K4Hmt01FlkxoCYvWAgjdaWzu57fjm+iy9gP 3CmIIVKrhJi1CYobaY6y7KDWQazAOpm5Fqrdvab1uKcPk70mto0HHhMue5QK1hDy5SArmlsOByEbT 6pqvhFC5WHXMIsgL/hrKlf57Vo67UrLHR1GaKyWtYrZBycAe//U5sZmU0UQQM+xA1bX2nGbsT9HUI ncYaXVlA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1h5y8o-0006Nm-Iu; Mon, 18 Mar 2019 19:41:46 +0000 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h5y84-0005PU-9c for linux-arm-kernel@lists.infradead.org; Mon, 18 Mar 2019 19:41:03 +0000 Received: by mail-wm1-x341.google.com with SMTP id n19so14275518wmi.1 for ; Mon, 18 Mar 2019 12:41:00 -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:in-reply-to:references; bh=mCYuzjXjAhAdmGCTChMacQlApx18wWBt60iN6MyaJRQ=; b=HzvfasmhXnx4JtwlIbiPWvb50HOkNd7QnQnXq9U/+ESG1TejnfmEDg90Pc/oz36xGF 3FSmmSmVBKgE++CMgTIp8QW5g5gcHWd7kvj4GAeLCLOdKbtbjGOK//MgjviiqWJxbOBS W1sIbjiPH+oUPWgpFovf9d7XNbVAkChWDuSYDGNFYuAFnpM0fUHfuAUZYuCDI76YIITj LuwAxB/14vsrp9U6YqS1qFMou5f/wHNbFs4t6Hvf8Kx4OsPFjT/b3w20mPWpKpUF/HI9 Asnz4uFGvVG6eu6B+3MEFCUdYf5M19qG2hA1797dOk+6YQXG/F+Fjzp8bvbxhcBuF9v+ tLAA== 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:in-reply-to :references; bh=mCYuzjXjAhAdmGCTChMacQlApx18wWBt60iN6MyaJRQ=; b=aaCrn2fd+l7S9IypcsAsOuuNKSGQ2dH1gKRcmJVoYzUCsfne44RKnypQnx6EvnnngM tg4BebPQV8vnToaS1xaBi6L8e2OsIBPT6qgxq5Fz+N71jFaAy99thAU8lBWlFFdCOgVo JtvSMvNR5luH3ARcZyd+Ksmrtib4O27R2ejTiuIpTP1BsyzG53N/jywLdQVxnwXg5vXA wPUaWgn6fFZ/slBn1BIb82UxSHG+lgSqG+lWwyKBjN51RdSILRpZEMEGQhO/R9ZNfndW o8BLvX/SZ333QRgiLaXkl7iQcCg015Bw5QyajJDGtTz/0jl7xMmDSRzOb8EI6wxHOKT/ Q5Dw== X-Gm-Message-State: APjAAAXDHMg0YlGaqzBv5PVLRL7dO27X1HHQtM9c+MNMf79I1EiXtrE7 oDGjhD8/tdoZoeVkprCME+QWjsySXOE= X-Google-Smtp-Source: APXvYqzhTusUZxAZX+UKsouiPFztVANdEtEHZhoPKs/a4eIOoxpW2MoOwRrgddVlTUDXw8v7v30Evg== X-Received: by 2002:a1c:7517:: with SMTP id o23mr435554wmc.9.1552938058758; Mon, 18 Mar 2019 12:40:58 -0700 (PDT) Received: from localhost.localdomain (cpc89244-aztw30-2-0-cust4998.18-1.cable.virginm.net. [86.31.179.135]) by smtp.gmail.com with ESMTPSA id s10sm4583941wrv.56.2019.03.18.12.40.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 18 Mar 2019 12:40:57 -0700 (PDT) From: Peter Griffin To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, airlied@linux.ie, daniel@ffwll.ch, robh+dt@kernel.org, mark.rutland@arm.com, p.zabel@pengutronix.de, xuwei5@hisilicon.com, mturquette@baylibre.com, sboyd@kernel.org Subject: [PATCH v1 4/6] reset: hi6220: Add support for AO reset controller Date: Mon, 18 Mar 2019 19:38:49 +0000 Message-Id: <1552937931-23050-5-git-send-email-peter.griffin@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1552937931-23050-1-git-send-email-peter.griffin@linaro.org> References: <1552937931-23050-1-git-send-email-peter.griffin@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190318_124100_530935_9764FAFB X-CRM114-Status: GOOD ( 14.30 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, john.stultz@linaro.org, linux-clk@vger.kernel.org, dri-devel@lists.freedesktop.org, yuq825@gmail.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 This is required to bring Mali450 gpu out of reset. Signed-off-by: Peter Griffin --- drivers/reset/hisilicon/hi6220_reset.c | 51 +++++++++++++++++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-) diff --git a/drivers/reset/hisilicon/hi6220_reset.c b/drivers/reset/hisilicon/hi6220_reset.c index d5e5229..0cd5f92 100644 --- a/drivers/reset/hisilicon/hi6220_reset.c +++ b/drivers/reset/hisilicon/hi6220_reset.c @@ -36,6 +36,7 @@ enum hi6220_reset_ctrl_type { PERIPHERAL, MEDIA, + AO, }; struct hi6220_reset_data { @@ -95,6 +96,47 @@ static const struct reset_control_ops hi6220_media_reset_ops = { .deassert = hi6220_media_deassert, }; +#define AO_SCTRL_SC_PW_CLKEN0 0x800 +#define AO_SCTRL_SC_PW_CLKDIS0 0x804 + +#define AO_SCTRL_SC_PW_RSTEN0 0x810 +#define AO_SCTRL_SC_PW_RSTDIS0 0x814 + +#define AO_SCTRL_SC_PW_ISOEN0 0x820 +#define AO_SCTRL_SC_PW_ISODIS0 0x824 +#define AO_MAX_INDEX 12 + +static int hi6220_ao_assert(struct reset_controller_dev *rc_dev, + unsigned long idx) +{ + struct hi6220_reset_data *data = to_reset_data(rc_dev); + struct regmap *regmap = data->regmap; + int ret; + + ret = regmap_write(regmap, AO_SCTRL_SC_PW_RSTEN0, BIT(idx)); + ret |= regmap_write(regmap, AO_SCTRL_SC_PW_ISOEN0, BIT(idx)); + ret |= regmap_write(regmap, AO_SCTRL_SC_PW_CLKDIS0, BIT(idx)); + return ret; +} + +static int hi6220_ao_deassert(struct reset_controller_dev *rc_dev, + unsigned long idx) +{ + struct hi6220_reset_data *data = to_reset_data(rc_dev); + struct regmap *regmap = data->regmap; + int ret; + + ret = regmap_write(regmap, AO_SCTRL_SC_PW_RSTDIS0, BIT(idx)); + ret |= regmap_write(regmap, AO_SCTRL_SC_PW_ISODIS0, BIT(idx)); + ret |= regmap_write(regmap, AO_SCTRL_SC_PW_CLKEN0, BIT(idx)); + return ret; +} + +static const struct reset_control_ops hi6220_ao_reset_ops = { + .assert = hi6220_ao_assert, + .deassert = hi6220_ao_deassert, +}; + static int hi6220_reset_probe(struct platform_device *pdev) { struct device_node *np = pdev->dev.of_node; @@ -120,9 +162,12 @@ static int hi6220_reset_probe(struct platform_device *pdev) if (type == MEDIA) { data->rc_dev.ops = &hi6220_media_reset_ops; data->rc_dev.nr_resets = MEDIA_MAX_INDEX; - } else { + } else if (type == PERIPHERAL) { data->rc_dev.ops = &hi6220_peripheral_reset_ops; data->rc_dev.nr_resets = PERIPH_MAX_INDEX; + } else { + data->rc_dev.ops = &hi6220_ao_reset_ops; + data->rc_dev.nr_resets = AO_MAX_INDEX; } return reset_controller_register(&data->rc_dev); @@ -137,6 +182,10 @@ static const struct of_device_id hi6220_reset_match[] = { .compatible = "hisilicon,hi6220-mediactrl", .data = (void *)MEDIA, }, + { + .compatible = "hisilicon,hi6220-aoctrl", + .data = (void *)AO, + }, { /* sentinel */ }, }; MODULE_DEVICE_TABLE(of, hi6220_reset_match); From patchwork Mon Mar 18 19:38:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Griffin X-Patchwork-Id: 10858467 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2CA9214DE for ; Mon, 18 Mar 2019 19:42:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0D3F92900B for ; Mon, 18 Mar 2019 19:42:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0180329045; Mon, 18 Mar 2019 19:42:04 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A53FF294B1 for ; Mon, 18 Mar 2019 19:42:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=lJ+4KYqq2+2EiSAdX8yrgWat0I7ganzbSybcNMLB83s=; b=Qjw0zf6Cy2TyLLyoEanFDg4drp fvLJj203AYobTjOo2mb8j1HOt+C6AK63dKuDUkXRQQ56hPLrdp15IvdabR0zXrosvi8y09R5YLgeI 4rtyJ5iJqv9hD5QHyj16RchAu7UP5eTPyKHDRJoiJJ06HuntNmPOU/a5VK348eiQ82VlpO5n1Poct heDCD3EIG1iFgHkj8POPWHSxhEUlcYykGTCVAnXxUXHg/hhDdysHq3eFTQYko1sbGfNI0kw5zqGtn 5Qt3UwJ4IKHRd862AAMdZcW+imERJ7/CUrPGEpOOURwrc0q9MshBGMEzbJCbk8ACNlSoNnpXaAQ64 daTn9rsw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1h5y8y-0006cm-Iw; Mon, 18 Mar 2019 19:41:56 +0000 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h5y85-0005Qj-V9 for linux-arm-kernel@lists.infradead.org; Mon, 18 Mar 2019 19:41:05 +0000 Received: by mail-wr1-x443.google.com with SMTP id p1so18439870wrs.8 for ; Mon, 18 Mar 2019 12:41:01 -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:in-reply-to:references; bh=2T8O0Mm4ruygwgr6c+1/UMNXLrosJEb50l9fzQq3+LI=; b=Uhf9yDYxmFCusnccxywzNceiIL+v/S2FVJrRXHMcKpbtFSzGE2KlxkfICt3hFRgRj9 SfGAAT7pvHqE20/PNiRTaQUqvMdkCt7X1BE6zng67/Jsrfr6soPXzMs0SBP9XhaUYTGm 0KtDzFKgCARAFb5D2wRdtxsd16NKlPIOBIl4qZ+lIvRkyxvzbV4niZ3tt2ULgvohMy4o jHKl+dbcAUTpTA/CGJrz5A42dLNe/sUn0To+anS/GWhqcFSQZTW3jVcZ7JoxMhIFYhxd dmR45nrOgYUK7wkzzpr1vKlhMAZRIlNWQfMttBozfa2K+54ccQuXbtuv9xLsNYbptOyu egsw== 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:in-reply-to :references; bh=2T8O0Mm4ruygwgr6c+1/UMNXLrosJEb50l9fzQq3+LI=; b=Htp6JhiHxn85ZWFTiYB6QENwM1QXwo0F11vt3lR3gSHfhqh7LcoHU3qKd7sDNWYQ5w ks/I4HRSPcCcoy0Lg1ctoXwpiqtkTYN6tU0BwCKNHrI/CDc101roM8ddeOmewdN4rr5A m78CCzysU56zI/RC+FoC6oCPoEWqKr+weG76ZMakwyefFmqLANCD8wHmCmeuK7t9q/h8 dPTGn9uXVaZmZBtWEyDyE/iJ93O0rVqfEY2XddXah6vUzzdyWNlV4Wl46rR8MMtGEwIZ gZOEk4IWObJqL1l5PU8sSxxR1ByzAEsSThZK0NgatnDnz0JQtNiiiXbkJhJXBpVjb/Zg 0bXA== X-Gm-Message-State: APjAAAU7OCRJSj8ERT9lTAxRZOKsnqsBvHP1tY1s6B9sFWlicbLZYTau qwJEdaGjDtzsptg+BXYYt1IumxPB+xU= X-Google-Smtp-Source: APXvYqwSlmj56Jf2NE2Gd3GBSYXic9INk2IDtEWlgFgQAvHuYAAMzoPBZjojS2u4BMrrmZiOOKIK5A== X-Received: by 2002:a5d:6543:: with SMTP id z3mr13195408wrv.200.1552938059981; Mon, 18 Mar 2019 12:40:59 -0700 (PDT) Received: from localhost.localdomain (cpc89244-aztw30-2-0-cust4998.18-1.cable.virginm.net. [86.31.179.135]) by smtp.gmail.com with ESMTPSA id s10sm4583941wrv.56.2019.03.18.12.40.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 18 Mar 2019 12:40:59 -0700 (PDT) From: Peter Griffin To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, airlied@linux.ie, daniel@ffwll.ch, robh+dt@kernel.org, mark.rutland@arm.com, p.zabel@pengutronix.de, xuwei5@hisilicon.com, mturquette@baylibre.com, sboyd@kernel.org Subject: [PATCH v1 5/6] dt-bindings: reset: hisilicon: Add ao reset controller Date: Mon, 18 Mar 2019 19:38:50 +0000 Message-Id: <1552937931-23050-6-git-send-email-peter.griffin@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1552937931-23050-1-git-send-email-peter.griffin@linaro.org> References: <1552937931-23050-1-git-send-email-peter.griffin@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190318_124102_423012_1C942CD9 X-CRM114-Status: UNSURE ( 9.77 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, john.stultz@linaro.org, linux-clk@vger.kernel.org, dri-devel@lists.freedesktop.org, yuq825@gmail.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 This is required to bring Mali450 gpu out of reset. Signed-off-by: Peter Griffin Reviewed-by: Rob Herring --- include/dt-bindings/reset/hisi,hi6220-resets.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/dt-bindings/reset/hisi,hi6220-resets.h b/include/dt-bindings/reset/hisi,hi6220-resets.h index e7c362a8..63aff7d 100644 --- a/include/dt-bindings/reset/hisi,hi6220-resets.h +++ b/include/dt-bindings/reset/hisi,hi6220-resets.h @@ -73,4 +73,11 @@ #define MEDIA_MMU 6 #define MEDIA_XG2RAM1 7 +#define AO_G3D 1 +#define AO_CODECISP 2 +#define AO_MCPU 4 +#define AO_BBPHARQMEM 5 +#define AO_HIFI 8 +#define AO_ACPUSCUL2C 12 + #endif /*_DT_BINDINGS_RESET_CONTROLLER_HI6220*/ From patchwork Mon Mar 18 19:38:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Griffin X-Patchwork-Id: 10858469 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0B7B91575 for ; Mon, 18 Mar 2019 19:42:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DCA1429222 for ; Mon, 18 Mar 2019 19:42:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D0BF329503; Mon, 18 Mar 2019 19:42:11 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 19D2D29222 for ; Mon, 18 Mar 2019 19:42:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=aZLtV9YbuUcuSjH52Iv1kH3YAjpUIp/H+MKGYg/ZeQ0=; b=ubPIaRZETl/iAIY1jRzBosZgF1 olIzpxvCBEOVP5jvZOl9itUIDqp0CzSEAnbQssbHQVCCNcxkt3Qa4+q3LE5tl2S+ZXe+FTCYog4lG xvsrnad5rh9IyOrj/smyrFUtw/1tpiRkMpwL/KKa52Lq8TvrN/fwVuVSj/QW8Sy/tbc6YW4gg+9zf GABGKTxAU2Q7QFBWNbxeZn8x7EuJJj2JG5G5T1bITC9NXxFWyRBFMDb2m48WFt7KxHXAPkeCPuJH1 JREJKddVuxWXRCEqRyRBsfxRooGDyh9RXh2phvtXBtjAv8OBfFUBdLIEGlgl0m+zriQJrCgZyR7Fq KBUOtWUQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1h5y9B-0006vx-9p; Mon, 18 Mar 2019 19:42:09 +0000 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h5y86-0005Ry-MZ for linux-arm-kernel@lists.infradead.org; Mon, 18 Mar 2019 19:41:07 +0000 Received: by mail-wr1-x443.google.com with SMTP id q1so2786330wrp.0 for ; Mon, 18 Mar 2019 12:41:02 -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:in-reply-to:references; bh=f+uCN0dtjEGnlJv3pfIkjdcZRrqjbDiHnBp4IPbDmW4=; b=rDY5Z6beU5to+2BGAZgeIkJkgr3wfP/KjLMRUdOpcCW6YCcJ4RivVQwKnooXBtJ2dj 7ok/tS8E0MGmIRyTmVgHPxRcJwd/tiRKSmPIbanxJm74jm/pZ3aUUI75FRp5+v5K/aTk vzJp68jARltyDy5MT0btgZdSjS5LTLQuLPAVaefO6yYD3maHUd2VxrlHDHVybALZ4mpK 5TzpsvylL5K4z+4aF+zVwWWRNby21sQ+vjjhehkTawWw9y+hheExStyuzngOL6bFP6w5 apFCKS0evYsNOvuWmCAb6rPc8eehmHkyOGdrVFROzko5ZAx02jSkcjFrS7KFWRNA+IsB nZtA== 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:in-reply-to :references; bh=f+uCN0dtjEGnlJv3pfIkjdcZRrqjbDiHnBp4IPbDmW4=; b=lV4lmF02AHoy1CbtIdP/Trw00p3T5IMjMWNu7FuBG8mdnqO05Z1G4Yyjcfas6/J3fa U/5r3ZVMR6u9+c3hyfFzoKKBtFznmq0mJBjdajSKUXwZnPIO4jETQ4GYtAj2qT4hyjk5 hIQSMZecGmXpd87AUCptc6XyzsvONN2UvT1XQYbrGbd2cJqudIaes5DcVYaLv9fXumk9 S/R44cO2+oc5UEYj+GaNNkBCCwksQFdj9C0Mz1+QoJdgx1UmqCkLmcoBwO6gXL95sflk 42IVEZ1EH7rrQNc3QNQYGMyV4uANuyIZeLQJjgN8gn57FhgECv7ZBzAvWhRit05UfeLL xYIQ== X-Gm-Message-State: APjAAAXp4Oe1Pka5NbBNUkOKjBHZ3OzOUY+GbDx3qxwXvE/Q0c9Xg8Dn PgouPRY+IS29K3jnbsWlIDuXY8kigg0= X-Google-Smtp-Source: APXvYqx+OpyuPhR9OKH2oYNzz4yUdu4KL8pJugxaOx7zkWRlZz+b/DZpiR2HE59qYxCt/JwwY6NXNQ== X-Received: by 2002:adf:fb82:: with SMTP id a2mr4551043wrr.214.1552938061153; Mon, 18 Mar 2019 12:41:01 -0700 (PDT) Received: from localhost.localdomain (cpc89244-aztw30-2-0-cust4998.18-1.cable.virginm.net. [86.31.179.135]) by smtp.gmail.com with ESMTPSA id s10sm4583941wrv.56.2019.03.18.12.41.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 18 Mar 2019 12:41:00 -0700 (PDT) From: Peter Griffin To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, airlied@linux.ie, daniel@ffwll.ch, robh+dt@kernel.org, mark.rutland@arm.com, p.zabel@pengutronix.de, xuwei5@hisilicon.com, mturquette@baylibre.com, sboyd@kernel.org Subject: [PATCH v1 6/6] clk: hi6220: use CLK_OF_DECLARE_DRIVER Date: Mon, 18 Mar 2019 19:38:51 +0000 Message-Id: <1552937931-23050-7-git-send-email-peter.griffin@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1552937931-23050-1-git-send-email-peter.griffin@linaro.org> References: <1552937931-23050-1-git-send-email-peter.griffin@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190318_124103_059448_B1BB63E0 X-CRM114-Status: GOOD ( 13.44 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, john.stultz@linaro.org, linux-clk@vger.kernel.org, dri-devel@lists.freedesktop.org, yuq825@gmail.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 As now we also need to probe in the reset driver as well. Signed-off-by: Peter Griffin --- drivers/clk/hisilicon/clk-hi6220.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/clk/hisilicon/clk-hi6220.c b/drivers/clk/hisilicon/clk-hi6220.c index a87809d..952ffe2 100644 --- a/drivers/clk/hisilicon/clk-hi6220.c +++ b/drivers/clk/hisilicon/clk-hi6220.c @@ -89,7 +89,7 @@ static void __init hi6220_clk_ao_init(struct device_node *np) hisi_clk_register_gate_sep(hi6220_separated_gate_clks_ao, ARRAY_SIZE(hi6220_separated_gate_clks_ao), clk_data_ao); } -CLK_OF_DECLARE(hi6220_clk_ao, "hisilicon,hi6220-aoctrl", hi6220_clk_ao_init); +CLK_OF_DECLARE_DRIVER(hi6220_clk_ao, "hisilicon,hi6220-aoctrl", hi6220_clk_ao_init); /* clocks in sysctrl */