From patchwork Mon Oct 30 11:37:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Brugger X-Patchwork-Id: 10032349 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 2A3AB60291 for ; Mon, 30 Oct 2017 11:38:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1602127FA3 for ; Mon, 30 Oct 2017 11:38:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0A74328856; Mon, 30 Oct 2017 11:38:46 +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=-4.2 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 77F0C27FA3 for ; Mon, 30 Oct 2017 11:38:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=nyDJKkvTduYif7byUN4Px+ChNTk0heEoVHWYHR7HGo4=; b=rCD N56V6hE6uuvLqi25AXHoYkUyufIc6QePCvlE1087zBbrdkJQFvFfZt4X3zBxG+dn6hJh74n1901Mc ieGm6TXVLB3KdRHe5fnHfz7/2G+QnnNdfco4C+xcRHWEkO8Dc9rsdDQUqa5yEqCLSPUikuaHZkjb+ W6iD+DQ9VGnizO/c9aUDBJ9o5ctssc32d0xoXPxsKT/Z9R0BNfCGa4rSSyIT9yklCHUUV3Xqs2d7/ fsmped+U0X2ajJXJPEi3PXBS7h1i1xHQdJ/eEx5USlhgW37DDOpydmnBH4oFN6PvqK3FQuOVdfMFr X3GDlP3oqiVjL62gVJOjF4oZwRB6Yow==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1e98Ou-0006s1-2f; Mon, 30 Oct 2017 11:38:40 +0000 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1e98Oo-0006i5-6G; Mon, 30 Oct 2017 11:38:38 +0000 Received: by mail-wm0-x244.google.com with SMTP id t139so15784792wmt.1; Mon, 30 Oct 2017 04:38:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=M9rUsPtdGfR3v6TmWfN4B39dFFJ7mLupB8WzQ9YKDZI=; b=FeNjMMuiTMNwFpAJTNAcL9VZN2tk4MWyT1OkPNSI44fisyhghITgHuaCs02VBNUWVN +auP9Kn3IFEh9LNmamNsj85GRvM+u/ardXBoYCltiTKhz0hroFKV1eS93epyHEtAZnsj aLCdP+fx5uAmHqzos4bO86aZ4ZheI234+zytUql8ofrMMsdV+UiSVu2RkoaGsHYvknjj nvARcfJ1A5pd7GV5Mo5bSMO4+vTBEf26ep40n8JhPqKmbuEvaoMTS2h4Ipcp55FN9cO4 yt7V9nzG6zAqxajcvBhYnksJgiG3iv3QrSuq8AygZhd0MILMnmlGLhoKI6AHxcoEqlPK XUYA== 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:subject:date:message-id; bh=M9rUsPtdGfR3v6TmWfN4B39dFFJ7mLupB8WzQ9YKDZI=; b=Cr/tP++fMQvRpQh8j4SOyIl0em21E3PYZPFrT0o2M438ZFhoJQ+0K75WEk4M5CLnvk Wmx0zDfN5W/FOuAQNc5WKKYpth6SSnLpv6bLHuV9lLRG7B70OCZemyPXB5MPRfixLG72 aWcV6rViN+I1hgCgDeNouNcG/KDLIq08vMjtk01aaZEKU4272gr1bCpJYrGpHIHToavw lKfb76MAmHLzOSBmApYwQgsXKz21ppNCEmC70/hJ6IMSYkk/xLaDGUcx7yWdV/a19wNG a2c8NnfQRUwd03gVFx5SEFuoAV922sDH11hOzljv82Rox4KxPVX7jvXbo/5Oz4VMiN20 gX1Q== X-Gm-Message-State: AMCzsaVlLUaEnwa8zXcMPyzvTOru1B3UX3BX7iyBuvlpYfD689s9lFIK su735+icBRFMVIGKY3ul6cc= X-Google-Smtp-Source: ABhQp+QT+nU9gKe3x/srsbj/JFzHlo5hYl7ldxn3/lEx0adqT0m0HnTYh07Q02hpSWz8/IE9dbTGTQ== X-Received: by 10.28.84.89 with SMTP id p25mr3156352wmi.112.1509363492003; Mon, 30 Oct 2017 04:38:12 -0700 (PDT) Received: from localhost.localdomain ([92.57.80.122]) by smtp.gmail.com with ESMTPSA id r2sm3014800wmb.38.2017.10.30.04.38.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 30 Oct 2017 04:38:11 -0700 (PDT) From: Matthias Brugger To: joro@8bytes.org, sean.wang@mediatek.com, honghui.zhang@mediatek.com Subject: [PATCH] iommu/mediatek: Fix driver name Date: Mon, 30 Oct 2017 12:37:55 +0100 Message-Id: <20171030113755.32408-1-matthias.bgg@gmail.com> X-Mailer: git-send-email 2.14.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171030_043834_473188_A132766D X-CRM114-Status: GOOD ( 12.78 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Matthias Brugger , iommu@lists.linux-foundation.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP There exist two Mediatek iommu drivers for the two different generations of the device. But both drivers have the same name "mtk-iommu". This breaks the registration of the second driver: Error: Driver 'mtk-iommu' is already registered, aborting... Fix this by changing the name for first generation to "mtk-iommu-v1". Fixes: b17336c55d89 ("iommu/mediatek: add support for mtk iommu generation one HW") Signed-off-by: Matthias Brugger --- drivers/iommu/mtk_iommu_v1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/iommu/mtk_iommu_v1.c b/drivers/iommu/mtk_iommu_v1.c index bc1efbfb9ddf..542930cd183d 100644 --- a/drivers/iommu/mtk_iommu_v1.c +++ b/drivers/iommu/mtk_iommu_v1.c @@ -708,7 +708,7 @@ static struct platform_driver mtk_iommu_driver = { .probe = mtk_iommu_probe, .remove = mtk_iommu_remove, .driver = { - .name = "mtk-iommu", + .name = "mtk-iommu-v1", .of_match_table = mtk_iommu_of_ids, .pm = &mtk_iommu_pm_ops, }