From patchwork Mon Aug 19 23:48:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 1149683 Return-Path: X-Original-To: incoming-dt@patchwork.ozlabs.org Delivered-To: patchwork-incoming-dt@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=devicetree-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="deXVNLoy"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46C9cL368vz9s00 for ; Tue, 20 Aug 2019 09:48:50 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728758AbfHSXss (ORCPT ); Mon, 19 Aug 2019 19:48:48 -0400 Received: from mail-pl1-f193.google.com ([209.85.214.193]:42087 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728351AbfHSXss (ORCPT ); Mon, 19 Aug 2019 19:48:48 -0400 Received: by mail-pl1-f193.google.com with SMTP id y1so1727576plp.9 for ; Mon, 19 Aug 2019 16:48:48 -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=0FuLv5Zr+cxHC18qV9Ymv7B49a2IFYwtbEueh1KcEvM=; b=deXVNLoyRrdJV5151g0Pj2weOCcEQHbEb21VCS8oSn05nF5EWXO9webwpbjy4Ut3Zb 3LSfDRu3+aJpOCzDEYIVK/trRJQl9rWYVgr0C/70/2k5lL9thzLvbgE1/YlLFwfUC9PC AqobLGMOtXBzxKYNOADY2/q7xlXvU9X8WF8Qz38M1Kcr7CUYCQhz/rrLZpUAiCw3ZDf7 Z/kgAzyvZ7IF1DyrR1/RsoVJfai1gZ61jtd0thGL3aQfQqPoAIGFiH/u+bbc5jurbxDt JJqD4iWqPTL/Od+crWcr/D4G55rsMq/iBL64vZpIVxsIVSuexFhkgweWd6XQ+bASDQUP x7nQ== 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=0FuLv5Zr+cxHC18qV9Ymv7B49a2IFYwtbEueh1KcEvM=; b=XlyVQQEuxvBwrxD6O6y8r/A4Gq+O7R5tV0DKchl8tnVyuK0pqZoPNvC/Q/tp6bOTiq sg/HbbHJKI3FcLN98ht9EVd/uIwonMGzAMtYrDzRNRrpNLbz7dfDLI4mGiUCPYBOaFGM huw1QV2k0hgnBcbLITJe/6VG8odJv3fcy+dRsnBZMJqWC1oOnQxd5e4rCWNsYVwIjNaw iK0acnhvKcg86hLIhv1Z6+qHs61St36ZAiIGjFyRx8luOV6+SX9QBNaCB/xl8/qU4gpN xr++bTGOgQ7HreXzVAwG3IwrVSq8VNwzeg2T8S/CLjMC/MCURD48G66NHfAu6Be6RwkM muhA== X-Gm-Message-State: APjAAAU0wDgE44s5+TVX/qJAVeHbREMg7IQ1wNRbKuHQvbLczen9lDLP ejA7yVuNy/S01ZpQGddRnCXlWA== X-Google-Smtp-Source: APXvYqwS90/sOsmy9exLtni67ANg3PZmELosaPRMBAbUykexQdBfrAbKQp74SAYJ2MucrBWI+jCC/Q== X-Received: by 2002:a17:902:e30b:: with SMTP id cg11mr25695004plb.335.1566258527616; Mon, 19 Aug 2019 16:48:47 -0700 (PDT) Received: from localhost.localdomain ([2601:1c2:680:1319:692:26ff:feda:3a81]) by smtp.gmail.com with ESMTPSA id 185sm18769681pfa.170.2019.08.19.16.48.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Aug 2019 16:48:46 -0700 (PDT) From: John Stultz To: linux-kernel@vger.kernel.org Cc: Peter Griffin , David Airlie , Daniel Vetter , Rob Herring , Mark Rutland , Philipp Zabel , dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, John Stultz Subject: [PATCH 1/3] dt-bindings: gpu: mali-utgard: add hisilicon, hi6220-mali compatible Date: Mon, 19 Aug 2019 23:48:38 +0000 Message-Id: <20190819234840.37786-2-john.stultz@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190819234840.37786-1-john.stultz@linaro.org> References: <20190819234840.37786-1-john.stultz@linaro.org> Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org From: Peter Griffin The Hisilicon hi6220 uses a Mali-450MP4 with 4 PPs, so add a compatible for it. Cc: David Airlie Cc: Daniel Vetter Cc: Rob Herring Cc: Mark Rutland Cc: Philipp Zabel Cc: dri-devel@lists.freedesktop.org Cc: devicetree@vger.kernel.org Reviewed-by: Rob Herring Signed-off-by: Peter Griffin Signed-off-by: John Stultz --- 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 b352a6851a06..ba895efe3039 100644 --- a/Documentation/devicetree/bindings/gpu/arm,mali-utgard.txt +++ b/Documentation/devicetree/bindings/gpu/arm,mali-utgard.txt @@ -24,6 +24,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 @@ -98,6 +99,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 Aug 19 23:48:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 1149685 Return-Path: X-Original-To: incoming-dt@patchwork.ozlabs.org Delivered-To: patchwork-incoming-dt@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=devicetree-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="j+8970Ob"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46C9cZ3TVzz9s4Y for ; Tue, 20 Aug 2019 09:49:02 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728764AbfHSXsv (ORCPT ); Mon, 19 Aug 2019 19:48:51 -0400 Received: from mail-pg1-f196.google.com ([209.85.215.196]:36547 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728351AbfHSXsu (ORCPT ); Mon, 19 Aug 2019 19:48:50 -0400 Received: by mail-pg1-f196.google.com with SMTP id l21so2095675pgm.3 for ; Mon, 19 Aug 2019 16:48:49 -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=lQDNdRIDsrfByKdWclsgiLu5o6EPo6fOoPt7hg1xhn8=; b=j+8970ObdyCKHy/+UoDrc+05m+hWvJNJG2qzOu88xTMa17yHAD64/pAdmkJoG3rUlq lh/kv8j6ql1G22DuIZWnIM2eEWBn9VNfepRJOjanpvwSXTEOCn68OaF/2zRyN+vXR/9i HHCy05NmdvzHJGDjT8nincGyBmkNrLgCWhAd4Jmf9Erzong/0UMNYo6utGEeFpk8cYJq uNIoijtzeu9wivPWDLWS86e0eYb64Af+T7A4ri/rxlXge0LO+FMZ5NmppKrv//vGeyeX J5Yn2OQdoscv+nvZX7oi7zZ1/VQVX9QC/Eh0qSY3nx7vbYritd+hiTXsqqktqOD8TtCH sMFg== 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=lQDNdRIDsrfByKdWclsgiLu5o6EPo6fOoPt7hg1xhn8=; b=uLVq4ZwztaifULIE9TfPyZjR7Ee4qI56HZfDdyHkx2k639SibCWD7pL/1XLaWHZgsh +SsZ4nZxgHk6GQ2Vn2L6qqJvS1UPim84guRmn5NecAqv9hXwI8tL+GyEUF+9Z/bwTMi5 Fvpls3J8Whfd8Rw0iSdruIS3KJUZkGUz6uJjooNk0jKsj3g36rIgO02FLdoMjsoOqp8C FKKEAgNDexcwLY11hpRO31ZvWAPwg4irxwCbuBaarD19NwHVG2u8i94olxpsde+rvQ0A NDWpbHivA4X6iODxoRwyDgpFfm52tm3F8lgflzJZNjCdO5ZNWa7jcw6PTSO7x3uK/23j YQfA== X-Gm-Message-State: APjAAAVXuRjWdtVx75UQfPfdEaGrAC11bKRUsywGrHfbsIRQzGmJbjBB 3Ah2OQQnrbtjccdTKns1o7Xs2w== X-Google-Smtp-Source: APXvYqyG2bGpvXD+cv5Riz6fGjbJ4+cU+bFTeZSKQxqoj5uquFux67PipWDb9QA2yJsp6eP5B6hVMg== X-Received: by 2002:a63:f907:: with SMTP id h7mr16006795pgi.418.1566258529203; Mon, 19 Aug 2019 16:48:49 -0700 (PDT) Received: from localhost.localdomain ([2601:1c2:680:1319:692:26ff:feda:3a81]) by smtp.gmail.com with ESMTPSA id 185sm18769681pfa.170.2019.08.19.16.48.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Aug 2019 16:48:48 -0700 (PDT) From: John Stultz To: linux-kernel@vger.kernel.org Cc: Peter Griffin , David Airlie , Daniel Vetter , Rob Herring , Mark Rutland , Philipp Zabel , dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, John Stultz Subject: [PATCH 2/3] dt-bindings: reset: hisilicon: Update compatible documentation Date: Mon, 19 Aug 2019 23:48:39 +0000 Message-Id: <20190819234840.37786-3-john.stultz@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190819234840.37786-1-john.stultz@linaro.org> References: <20190819234840.37786-1-john.stultz@linaro.org> Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org From: Peter Griffin The reset driver now supports the ao reset controller, so update the documentation to match. Cc: David Airlie Cc: Daniel Vetter Cc: Rob Herring Cc: Mark Rutland Cc: Philipp Zabel Cc: dri-devel@lists.freedesktop.org Cc: devicetree@vger.kernel.org Reviewed-by: Rob Herring Signed-off-by: Peter Griffin Signed-off-by: John Stultz --- .../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 c25da39df707..ea0a6a9734c1 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 Aug 19 23:48:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 1149684 Return-Path: X-Original-To: incoming-dt@patchwork.ozlabs.org Delivered-To: patchwork-incoming-dt@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=devicetree-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="IQ80pFZQ"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46C9cT22yDz9sBF for ; Tue, 20 Aug 2019 09:48:57 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728786AbfHSXsw (ORCPT ); Mon, 19 Aug 2019 19:48:52 -0400 Received: from mail-pg1-f195.google.com ([209.85.215.195]:41808 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728768AbfHSXsv (ORCPT ); Mon, 19 Aug 2019 19:48:51 -0400 Received: by mail-pg1-f195.google.com with SMTP id x15so2089756pgg.8 for ; Mon, 19 Aug 2019 16:48:51 -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=Jxj+2KZBWtI0JOpMk5ZJCeu1tAsbbFil+Y5lPkm52H0=; b=IQ80pFZQbJTfI6qmkgm+X+z7T8DmQFSexAjS798jPAeYmmSZvKqg06wlrUWHjTqetS pHe2HzyMwsb87YS2RnHuQkyNUaEAfCUbelgxXpsrVrA4jVavbmh5+RqRvrKSUL2gDSBq HNzka37Lk81sHpP1Y4riaLwTV71A38hbWVOZCBafoKC78lXSVf3bVUbYMOA6VZQ6LYA8 rwcLSCBDQ2AeHiQpblEGOT+1ZHQuzRIDHmtEbrbzPypjmYgkvsqHYNRWlHow0JAT8DDm mokqDCa9u+jye8pLY5XmDAMyT0QgAhT4ezy4EmbVCCydamwAQ+lDBzjVIWGOgd4AYvla GRFQ== 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=Jxj+2KZBWtI0JOpMk5ZJCeu1tAsbbFil+Y5lPkm52H0=; b=Ihrz9UnLs10q5ePwJagyLjuwiNiQBLj86+89InTzGBwR25nd+6SnOna00IL8MM88c/ pK7+0mvNZwJBy/3DEFd0xreLD577F27qdaYGtjgkx1O0nFJTyenn4dCKo7K0mMyYXdRU gHJ9RrhY/NBc6GaaD5LDwfTuWw4jPpifXwopXATnQWhPDTBjMx9uhQDnugx5HoJG5t+U /ZC8oByqxF4rwW9sWAClGaVg7Pzhj7Xer06lWLe5dqDB5vG2TYOhwL0c5xYHCOD7CEo8 T2U5DbpN8SneKNgml4Yee29A7MZW5/rBNLcLJGlm7gzkFm5X2lB4JQTxT0E0hVQLCnmJ 8TLw== X-Gm-Message-State: APjAAAWm5vRVOAM0MnPGC/Os8KdcE1e7+IO5gHiWQIqvapjGDnOSLX5t Zq/3GvbzQ+aYPUX1i2oVFCsIIQ== X-Google-Smtp-Source: APXvYqxDZJWpa+rGG7aHYapq5x9JNeNVXRKzvW0GVlc0jWWCMSrxU1NQ4LMuf5Vx7sh6EKVz9sl47Q== X-Received: by 2002:a65:68cd:: with SMTP id k13mr22123663pgt.411.1566258530724; Mon, 19 Aug 2019 16:48:50 -0700 (PDT) Received: from localhost.localdomain ([2601:1c2:680:1319:692:26ff:feda:3a81]) by smtp.gmail.com with ESMTPSA id 185sm18769681pfa.170.2019.08.19.16.48.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Aug 2019 16:48:50 -0700 (PDT) From: John Stultz To: linux-kernel@vger.kernel.org Cc: Peter Griffin , David Airlie , Daniel Vetter , Rob Herring , Mark Rutland , Philipp Zabel , dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, John Stultz Subject: [PATCH 3/3] dt-bindings: reset: hisilicon: Add ao reset controller Date: Mon, 19 Aug 2019 23:48:40 +0000 Message-Id: <20190819234840.37786-4-john.stultz@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190819234840.37786-1-john.stultz@linaro.org> References: <20190819234840.37786-1-john.stultz@linaro.org> Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org From: Peter Griffin This is required to bring Mali450 gpu out of reset. Cc: David Airlie Cc: Daniel Vetter Cc: Rob Herring Cc: Mark Rutland Cc: Philipp Zabel Cc: dri-devel@lists.freedesktop.org Cc: devicetree@vger.kernel.org Reviewed-by: Rob Herring Signed-off-by: Peter Griffin Signed-off-by: John Stultz --- 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 e7c362a81a97..63aff7d8aa45 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*/