From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.7 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F2E28C31E45 for ; Thu, 13 Jun 2019 15:55:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C1F4D20851 for ; Thu, 13 Jun 2019 15:55:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560441343; bh=4rzwWjMWaDAodybALEky2I9+FJ7Gp9NqTbx/hvV9UUc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=tYq77hARW4p4qWX4poMWsclMiht7W1sZr0Ug43HTSjO2cp33hl2lG6YvJBg9iGDUy VCyZTrnVjbBVD12CcPrTqEi+IM+2Up0oz6+peLWUv0zStV3RCpV5hv1nGFCJykE3/Q trH5X62yYSmtkA9qr07yNUcfR0/DVbLCHJs8Wmxg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726238AbfFMPzn (ORCPT ); Thu, 13 Jun 2019 11:55:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:39104 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731537AbfFMIvn (ORCPT ); Thu, 13 Jun 2019 04:51:43 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BBBB421743; Thu, 13 Jun 2019 08:51:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560415903; bh=4rzwWjMWaDAodybALEky2I9+FJ7Gp9NqTbx/hvV9UUc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=M0KGmjdHu134zB6yJILgsoe+0pyUZHcoCC8imVzBl2hM/7Vll91HMQhciT7TntEEs kP3HU2hPMw/y6gbh0V2q9CQb37+PWjkw51y16ToKKFhr9cSbFTHpMhZftWFwASi6z9 n+1TfOMeMg+7ayCBpMkwA0TdWyOPurB/cdXWQcHM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Takeshi Kihara , Geert Uytterhoeven , Simon Horman , Sasha Levin Subject: [PATCH 5.1 148/155] soc: renesas: Identify R-Car M3-W ES1.3 Date: Thu, 13 Jun 2019 10:34:20 +0200 Message-Id: <20190613075701.179730093@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190613075652.691765927@linuxfoundation.org> References: <20190613075652.691765927@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ Upstream commit 15160f6de0bba712fcea078c5ac7571fe33fcd5d ] The Product Register of R-Car M3-W ES1.3 incorrectly identifies the SoC revision as ES2.1. Add a workaround to fix this. Signed-off-by: Takeshi Kihara Signed-off-by: Geert Uytterhoeven Signed-off-by: Simon Horman Signed-off-by: Sasha Levin --- drivers/soc/renesas/renesas-soc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/soc/renesas/renesas-soc.c b/drivers/soc/renesas/renesas-soc.c index 4af96e668a2f..3299cf5365f3 100644 --- a/drivers/soc/renesas/renesas-soc.c +++ b/drivers/soc/renesas/renesas-soc.c @@ -335,6 +335,9 @@ static int __init renesas_soc_init(void) /* R-Car M3-W ES1.1 incorrectly identifies as ES2.0 */ if ((product & 0x7fff) == 0x5210) product ^= 0x11; + /* R-Car M3-W ES1.3 incorrectly identifies as ES2.1 */ + if ((product & 0x7fff) == 0x5211) + product ^= 0x12; if (soc->id && ((product >> 8) & 0xff) != soc->id) { pr_warn("SoC mismatch (product = 0x%x)\n", product); return -ENODEV; -- 2.20.1