From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2158FC2BA83 for ; Fri, 14 Feb 2020 15:59:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E4C9824654 for ; Fri, 14 Feb 2020 15:59:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581695977; bh=H3BVbcXuReFlU6I0tNUk4CBvia1+b5+4dg/4OFjB0UE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=bQPrleFbxtxQnHBIqpilKtYm4AJQ4DxJHN9X/mrRJ+Ak6Kk+35umliXhP5pz6Qba4 urcfo9lOaB9y9WXG6OtMar3Xjn2bRf8hMkYxKabJAa/IQHfbyWMYTq4ANzZ/q1v32u D/dvxfH1RG9I1407ILbHKcGF1AGjwb3ivHFh9x5c= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388951AbgBNP7f (ORCPT ); Fri, 14 Feb 2020 10:59:35 -0500 Received: from mail.kernel.org ([198.145.29.99]:44412 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388947AbgBNP7e (ORCPT ); Fri, 14 Feb 2020 10:59:34 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C2B5D222C4; Fri, 14 Feb 2020 15:59:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581695974; bh=H3BVbcXuReFlU6I0tNUk4CBvia1+b5+4dg/4OFjB0UE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dv2y+kdkaYdZORo93IUDPbFIQLe7hX8LWIYGiUDV26/41pmGeuCA2snnY7eR09gEQ DG66+AQiz0T6f5+DwCmnhOVtArsN7KzyV98n6bIAG6LzfB8JYWEVvIYnIHknV13Dx5 uS+KYYsxEvEXDzxin/0d6GcfsZuV21AZTs4hCEVI= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Akshu Agrawal , Raul E Rangel , Enric Balletbo i Serra , Wolfram Sang , Sasha Levin , linux-i2c@vger.kernel.org Subject: [PATCH AUTOSEL 5.5 500/542] i2c: cros-ec-tunnel: Fix slave device enumeration Date: Fri, 14 Feb 2020 10:48:12 -0500 Message-Id: <20200214154854.6746-500-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200214154854.6746-1-sashal@kernel.org> References: <20200214154854.6746-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Akshu Agrawal [ Upstream commit 8ff2d7ca4a55dfabf12e876369835bd024eb4621 ] During adding of the adapter the slave device registration use to fail as the acpi companion field was not populated. Fixes: 9af1563a5486 ("i2c: cros-ec-tunnel: Make the device acpi compatible") Signed-off-by: Akshu Agrawal Acked-by: Raul E Rangel Reviewed-by: Enric Balletbo i Serra Signed-off-by: Wolfram Sang Signed-off-by: Sasha Levin --- drivers/i2c/busses/i2c-cros-ec-tunnel.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/i2c/busses/i2c-cros-ec-tunnel.c b/drivers/i2c/busses/i2c-cros-ec-tunnel.c index 958161c71985d..8a2db3ac3b3c7 100644 --- a/drivers/i2c/busses/i2c-cros-ec-tunnel.c +++ b/drivers/i2c/busses/i2c-cros-ec-tunnel.c @@ -273,6 +273,7 @@ static int ec_i2c_probe(struct platform_device *pdev) bus->adap.dev.parent = &pdev->dev; bus->adap.dev.of_node = pdev->dev.of_node; bus->adap.retries = I2C_MAX_RETRIES; + ACPI_COMPANION_SET(&bus->adap.dev, ACPI_COMPANION(&pdev->dev)); err = i2c_add_adapter(&bus->adap); if (err) -- 2.20.1