From patchwork Mon Oct 15 09:55:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 10641459 X-Patchwork-Delegate: geert@linux-m68k.org 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 4D28D13AD for ; Mon, 15 Oct 2018 09:56:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3BEB5205FB for ; Mon, 15 Oct 2018 09:56:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2F6E0293DF; Mon, 15 Oct 2018 09:56:06 +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=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 948F9205FB for ; Mon, 15 Oct 2018 09:56:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726422AbeJORkg (ORCPT ); Mon, 15 Oct 2018 13:40:36 -0400 Received: from kirsty.vergenet.net ([202.4.237.240]:41714 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726273AbeJORkg (ORCPT ); Mon, 15 Oct 2018 13:40:36 -0400 Received: from penelope.horms.nl (ip4dab7138.direct-adsl.nl [77.171.113.56]) by kirsty.vergenet.net (Postfix) with ESMTPA id 6D0A625AE76; Mon, 15 Oct 2018 20:56:03 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=verge.net.au; s=mail; t=1539597363; bh=dZ+yGrQkPkQLwXCPMRjpmsfmyiEVdDM/WGxoD4uRSI8=; h=From:To:Cc:Subject:Date:From; b=hsWep4qeVAhwm5qZfIrUiGiS9kXWyHwrWPkrpQbB5Mzk9vTtnH3otL0ejuzNKbm0R guYpJ7ppNGzvXLeLLVM1m4+mvEDqqk3OCGMg9aP/92p594sOUf1DCMhKC2JhxMalSF lUb70NopoZQY/JeMCuq79nPYoBHd4Gaasj6gWTFs= Received: by penelope.horms.nl (Postfix, from userid 7100) id 1C053E21DB9; Mon, 15 Oct 2018 11:56:01 +0200 (CEST) From: Simon Horman To: Alex Williamson , Joerg Roedel Cc: Magnus Damm , iommu@lists.linux-foundation.org, linux-renesas-soc@vger.kernel.org, Hai Nguyen Pham , Kazuya Mizuguchi , Simon Horman Subject: [PATCH] iommu/ipmmu-vmsa: Hook up r8a77990 DT matching code Date: Mon, 15 Oct 2018 11:55:57 +0200 Message-Id: <20181015095557.25135-1-horms+renesas@verge.net.au> X-Mailer: git-send-email 2.11.0 Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Hai Nguyen Pham Support the r8a77990 IPMMU and update IPMMU_OF_DECLARE to hook up the updated compat string. Signed-off-by: Hai Nguyen Pham Signed-off-by: Kazuya Mizuguchi [simon: rebased; dropped no longer required IOMMU_OF_DECLARE hunk] Signed-off-by: Simon Horman --- drivers/iommu/ipmmu-vmsa.c | 4 ++++ 1 file changed, 4 insertions(+) This is based on the next branch pf Joerg Roedel's iommu tree: 2f2fbfb71ecc ("Merge branches 'arm/renesas', 'arm/smmu', 'ppc/pamu', 'x86/vt-d', 'x86/amd' and 'core' into next") diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c index b98a03189580..e0adf5d6c13c 100644 --- a/drivers/iommu/ipmmu-vmsa.c +++ b/drivers/iommu/ipmmu-vmsa.c @@ -762,6 +762,7 @@ static const struct soc_device_attribute soc_rcar_gen3[] = { { .soc_id = "r8a7796", }, { .soc_id = "r8a77965", }, { .soc_id = "r8a77970", }, + { .soc_id = "r8a77990", }, { .soc_id = "r8a77995", }, { /* sentinel */ } }; @@ -950,6 +951,9 @@ static const struct of_device_id ipmmu_of_ids[] = { .compatible = "renesas,ipmmu-r8a77970", .data = &ipmmu_features_rcar_gen3, }, { + .compatible = "renesas,ipmmu-r8a77990", + .data = &ipmmu_features_rcar_gen3, + }, { .compatible = "renesas,ipmmu-r8a77995", .data = &ipmmu_features_rcar_gen3, }, {