From patchwork Tue Jan 10 16:19:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1724161 X-Patchwork-Delegate: trini@ti.com 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 (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.a=rsa-sha256 header.s=google header.b=KQGra/yF; 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 4Nrwz15Mm0z23gB for ; Wed, 11 Jan 2023 03:20:45 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5FD4385528; Tue, 10 Jan 2023 17:20:16 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.b="KQGra/yF"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5A61A85562; Tue, 10 Jan 2023 17:19:55 +0100 (CET) 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,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-yw1-x112a.google.com (mail-yw1-x112a.google.com [IPv6:2607:f8b0:4864:20::112a]) (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 E543F854C2 for ; Tue, 10 Jan 2023 17:19:50 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-yw1-x112a.google.com with SMTP id 00721157ae682-476e643d1d5so160843677b3.1 for ; Tue, 10 Jan 2023 08:19:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=V3Q4Ggi5HaBPYC9Iv3+LpFI7UikxYfD6CflpsjJGG/Y=; b=KQGra/yFdIGG38YDARWex1eK1F2xn5o7KjcTGP2zZQXE2XqAiK4RaEpZ7vn3TNXbmm yt/0Je9myvVBDcHTfnPFZDhqV8eppZVPkOhQWUtXmlbecBwwCF2sBweVvrMm6DbIIV/y oZtHBq4XZ6Y9mZA3bwyR6bufLTkkwVxogXUJw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=V3Q4Ggi5HaBPYC9Iv3+LpFI7UikxYfD6CflpsjJGG/Y=; b=5owcV9QJ/DdOaDYKRh+HLhLyge3a09/0WVu2CDvlRxi3JUsyItGEa50g4P9VA06AiU nFm7IGZjlLtkeXzWabK/f82+rNzmlHzlbiHHku9OdRCqNC1TjOoeOzj03ndVob4cHEkj dOJxXegj9mbf54JXVVmAIt+qvThmQ6RHQ6J42vQNzzvW7PsjofPfM3/Ot9UgYfgb0Mb0 SJgl7psD5XO1bSlnDVJRyNKynOBFKt/uLRRZkwj1cWIvg5AiP0OODxFSgRGaOqKjYkNt ifaBITTiBcXkl8cvriV5MNELsArB89gKjDdRy9ik4RkeZSbZdDBPD2x7TukZAhkXeY8g uwCw== X-Gm-Message-State: AFqh2kr8zFd3F3u3PEMBwsyAVbpJOz9FikeRaBGt7oZMHsfgj4P5Uend ipDhBJTtCgDOj7uNbZHWYhH2DOsc4n3pSDLJnRk= X-Google-Smtp-Source: AMrXdXsIfztfOEjBmSDYCqX9GShcjRtzSr9OwPftbLKef4n/3la+9f8I1dhMc3V7sx5g6wMo/C8+nQ== X-Received: by 2002:a05:7500:254b:b0:f0:2571:46eb with SMTP id bl11-20020a057500254b00b000f0257146ebmr1362359gab.32.1673367589438; Tue, 10 Jan 2023 08:19:49 -0800 (PST) Received: from bill-the-cat.lan (2603-6081-7b00-6400-2c2f-ce0f-8dee-7136.res6.spectrum.com. [2603:6081:7b00:6400:2c2f:ce0f:8dee:7136]) by smtp.gmail.com with ESMTPSA id d12-20020a05620a240c00b006fcc3858044sm7557110qkn.86.2023.01.10.08.19.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jan 2023 08:19:48 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 03/19] i2c: fsl_i2c: Rework usage of CONFIG_SYS_IMMR Date: Tue, 10 Jan 2023 11:19:30 -0500 Message-Id: <20230110161946.3816866-3-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230110161946.3816866-1-trini@konsulko.com> References: <20230110161946.3816866-1-trini@konsulko.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.6 at phobos.denx.de X-Virus-Status: Clean This driver is used on both m68k, where CONFIG_SYS_IMMR is not used, and PowerPC an ARM where it is. Abstract this to a new value rather than re-defining a CONFIG symbol on m68k. Signed-off-by: Tom Rini --- drivers/i2c/fsl_i2c.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/i2c/fsl_i2c.c b/drivers/i2c/fsl_i2c.c index 187db92b75f6..147a4b91f0c5 100644 --- a/drivers/i2c/fsl_i2c.c +++ b/drivers/i2c/fsl_i2c.c @@ -41,20 +41,22 @@ DECLARE_GLOBAL_DATA_PTR; #ifdef CONFIG_M68K -#define CONFIG_SYS_IMMR CFG_SYS_MBAR +#define CFG_FSL_I2C_BASE_ADDR CFG_SYS_MBAR +#else +#define CFG_FSL_I2C_BASE_ADDR CONFIG_SYS_IMMR #endif #if !CONFIG_IS_ENABLED(DM_I2C) static const struct fsl_i2c_base *i2c_base[4] = { - (struct fsl_i2c_base *)(CONFIG_SYS_IMMR + CONFIG_SYS_FSL_I2C_OFFSET), + (struct fsl_i2c_base *)(CFG_FSL_I2C_BASE_ADDR + CONFIG_SYS_FSL_I2C_OFFSET), #ifdef CONFIG_SYS_FSL_I2C2_OFFSET - (struct fsl_i2c_base *)(CONFIG_SYS_IMMR + CONFIG_SYS_FSL_I2C2_OFFSET), + (struct fsl_i2c_base *)(CFG_FSL_I2C_BASE_ADDR + CONFIG_SYS_FSL_I2C2_OFFSET), #endif #ifdef CONFIG_SYS_FSL_I2C3_OFFSET - (struct fsl_i2c_base *)(CONFIG_SYS_IMMR + CONFIG_SYS_FSL_I2C3_OFFSET), + (struct fsl_i2c_base *)(CFG_FSL_I2C_BASE_ADDR + CONFIG_SYS_FSL_I2C3_OFFSET), #endif #ifdef CONFIG_SYS_FSL_I2C4_OFFSET - (struct fsl_i2c_base *)(CONFIG_SYS_IMMR + CONFIG_SYS_FSL_I2C4_OFFSET) + (struct fsl_i2c_base *)(CFG_FSL_I2C_BASE_ADDR + CONFIG_SYS_FSL_I2C4_OFFSET) #endif }; #endif