From patchwork Tue Oct 27 13:53:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 312010 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=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable 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 E067BC5DF9E for ; Tue, 27 Oct 2020 17:31:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8B0A820878 for ; Tue, 27 Oct 2020 17:31:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603819885; bh=tkB/yXFVPby4N0FmtBJI2vukNkHoKcMz+QpOnze/WcM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=oQCGDTWQYix25vJTuGPo5lADVcXs1XDYbcTk2IhsefhRGkW01w/qbWfvAtryQ/jLI 4EzAgAhEVpujNeNWjv/3kKT5OsuH6htv5IRJSHKn8ponyfwJhGkK9lTklUh/rnoLfr qE2HwbvArW8HJQ2oRVBbgvDdIrG9D+laEpU7CDII= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762204AbgJ0Ol2 (ORCPT ); Tue, 27 Oct 2020 10:41:28 -0400 Received: from mail.kernel.org ([198.145.29.99]:39464 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761794AbgJ0OkR (ORCPT ); Tue, 27 Oct 2020 10:40:17 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6B429206B2; Tue, 27 Oct 2020 14:40:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603809617; bh=tkB/yXFVPby4N0FmtBJI2vukNkHoKcMz+QpOnze/WcM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tdAZZ3V0fyOgzz147ZGCgUmVlGfsRjBRzuv5VnjzOIx3ZG/rX09CRkuDAhO9noiYP JL8JdGwKZ9VdzWMAIwr4IOh+TasW9ZgeP/i3CcPSIE11rK5PMSPq+hhbkPIVSv+xTe WAelnZs/m4+ybZ4o35U0AADWjpd+TKyxh+d7ok0Y= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dirk Behme , Andy Lowe , Eugeniu Rosca , Wolfram Sang , Sasha Levin Subject: [PATCH 5.4 260/408] i2c: rcar: Auto select RESET_CONTROLLER Date: Tue, 27 Oct 2020 14:53:18 +0100 Message-Id: <20201027135507.105270046@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135455.027547757@linuxfoundation.org> References: <20201027135455.027547757@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Dirk Behme [ Upstream commit 5b9bacf28a973a6b16510493416baeefa2c06289 ] The i2c-rcar driver utilizes the Generic Reset Controller kernel feature, so select the RESET_CONTROLLER option when the I2C_RCAR option is selected with a Gen3 SoC. Fixes: 2b16fd63059ab9 ("i2c: rcar: handle RXDMA HW behaviour on Gen3") Signed-off-by: Dirk Behme Signed-off-by: Andy Lowe [erosca: Add "if ARCH_RCAR_GEN3" per Wolfram's request] Signed-off-by: Eugeniu Rosca Signed-off-by: Wolfram Sang Signed-off-by: Sasha Levin --- drivers/i2c/busses/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig index 146ce40d8e0aa..2d08a8719506c 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig @@ -1162,6 +1162,7 @@ config I2C_RCAR tristate "Renesas R-Car I2C Controller" depends on ARCH_RENESAS || COMPILE_TEST select I2C_SLAVE + select RESET_CONTROLLER if ARCH_RCAR_GEN3 help If you say yes to this option, support will be included for the R-Car I2C controller.