From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932631AbcFNScd (ORCPT ); Tue, 14 Jun 2016 14:32:33 -0400 Received: from mail.savoirfairelinux.com ([208.88.110.44]:58443 "EHLO mail.savoirfairelinux.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932503AbcFNSc2 (ORCPT ); Tue, 14 Jun 2016 14:32:28 -0400 From: Vivien Didelot To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, kernel@savoirfairelinux.com, "David S. Miller" , Andrew Lunn , Florian Fainelli , Vivien Didelot Subject: [PATCH v2 net-next v2 07/12] net: dsa: mv88e6xxx: put chip info in ID table Date: Tue, 14 Jun 2016 14:31:48 -0400 Message-Id: <20160614183153.32327-8-vivien.didelot@savoirfairelinux.com> X-Mailer: git-send-email 2.8.3 In-Reply-To: <20160614183153.32327-1-vivien.didelot@savoirfairelinux.com> References: <20160614183153.32327-1-vivien.didelot@savoirfairelinux.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add the chip info structure as the data of the compatible of device, which will be used later by probe code. Signed-off-by: Vivien Didelot --- drivers/net/dsa/mv88e6xxx.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/drivers/net/dsa/mv88e6xxx.c b/drivers/net/dsa/mv88e6xxx.c index 6f43280..8c39dd0 100644 --- a/drivers/net/dsa/mv88e6xxx.c +++ b/drivers/net/dsa/mv88e6xxx.c @@ -3607,6 +3607,16 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { }, }; +static const struct of_device_id mv88e6xxx_of_id_table[] = { + { + .compatible = "marvell,mv88e6085", + .data = &mv88e6xxx_table[MV88E6085], + }, + { /* sentinel */ }, +}; + +MODULE_DEVICE_TABLE(of, mv88e6xxx_of_id_table); + static const struct mv88e6xxx_info * mv88e6xxx_lookup_info(unsigned int prod_num, const struct mv88e6xxx_info *table, unsigned int num) @@ -3801,19 +3811,12 @@ static void mv88e6xxx_remove(struct mdio_device *mdiodev) mv88e6xxx_mdio_unregister(ps); } -static const struct of_device_id mv88e6xxx_of_match[] = { - { .compatible = "marvell,mv88e6085" }, - { /* sentinel */ }, -}; - -MODULE_DEVICE_TABLE(of, mv88e6xxx_of_match); - static struct mdio_driver mv88e6xxx_driver = { .probe = mv88e6xxx_probe, .remove = mv88e6xxx_remove, .mdiodrv.driver = { - .name = "mv88e6085", - .of_match_table = mv88e6xxx_of_match, + .name = "mv88e6xxx", + .of_match_table = mv88e6xxx_of_id_table, }, }; -- 2.8.3