From patchwork Tue Jun 7 03:39:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 9159775 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 89EA66086C for ; Tue, 7 Jun 2016 03:50:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7A428281F9 for ; Tue, 7 Jun 2016 03:50:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6C39E28354; Tue, 7 Jun 2016 03:50:11 +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=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 09D772834A for ; Tue, 7 Jun 2016 03:50:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751399AbcFGDuK (ORCPT ); Mon, 6 Jun 2016 23:50:10 -0400 Received: from mail-pa0-f66.google.com ([209.85.220.66]:35445 "EHLO mail-pa0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752006AbcFGDuG (ORCPT ); Mon, 6 Jun 2016 23:50:06 -0400 Received: by mail-pa0-f66.google.com with SMTP id gp3so13118322pac.2; Mon, 06 Jun 2016 20:50:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:date:message-id:in-reply-to:references:subject; bh=sjCVoVkTYIBygvjP6tpx7FlLIfEukOE4IMGGEfbSjf8=; b=YZN4BWoglqqLfIeS7skiK4NQxoEEo3Ooul0L4y/Q2sA/uFqNdDf4bMrjhMLI3I0Lyf l8p2Fd9MDRzHGP8ancnuNeZ0mHkiVNA0dwhpDg+UTSgkiU4C5cIZlG0Dx8lJrzlubye1 mex8Eq1g+Z5nV9g/vNAurPqVlPZPpr39CJRaNZpDYtZ8TISPf5eCJkUz53iO7Q7EGSEN RyIDxShdjUxM02owEvTDy0TRwtfg9hXBZFvGnMyMRtkRdPR0Ttx+DYV5PSG3s8s2ECTm IGTdp7ib/BU9327stg/KlClAZiAIFesnQMyP8b0lOHglm0pP2Lv+MIOtwI4UvUXo0vjN whJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:date:message-id:in-reply-to :references:subject; bh=sjCVoVkTYIBygvjP6tpx7FlLIfEukOE4IMGGEfbSjf8=; b=kyCdspVxht4RQ+p/Xsj6zwr0ALtk8qZEmhjIUeqfTSAk/MwTyDQ2h+VNIj3kw+P3rp C6+V6+OqUQDJ4EB9Hk/LxpXN2IaQj5jvPwcHyUYx2cCn3YNgV985rZHVy9l3ulWCdoTo aK3o7OVNw8c98LQ6hzliwLzN1duRtfiVxC4/ULzSVmrKCxIbc+p+zdPIMSJsK0Vwg5MS JrWgoEOjcms4kYRJ5f+NHhzteeaur9H3ODC0BT3LXHTdWnvopX0pThdlsIfHE78YzDuB T3OlUMHi9URmAtdRfB4BRWzTUPdquZ6rXL0X/2BLiuEzq6ALYi/CzJ3KFKiBGCjlXq7N oq6A== X-Gm-Message-State: ALyK8tL8VJyOfiYnXKuqn/3gzWgLRRT/fMsdm07uICH/4EjHIQ5JCc0oUR5LgE+6TWfpaw== X-Received: by 10.66.126.179 with SMTP id mz19mr16715127pab.27.1465271405647; Mon, 06 Jun 2016 20:50:05 -0700 (PDT) Received: from [127.0.0.1] (s214090.ppp.asahi-net.or.jp. [220.157.214.90]) by smtp.gmail.com with ESMTPSA id i65sm30878516pfk.84.2016.06.06.20.50.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Jun 2016 20:50:04 -0700 (PDT) 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: Tue, 07 Jun 2016 12:39:45 +0900 Message-Id: <20160607033945.28687.70956.sendpatchset@little-apple> In-Reply-To: <20160607033918.28687.98260.sendpatchset@little-apple> References: <20160607033918.28687.98260.sendpatchset@little-apple> Subject: [PATCH 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 --- 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");