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 Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DA683C636CC for ; Sun, 5 Feb 2023 23:08:17 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2CC8E85A24; Mon, 6 Feb 2023 00:02:11 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="Vb94DwIm"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4A1A185A5C; Sun, 5 Feb 2023 23:52:41 +0100 (CET) Received: from mail-il1-x12d.google.com (mail-il1-x12d.google.com [IPv6:2607:f8b0:4864:20::12d]) (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 17B5A85B39 for ; Sun, 5 Feb 2023 23:44:27 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12d.google.com with SMTP id k17so1364518ilq.12 for ; Sun, 05 Feb 2023 14:44:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; 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=vSp9sa33vlBI5pn1tTTVdPoajtNLFDYbHvTVmT19RHI=; b=Vb94DwImCxlM7Z7BDOcAbgSylWP/bNkeRypL2cSNvUPzWJ1oQkKR8Wm/2PMxvEP72n KW2M7LyuS0xGUTKx2xxE3jH8rN+Kzb80TU1ZjcpgatGQLIl50SHu9eIlU+X/BWGT1CCd 9ceMP55Rt7uJEb41NoJsQ46Vc5UUt4mC+lO90= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vSp9sa33vlBI5pn1tTTVdPoajtNLFDYbHvTVmT19RHI=; b=5EPJ2e/R3MguUG/VQU6sYkZZXJGOdDROJ4aI/X7h5iVvxH1OQZpyCZLcMen8pR0Opt j0iO3oXAeXzKr3hICWGekOKiIaX83HSoUttQziPEpM4nsCTOt0hG346XC0SJwzuwWuMi J+/qZ11pHjQXUbR+s8IOMV8PIVIYQHh6K6d1w2ycMykSpey3S6ETmLOIHDrKUGkm3Zf+ kQLENfs0h3AhKXmFsYeumoszdQNiLwkininb8zB1jFfg74DkMIXHMy1VBE18jO6Wafoy FrsJiIxJMUbq7WLxPV/fPlYD11LKS6MwaWtgrVP+eW76bFKTIG6RWYNbv8jHjWNBP7Ke 05fA== X-Gm-Message-State: AO0yUKXVBCLFNlhasUQLEa7JS/WVJeQlsnR3gy09oLGelInIGmD0knAT /2NkYx+EUBGnaWRaJtcM/TF7Yps8gXtlEEEc X-Google-Smtp-Source: AK7set8SoouY5Bw6cp42I+TwnH21pl8ewh6MVwQ1LNWfPCcXePSmdRsyvho+Pu0J6yPTe1ozwa+JQQ== X-Received: by 2002:a05:6e02:1d06:b0:30e:fa5b:495d with SMTP id i6-20020a056e021d0600b0030efa5b495dmr16639439ila.5.1675637014743; Sun, 05 Feb 2023 14:43:34 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.43.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:43:34 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 134/169] Correct SPL uses of SANDBOX_CLK_CCF Date: Sun, 5 Feb 2023 15:40:43 -0700 Message-Id: <20230205224118.233425-135-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 converts 12 usages of this option to the non-SPL form, since there is no SPL_SANDBOX_CLK_CCF defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) drivers/clk/clk-divider.c | 4 ++-- drivers/clk/clk-gate.c | 6 +++--- drivers/clk/clk-mux.c | 8 ++++---- include/linux/clk-provider.h | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/clk/clk-divider.c b/drivers/clk/clk-divider.c index 7e8e62feeee..6ab137a72be 100644 --- a/drivers/clk/clk-divider.c +++ b/drivers/clk/clk-divider.c @@ -81,7 +81,7 @@ static ulong clk_divider_recalc_rate(struct clk *clk) unsigned long parent_rate = clk_get_parent_rate(clk); unsigned int val; -#if CONFIG_IS_ENABLED(SANDBOX_CLK_CCF) +#if IS_ENABLED(CONFIG_SANDBOX_CLK_CCF) val = divider->io_divider_val; #else val = readl(divider->reg); @@ -210,7 +210,7 @@ static struct clk *_register_divider(struct device *dev, const char *name, div->width = width; div->flags = clk_divider_flags; div->table = table; -#if CONFIG_IS_ENABLED(SANDBOX_CLK_CCF) +#if IS_ENABLED(CONFIG_SANDBOX_CLK_CCF) div->io_divider_val = *(u32 *)reg; #endif diff --git a/drivers/clk/clk-gate.c b/drivers/clk/clk-gate.c index aa40daf3d79..a8775c77dc2 100644 --- a/drivers/clk/clk-gate.c +++ b/drivers/clk/clk-gate.c @@ -62,7 +62,7 @@ static void clk_gate_endisable(struct clk *clk, int enable) if (set) reg |= BIT(gate->bit_idx); } else { -#if CONFIG_IS_ENABLED(SANDBOX_CLK_CCF) +#if IS_ENABLED(CONFIG_SANDBOX_CLK_CCF) reg = gate->io_gate_val; #else reg = readl(gate->reg); @@ -96,7 +96,7 @@ int clk_gate_is_enabled(struct clk *clk) struct clk_gate *gate = to_clk_gate(clk); u32 reg; -#if CONFIG_IS_ENABLED(SANDBOX_CLK_CCF) +#if IS_ENABLED(CONFIG_SANDBOX_CLK_CCF) reg = gate->io_gate_val; #else reg = readl(gate->reg); @@ -142,7 +142,7 @@ struct clk *clk_register_gate(struct device *dev, const char *name, gate->reg = reg; gate->bit_idx = bit_idx; gate->flags = clk_gate_flags; -#if CONFIG_IS_ENABLED(SANDBOX_CLK_CCF) +#if IS_ENABLED(CONFIG_SANDBOX_CLK_CCF) gate->io_gate_val = *(u32 *)reg; #endif diff --git a/drivers/clk/clk-mux.c b/drivers/clk/clk-mux.c index b49946fbcd5..184d426d0b3 100644 --- a/drivers/clk/clk-mux.c +++ b/drivers/clk/clk-mux.c @@ -90,7 +90,7 @@ u8 clk_mux_get_parent(struct clk *clk) struct clk_mux *mux = to_clk_mux(clk); u32 val; -#if CONFIG_IS_ENABLED(SANDBOX_CLK_CCF) +#if IS_ENABLED(CONFIG_SANDBOX_CLK_CCF) val = mux->io_mux_val; #else val = readl(mux->reg); @@ -137,7 +137,7 @@ static int clk_mux_set_parent(struct clk *clk, struct clk *parent) if (mux->flags & CLK_MUX_HIWORD_MASK) { reg = mux->mask << (mux->shift + 16); } else { -#if CONFIG_IS_ENABLED(SANDBOX_CLK_CCF) +#if IS_ENABLED(CONFIG_SANDBOX_CLK_CCF) reg = mux->io_mux_val; #else reg = readl(mux->reg); @@ -146,7 +146,7 @@ static int clk_mux_set_parent(struct clk *clk, struct clk *parent) } val = val << mux->shift; reg |= val; -#if CONFIG_IS_ENABLED(SANDBOX_CLK_CCF) +#if IS_ENABLED(CONFIG_SANDBOX_CLK_CCF) mux->io_mux_val = reg; #else writel(reg, mux->reg); @@ -194,7 +194,7 @@ struct clk *clk_hw_register_mux_table(struct device *dev, const char *name, mux->mask = mask; mux->flags = clk_mux_flags; mux->table = table; -#if CONFIG_IS_ENABLED(SANDBOX_CLK_CCF) +#if IS_ENABLED(CONFIG_SANDBOX_CLK_CCF) mux->io_mux_val = *(u32 *)reg; #endif diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h index 2d04882d053..b8acacd49ee 100644 --- a/include/linux/clk-provider.h +++ b/include/linux/clk-provider.h @@ -65,7 +65,7 @@ struct clk_mux { */ const char * const *parent_names; u8 num_parents; -#if CONFIG_IS_ENABLED(SANDBOX_CLK_CCF) +#if IS_ENABLED(CONFIG_SANDBOX_CLK_CCF) u32 io_mux_val; #endif @@ -93,7 +93,7 @@ struct clk_gate { void __iomem *reg; u8 bit_idx; u8 flags; -#if CONFIG_IS_ENABLED(SANDBOX_CLK_CCF) +#if IS_ENABLED(CONFIG_SANDBOX_CLK_CCF) u32 io_gate_val; #endif }; @@ -121,7 +121,7 @@ struct clk_divider { u8 width; u8 flags; const struct clk_div_table *table; -#if CONFIG_IS_ENABLED(SANDBOX_CLK_CCF) +#if IS_ENABLED(CONFIG_SANDBOX_CLK_CCF) u32 io_divider_val; #endif }; -- 2.39.1.519.gcb327c4b5f-goog