From patchwork Tue Jul 25 23:13:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 1812920 X-Patchwork-Delegate: sr@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=JgzPRq63; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4R9XsZ0XP5z1yY5 for ; Wed, 26 Jul 2023 09:14:10 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4EC088686E; Wed, 26 Jul 2023 01:13:53 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="JgzPRq63"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1FE2886861; Wed, 26 Jul 2023 01:13:41 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-pl1-x632.google.com (mail-pl1-x632.google.com [IPv6:2607:f8b0:4864:20::632]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 3468F8679F for ; Wed, 26 Jul 2023 01:13:38 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=judge.packham@gmail.com Received: by mail-pl1-x632.google.com with SMTP id d9443c01a7336-1bb775625e2so2593245ad.1 for ; Tue, 25 Jul 2023 16:13:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690326816; x=1690931616; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=X5DVhzety1tCnjMMVCC6vFSiwzQOgLf8zp+Man4/3kk=; b=JgzPRq63lirhfV7TVB7xmRCVhpJPJTeymtaW6/G765FZWjnJfAHP8CwuDOgWMBkGSw 1K8JvE6OqMkcUlLyfAqG6Y9gDqm9gilg5n8MXFTVLyWspv1VncppMEFvrDD2BTjMLzc/ WGAia8x8zQmPc6tbsMbV09q2CukxtpDHZo6JnSMm0DAQT30Gdtun6H0E5OYcoRgjioHP 8NyZk5rZhYiPnKLJvSzNx952ZeT6m4zvHh6XAS1i0WO6frIdQXy5P0IwxDoKpNq9ll7L Ldh/jjzA1CNhLjbZUDxey7HQNA1B2Rsl6VB9xUCaoWT5L0GgePYjdBOkH07K8HN+B+tD Nyqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690326816; x=1690931616; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=X5DVhzety1tCnjMMVCC6vFSiwzQOgLf8zp+Man4/3kk=; b=LXo4DleQmVliM5AsE9gpzEidgkvA6CW2ozTOmicKtL+dnKS1RbvTR7riUHEdd9mzbN X+BG1uIFDr1ZsLclp15M7uxiZ0e2fdZXHAa8j4u+DnMGoxSgUenLOmS9fok+l3nX1tJF 4pWxt1Hb3cbdMWx8GhVWY6K7p8gvBwTzA+I7Wy87Eer+WOev83n31Qyi4Ck1+wL3GUl8 SdN7H33IW7UmYniLxkNmfLt8kSsRxAMXSyiRIerAVifbuMvQ1E/TJP2xj9A+AwKp1q/f PBGT99dRIpLDrz2wGwckp1TJzTId3O97ZJ3QrI5XHxmo9ZywXkJfSRlsJT/mrSqbeD8A SBbw== X-Gm-Message-State: ABy/qLbwwbPJ1R0Hn2/5737KKA60jj+GMJEy9QnwfWEn25Bzt2eiZyQc ECFVhiR4SuZQdCWK2cIFc5BNha6BNI37GA== X-Google-Smtp-Source: APBJJlF8S7R5ioWvHZ9MfM/0hHP24Y4zp7ERcsIfGRCReK1kjMH6CWWr4e58Zrsx3I/dqQZ0OVWHtQ== X-Received: by 2002:a17:902:ec81:b0:1b2:676d:1143 with SMTP id x1-20020a170902ec8100b001b2676d1143mr591667plg.15.1690326815788; Tue, 25 Jul 2023 16:13:35 -0700 (PDT) Received: from chrisp-dl.atlnz.lc ([2001:df5:b000:22:505b:9968:7c0f:8cf6]) by smtp.gmail.com with ESMTPSA id a2-20020a170902ee8200b001b7f40a8959sm2529593pld.76.2023.07.25.16.13.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Jul 2023 16:13:35 -0700 (PDT) From: Chris Packham To: u-boot@lists.denx.de Cc: Chris Packham , Chris Packham , Stefan Roese , Tom Rini Subject: [PATCH v2 2/2] arm: mvebu: x240: Use i2c-gpio instead of built in controller Date: Wed, 26 Jul 2023 11:13:09 +1200 Message-ID: <20230725231322.1375303-2-judge.packham@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230725231322.1375303-1-judge.packham@gmail.com> References: <20230725231322.1375303-1-judge.packham@gmail.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean There is an Errata with the built-in I2C controller where various I2C hardware errors cause a complete lockup of the CPU (which eventually results in an watchdog reset). Put the I2C MPP pins into GPIO mode and use the i2c-gpio driver instead. This uses a bit-banged implementation of an I2C controller and avoids triggering the Errata. Signed-off-by: Chris Packham Reviewed-by: Stefan Roese --- Changes in v2: - Update i2c0 alias - Move i2c-gpio definition to root of device tree - Remove &i2c0 instead of just disabling it - Add r-by from Stefan arch/arm/dts/ac5-98dx35xx-atl-x240.dts | 30 ++++++++++++++++++++------ configs/x240_defconfig | 1 + 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/arch/arm/dts/ac5-98dx35xx-atl-x240.dts b/arch/arm/dts/ac5-98dx35xx-atl-x240.dts index 820ec18b4355..c19b25925ba2 100644 --- a/arch/arm/dts/ac5-98dx35xx-atl-x240.dts +++ b/arch/arm/dts/ac5-98dx35xx-atl-x240.dts @@ -16,7 +16,7 @@ gpio0 = &gpio0; gpio1 = &gpio1; spi0 = &spi0; - i2c0 = &i2c0; + i2c0 = &i2cgpio; usb0 = &usb0; pinctrl0 = &pinctrl0; }; @@ -40,6 +40,19 @@ default-state = "on"; }; }; + + i2cgpio: i2c-gpio-0 { + compatible = "i2c-gpio"; + #address-cells = <1>; + #size-cells = <0>; + + pinctrl-names = "default"; + pinctrl-0 = <&i2c0_gpio>; + scl-gpios = <&gpio0 26 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; + sda-gpios = <&gpio0 27 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; + i2c-gpio,delay-us = <2>; + status = "okay"; + }; }; &nand { @@ -70,9 +83,7 @@ status = "okay"; }; -&i2c0 { - status = "okay"; - +&i2cgpio { mux@71 { #address-cells = <1>; #size-cells = <0>; @@ -177,8 +188,8 @@ * LED_OE_N [23] * USB_PWR_FLT_N [24] * SFP_INT_N [25] - * I2C0_SCL [26] - * I2C0_SDA [27] + * I2C0_SCL [26] (GPIO) + * I2C0_SDA [27] (GPIO) * USB_EN [28] * MONITOR_INT_N [29] * XM1_MDC [30] @@ -201,7 +212,7 @@ /* 0 1 2 3 4 5 6 7 8 9 */ pin-func = < 0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff 1 1 1 1 0xff 0xff 0 0 - 0 0 0 0 0 0 1 1 0 0 + 0 0 0 0 0 0 0xff 0xff 0 0 1 1 1 1 0 0 0 0 0 0 0 0 0 1 1 1 >; @@ -209,4 +220,9 @@ marvell,pins = <0 1 2 3 4 5 6 7 8 9 10 11 16 17>; marvell,function = <2>; }; + + i2c0_gpio: i2c0-gpio-pins { + marvell,pins = <26 27>; + marvell,function = <0>; + }; }; diff --git a/configs/x240_defconfig b/configs/x240_defconfig index a78cb3ce6cbf..7d2b8603e6f4 100644 --- a/configs/x240_defconfig +++ b/configs/x240_defconfig @@ -42,6 +42,7 @@ CONFIG_CLK_MVEBU=y CONFIG_GPIO_HOG=y CONFIG_DM_PCA953X=y CONFIG_DM_I2C=y +CONFIG_DM_I2C_GPIO=y CONFIG_SYS_I2C_MVTWSI=y CONFIG_I2C_MUX=y CONFIG_I2C_MUX_PCA954x=y