From patchwork Mon Jan 23 11:40:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 9532321 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.web.codeaurora.org (Postfix) with ESMTP id C94226042D for ; Mon, 23 Jan 2017 11:47:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BF569201A4 for ; Mon, 23 Jan 2017 11:47:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B423B27D5E; Mon, 23 Jan 2017 11:47:25 +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=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable 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 89C4926E82 for ; Mon, 23 Jan 2017 11:47:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751091AbdAWLrL (ORCPT ); Mon, 23 Jan 2017 06:47:11 -0500 Received: from mail-pf0-f194.google.com ([209.85.192.194]:36817 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750903AbdAWLrK (ORCPT ); Mon, 23 Jan 2017 06:47:10 -0500 Received: by mail-pf0-f194.google.com with SMTP id 19so9900112pfo.3; Mon, 23 Jan 2017 03:47:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:date:message-id:in-reply-to:references:subject; bh=NOseC/9QQrFHes5q1sYTURCI5OsbEw6Z7i3J+9VMeBg=; b=ZLUXyqHu4gLO82pC0CCjv5C13tO3++vY1OZWMYpo61PRn3lRGQulxe/gT7g/zq330z IwKIn1OZhc+XVw2oV7ntt25qMtojdKhI1c3+C0pHb8wAXxBRYQ8Mc8mvsF4j5Vmv7BMY 3My8ewENnSdeLd8TY5NGRNMoSa63b3Zpc5fspVMCAdztNymvxH6D+Kb79Fw5GTJZTLfn OPzpkdzFPbNip6RqQvXfpdrSnwsfOxvgcsaLsNMWYuhsnsTfC+Ba6wFckN73aTyJZ7ZT nxIUKwmB0ZIs8r/BhbnXrNGNTUpSYbQ8jPVwj9z1UGNKlp7qFkRX2YdYPAgYIJNB2f25 uD6g== 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:date:message-id:in-reply-to :references:subject; bh=NOseC/9QQrFHes5q1sYTURCI5OsbEw6Z7i3J+9VMeBg=; b=C5lWlbZqSoi67buPoLGrEADPFG2Efo2hAO401KItN274O1mtZJKtJ831jpN5RZkrHc EucLDmST3J7ghXs1c6uJJVeUKN/GDCXN99RfrPbYmSA/119x3qoprXpO+9MB5Xnh1Ro7 T9xBQLz5XNt3R7bnoF4/5lJCTUfaopg0oi4iJ/QnuRc86WdwwEAskGaejVOqmQ9gwRcp ULNLQBy4yOi9NSPmim1GrpHlyC0YCJWsdoyAHb5l5i4JIePJwJ25R74AMKQdwEU0UATt BKQJYgcEQrvgMtFhEkJIwZo+fgZZosuxA4yl5kkj3aNEBeBXUF9EGf3Wl6sjWNYf4EVm 1DjQ== X-Gm-Message-State: AIkVDXK/8F68Zt9MaUcr54q+72TdRvP5n3YR/qfhVd7cEHj+5pRlwMbglu7Gj0jODDPkQQ== X-Received: by 10.98.206.6 with SMTP id y6mr31436533pfg.122.1485172019649; Mon, 23 Jan 2017 03:46:59 -0800 (PST) Received: from [127.0.0.1] (s214090.ppp.asahi-net.or.jp. [220.157.214.90]) by smtp.gmail.com with ESMTPSA id q5sm36519080pgf.45.2017.01.23.03.46.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Jan 2017 03:46:58 -0800 (PST) From: Magnus Damm To: iommu@lists.linux-foundation.org Cc: laurent.pinchart+renesas@ideasonboard.com, geert+renesas@glider.be, joro@8bytes.org, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, horms+renesas@verge.net.au, Magnus Damm Date: Mon, 23 Jan 2017 20:40:38 +0900 Message-Id: <148517163800.13306.4525529383838653751.sendpatchset@little-apple> In-Reply-To: <148517158986.13306.314435910710426381.sendpatchset@little-apple> References: <148517158986.13306.314435910710426381.sendpatchset@little-apple> Subject: [PATCH v2 3/3] iommu/ipmmu-vmsa: Hook up r8a7796 DT matching code 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: Magnus Damm Support the r8a7796 IPMMU by sharing feature flags between r8a7795 and r8a7796. Also update IOMMU_OF_DECLARE to hook up the updated compat string. Signed-off-by: Magnus Damm --- Changes since V1: - None drivers/iommu/ipmmu-vmsa.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) --- 0031/drivers/iommu/ipmmu-vmsa.c +++ work/drivers/iommu/ipmmu-vmsa.c 2016-06-06 11:19:40.210607110 +0900 @@ -1074,7 +1074,7 @@ static const struct ipmmu_features ipmmu .twobit_imttbcr_sl0 = false, }; -static const struct ipmmu_features ipmmu_features_r8a7795 = { +static const struct ipmmu_features ipmmu_features_rcar_gen3 = { .use_ns_alias_offset = false, .has_cache_leaf_nodes = true, .has_eight_ctx = true, @@ -1088,7 +1088,10 @@ static const struct of_device_id ipmmu_o .data = &ipmmu_features_default, }, { .compatible = "renesas,ipmmu-r8a7795", - .data = &ipmmu_features_r8a7795, + .data = &ipmmu_features_rcar_gen3, + }, { + .compatible = "renesas,ipmmu-r8a7796", + .data = &ipmmu_features_rcar_gen3, }, { /* Terminator */ }, @@ -1268,6 +1271,8 @@ IOMMU_OF_DECLARE(ipmmu_vmsa_iommu_of, "r ipmmu_vmsa_iommu_of_setup); IOMMU_OF_DECLARE(ipmmu_r8a7795_iommu_of, "renesas,ipmmu-r8a7795", ipmmu_vmsa_iommu_of_setup); +IOMMU_OF_DECLARE(ipmmu_r8a7796_iommu_of, "renesas,ipmmu-r8a7796", + ipmmu_vmsa_iommu_of_setup); #endif MODULE_DESCRIPTION("IOMMU API for Renesas VMSA-compatible IPMMU");