Received: by 2002:a05:7412:bb8d:b0:d7:7d3a:4fe2 with SMTP id js13csp2509065rdb; Fri, 18 Aug 2023 02:32:34 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHU5/gOUpRGWaBDDbGlgr6poGJfUOlIRtTeLSKRkVOXFjOF00omZz3d68bBnMYgIfQRYzXd X-Received: by 2002:a05:6512:3154:b0:4ff:9efd:8a9c with SMTP id s20-20020a056512315400b004ff9efd8a9cmr1058883lfi.5.1692351154183; Fri, 18 Aug 2023 02:32:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692351154; cv=none; d=google.com; s=arc-20160816; b=nepeU2HbkV6hlHgkF/uMW1DRPmev0hOW5QN+pqFqH9k9DQ3TMu95BU/ecSgVKcThYY LqY4291utr33IlRCBu2rET0GUQnyBxPFOa1RCZ7OYqknJa9o2fApROeT1GIy2JI3L5Yz HA6QhnBItGIF7pvGsCKYQIrEerxoQgnx8cPDeCa5JwCUq9QTm1xtLI//NLynbFuHE3y5 XD3Jq3J9oWmNmbT2CxYogEsqCpwCsJNyfkHgGdUXBT0yB2PtX9WamVI1h92SNAsgIx2F h4h17Zdb9yIbj8bXFfjM1d8KHt3nRhXOFR+ELUG1gs0R7s6h0BNjJKMNERSdHZgSZiiL ZaIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=japL+rpC/GZozXYnJS8Yq3Zbdhh5GQZbzanvuFxVPCc=; fh=QoGb5/khFjeKo9whusdHyVj1OvsVib4M00vkUA6SKKs=; b=Q2iST1CMxm1nwlX7LAqzkNMT8iOJnSA2xJNO6RbULFEzOjfprIqnQwvtPEHP+dX1Gw 0+0xo+XM4cROg3WKXbH8+TONwcfpx6YNPHoY89L2pMy/ivgge1S/Lp7mT6gi/lz6HirD kxSULYPymf87HeIcbHyhlOiCixGZ7fVVDHIc9/xbV4NOK7SAtGIcfEvhHwEhYT/HKb0H 2TgG0j+u8XJoeFEfq1wa6E5n4n3De4SXkbr+vHfHhcvG3r7SZl3ilv8xGaX84YI46imz NPCppw/QS+/PIQukt49Q71MUPf7OPBFhnb89ijzVXsEQCTHnfBw0sZw4ZUNbdKIquQ/q X7/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=V455VNbf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u10-20020a05640207ca00b005234cf575fcsi1011799edy.285.2023.08.18.02.31.59; Fri, 18 Aug 2023 02:32:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=V455VNbf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353307AbjHQPqY (ORCPT + 99 others); Thu, 17 Aug 2023 11:46:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58776 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353319AbjHQPqO (ORCPT ); Thu, 17 Aug 2023 11:46:14 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 51F3730C5; Thu, 17 Aug 2023 08:46:13 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id E4DAF611D9; Thu, 17 Aug 2023 15:46:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 45BE1C433C9; Thu, 17 Aug 2023 15:46:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1692287172; bh=r3gM2wBVuSBtneu8My7vWP8nSkzO9VJPLNZSYw6zw9w=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=V455VNbfkD6kUBBQVwl9hnKTBVsfiIh+M02EHAkbZmoXJOCTFW+R+2GYBvDATjSh5 Nv72ywmAYjPLV/WdMPP7tGdt1/zW5wiVIIZG4yBwWdbRyun/CvDOdzCKJKZqbOvCdF LTV+zpfmmR4oJbCN+lNFSApR7EuaVRNXoKjK0l48do5sdfoF3yPrt9z3uuicDXNjCC 55Wb0z5c0KdOBNceOau9J9245wWKUpfFnC9eS09s+6eJXho2jYmv99xCdcEw9O1QLO NsyrRCXfFeOIdLKQYUhK37zKMtCN1rBdfr5J/88H0QwYHhk99MjsTa/v5c/Gn8bZCj Y/jvl51LUtKtQ== Received: (nullmailer pid 1187293 invoked by uid 1000); Thu, 17 Aug 2023 15:46:10 -0000 Date: Thu, 17 Aug 2023 10:46:10 -0500 From: Rob Herring To: Eddie James Cc: linux-fsi@lists.ozlabs.org, linux-kernel@vger.kernel.org, jk@ozlabs.org, joel@jms.id.au, alistair@popple.id.au, andrew@aj.id.au, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, devicetree@vger.kernel.org Subject: Re: [PATCH 03/14] fsi: Use of_match_table for bus matching if specified Message-ID: <20230817154610.GA1179394-robh@kernel.org> References: <20230612195657.245125-1-eajames@linux.ibm.com> <20230612195657.245125-4-eajames@linux.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230612195657.245125-4-eajames@linux.ibm.com> X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Jun 12, 2023 at 02:56:46PM -0500, Eddie James wrote: > Since we have two scom drivers, use the standard of matching if > the driver specifies a table so that the right devices go to the > right driver. > > Signed-off-by: Eddie James > --- > drivers/fsi/fsi-core.c | 11 +++++++++-- > drivers/fsi/fsi-scom.c | 8 ++++++++ > 2 files changed, 17 insertions(+), 2 deletions(-) > > diff --git a/drivers/fsi/fsi-core.c b/drivers/fsi/fsi-core.c > index b77013b9d8a7..ca4a9634fbc3 100644 > --- a/drivers/fsi/fsi-core.c > +++ b/drivers/fsi/fsi-core.c > @@ -16,6 +16,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -1375,8 +1376,14 @@ static int fsi_bus_match(struct device *dev, struct device_driver *drv) > if (id->engine_type != fsi_dev->engine_type) > continue; > if (id->version == FSI_VERSION_ANY || > - id->version == fsi_dev->version) > - return 1; > + id->version == fsi_dev->version) { > + if (drv->of_match_table) { > + if (of_driver_match_device(dev, drv)) > + return 1; > + } else { > + return 1; > + } > + } > } > > return 0; > diff --git a/drivers/fsi/fsi-scom.c b/drivers/fsi/fsi-scom.c > index bcb756dc9866..61dbda9dbe2b 100644 > --- a/drivers/fsi/fsi-scom.c > +++ b/drivers/fsi/fsi-scom.c > @@ -10,6 +10,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -587,6 +588,12 @@ static int scom_remove(struct device *dev) > return 0; > } > > +static const struct of_device_id scom_of_ids[] = { > + { .compatible = "ibm,fsi2pib" }, This is not documented. Please add a binding. Rob