From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757096AbeDZQ7S (ORCPT ); Thu, 26 Apr 2018 12:59:18 -0400 Received: from perceval.ideasonboard.com ([213.167.242.64]:58064 "EHLO perceval.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756853AbeDZQxz (ORCPT ); Thu, 26 Apr 2018 12:53:55 -0400 From: Kieran Bingham To: linux-renesas-soc@vger.kernel.org Cc: Kieran Bingham , Laurent Pinchart , David Airlie , dri-devel@lists.freedesktop.org (open list:DRM DRIVERS FOR RENESAS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 04/17] drm: rcar-du: Use the correct naming for ODPM fields in DEFR6 Date: Thu, 26 Apr 2018 17:53:33 +0100 Message-Id: <20180426165346.494-5-kieran.bingham+renesas@ideasonboard.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180426165346.494-1-kieran.bingham+renesas@ideasonboard.com> References: <20180426165346.494-1-kieran.bingham+renesas@ideasonboard.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The naming of the fields for the ODPM signals in the DU extensional function control register 6 (DEFR6) is incorrect against the data sheets for both R-Car Gen2 and R-Car Gen3. Rename the fields to match the datasheet. Signed-off-by: Kieran Bingham --- drivers/gpu/drm/rcar-du/rcar_du_group.c | 4 ++-- drivers/gpu/drm/rcar-du/rcar_du_regs.h | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/rcar-du/rcar_du_group.c b/drivers/gpu/drm/rcar-du/rcar_du_group.c index 2f37ea901873..eead202c95c7 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_group.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_group.c @@ -46,10 +46,10 @@ void rcar_du_group_write(struct rcar_du_group *rgrp, u32 reg, u32 data) static void rcar_du_group_setup_pins(struct rcar_du_group *rgrp) { - u32 defr6 = DEFR6_CODE | DEFR6_ODPM12_DISP; + u32 defr6 = DEFR6_CODE | DEFR6_ODPM02_DISP; if (rgrp->num_crtcs > 1) - defr6 |= DEFR6_ODPM22_DISP; + defr6 |= DEFR6_ODPM12_DISP; rcar_du_group_write(rgrp, DEFR6, defr6); } diff --git a/drivers/gpu/drm/rcar-du/rcar_du_regs.h b/drivers/gpu/drm/rcar-du/rcar_du_regs.h index d5bae99d3cfe..9dfd220ceda1 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_regs.h +++ b/drivers/gpu/drm/rcar-du/rcar_du_regs.h @@ -187,14 +187,14 @@ #define DEFR6 0x000e8 #define DEFR6_CODE (0x7778 << 16) -#define DEFR6_ODPM22_DSMR (0 << 10) -#define DEFR6_ODPM22_DISP (2 << 10) -#define DEFR6_ODPM22_CDE (3 << 10) -#define DEFR6_ODPM22_MASK (3 << 10) -#define DEFR6_ODPM12_DSMR (0 << 8) -#define DEFR6_ODPM12_DISP (2 << 8) -#define DEFR6_ODPM12_CDE (3 << 8) -#define DEFR6_ODPM12_MASK (3 << 8) +#define DEFR6_ODPM12_DSMR (0 << 10) +#define DEFR6_ODPM12_DISP (2 << 10) +#define DEFR6_ODPM12_CDE (3 << 10) +#define DEFR6_ODPM12_MASK (3 << 10) +#define DEFR6_ODPM02_DSMR (0 << 8) +#define DEFR6_ODPM02_DISP (2 << 8) +#define DEFR6_ODPM02_CDE (3 << 8) +#define DEFR6_ODPM02_MASK (3 << 8) #define DEFR6_TCNE1 (1 << 6) #define DEFR6_TCNE0 (1 << 4) #define DEFR6_MLOS1 (1 << 2) -- 2.17.0 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kieran Bingham Subject: [PATCH 04/17] drm: rcar-du: Use the correct naming for ODPM fields in DEFR6 Date: Thu, 26 Apr 2018 17:53:33 +0100 Message-ID: <20180426165346.494-5-kieran.bingham+renesas@ideasonboard.com> References: <20180426165346.494-1-kieran.bingham+renesas@ideasonboard.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7E19C6E755 for ; Thu, 26 Apr 2018 16:53:56 +0000 (UTC) In-Reply-To: <20180426165346.494-1-kieran.bingham+renesas@ideasonboard.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: linux-renesas-soc@vger.kernel.org Cc: David Airlie , Kieran Bingham , Laurent Pinchart , "open list:DRM DRIVERS FOR RENESAS" , open list List-Id: dri-devel@lists.freedesktop.org VGhlIG5hbWluZyBvZiB0aGUgZmllbGRzIGZvciB0aGUgT0RQTSBzaWduYWxzIGluIHRoZSBEVSBl eHRlbnNpb25hbApmdW5jdGlvbiBjb250cm9sIHJlZ2lzdGVyIDYgKERFRlI2KSBpcyBpbmNvcnJl Y3QgYWdhaW5zdCB0aGUgZGF0YSBzaGVldHMKZm9yIGJvdGggUi1DYXIgR2VuMiBhbmQgUi1DYXIg R2VuMy4KClJlbmFtZSB0aGUgZmllbGRzIHRvIG1hdGNoIHRoZSBkYXRhc2hlZXQuCgpTaWduZWQt b2ZmLWJ5OiBLaWVyYW4gQmluZ2hhbSA8a2llcmFuLmJpbmdoYW0rcmVuZXNhc0BpZGVhc29uYm9h cmQuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9yY2FyLWR1L3JjYXJfZHVfZ3JvdXAuYyB8ICA0 ICsrLS0KIGRyaXZlcnMvZ3B1L2RybS9yY2FyLWR1L3JjYXJfZHVfcmVncy5oICB8IDE2ICsrKysr KysrLS0tLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgMTAgaW5zZXJ0aW9ucygrKSwgMTAgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3JjYXItZHUvcmNhcl9kdV9ncm91 cC5jIGIvZHJpdmVycy9ncHUvZHJtL3JjYXItZHUvcmNhcl9kdV9ncm91cC5jCmluZGV4IDJmMzdl YTkwMTg3My4uZWVhZDIwMmM5NWM3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vcmNhci1k dS9yY2FyX2R1X2dyb3VwLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3JjYXItZHUvcmNhcl9kdV9n cm91cC5jCkBAIC00NiwxMCArNDYsMTAgQEAgdm9pZCByY2FyX2R1X2dyb3VwX3dyaXRlKHN0cnVj dCByY2FyX2R1X2dyb3VwICpyZ3JwLCB1MzIgcmVnLCB1MzIgZGF0YSkKIAogc3RhdGljIHZvaWQg cmNhcl9kdV9ncm91cF9zZXR1cF9waW5zKHN0cnVjdCByY2FyX2R1X2dyb3VwICpyZ3JwKQogewot CXUzMiBkZWZyNiA9IERFRlI2X0NPREUgfCBERUZSNl9PRFBNMTJfRElTUDsKKwl1MzIgZGVmcjYg PSBERUZSNl9DT0RFIHwgREVGUjZfT0RQTTAyX0RJU1A7CiAKIAlpZiAocmdycC0+bnVtX2NydGNz ID4gMSkKLQkJZGVmcjYgfD0gREVGUjZfT0RQTTIyX0RJU1A7CisJCWRlZnI2IHw9IERFRlI2X09E UE0xMl9ESVNQOwogCiAJcmNhcl9kdV9ncm91cF93cml0ZShyZ3JwLCBERUZSNiwgZGVmcjYpOwog fQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3JjYXItZHUvcmNhcl9kdV9yZWdzLmggYi9k cml2ZXJzL2dwdS9kcm0vcmNhci1kdS9yY2FyX2R1X3JlZ3MuaAppbmRleCBkNWJhZTk5ZDNjZmUu LjlkZmQyMjBjZWRhMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3JjYXItZHUvcmNhcl9k dV9yZWdzLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL3JjYXItZHUvcmNhcl9kdV9yZWdzLmgKQEAg LTE4NywxNCArMTg3LDE0IEBACiAKICNkZWZpbmUgREVGUjYJCQkweDAwMGU4CiAjZGVmaW5lIERF RlI2X0NPREUJCSgweDc3NzggPDwgMTYpCi0jZGVmaW5lIERFRlI2X09EUE0yMl9EU01SCSgwIDw8 IDEwKQotI2RlZmluZSBERUZSNl9PRFBNMjJfRElTUAkoMiA8PCAxMCkKLSNkZWZpbmUgREVGUjZf T0RQTTIyX0NERQkoMyA8PCAxMCkKLSNkZWZpbmUgREVGUjZfT0RQTTIyX01BU0sJKDMgPDwgMTAp Ci0jZGVmaW5lIERFRlI2X09EUE0xMl9EU01SCSgwIDw8IDgpCi0jZGVmaW5lIERFRlI2X09EUE0x Ml9ESVNQCSgyIDw8IDgpCi0jZGVmaW5lIERFRlI2X09EUE0xMl9DREUJKDMgPDwgOCkKLSNkZWZp bmUgREVGUjZfT0RQTTEyX01BU0sJKDMgPDwgOCkKKyNkZWZpbmUgREVGUjZfT0RQTTEyX0RTTVIJ KDAgPDwgMTApCisjZGVmaW5lIERFRlI2X09EUE0xMl9ESVNQCSgyIDw8IDEwKQorI2RlZmluZSBE RUZSNl9PRFBNMTJfQ0RFCSgzIDw8IDEwKQorI2RlZmluZSBERUZSNl9PRFBNMTJfTUFTSwkoMyA8 PCAxMCkKKyNkZWZpbmUgREVGUjZfT0RQTTAyX0RTTVIJKDAgPDwgOCkKKyNkZWZpbmUgREVGUjZf T0RQTTAyX0RJU1AJKDIgPDwgOCkKKyNkZWZpbmUgREVGUjZfT0RQTTAyX0NERQkoMyA8PCA4KQor I2RlZmluZSBERUZSNl9PRFBNMDJfTUFTSwkoMyA8PCA4KQogI2RlZmluZSBERUZSNl9UQ05FMQkJ KDEgPDwgNikKICNkZWZpbmUgREVGUjZfVENORTAJCSgxIDw8IDQpCiAjZGVmaW5lIERFRlI2X01M T1MxCQkoMSA8PCAyKQotLSAKMi4xNy4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5m cmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9kcmktZGV2ZWwK