From patchwork Tue Jun 23 19:50:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 223587 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.0 required=3.0 tests=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=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 2F2BFC433DF for ; Tue, 23 Jun 2020 20:02:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 068662080C for ; Tue, 23 Jun 2020 20:02:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592942566; bh=ZY0ExcuG9r4DZ3x+ypWUTpri90Go+Mb9v+s8BPYLiTY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=MXl49yzDhalcEyyOPj0WO7IikjTspGNpx6aTxcrd4Vhm0CxDXfqfLqy/Hl6cOws49 a3F4k02CzDeBbo7IOpdZoDSRCjoeivA4BR3p/WUSqekaKWh3HTzTfMA3q1QC/jkpkt AegugWVUhV+MQQ486s/4+zA+uwj2Rq3AE3XnbYlQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387901AbgFWUCo (ORCPT ); Tue, 23 Jun 2020 16:02:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:40130 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387895AbgFWUCn (ORCPT ); Tue, 23 Jun 2020 16:02:43 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 00F692137B; Tue, 23 Jun 2020 20:02:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592942563; bh=ZY0ExcuG9r4DZ3x+ypWUTpri90Go+Mb9v+s8BPYLiTY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fquf2UulqVTjxWiwODl4E6U+mIcRkEuoonlUEgOs59512ArdlaMFlWuTmdsd+OUsC ec56pHZHWaPYeqEIN60oKqO69nSpFuUDE8swM8/wVarCV1gMF72yRd26P2VGaWPAEB iKApkpCO28r4cK2jUWs4rFVQG8Z42DMkSQxXwg28= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, =?utf-8?q?Marek_Beh=C3=BAn?= , Gregory CLEMENT , Sasha Levin Subject: [PATCH 5.7 048/477] arm64: dts: armada-3720-turris-mox: fix SFP binding Date: Tue, 23 Jun 2020 21:50:45 +0200 Message-Id: <20200623195409.880526983@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623195407.572062007@linuxfoundation.org> References: <20200623195407.572062007@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Marek Behún [ Upstream commit c2671acbbbd822ef077cc168991e0a7dbe2172c9 ] The sfp compatible should be 'sff,sfp', not 'sff,sfp+'. We used patched kernel where the latter was working. Fixes: 7109d817db2e ("arm64: dts: marvell: add DTS for Turris Mox") Signed-off-by: Marek Behún Cc: Gregory CLEMENT Signed-off-by: Gregory CLEMENT Signed-off-by: Sasha Levin --- arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts index 47fee66c70cbc..0e0491ca2930d 100644 --- a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts +++ b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts @@ -95,7 +95,7 @@ }; sfp: sfp { - compatible = "sff,sfp+"; + compatible = "sff,sfp"; i2c-bus = <&i2c0>; los-gpio = <&moxtet_sfp 0 GPIO_ACTIVE_HIGH>; tx-fault-gpio = <&moxtet_sfp 1 GPIO_ACTIVE_HIGH>;