From patchwork Wed Jun 28 21:53:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 9815553 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 A3B2D603F2 for ; Wed, 28 Jun 2017 21:53:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9531428384 for ; Wed, 28 Jun 2017 21:53:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8795E283CF; Wed, 28 Jun 2017 21:53:30 +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=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1F3CF28384 for ; Wed, 28 Jun 2017 21:53:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751566AbdF1Vx2 (ORCPT ); Wed, 28 Jun 2017 17:53:28 -0400 Received: from mail-pf0-f173.google.com ([209.85.192.173]:34031 "EHLO mail-pf0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751537AbdF1Vx2 (ORCPT ); Wed, 28 Jun 2017 17:53:28 -0400 Received: by mail-pf0-f173.google.com with SMTP id s66so39776267pfs.1 for ; Wed, 28 Jun 2017 14:53:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=WnfXYCh1A2ZsfQelxaeQMVn7kocAvgMkLL6gJ5HXG40=; b=ShWNQCWz1qj26OcyblejTZQnn3cZobWhkK1zcXrs3mCwGbBIBZqQOZwJxlhYCI4bqN ZQ6nbcASxt1fh0UBlp5kaUUtPAij3R+jKuNKEjJYy4WP5LB55sB0Vz4dYxF8J09WOyY+ VgD+ntvq2sgXY36+YYvPM15zUjOU6wh5zD0SY= 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=WnfXYCh1A2ZsfQelxaeQMVn7kocAvgMkLL6gJ5HXG40=; b=Bdp07yuS2CxJAAacpn0os+AXIlH6wxCLBzXfQfrIwlaV3R+ydfE7LjI5tEh7lqveuq mYC2yk/fq32CY9Pp7iG1NImNdG73rvuOuHueiknYPD1FsirfxbYCFYhtkTHTEgaV37iT CIm1IQ0pz29bdukwUTFARSHvyNnk/QQ9SagXFdiYM2ChAL9NRL14T4/La8GYGDojlJ+P LQO2KGJSbbzI5JX4Teq/M8y+OlrtYai/84rnJug6PTS2cYMn5qjAISfN0DJpS2F74UOq Ruym1OfmLAUU3SFtgPyx6TnmAWyiNxGOKRydIK3yYizZSaSISkkICnepnaDqGa9IrEA1 umCw== X-Gm-Message-State: AKS2vOwGN0iGaAcKNQQtLkhmgF4WP2nFzI7xbUYbZ9mlipcSCP+yey4u NyrqO8FQ4RXULdcT X-Received: by 10.99.107.66 with SMTP id g63mr12313979pgc.277.1498686807239; Wed, 28 Jun 2017 14:53:27 -0700 (PDT) Received: from localhost.localdomain (ip68-111-217-79.sd.sd.cox.net. [68.111.217.79]) by smtp.gmail.com with ESMTPSA id o6sm6060978pfb.110.2017.06.28.14.53.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Jun 2017 14:53:26 -0700 (PDT) From: Bjorn Andersson To: Ohad Ben-Cohen , Bjorn Andersson Cc: linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org, Rob Clark Subject: [PATCH v2] rpmsg: Make modalias work for DeviceTree based devices Date: Wed, 28 Jun 2017 14:53:23 -0700 Message-Id: <20170628215323.5658-1-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.12.0 Sender: linux-remoteproc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When rpmsg devices are expected to be matched based on their compatible the modalias should reflect this, so that module autoloading has a chance to match and load the appropriate module. Tested-by: Rob Clark Reported-by: Rob Clark Signed-off-by: Bjorn Andersson --- Changes since v1: - Also update rpmsg_uevent() drivers/rpmsg/rpmsg_core.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/rpmsg/rpmsg_core.c b/drivers/rpmsg/rpmsg_core.c index ad3d2a9df287..067650c5bcb6 100644 --- a/drivers/rpmsg/rpmsg_core.c +++ b/drivers/rpmsg/rpmsg_core.c @@ -343,6 +343,11 @@ static ssize_t modalias_show(struct device *dev, struct device_attribute *attr, char *buf) { struct rpmsg_device *rpdev = to_rpmsg_device(dev); + ssize_t len; + + len = of_device_modalias(dev, buf, PAGE_SIZE); + if (len != -ENODEV) + return len; return sprintf(buf, RPMSG_DEVICE_MODALIAS_FMT "\n", rpdev->id.name); } @@ -387,6 +392,11 @@ static int rpmsg_dev_match(struct device *dev, struct device_driver *drv) static int rpmsg_uevent(struct device *dev, struct kobj_uevent_env *env) { struct rpmsg_device *rpdev = to_rpmsg_device(dev); + int ret; + + ret = of_device_uevent_modalias(dev, env); + if (ret != -ENODEV) + return ret; return add_uevent_var(env, "MODALIAS=" RPMSG_DEVICE_MODALIAS_FMT, rpdev->id.name);