From patchwork Wed Dec 20 12:24:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 10125637 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 0FCF26019C for ; Wed, 20 Dec 2017 12:25:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 07A8B28AF9 for ; Wed, 20 Dec 2017 12:25:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F083029153; Wed, 20 Dec 2017 12:25:08 +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.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, 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 79D4C28AF9 for ; Wed, 20 Dec 2017 12:25:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754542AbdLTMZI (ORCPT ); Wed, 20 Dec 2017 07:25:08 -0500 Received: from mail-pl0-f65.google.com ([209.85.160.65]:44815 "EHLO mail-pl0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754337AbdLTMZH (ORCPT ); Wed, 20 Dec 2017 07:25:07 -0500 Received: by mail-pl0-f65.google.com with SMTP id n13so8895369plp.11 for ; Wed, 20 Dec 2017 04:25:07 -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=+nca7VhnxgVB3dvAU209u8nTdXteS9kCoI1pJ7cmztQ=; b=Du08jkARMiUhmJ/Pqi9LpmPO/6lk7K2troqNSv7D7LaMwxU3fXHRIxELv2tC1PZHGM pD1gzqOw23MQ8f4WoL6jyQE0fZCvyU8KAPYGUx8tR0HsEfzd/SNRSjdeprOhboop2J9b GpwkEJyBYDvpr9lIWrbqXuM3I50dYxFvrvJ9tr8WWI2uZ2AXSc0tcKtSeI7n7U5prnQ1 XWMVorZ09/Lw0614QO5nzU0dJJTaa6VONTKZQHrE7Le1ZX7dJUcC4GC7g0zkA9dXTs2s kGwebnLUmN+unP6j9DZkTeseKCyq2HQa8OvIWmy6rhjjcVPD/WXgIG8wUjQdt8D3EiIi 6ISw== 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=+nca7VhnxgVB3dvAU209u8nTdXteS9kCoI1pJ7cmztQ=; b=fms23VBYNtiTvqVpIx7IDt5wAFUHp3MQzFJi8nYWmxI9RW7oYU1E6nwI8kqgsvGYHp TKX/ge+mIVyQFZnrDbxVKXZk58rmeMZQGM6B+2WvjfiHJkRHp3f2tSoYVhb1sZoKVbRm n3UMxQ0zX16FuOgdHOp4/kdNOU6We3gReEt1fHol5okdZY6hx0SM05hB2m/6VMN8WjFA QY1+CAF5/xFghpuHpIreyJqRhcLjLx+5gGLwOv8PASotDvwRWC5uLoOCPa1ZQSq3hjAn sfeMMURc+Vod9rItEz9c6kYqSIwCehpiQ3Uv0lrRXFp94FqTvm8yNGJlqayjrw1m/t9y cb0g== X-Gm-Message-State: AKGB3mILohhZkhFYgAhdzxU//6KklW1xOKoZAWWgOZBJ1BDuoPGGpaiM wk52y+oUwFuOXcwkkxzt+IQ8C9Tx X-Google-Smtp-Source: ACJfBosCMr+x6hN6p2Eu0i8Esv454vWtY5OKplI/e6X1N4Fop+CjPJcH/HKhMp7eheSR4K/46rS+qw== X-Received: by 10.84.129.197 with SMTP id b63mr6786528plb.278.1513772706648; Wed, 20 Dec 2017 04:25:06 -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 b10sm7043097pgr.75.2017.12.20.04.25.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Dec 2017 04:25:05 -0800 (PST) From: Magnus Damm To: linux-renesas-soc@vger.kernel.org Cc: Magnus Damm Date: Wed, 20 Dec 2017 21:24:04 +0900 Message-Id: <151377264404.17613.15104906014272414275.sendpatchset@little-apple> In-Reply-To: <151377262568.17613.8610167192375932687.sendpatchset@little-apple> References: <151377262568.17613.8610167192375932687.sendpatchset@little-apple> Subject: [PATCH/RFC 02/03] iommu/ipmmu-vmsa: Detect r8a77965 compat strings 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 Match on the r8a77965 SoC in the IPMMU driver. Software wise the same IPMMU driver can be used as for other R-Car Gen3 SoCs, however the hardware contains certain changes so using separate SoC compat strings will allow us more fine grained control of features in the future. Not-Yet-Signed-off-by: Magnus Damm --- drivers/iommu/ipmmu-vmsa.c | 6 ++++++ 1 file changed, 6 insertions(+) --- 0001/drivers/iommu/ipmmu-vmsa.c +++ work/drivers/iommu/ipmmu-vmsa.c 2017-11-22 13:16:08.600607110 +0900 @@ -763,6 +763,7 @@ static bool ipmmu_slave_whitelist(struct static const struct soc_device_attribute soc_rcar_gen3[] = { { .soc_id = "r8a7795", }, { .soc_id = "r8a7796", }, + { .soc_id = "r8a77965", }, { .soc_id = "r8a77970", }, { .soc_id = "r8a77995", }, { /* sentinel */ } @@ -945,6 +946,9 @@ static const struct of_device_id ipmmu_o .compatible = "renesas,ipmmu-r8a7796", .data = &ipmmu_features_rcar_gen3, }, { + .compatible = "renesas,ipmmu-r8a77965", + .data = &ipmmu_features_rcar_gen3, + }, { .compatible = "renesas,ipmmu-r8a77970", .data = &ipmmu_features_rcar_gen3, }, { @@ -1137,6 +1141,8 @@ IOMMU_OF_DECLARE(ipmmu_r8a7795_iommu_of, ipmmu_vmsa_iommu_of_setup); IOMMU_OF_DECLARE(ipmmu_r8a7796_iommu_of, "renesas,ipmmu-r8a7796", ipmmu_vmsa_iommu_of_setup); +IOMMU_OF_DECLARE(ipmmu_r8a77965_iommu_of, "renesas,ipmmu-r8a77965", + ipmmu_vmsa_iommu_of_setup); IOMMU_OF_DECLARE(ipmmu_r8a77970_iommu_of, "renesas,ipmmu-r8a77970", ipmmu_vmsa_iommu_of_setup); IOMMU_OF_DECLARE(ipmmu_r8a77995_iommu_of, "renesas,ipmmu-r8a77995",