From patchwork Fri Nov 5 15:42:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 12604937 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 020F7C433EF for ; Fri, 5 Nov 2021 15:45:27 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C646E61108 for ; Fri, 5 Nov 2021 15:45:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org C646E61108 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=IBprARMoBKlJlxYlnaH3aa0QzP7TGDkMIgf/QXDLv/s=; b=l+z64k7NGYgoWt +l9V69sucBrrVrLt8RKf8d9gTKelDhpZt4D3euckNaI/biEvDZFIPu+TfquF3b9cgDcR1yqqbuq1T +BLRpv1H7/JXqItAkzQw8J7qKdEeWzG4p2Fq5IYVu8EP5WVW6RYctx0c/huiD7CRwL2XSBr6bvTh5 BLp3zvxez/32zQi3TyXJVfdsRFdjrMCA2Wq3vFf4Ty7jEB1Z24xVWQzrtmcvu0HrmosOfyZru7WuP zSYZ5spPfhItUDLUtkYI/PSAIh1eXYE8dzubci5uVar7JBTBwkVqzPREpQZhcR+gEaCzPeuvDmuLm Fvs7ICrkLe+lKPTVN5wQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mj1Nb-00Bli7-Pg; Fri, 05 Nov 2021 15:43:48 +0000 Received: from mail-pj1-x102e.google.com ([2607:f8b0:4864:20::102e]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mj1MD-00BlCP-2e for linux-arm-kernel@lists.infradead.org; Fri, 05 Nov 2021 15:42:22 +0000 Received: by mail-pj1-x102e.google.com with SMTP id y14-20020a17090a2b4e00b001a5824f4918so3599935pjc.4 for ; Fri, 05 Nov 2021 08:42:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5tJguGsd/yhajMqKVQpl9RHTa8E0C6uvBpHGThfw2qI=; b=Ea3yMADmZmIS2dtEg/ThXtD2S5Bs2Z0UVK6FU/d5NURRF+L/iMdgJsYgIgU5iccQKg 4WhkSmBoGSfzReZF8XiIWGKYsYdYITqEXGYy4W6C3sVyTZg8bDGeG/e0OQ1SWMEql8kj I6R9XaUCGoY59YWUZMwZp2x/Uc4hGENT1TN8cmdQyQMz+dXonHEWA0NZEJEcRwzQePA/ 3APBoGks+V8EjX63hL7GxaW4Nc8s8e3S4WmdZDBQcu/b3AN9qe7eAK0+ua+r1DA+T6Cd JePN6WJE3f+148lPhpwoQGbR1onAb5E/H65VlPg5FHohHe+UCaNMoa18P71VsPOxbb9u i1SQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5tJguGsd/yhajMqKVQpl9RHTa8E0C6uvBpHGThfw2qI=; b=rc8xoAmujo/7XpUuLWS4Dyk2WNRx9pGwlC2UI8hkOrnJFAoOx6SPGK7Aw9xdp7N0ee 5+I7keMgBh9cNAiXe/QEdQG5Hli5Ec2/m4Q+33e9OY4C3y+ntqgbyZD5eZ3Ci6kzU/m8 jXGGfSA7GlMsl9TGNWq4kENiOpW9utItfhFzskzd73pNrjoiPEx/tTvAiEBrFLe1TYIW Yde2iKH28HUgDCtgzT1PVtQYhycqtZZhTgTQjK9/X4fnx44ENbk5s42EvWCcHBVkfoOx TZ9av/2Ipck/HAZ2gjeRmnbYJMJOWt9r7UnwHv6l+wyGpmqewgKtKcftFBumkS6RL/nu KRHg== X-Gm-Message-State: AOAM530AP11HwqxZ0XkLGMCH/E+S4Gb0vk4Lju2fOdU4zeOiKQpQedD+ TuhnOn31Q1bj7+N+VSj1p24= X-Google-Smtp-Source: ABdhPJwirHuLA3Dxs9ZbG4h/i+OUmUOAhxmWTO33lSjWqpljyYYQD2h+Qnhe6mQrgU3oYpH3tEZdZg== X-Received: by 2002:a17:90a:1283:: with SMTP id g3mr13812942pja.174.1636126940334; Fri, 05 Nov 2021 08:42:20 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id b8sm7547097pfi.103.2021.11.05.08.42.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Nov 2021 08:42:19 -0700 (PDT) From: Florian Fainelli To: linux-kernel@vger.kernel.org Cc: Florian Fainelli , Guenter Roeck , Wim Van Sebroeck , Rob Herring , Thomas Bogendoerfer , bcm-kernel-feedback-list@broadcom.com (maintainer:BROADCOM BCM63XX ARM ARCHITECTURE), Justin Chen , linux-watchdog@vger.kernel.org (open list:WATCHDOG DEVICE DRIVERS), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-mips@vger.kernel.org (open list:MIPS), linux-arm-kernel@lists.infradead.org (moderated list:BROADCOM BCM63XX ARM ARCHITECTURE) Subject: [PATCH v4 5/7] watchdog: bcm7038_wdt: Add platform device id for bcm63xx-wdt Date: Fri, 5 Nov 2021 08:42:06 -0700 Message-Id: <20211105154208.614260-6-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211105154208.614260-1-f.fainelli@gmail.com> References: <20211105154208.614260-1-f.fainelli@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211105_084221_153293_88A5B06D X-CRM114-Status: GOOD ( 13.76 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org In order to phase out bcm63xx_wdt and use bcm7038_wdt instead, introduce a platform_device_id table that allows both names to be matched. Reviewed-by: Guenter Roeck Signed-off-by: Florian Fainelli --- drivers/watchdog/bcm7038_wdt.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/watchdog/bcm7038_wdt.c b/drivers/watchdog/bcm7038_wdt.c index 506cd7ef9c77..a8a0e8485125 100644 --- a/drivers/watchdog/bcm7038_wdt.c +++ b/drivers/watchdog/bcm7038_wdt.c @@ -223,8 +223,16 @@ static const struct of_device_id bcm7038_wdt_match[] = { }; MODULE_DEVICE_TABLE(of, bcm7038_wdt_match); +static const struct platform_device_id bcm7038_wdt_devtype[] = { + { .name = "bcm7038-wdt" }, + { .name = "bcm63xx-wdt" }, + { /* sentinel */ }, +}; +MODULE_DEVICE_TABLE(platform, bcm7038_wdt_devtype); + static struct platform_driver bcm7038_wdt_driver = { .probe = bcm7038_wdt_probe, + .id_table = bcm7038_wdt_devtype, .driver = { .name = "bcm7038-wdt", .of_match_table = bcm7038_wdt_match,