From patchwork Thu Jan 27 17:50:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Hancock X-Patchwork-Id: 12727151 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 20F39C433F5 for ; Thu, 27 Jan 2022 17:52:54 +0000 (UTC) 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: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:In-Reply-To:References: List-Owner; bh=2LAg6LCCecD/caVB7x8t3Hz+fTBYlvPjpQmU+xQSyV8=; b=AH+z+MjIEFbaFa 9b29S9VlaZXQBP0XFUv8Rs5w5WRImbbo7hq89Z+dY7UwXrVF5529RxBHAbZdm1ObfrtU0EL0r67oo HGvzARTQ9MorR0xfd5fXobfzDAWUi2N0kvxWSCeLo7ZHZGw5iufo8UoUpQQxq2Gx7ylZuf1N9vbhM thAJPRQllwTMhYkB8mMBr866xdYiQYRaaKDP3Na/U1bhN0+9o4cL5qaApJ3AT/8ammZLQUo9QDRVN sRc5ok+pDjMQHfzLQ71Q0mFT/NuThEcKuqeV3JLCos90iSjfBs0Gf4Blbx+ltz+UmPD+h6xnvOLnL kAI9VeAtW3cpvaTrFF7Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nD8vi-00GlVZ-9z; Thu, 27 Jan 2022 17:51:30 +0000 Received: from mx0c-0054df01.pphosted.com ([67.231.159.91]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nD8vf-00GlV3-4s for linux-arm-kernel@lists.infradead.org; Thu, 27 Jan 2022 17:51:28 +0000 Received: from pps.filterd (m0208999.ppops.net [127.0.0.1]) by mx0c-0054df01.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 20RCPRad015054; Thu, 27 Jan 2022 12:51:16 -0500 Received: from can01-to1-obe.outbound.protection.outlook.com (mail-to1can01lp2052.outbound.protection.outlook.com [104.47.61.52]) by mx0c-0054df01.pphosted.com (PPS) with ESMTPS id 3duu8kr8kj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 27 Jan 2022 12:51:16 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DAIX43UWLqj2PWFN3Tkz+g+oc/Ov7GTelZGn0E92QAoGdROhfOuB0EUzJAeZs02p9euoTmfFbbeVDak6Vize/1xzeQdK89f6z8JkT+dlrD/pujzetmHrc3OQXaOyaYBZ1qQLKGARSNirRn2BV7ubxcGq6zoQBRcFq7+XyXdMv8lvJOuFbzhfyI6C6WCJHRs3E4os/3LfhLzgE/UOB25pQDZ57mhTymVRff0qQnUHX0ntSuIU/AH48yBoEXpA/VCv57yxgxJBrp4Sc58EDxEbde5OVTudTub7EfZAbtYzM5nh7lo4Xjd74TVXVikDVUQ3EtGH8TwXp6I0oTzTSSVNFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=CrKEyJw/MwQHOGaci73aIm9bViL/CHAy2JGnlnWO+vQ=; b=e3p5J5jmux0SimAQXRzYlfJm22eTYKXYZWrMuNORlFt7N0rbr7i+ANCBTpsK3GglO+vwMBvh2o+u69eCAyBu6NJY0uPXQVAIgwvC8Lu7gcMJAz0pQ/TsFh1wMQeTvfx3O0Y1l532bAcjdiNaQDy66uVpTo6naP+Pz7FtW5MWNLCvOmw9CCAWWjBwtVViqb9pZrzzNRS9XW6/7GTOPfUDwmizAnoYXmurZ5I/Y7Ol0DJ4hwJe5vfx25KEdLJA6HGgPAc48+hsXsGPBm5RRtgK/wJWZJ+oHCVf7fGWjIXxjWdnUiqAUmcjcApSMFUv7TbU56KbLsiYGykJuDbVhlaQrA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=calian.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=CrKEyJw/MwQHOGaci73aIm9bViL/CHAy2JGnlnWO+vQ=; b=wiIqxidOziNFGNrjkxZNamn2W0NQ+PIET8rcB5cuX0izLlU5KE3JDqIBwfLXXbfhHv4mQjo6aNVkxJR9FN59kVhcEZiPGR5ylzJS5rylhYnzwIUEumXFXfJiSFq8YSxnaX9Ljtrx0Cvx/pX8ov/IVpoqcZ9YMJ6UdxF4Claoo2A= Received: from YT3PR01MB6274.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:6a::19) by YTBPR01MB2765.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:21::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.17; Thu, 27 Jan 2022 17:51:14 +0000 Received: from YT3PR01MB6274.CANPRD01.PROD.OUTLOOK.COM ([fe80::6929:c39f:d893:b6c8]) by YT3PR01MB6274.CANPRD01.PROD.OUTLOOK.COM ([fe80::6929:c39f:d893:b6c8%2]) with mapi id 15.20.4888.020; Thu, 27 Jan 2022 17:51:14 +0000 From: Robert Hancock To: linux-i2c@vger.kernel.org Cc: michal.simek@xilinx.com, ben-linux@fluff.org, richard.rojfors@pelagicore.com, linux-arm-kernel@lists.infradead.org, Robert Hancock Subject: [PATCH] i2c: xiic: Make bus names unique Date: Thu, 27 Jan 2022 11:50:13 -0600 Message-Id: <20220127175013.3689724-1-robert.hancock@calian.com> X-Mailer: git-send-email 2.31.1 X-ClientProxiedBy: CH0PR03CA0038.namprd03.prod.outlook.com (2603:10b6:610:b3::13) To YT3PR01MB6274.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:6a::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a81c7859-10ed-4753-11ea-08d9e1bd9c99 X-MS-TrafficTypeDiagnostic: YTBPR01MB2765:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: m8nv7lTTU5RhzZDjl81wxQqXxbtn4TwQx1OHaK+JoEuIpksu1gkhPFTDco6pQ0i+zpomGTuUX+lspzmsOVoyLLWNafvqMtgM/T7Xwe7sOgz4ghNg9aY9DeRtmCoTlHPzjKdckC9wUA+k4kvbo8brSaukXHgA7RvEyufra6GZqgW1RcBP3JZqcJ52k25ln9ZZu8C06J0eq0Q3O6cmABz09JvYGGnMzdFG+T6DwGlKrdmApYN1bMUhHTUELArLtthazM5uVGa3pCuVleXH5R55eSSBbywK5M18jllDL3ivDqBs4pxaRTGfkVvpX21iYRX4RjKGpVI35yfSeGf523W1501v3JsnKFLiFtVpIcMeUsB389gyGJLdElFBxe4ZrY7JSGDScXHCUjVp/J0fyfINvIzZUA5wf7pX+Z5EBnrmXFc/WNsY/PGhPoB8NEJPqwBxpwCzDFE+fRKdkki1lsgJUM0Shyov3ntJwRGpD+3ItezBymjxeczv5t3BtDdLl49J6RZU/diss/zoDhwZw9avL3m67mk/kkLbDB6MpLmqw2qu/rBK0C2J4vDMoIWpRfV/6XwCTTCqEUxf/JHqK5GZBKLOjhMa7OJHhj8AD4LdMg9RvLUiPiWzxnsxIarvuFqMjsD9GI67Sat/Lyj7Gbo0zgXOQ1w2hV9uF4VvaWTI31mU/DKzmVOsRVdZU/o0RlhS8q7yQSPgGvxVgHFH/faJNQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:YT3PR01MB6274.CANPRD01.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(66946007)(66476007)(66556008)(8676002)(4326008)(8936002)(6486002)(52116002)(6506007)(38100700002)(508600001)(107886003)(38350700002)(44832011)(5660300002)(86362001)(2616005)(36756003)(1076003)(6916009)(26005)(186003)(6512007)(83380400001)(2906002)(316002)(20210929001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ZJs12Rg1LoXww6Hz1970z5boi/jGzG3Nhb+zgnlPH9x+YrsCJ7I86+X1g9bShQ6KtL+yt7fFUe07dLhMeqXVhyIMVNM7n2rW3dtDEIkH/0YWhDvyhjx55cIFE2cR1htVuikXET0QXMATfAksvce31iS1NoIfbPK4NBcGXRvUa15wc1WRs11MGMHCV8ZxPwlGepggoo5TljcJHZodlq2f/5hn6D2eha6sQGu1rMPJ/ZbHCU8QeFblg4vfflPaLoSjL1Ce4Ax2fi5h61OFdO3l/mRtAzjMDMuPnM04UtpihiiIrg3NhQOhMFQYLRS6jdxgzDS4CvQ4g301o4yEZOnvCJg4rgJKKkAS7tSK+RIbQDhLEc8scX5A/ptvEbptB73Rm/fMigStzngs36uqhFgeimx7Ygydq0Y45ach7Zq/dm06R2X0IdYzXig9niJokmvibKUgIHIrcx3ZR2oVw2M65IUJs1rkU9VLFVyrj8W0XsFn2RD76jWJAy8sNWv5fox9Cn0CsfaKkKjBahaTQsShwJ1Y9lFtkoKZDLTs2L75ifCR78TaHHnBWyTasDTF0EWC+ygsgV03DSrrabbWONPAAMx9w8vzkgiWu4MnSW+6I5GmGmaIoqFNqXk27XMIaDtxMl3azi+yhx3o5+9k2fvjOD7fL+qlq1JUQ/a/GZNk89kteMxcN7gUFCmNN84jZy5Cv2Mq9ACzJy2R/gc7gTuWHiizKiQ9qwt5XESnebNSJ8ux0n+dUf4iNuK0WTvoWVVDIP2PelaTWsfmgntOzWOurotXR6s9jctv5c8jPeeYXTCGK3b4+V32vg1Y0h6ABdRpW1yLRNC3kiJwjMyr5Jx/P/Bc2r/87rsdi4xtVHRcO6pCcmwXTOGhVgIh8ValyJysVbaZ3uuHUwWQ0xIfBUhYVlmoU/ml9Ucib1mkbGnPYOQR3CjXgpc5fDbp0Oe8jTIprJozytOwbvIRkRwW80o9/I3Y3Ix89fZp157ycxkxxYugXVvCjRBbG6R6E2LM9UXu9nUGZEpX2bYv7xBZ8DymCivj/ZzPjXyNWwqrxR73reMtPf5MLUhIGv4hcja8vnWMRpvIWBMGNiVto/0ReNiRtz4GL7ic7BSQCsR0LTqc20jB0L1/OBEcrJ5NBltPlcF3CYXvdnplFBD3HerlPuf78947BTnXq+xLV4Hw7ByriruFSQYS3gcc79FDO16e+mAcMntiBfBVTKIaM6up2OsI3DcgbnIjuMXRrKI4PKgPmGkPVQ8orGoGVlBnvL5qNZ4pPd9u+EQ3W3GicguuRAGlB5a9HBoRrNc+UOYcV1rQkkyGMOcwjpxMlSD6Tz6q+ln4AwkijC/cWNkub5zBWzSKwST3ScWC5qpvWOFRWfrnRDxj7KG7LfmlGUJwutNWCrMlkAu0MCHv2Iyh9pQvhLqDHDCqQfW37EhoD1oLLdUT8ZQCOulp2rs74kY42NvAdXjg85tKAAJZb1L9qzMHCgcJcIpM/MfJTFaXOOKjk5xZY5/o1zJV8GbQnog5+LALOJPjrwhLafjIcW8EAvuMEd7FQvTPstLuvxKf9HK0ui1s7rW2cSlmaOa9dNFmaBAbX44vuRGEwb3QRmkFryzT0SqhU9B/HRt+ZzNIO7KmQ3u8/yCv1PuCSbnJv5vXUUTS7f4BQCV+BtqXgOLoeQlknue93Z4iFZ+NpBDAM0SCEUfcRSE= X-OriginatorOrg: calian.com X-MS-Exchange-CrossTenant-Network-Message-Id: a81c7859-10ed-4753-11ea-08d9e1bd9c99 X-MS-Exchange-CrossTenant-AuthSource: YT3PR01MB6274.CANPRD01.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jan 2022 17:51:14.3387 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 23b57807-562f-49ad-92c4-3bb0f07a1fdf X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: PgOjU4RpEERPmOAlZr1bTJcfL0/ZK4hcRpYzCgTjSFkhTVCusip/q9jFT76iN9oFk0aS7oDRTLFaKrgMeyN3xizOByVsUoP0M5xqUcf092A= X-MS-Exchange-Transport-CrossTenantHeadersStamped: YTBPR01MB2765 X-Proofpoint-GUID: -Oz7_vKYF1XG_eMhJ915X_MW-fcggcam X-Proofpoint-ORIG-GUID: -Oz7_vKYF1XG_eMhJ915X_MW-fcggcam X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.816,Hydra:6.0.425,FMLib:17.11.62.513 definitions=2022-01-27_03,2022-01-27_01,2021-12-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 clxscore=1011 bulkscore=0 impostorscore=0 phishscore=0 adultscore=0 lowpriorityscore=0 priorityscore=1501 mlxlogscore=696 malwarescore=0 suspectscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2201110000 definitions=main-2201270103 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220127_095127_451240_AE893FA9 X-CRM114-Status: GOOD ( 14.43 ) 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 This driver is for an FPGA logic core, so there can be arbitrarily many instances of the bus on a given system. Previously all of the I2C bus names were "xiic-i2c" which caused issues with lm_sensors when trying to map human-readable names to sensor inputs because it could not properly distinguish the busses, for example. Append the platform device name to the I2C bus name so it is unique between different instances. Fixes: e1d5b6598cdc ("i2c: Add support for Xilinx XPS IIC Bus Interface") Signed-off-by: Robert Hancock Tested-by: Michal Simek --- drivers/i2c/busses/i2c-xiic.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/i2c/busses/i2c-xiic.c b/drivers/i2c/busses/i2c-xiic.c index eb789cfb9973..ffefe3c482e9 100644 --- a/drivers/i2c/busses/i2c-xiic.c +++ b/drivers/i2c/busses/i2c-xiic.c @@ -734,7 +734,6 @@ static const struct i2c_adapter_quirks xiic_quirks = { static const struct i2c_adapter xiic_adapter = { .owner = THIS_MODULE, - .name = DRIVER_NAME, .class = I2C_CLASS_DEPRECATED, .algo = &xiic_algorithm, .quirks = &xiic_quirks, @@ -771,6 +770,8 @@ static int xiic_i2c_probe(struct platform_device *pdev) i2c_set_adapdata(&i2c->adap, i2c); i2c->adap.dev.parent = &pdev->dev; i2c->adap.dev.of_node = pdev->dev.of_node; + snprintf(i2c->adap.name, sizeof(i2c->adap.name), + DRIVER_NAME " %s", pdev->name); mutex_init(&i2c->lock);