From patchwork Fri Aug 2 13:48:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Marangi X-Patchwork-Id: 1968513 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; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=T4/feyfJ; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WbGgs48ghz1yZl for ; Sat, 3 Aug 2024 05:52:09 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E0F5B88C16; Fri, 2 Aug 2024 21:52:01 +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="T4/feyfJ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7D58B88C37; Fri, 2 Aug 2024 21:52:00 +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=-0.5 required=5.0 tests=BAYES_00, DATE_IN_PAST_06_12, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, SPF_HELO_NONE,SPF_PASS,UPPERCASE_50_75 autolearn=no autolearn_force=no version=3.4.2 Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) (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 167C888C0F for ; Fri, 2 Aug 2024 21:51:58 +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=ansuelsmth@gmail.com Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-3686b554cfcso4306174f8f.1 for ; Fri, 02 Aug 2024 12:51:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722628317; x=1723233117; darn=lists.denx.de; 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=CFIu3Xo5u3gKh3u396SMqHcfNLJMHqCmnONohW3sQug=; b=T4/feyfJOqFKZ0sJGbN+Vz5mZJdekbQPlciZBm2NO6utMGo/wN3ZinTvMQ8kPA7IZz WwuoijSZu/n/KEkT/6eZHhPzH8C0otYGRqzeo+grKif60nURgAeihg6K1QcfcOO6I2vz QIzdoD//QrGA6BmhcwAipJcG8yjWlFKok9aQwKj4mhJs61wwwBzpupgng7gn3zWKNcSo 7VAVrFqlhGyS8btgNY8QQfzxwA0t+PRz8gcWaqBonvT4aw9oMmVC9pK9MtZ6VgjySVAm /4zwvh5wjrQTo3nvsWcjx7atNEGKOmNEAnMaf1yk2UNA6DOpOmBKSn9WWbtmBDAC7Uwp 3B9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722628317; x=1723233117; 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=CFIu3Xo5u3gKh3u396SMqHcfNLJMHqCmnONohW3sQug=; b=lIHY41jnqtyS9kmAD0vT+/vDYQu90KqeD7+iqsN1zDZgVdBpxLqkspKhivsXeFHEdo BfnGNdiJvHW6GjIgQ0Yi276DzVkUl60CzU9tSxRToXraN7y/1M2e+etsUEhRkqWtP5gx w5Wz71u/WUujYxrtlDcLxoguxSw2kfq76xw6/mL40nccZ/5wCX+Og9fwr0gSSAm3yKOP f6E/IERXo5jn38YD8BYwowsS241Jv7KmIjUUs3kUdT7sAG4DakxK94OLm7iVQlvloNHL 8IIH6QDD4LWkBBNshTru3AISo9Ru2ssCYKtUY1nHNmLPK5XwllWPHuzY9liNQxaBegMV itqw== X-Forwarded-Encrypted: i=1; AJvYcCUa0xaVur8bXV/W/3WriyRCxZPk3ynx2N6MIsw2n963XhybNn3rQS5qb/1Z1BI6g8nI3j2jEYMSsbeKymPTMyfgje53bA== X-Gm-Message-State: AOJu0Yx9gBzrcRoZjPzEHrbQECYQWI8T/ZjAArWBgRpDlvVyX7gTspOr cabzf8dOhyhbcc3ifFU/sA7xPYS6/vWktxQW7oNtNU0ZlUwN9eLu X-Google-Smtp-Source: AGHT+IEt56vzgu/tWDr3aPQdEQvYQ46wgGySL1NmqlhPt+m/vMgjcCAMZZmUMpxbJ34HNSZuK/Eshg== X-Received: by 2002:adf:cc89:0:b0:368:68d3:32b3 with SMTP id ffacd0b85a97d-36bbc11aaa5mr2832196f8f.26.1722628317255; Fri, 02 Aug 2024 12:51:57 -0700 (PDT) Received: from localhost.localdomain (host-87-6-196-30.retail.telecomitalia.it. [87.6.196.30]) by smtp.googlemail.com with ESMTPSA id ffacd0b85a97d-36bbd06d03fsm2643344f8f.91.2024.08.02.12.51.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Aug 2024 12:51:56 -0700 (PDT) From: Christian Marangi To: Lukasz Majewski , Sean Anderson , Ryder Lee , Weijie Gao , Chunfeng Yun , GSS_MTK_Uboot_upstream , Tom Rini , Christian Marangi , u-boot@lists.denx.de Subject: [PATCH 1/8] clk: mediatek: mt7622: fix broken peri_cgs clk with XTAL parents Date: Fri, 2 Aug 2024 15:48:25 +0200 Message-ID: <20240802134835.24006-2-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240802134835.24006-1-ansuelsmth@gmail.com> References: <20240802134835.24006-1-ansuelsmth@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 Fix broken peri_cgs clock with XTAL parents as they have wrong definition of the parent type. Correctly fix them and use CLK_PARENT_XTAL for them. Signed-off-by: Christian Marangi --- drivers/clk/mediatek/clk-mt7622.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/drivers/clk/mediatek/clk-mt7622.c b/drivers/clk/mediatek/clk-mt7622.c index 2beb63030f2..4a7c5faff1a 100644 --- a/drivers/clk/mediatek/clk-mt7622.c +++ b/drivers/clk/mediatek/clk-mt7622.c @@ -402,13 +402,17 @@ static const struct mtk_gate_regs peri1_cg_regs = { .sta_ofs = 0x1C, }; -#define GATE_PERI0(_id, _parent, _shift) { \ +#define GATE_PERI0_FLAGS(_id, _parent, _shift, _flags) { \ .id = _id, \ .parent = _parent, \ .regs = &peri0_cg_regs, \ .shift = _shift, \ - .flags = CLK_GATE_SETCLR | CLK_PARENT_TOPCKGEN, \ + .flags = _flags, \ } +#define GATE_PERI0(_id, _parent, _shift) \ + GATE_PERI0_FLAGS(_id, _parent, _shift, CLK_GATE_SETCLR | CLK_PARENT_TOPCKGEN) +#define GATE_PERI0_XTAL(_id, _parent, _shift) \ + GATE_PERI0_FLAGS(_id, _parent, _shift, CLK_GATE_SETCLR | CLK_PARENT_XTAL) #define GATE_PERI1(_id, _parent, _shift) { \ .id = _id, \ @@ -421,14 +425,14 @@ static const struct mtk_gate_regs peri1_cg_regs = { static const struct mtk_gate peri_cgs[] = { /* PERI0 */ GATE_PERI0(CLK_PERI_THERM_PD, CLK_TOP_AXI_SEL, 1), - GATE_PERI0(CLK_PERI_PWM1_PD, CLK_XTAL, 2), - GATE_PERI0(CLK_PERI_PWM2_PD, CLK_XTAL, 3), - GATE_PERI0(CLK_PERI_PWM3_PD, CLK_XTAL, 4), - GATE_PERI0(CLK_PERI_PWM4_PD, CLK_XTAL, 5), - GATE_PERI0(CLK_PERI_PWM5_PD, CLK_XTAL, 6), - GATE_PERI0(CLK_PERI_PWM6_PD, CLK_XTAL, 7), - GATE_PERI0(CLK_PERI_PWM7_PD, CLK_XTAL, 8), - GATE_PERI0(CLK_PERI_PWM_PD, CLK_XTAL, 9), + GATE_PERI0_XTAL(CLK_PERI_PWM1_PD, CLK_XTAL, 2), + GATE_PERI0_XTAL(CLK_PERI_PWM2_PD, CLK_XTAL, 3), + GATE_PERI0_XTAL(CLK_PERI_PWM3_PD, CLK_XTAL, 4), + GATE_PERI0_XTAL(CLK_PERI_PWM4_PD, CLK_XTAL, 5), + GATE_PERI0_XTAL(CLK_PERI_PWM5_PD, CLK_XTAL, 6), + GATE_PERI0_XTAL(CLK_PERI_PWM6_PD, CLK_XTAL, 7), + GATE_PERI0_XTAL(CLK_PERI_PWM7_PD, CLK_XTAL, 8), + GATE_PERI0_XTAL(CLK_PERI_PWM_PD, CLK_XTAL, 9), GATE_PERI0(CLK_PERI_AP_DMA_PD, CLK_TOP_AXI_SEL, 12), GATE_PERI0(CLK_PERI_MSDC30_0_PD, CLK_TOP_MSDC30_0_SEL, 13), GATE_PERI0(CLK_PERI_MSDC30_1_PD, CLK_TOP_MSDC30_1_SEL, 14), @@ -441,7 +445,7 @@ static const struct mtk_gate peri_cgs[] = { GATE_PERI0(CLK_PERI_I2C1_PD, CLK_TOP_AXI_SEL, 24), GATE_PERI0(CLK_PERI_I2C2_PD, CLK_TOP_AXI_SEL, 25), GATE_PERI0(CLK_PERI_SPI1_PD, CLK_TOP_SPI1_SEL, 26), - GATE_PERI0(CLK_PERI_AUXADC_PD, CLK_XTAL, 27), + GATE_PERI0_XTAL(CLK_PERI_AUXADC_PD, CLK_XTAL, 27), GATE_PERI0(CLK_PERI_SPI0_PD, CLK_TOP_SPI0_SEL, 28), GATE_PERI0(CLK_PERI_SNFI_PD, CLK_TOP_NFI_INFRA_SEL, 29), GATE_PERI0(CLK_PERI_NFI_PD, CLK_TOP_AXI_SEL, 30), From patchwork Fri Aug 2 13:48:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Marangi X-Patchwork-Id: 1968514 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; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=CaGIDBF4; dkim-atps=neutral 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=patchwork.ozlabs.org) 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 (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WbGh16gbgz1yZl for ; Sat, 3 Aug 2024 05:52:17 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4C5FE88C3D; Fri, 2 Aug 2024 21:52:02 +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="CaGIDBF4"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id EE3EE88C0F; Fri, 2 Aug 2024 21:52:00 +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=-0.6 required=5.0 tests=BAYES_00, DATE_IN_PAST_06_12, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) (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 1E18088622 for ; Fri, 2 Aug 2024 21:51:59 +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=ansuelsmth@gmail.com Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-42809d6e719so58191745e9.3 for ; Fri, 02 Aug 2024 12:51:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722628318; x=1723233118; darn=lists.denx.de; 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=YgRtonaE8hCd+bWdqCbKl0gWqVY8uZ649lUm7hnNMxE=; b=CaGIDBF4Lmjz78PzRIfvvEAEYWstSaZAtLtsgRKJhEFHaV9x6Sp/zufFmiHounJ5bn 58iLuHLNKQDFuLkNEuLkzy7kLn1ZgzgIodkpThOYq9YPTZeXGM7mSTvHPDJdMsms95qe 3NFHlKwCmGy22iMn+s3UlJDJMhO/i9VwI42ob6zTTzvCwHcEGMwQuna0tnu3VF05m7Px wmAQrOkgaqDa3sLh9ga8VDJVZ+xqrnfsEJWpyZwClPk2EgqyF0qUaJ42PBCJr0URinba 2F956v8founG/4lVN3l6JLS2d4KfQjpEO2w7cYiZAz8TbJ2djh8VNBHFA5OYEMbdJVyk KiYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722628318; x=1723233118; 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=YgRtonaE8hCd+bWdqCbKl0gWqVY8uZ649lUm7hnNMxE=; b=LmB1Dw6nV4RE8HnEkxiKx4kikjnQ2O2Db/VyNrnXOgNZONnULqiuJytuud0KxTd5UI u6Jmv71mmbD1XUSykQRPSOOHJQITPGPvB5CzkiP6s+XCd5wXaS8qmBA22ohg0tU8QRMK E+VPE7Ep/LnOfk7ozFMkzmlJjxfG69xzt9uvnPS0KGybuuLhUfPI6Wagum/d6UNR9IFo geApNUFUXLJLROD3uQ/hFBI5DczrINcIAYp086Wr9/eRloo47Zq19JXNf1u7AUZGJBNY zN8FeP4eOo1ZjUv5MMz34EigGZfRz1S33HphFi7pgRqz3t1ckCkVVeTn0M3j6omdyFYt b94Q== X-Forwarded-Encrypted: i=1; AJvYcCUGZGxl0vU2aGCUxf/3oxQN2GTJfwu5RqrndHTqrqd9cp5kd6/zK80NBsQXixyQU0xeTF8695kO4lZ62WnaPEsL2BpnLA== X-Gm-Message-State: AOJu0YxAmBBdJYEMBOHUxna49dTgDUkLxWAan65LfqxOk8rHtcFtL5aQ vOSG3kN8KuPz5+EBBJFELcdL9abKK/hmggvsYXgw/b1jfpX+kcA+ X-Google-Smtp-Source: AGHT+IENK1p0+M6m1ookQW2qNU3829RsRzDwlHhXfH2YhNB8G2mO2cDYpsiyR0zhGKHOg7bDzN+aCg== X-Received: by 2002:a05:6000:cc8:b0:367:8909:197b with SMTP id ffacd0b85a97d-36bbc181e5fmr2745000f8f.61.1722628318478; Fri, 02 Aug 2024 12:51:58 -0700 (PDT) Received: from localhost.localdomain (host-87-6-196-30.retail.telecomitalia.it. [87.6.196.30]) by smtp.googlemail.com with ESMTPSA id ffacd0b85a97d-36bbd06d03fsm2643344f8f.91.2024.08.02.12.51.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Aug 2024 12:51:58 -0700 (PDT) From: Christian Marangi To: Lukasz Majewski , Sean Anderson , Ryder Lee , Weijie Gao , Chunfeng Yun , GSS_MTK_Uboot_upstream , Tom Rini , Christian Marangi , u-boot@lists.denx.de Subject: [PATCH 2/8] clk: mediatek_ mt7622: rename AUDIO_AWB3 to AUDIO_AWB2 Date: Fri, 2 Aug 2024 15:48:26 +0200 Message-ID: <20240802134835.24006-3-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240802134835.24006-1-ansuelsmth@gmail.com> References: <20240802134835.24006-1-ansuelsmth@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 Rename AUDIO_AWB3 to AUDIO_AWB2 to match upstream linux naming in preparation for OF_UPSTREAM support. Signed-off-by: Christian Marangi --- include/dt-bindings/clock/mt7622-clk.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/dt-bindings/clock/mt7622-clk.h b/include/dt-bindings/clock/mt7622-clk.h index 76fcaff0e42..78804f40307 100644 --- a/include/dt-bindings/clock/mt7622-clk.h +++ b/include/dt-bindings/clock/mt7622-clk.h @@ -206,7 +206,7 @@ #define CLK_AUDIO_DLMCH 31 #define CLK_AUDIO_ARB1 32 #define CLK_AUDIO_AWB 33 -#define CLK_AUDIO_AWB3 34 +#define CLK_AUDIO_AWB2 34 #define CLK_AUDIO_DAI 35 #define CLK_AUDIO_MOD 36 #define CLK_AUDIO_ASRCI3 37 From patchwork Fri Aug 2 13:48:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Marangi X-Patchwork-Id: 1968515 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; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=eD47b4ui; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WbGhB3tD0z1yZl for ; Sat, 3 Aug 2024 05:52:26 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BBF6288C4C; Fri, 2 Aug 2024 21:52:03 +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="eD47b4ui"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 691EB88C40; Fri, 2 Aug 2024 21:52:02 +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=-0.6 required=5.0 tests=BAYES_00, DATE_IN_PAST_06_12, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) (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 3786F88C2A for ; Fri, 2 Aug 2024 21:52:00 +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=ansuelsmth@gmail.com Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-368f92df172so4263879f8f.2 for ; Fri, 02 Aug 2024 12:52:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722628320; x=1723233120; darn=lists.denx.de; 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=bXrki54RVcmmjktEkchfr8DNQEZvOA5hURHgspdveNc=; b=eD47b4uiw/HJzW5LTv1xRHr/9X7G/S9Q7jquXvGu+0E/1aC20DKWSBf6uXCv2dIcpr ASmw0C1N7/Q7gkqTLH0dKHK4UxN3DoYG0/ZFvVZKwSzBjS9Ex0ZkLh8Hq1Mfnnl2cJ7D /zve6D0AGIhY8zfA1yjWJUOliUPa2JM78qD32eGSVX4p5fVWe4kRcU6JWKplS3cM9c5O l6nfOb7hqoxEsrwY2EIMtN36pYbsfFtavUjXejS94+Ydvw6IicYYMsnenPLlHBwjUkV5 BlvWFivoydmYvJ0RUQemwZK2Rxn9BeQHq0K4+yReo1gPgfoU+vpnDA3JVsOnYBVolHqr zZJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722628320; x=1723233120; 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=bXrki54RVcmmjktEkchfr8DNQEZvOA5hURHgspdveNc=; b=c6n/XdsEYMLiKOBQLXbPdW1ggdI1JSFPXXFvP2gtmdsbuICyylU/CyNgk2+OylFsiq 71Y0FYqC5izH+I+sC4TgIUB0UnUsAcjaeGxfu7dJ9LN1lCE75Q7KUL/gfiD3ZWR1N67u FR8Bt3ru4xaRCmZ/l1zdtwasdYQ83ROtPwgkIItur0pHkcvK8bOG8Wrqs6Ztch4Y77x3 DwRsiDNT3f/C81kf+3Nr4BmwXloLaZcfrCmAmCoeckhm0ZOIGB+OM2qzmM2sd5m8CBJ7 TgyDMHTy2D2dbxADeZWGQVi1fYJRldwQ7F73wf3RHtA4YR/QuUrOAB+RaqV4Ima+A2pd p5+w== X-Forwarded-Encrypted: i=1; AJvYcCUxFutfKaXSzKVkz1ePxMfLrHuwzwCEVner14EdMCAO6sT1hDwA5/l2m8wPAgbXr4RkBdcAYr8S62DYkIfaJbTJ0EoDhw== X-Gm-Message-State: AOJu0Yw4aLvd7AZEqQAcU+8l/QN5Q2kmzznic+risMzfssjLhZenE88s AagOJiHTM/Pvoc+1v+1gluwT2+kdcYEBuGympmHLhpllGoTlyzAn X-Google-Smtp-Source: AGHT+IE3mX59zBZyTTeScfmNZjajG0K+kK9rZAXoH9gMIeXj5tN3BbjFDQYXO2g++oV8pQGvd1bDpw== X-Received: by 2002:a05:6000:c0c:b0:368:420e:b7a4 with SMTP id ffacd0b85a97d-36bbc0a750bmr3016055f8f.4.1722628319607; Fri, 02 Aug 2024 12:51:59 -0700 (PDT) Received: from localhost.localdomain (host-87-6-196-30.retail.telecomitalia.it. [87.6.196.30]) by smtp.googlemail.com with ESMTPSA id ffacd0b85a97d-36bbd06d03fsm2643344f8f.91.2024.08.02.12.51.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Aug 2024 12:51:59 -0700 (PDT) From: Christian Marangi To: Lukasz Majewski , Sean Anderson , Ryder Lee , Weijie Gao , Chunfeng Yun , GSS_MTK_Uboot_upstream , Tom Rini , Christian Marangi , u-boot@lists.denx.de Subject: [PATCH 3/8] clk: mediatek: mt7622: move INFRA_TRNG to the bottom Date: Fri, 2 Aug 2024 15:48:27 +0200 Message-ID: <20240802134835.24006-4-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240802134835.24006-1-ansuelsmth@gmail.com> References: <20240802134835.24006-1-ansuelsmth@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 Move INFRA_TRNG clock to the bottom of the clk ID to match upstream linux order. This is in preparation of OF_UPSTREAM. Signed-off-by: Christian Marangi --- drivers/clk/mediatek/clk-mt7622.c | 2 +- include/dt-bindings/clock/mt7622-clk.h | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/clk/mediatek/clk-mt7622.c b/drivers/clk/mediatek/clk-mt7622.c index 4a7c5faff1a..8f173b79453 100644 --- a/drivers/clk/mediatek/clk-mt7622.c +++ b/drivers/clk/mediatek/clk-mt7622.c @@ -382,11 +382,11 @@ static const struct mtk_gate_regs infra_cg_regs = { static const struct mtk_gate infra_cgs[] = { GATE_INFRA(CLK_INFRA_DBGCLK_PD, CLK_TOP_AXI_SEL, 0), - GATE_INFRA(CLK_INFRA_TRNG, CLK_TOP_AXI_SEL, 2), GATE_INFRA(CLK_INFRA_AUDIO_PD, CLK_TOP_AUD_INTBUS_SEL, 5), GATE_INFRA(CLK_INFRA_IRRX_PD, CLK_TOP_IRRX_SEL, 16), GATE_INFRA(CLK_INFRA_APXGPT_PD, CLK_TOP_F10M_REF_SEL, 18), GATE_INFRA(CLK_INFRA_PMIC_PD, CLK_TOP_PMICSPI_SEL, 22), + GATE_INFRA(CLK_INFRA_TRNG, CLK_TOP_AXI_SEL, 2), }; /* pericfg */ diff --git a/include/dt-bindings/clock/mt7622-clk.h b/include/dt-bindings/clock/mt7622-clk.h index 78804f40307..2f36abcf8ae 100644 --- a/include/dt-bindings/clock/mt7622-clk.h +++ b/include/dt-bindings/clock/mt7622-clk.h @@ -121,11 +121,11 @@ /* INFRACFG */ #define CLK_INFRA_DBGCLK_PD 0 -#define CLK_INFRA_TRNG 1 -#define CLK_INFRA_AUDIO_PD 2 -#define CLK_INFRA_IRRX_PD 3 -#define CLK_INFRA_APXGPT_PD 4 -#define CLK_INFRA_PMIC_PD 5 +#define CLK_INFRA_AUDIO_PD 1 +#define CLK_INFRA_IRRX_PD 2 +#define CLK_INFRA_APXGPT_PD 3 +#define CLK_INFRA_PMIC_PD 4 +#define CLK_INFRA_TRNG 5 /* PERICFG */ From patchwork Fri Aug 2 13:48:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Marangi X-Patchwork-Id: 1968516 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; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=ON1ZiOVH; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WbGhM5B2yz1yZl for ; Sat, 3 Aug 2024 05:52:35 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 37D5988C3F; Fri, 2 Aug 2024 21:52:05 +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="ON1ZiOVH"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6D6C688622; Fri, 2 Aug 2024 21:52:03 +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=-0.6 required=5.0 tests=BAYES_00, DATE_IN_PAST_06_12, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) (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 7D16688622 for ; Fri, 2 Aug 2024 21:52:01 +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=ansuelsmth@gmail.com Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-4281faefea9so45598215e9.2 for ; Fri, 02 Aug 2024 12:52:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722628321; x=1723233121; darn=lists.denx.de; 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=cmeWB+D0lILjJuJwQtC1PhEdk3GWPK+PYFgpMfusl/Y=; b=ON1ZiOVHsMyXpJE3JNw8aZcvXJEtVfocq8TdzI8/YUqtXimYLWkPOXwRyYz/Db8zEt mpg95oT3mZ+OvRhWKTDv+wHvD7qC9QXTwTIH3gAEhCvhy4EtAj7DthsgaF2oMec8GLWr Q7nHkX/hfq+T8z9n7StJNpmFoMEBAT6DlfqJEaRv2l3rKoODe/nZ/4vV1ajdAH2FLtcj nL9TAWswAYkqUp//1scLdZwkSIyNND/NDTE7eDQi0SAadPi9tNJ5cc5sxHMQCVc/GrcJ xaR13/y/VSzK8iUKA1O/eD7WQF4sWeHAKpDgqFqmkzaNJyWeMb3FTUthn+kSnq+xb7VR wLpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722628321; x=1723233121; 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=cmeWB+D0lILjJuJwQtC1PhEdk3GWPK+PYFgpMfusl/Y=; b=g6b3d/Qn6JNgN36/Hs59bGZYgGT4f01X42yZ7jw/TtHm7zFVh6k52R5b7Sfl3McepH rZXlL3MeUBKHy+s8l8vclyCV+FqxC8y5jyNMSZ8Dw701qV8+HhPyHi57sovFlAL1iINm DT7JP0oXKrB3FmCVNTK4Y6YfnU1TeCFPeWzNU7DQzMxBjR7Ls2UH2lbrieoCzQaY27Ci lYCZWviEM8WK7+kCQ14JwZcy1uguSxRhdC0PJD0DkERAmMXNelPLLhWinaonnxjglQtQ gErRqiX6uzAtYEqWOifTIM6d3IdFVj2YIX+oA6SiiglCE89d85IR6CbY71qT5SdEVrY/ 4HsQ== X-Forwarded-Encrypted: i=1; AJvYcCXvDMqetxR+CZ9FLgvYr1D1B3zW2pAKCMi62jGzcPQEqXb5M1K0HVqJWEUVjj4iqRN0P1rI8o6UyKUJ3XP9x1H8lR1mbg== X-Gm-Message-State: AOJu0YxIMjxnbHkJDHV58k3NyX8PALsbR232/wtw9GcyvOO6yZ3cPh7x ydTp/rQ3PwpYME1/5slIkkAqt/2QcNGRXXuyKcUZywd9F1SP9eqD X-Google-Smtp-Source: AGHT+IHAPK909zgwcTJNriZicScXGbKZOssMp80/uasauGM6mMVlyzL0gPvpUFpai3BpdWlWDC4leQ== X-Received: by 2002:a05:600c:468b:b0:428:18d9:9963 with SMTP id 5b1f17b1804b1-428e6b2a6c8mr31095545e9.22.1722628320739; Fri, 02 Aug 2024 12:52:00 -0700 (PDT) Received: from localhost.localdomain (host-87-6-196-30.retail.telecomitalia.it. [87.6.196.30]) by smtp.googlemail.com with ESMTPSA id ffacd0b85a97d-36bbd06d03fsm2643344f8f.91.2024.08.02.12.51.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Aug 2024 12:52:00 -0700 (PDT) From: Christian Marangi To: Lukasz Majewski , Sean Anderson , Ryder Lee , Weijie Gao , Chunfeng Yun , GSS_MTK_Uboot_upstream , Tom Rini , Christian Marangi , u-boot@lists.denx.de Subject: [PATCH 4/8] clk: mediatek: mt7622: add missing clock define for MAIN_CORE_EN Date: Fri, 2 Aug 2024 15:48:28 +0200 Message-ID: <20240802134835.24006-5-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240802134835.24006-1-ansuelsmth@gmail.com> References: <20240802134835.24006-1-ansuelsmth@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 Add missing clock for MAIN_CORE_EN. This is a special clock as it's a gate for the APMIXED clocks required as a parent for CPU clocks. Signed-off-by: Christian Marangi --- drivers/clk/mediatek/clk-mt7622.c | 29 +++++++++++++++++++++++--- include/dt-bindings/clock/mt7622-clk.h | 1 + 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/drivers/clk/mediatek/clk-mt7622.c b/drivers/clk/mediatek/clk-mt7622.c index 8f173b79453..49adffb3b43 100644 --- a/drivers/clk/mediatek/clk-mt7622.c +++ b/drivers/clk/mediatek/clk-mt7622.c @@ -66,6 +66,24 @@ static const struct mtk_pll_data apmixed_plls[] = { 21, 0x358, 1, 0x35c, 0), }; +static const struct mtk_gate_regs apmixed_cg_regs = { + .set_ofs = 0x8, + .clr_ofs = 0x8, + .sta_ofs = 0x8, +}; + +#define GATE_APMIXED(_id, _parent, _shift) { \ + .id = _id, \ + .parent = _parent, \ + .regs = &apmixed_cg_regs, \ + .shift = _shift, \ + .flags = CLK_GATE_NO_SETCLR_INV, \ + } + +static const struct mtk_gate apmixed_cgs[] = { + GATE_APMIXED(CLK_APMIXED_MAIN_CORE_EN, CLK_APMIXED_MAINPLL, 5), +}; + /* topckgen */ #define FACTOR0(_id, _parent, _mult, _div) \ FACTOR(_id, _parent, _mult, _div, CLK_PARENT_APMIXED) @@ -554,12 +572,17 @@ static const struct mtk_gate ssusb_cgs[] = { GATE_SSUSB(CLK_SSUSB_DMA_EN, CLK_TOP_HIF_SEL, 8), }; +static const struct mtk_clk_tree mt7622_apmixed_clk_tree = { + .xtal2_rate = 25 * MHZ, + .plls = apmixed_plls, + .gates_offs = CLK_APMIXED_MAIN_CORE_EN, + .gates = apmixed_cgs, +}; + static const struct mtk_clk_tree mt7622_clk_tree = { .xtal_rate = 25 * MHZ, - .xtal2_rate = 25 * MHZ, .fdivs_offs = CLK_TOP_TO_USB3_SYS, .muxes_offs = CLK_TOP_AXI_SEL, - .plls = apmixed_plls, .fclks = top_fixed_clks, .fdivs = top_fixed_divs, .muxes = top_muxes, @@ -586,7 +609,7 @@ static int mt7622_apmixedsys_probe(struct udevice *dev) struct mtk_clk_priv *priv = dev_get_priv(dev); int ret; - ret = mtk_common_clk_init(dev, &mt7622_clk_tree); + ret = mtk_common_clk_init(dev, &mt7622_apmixed_clk_tree); if (ret) return ret; diff --git a/include/dt-bindings/clock/mt7622-clk.h b/include/dt-bindings/clock/mt7622-clk.h index 2f36abcf8ae..569bfce0d05 100644 --- a/include/dt-bindings/clock/mt7622-clk.h +++ b/include/dt-bindings/clock/mt7622-clk.h @@ -169,6 +169,7 @@ #define CLK_APMIXED_AUD2PLL 6 #define CLK_APMIXED_TRGPLL 7 #define CLK_APMIXED_SGMIPLL 8 +#define CLK_APMIXED_MAIN_CORE_EN 9 /* AUDIOSYS */ From patchwork Fri Aug 2 13:48:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Marangi X-Patchwork-Id: 1968517 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; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=YnA5KOhe; dkim-atps=neutral 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=patchwork.ozlabs.org) 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 (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WbGhY6pQKz1yZl for ; Sat, 3 Aug 2024 05:52:45 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A6F9088C42; Fri, 2 Aug 2024 21:52:05 +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="YnA5KOhe"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9412F88C0F; Fri, 2 Aug 2024 21:52:04 +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=-0.6 required=5.0 tests=BAYES_00, DATE_IN_PAST_06_12, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) (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 9500688C2F for ; Fri, 2 Aug 2024 21:52:02 +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=ansuelsmth@gmail.com Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-42816ca782dso56069065e9.2 for ; Fri, 02 Aug 2024 12:52:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722628322; x=1723233122; darn=lists.denx.de; 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=3lIRnAjdTao3YSkLCOvkKSbCs6hrDofoqspPWHdjbr0=; b=YnA5KOheQzuyBbrhlWJNvuj0bCAjahrJkwCAiJKvpJeBW+0dtXh/RiwitIEnqPT6ir A58pNylQPV4yp+MhLiBQ5WVM6O0+Pdvn3mUFfobYMcUfeTvv7e7O1D0q4zQE3UM80eri vcQG62KotctDJrIljSS0UWnMyTFzJNQm9gvu2kPYwpkut6/fghqqwdNrimNW/xQ86ese ECu38jYK531lDal4LGSiNfW8em9CDGfV8pmQD8MJeBOanKzyeEx/CaivYWL6EE2w6xrT xaV51RbF6E7kelNZiqAr0xX/RgxoivdG1AVKtqm5XgE6CIljNHM/Gz5RGtRz2w+II5cX 3jCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722628322; x=1723233122; 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=3lIRnAjdTao3YSkLCOvkKSbCs6hrDofoqspPWHdjbr0=; b=CG8LyM9SBDOGg+cZSJXW5MFlHvASOIG9c670qxSi1pH+InXV9IlLxQN3uBbb/0Dv3w ej/Pcn3qoOQQ7XRjM4o1RqFtjDtmrV5Lq1OYUIfJ1dudM9ZUOSbzSntM+WeLPgessLPs cl7kcl3y84AJN575/0hVFrHDrrHmy/1g5lyxK2oPLuJo/pgUO75J357Ygm8Qsdgfwkw1 AjtzYkkMnC/c2F+/8/e3XcyrZAUzwjuig7gzy/suJT3ASJpAGA7fQYJTnJizMPUQ9JOL 6cXrEenh+eqkbd6uMifLHdp1QqckYiOqaDANh4jbRjW9X8YQNQyf2fRU2IBcYF52rZ4O 1Psg== X-Forwarded-Encrypted: i=1; AJvYcCUoS0EiPTSCesCny2jbSNeGWDOqZJ6rBGYlqoOxfWNMk8TiBXTCqV3i61rhh+ONqlc0UfTy4am6ItlznzM/OfLB7FdmeA== X-Gm-Message-State: AOJu0YwwYuFLcfXw+3duNoHh+j7aQbOXp/5IHT2tbdUUvGIrwTDE1tFp UXfeP2g4yYl3ihZF9B1zOOmYaIHJEf6S8Vruh1gAkCAvl7drxO8T X-Google-Smtp-Source: AGHT+IHXIxxaWc7GCNT5eScjFypELxN+7yoPmEsArVwugVAj2MqM8tXO1sRjTYDncH4hl/02fXjzyw== X-Received: by 2002:a5d:4108:0:b0:367:95d2:4ec0 with SMTP id ffacd0b85a97d-36bbc182896mr2374890f8f.62.1722628321966; Fri, 02 Aug 2024 12:52:01 -0700 (PDT) Received: from localhost.localdomain (host-87-6-196-30.retail.telecomitalia.it. [87.6.196.30]) by smtp.googlemail.com with ESMTPSA id ffacd0b85a97d-36bbd06d03fsm2643344f8f.91.2024.08.02.12.52.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Aug 2024 12:52:01 -0700 (PDT) From: Christian Marangi To: Lukasz Majewski , Sean Anderson , Ryder Lee , Weijie Gao , Chunfeng Yun , GSS_MTK_Uboot_upstream , Tom Rini , Christian Marangi , u-boot@lists.denx.de Subject: [PATCH 5/8] clk: mediatek: mt7622: add missing clock MUX1_SEL Date: Fri, 2 Aug 2024 15:48:29 +0200 Message-ID: <20240802134835.24006-6-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240802134835.24006-1-ansuelsmth@gmail.com> References: <20240802134835.24006-1-ansuelsmth@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 Add missing infra clock MUX1_SEL needed for CPU clock. This is needed to match the upstream clk ID order in preparation for OF_UPSTREAM. Signed-off-by: Christian Marangi --- drivers/clk/mediatek/clk-mt7622.c | 24 +++++++++++++++++++++++- include/dt-bindings/clock/mt7622-clk.h | 13 +++++++------ 2 files changed, 30 insertions(+), 7 deletions(-) diff --git a/drivers/clk/mediatek/clk-mt7622.c b/drivers/clk/mediatek/clk-mt7622.c index 49adffb3b43..0da7a848163 100644 --- a/drivers/clk/mediatek/clk-mt7622.c +++ b/drivers/clk/mediatek/clk-mt7622.c @@ -384,6 +384,20 @@ static const struct mtk_composite top_muxes[] = { }; /* infracfg */ +#define APMIXED_PARENT(_id) PARENT(_id, CLK_PARENT_APMIXED) +#define XTAL_PARENT(_id) PARENT(_id, CLK_PARENT_XTAL) + +static const struct mtk_parent infra_mux1_parents[] = { + XTAL_PARENT(CLK_XTAL), + APMIXED_PARENT(CLK_APMIXED_MAINPLL), + APMIXED_PARENT(CLK_APMIXED_MAIN_CORE_EN), + APMIXED_PARENT(CLK_APMIXED_MAINPLL), +}; + +static const struct mtk_composite infra_muxes[] = { + MUX_MIXED(CLK_INFRA_MUX1_SEL, infra_mux1_parents, 0x000, 2, 2), +}; + static const struct mtk_gate_regs infra_cg_regs = { .set_ofs = 0x40, .clr_ofs = 0x44, @@ -579,6 +593,14 @@ static const struct mtk_clk_tree mt7622_apmixed_clk_tree = { .gates = apmixed_cgs, }; +static const struct mtk_clk_tree mt7622_infra_clk_tree = { + .xtal_rate = 25 * MHZ, + .muxes_offs = CLK_INFRA_MUX1_SEL, + .gates_offs = CLK_INFRA_DBGCLK_PD, + .muxes = infra_muxes, + .gates = infra_cgs, +}; + static const struct mtk_clk_tree mt7622_clk_tree = { .xtal_rate = 25 * MHZ, .fdivs_offs = CLK_TOP_TO_USB3_SYS, @@ -630,7 +652,7 @@ static int mt7622_topckgen_probe(struct udevice *dev) static int mt7622_infracfg_probe(struct udevice *dev) { - return mtk_common_clk_gate_init(dev, &mt7622_clk_tree, infra_cgs); + return mtk_common_clk_infrasys_init(dev, &mt7622_infra_clk_tree); } static int mt7622_pericfg_probe(struct udevice *dev) diff --git a/include/dt-bindings/clock/mt7622-clk.h b/include/dt-bindings/clock/mt7622-clk.h index 569bfce0d05..0820fab0a22 100644 --- a/include/dt-bindings/clock/mt7622-clk.h +++ b/include/dt-bindings/clock/mt7622-clk.h @@ -120,12 +120,13 @@ /* INFRACFG */ -#define CLK_INFRA_DBGCLK_PD 0 -#define CLK_INFRA_AUDIO_PD 1 -#define CLK_INFRA_IRRX_PD 2 -#define CLK_INFRA_APXGPT_PD 3 -#define CLK_INFRA_PMIC_PD 4 -#define CLK_INFRA_TRNG 5 +#define CLK_INFRA_MUX1_SEL 0 +#define CLK_INFRA_DBGCLK_PD 1 +#define CLK_INFRA_AUDIO_PD 2 +#define CLK_INFRA_IRRX_PD 3 +#define CLK_INFRA_APXGPT_PD 4 +#define CLK_INFRA_PMIC_PD 5 +#define CLK_INFRA_TRNG 6 /* PERICFG */ From patchwork Fri Aug 2 13:48:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Marangi X-Patchwork-Id: 1968518 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; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=fDF1g/uU; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WbGhl3y1Zz1yZl for ; Sat, 3 Aug 2024 05:52:55 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1CFD088C0F; Fri, 2 Aug 2024 21:52:08 +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="fDF1g/uU"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id AAE4F88C13; Fri, 2 Aug 2024 21:52:06 +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=-0.6 required=5.0 tests=BAYES_00, DATE_IN_PAST_06_12, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) (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 D65AA88C4F for ; Fri, 2 Aug 2024 21:52:03 +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=ansuelsmth@gmail.com Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-368440b073bso2299760f8f.0 for ; Fri, 02 Aug 2024 12:52:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722628323; x=1723233123; darn=lists.denx.de; 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=tnTo+hdD4tBsawHFt8O2ho//PArMPoaxDVt+kUP4aTQ=; b=fDF1g/uU+s3aUGnjhWdOw606jXj9jngCm3MmIgu2pL7cb1+PuzL26nanHhaGE9nNiG xVu0H0X6qCrvhiJfdD7RgVI555SVT7RU8C6upzEIi6s1t8gxpMLRI3010Sww/bP+Z90K BW7QxaTRkU9WPq4eZeSLkc+VQHD1oZF2qx6kYmqUttCyL1Um5rsVRngKipmiErS/OPB1 o905CjJ52HNc2S1JHQNxDbfGSsNmlHFVhPZrDHCAACVYuPWHBKp/w9BPRUTFn9lUgeTj TGJpfoagnvBZpswXXW7kn5C8+CwrFGv87PDadRAhgGsTGkWKY3PBKXNBN5hjfxjaZ3Om lS8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722628323; x=1723233123; 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=tnTo+hdD4tBsawHFt8O2ho//PArMPoaxDVt+kUP4aTQ=; b=dU9JddxvJSxxr8LFSYqP2Fpt5KagnbqtVxNWwZ+nDdbD7l2NEVBJW0fdiWgb/ieWwS 2i7j9KXNyeKyh08YyErqp9/D65rAqodE+4s3ISPKiNyLgdmomtaikZZZGR+NR11Yq4dD QM1W8Em9Q3f0GT082zGHU98cDG4pbTrlltBgOId5VbnbqJm2dE+Nw5y0MXdebJKjjDxY 0LJhBwYr6gOMz8qlcpPay0RdvAVhzfsPrJ74VxId/EK0MllLH1llBoyR+7YU3IqBiZEc FLVWWNg7k49mHHWXXqhPid+vF7c06FljzRps8TeY8saFhqY8++89dlpaigTGmIptGjn6 sd/g== X-Forwarded-Encrypted: i=1; AJvYcCVJ8RpQqimEzXHYRl9bxtBtyzySCLVmTBvhICunUn149McJ4nVHqBf2G14EpXh1Vx7+ON/nszUPU+ym4yEZhLthRM6IUg== X-Gm-Message-State: AOJu0YxmnkCqd8YFiCejOeTPv7LO7+ilimu6dhjjpR2wIJgKI89FK/8k stRCuaIyeBbCM+GDafb2xH/jgQfrGhGscU7QDT4g1ddKYH5T4qCF X-Google-Smtp-Source: AGHT+IGxCcQlFxwRvFI5W+Xv2uW45ioKcBJT9vTEdc8W+6fSJTs+ZNtFLd0YHPe0Ul/VkZznJ20Z3A== X-Received: by 2002:adf:f588:0:b0:360:70e3:ef2b with SMTP id ffacd0b85a97d-36bbbecb238mr3229083f8f.26.1722628323151; Fri, 02 Aug 2024 12:52:03 -0700 (PDT) Received: from localhost.localdomain (host-87-6-196-30.retail.telecomitalia.it. [87.6.196.30]) by smtp.googlemail.com with ESMTPSA id ffacd0b85a97d-36bbd06d03fsm2643344f8f.91.2024.08.02.12.52.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Aug 2024 12:52:02 -0700 (PDT) From: Christian Marangi To: Lukasz Majewski , Sean Anderson , Ryder Lee , Weijie Gao , Chunfeng Yun , GSS_MTK_Uboot_upstream , Tom Rini , Christian Marangi , u-boot@lists.denx.de Subject: [PATCH 6/8] clk: mediatek: mt7622: add missing clock PERI_UART4_PD Date: Fri, 2 Aug 2024 15:48:30 +0200 Message-ID: <20240802134835.24006-7-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240802134835.24006-1-ansuelsmth@gmail.com> References: <20240802134835.24006-1-ansuelsmth@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 Add missing clock PERI_UART4_PD for peri clock gates. This is needed to match upstream linux clk ID in preparation for OF_UPSTREAM. Also convert infracfg to mux + gate implementation as now we have mux on top of gates. Signed-off-by: Christian Marangi --- drivers/clk/mediatek/clk-mt7622.c | 1 + include/dt-bindings/clock/mt7622-clk.h | 25 +++++++++++++------------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/drivers/clk/mediatek/clk-mt7622.c b/drivers/clk/mediatek/clk-mt7622.c index 0da7a848163..5df62e64c9a 100644 --- a/drivers/clk/mediatek/clk-mt7622.c +++ b/drivers/clk/mediatek/clk-mt7622.c @@ -472,6 +472,7 @@ static const struct mtk_gate peri_cgs[] = { GATE_PERI0(CLK_PERI_UART1_PD, CLK_TOP_AXI_SEL, 18), GATE_PERI0(CLK_PERI_UART2_PD, CLK_TOP_AXI_SEL, 19), GATE_PERI0(CLK_PERI_UART3_PD, CLK_TOP_AXI_SEL, 20), + GATE_PERI0(CLK_PERI_UART4_PD, CLK_TOP_AXI_SEL, 21), GATE_PERI0(CLK_PERI_BTIF_PD, CLK_TOP_AXI_SEL, 22), GATE_PERI0(CLK_PERI_I2C0_PD, CLK_TOP_AXI_SEL, 23), GATE_PERI0(CLK_PERI_I2C1_PD, CLK_TOP_AXI_SEL, 24), diff --git a/include/dt-bindings/clock/mt7622-clk.h b/include/dt-bindings/clock/mt7622-clk.h index 0820fab0a22..4b6501c1020 100644 --- a/include/dt-bindings/clock/mt7622-clk.h +++ b/include/dt-bindings/clock/mt7622-clk.h @@ -146,18 +146,19 @@ #define CLK_PERI_UART1_PD 13 #define CLK_PERI_UART2_PD 14 #define CLK_PERI_UART3_PD 15 -#define CLK_PERI_BTIF_PD 16 -#define CLK_PERI_I2C0_PD 17 -#define CLK_PERI_I2C1_PD 18 -#define CLK_PERI_I2C2_PD 19 -#define CLK_PERI_SPI1_PD 20 -#define CLK_PERI_AUXADC_PD 21 -#define CLK_PERI_SPI0_PD 22 -#define CLK_PERI_SNFI_PD 23 -#define CLK_PERI_NFI_PD 24 -#define CLK_PERI_NFIECC_PD 25 -#define CLK_PERI_FLASH_PD 26 -#define CLK_PERI_IRTX_PD 27 +#define CLK_PERI_UART4_PD 16 +#define CLK_PERI_BTIF_PD 17 +#define CLK_PERI_I2C0_PD 18 +#define CLK_PERI_I2C1_PD 19 +#define CLK_PERI_I2C2_PD 20 +#define CLK_PERI_SPI1_PD 21 +#define CLK_PERI_AUXADC_PD 22 +#define CLK_PERI_SPI0_PD 23 +#define CLK_PERI_SNFI_PD 24 +#define CLK_PERI_NFI_PD 25 +#define CLK_PERI_NFIECC_PD 26 +#define CLK_PERI_FLASH_PD 27 +#define CLK_PERI_IRTX_PD 28 /* APMIXEDSYS */ From patchwork Fri Aug 2 13:48:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Marangi X-Patchwork-Id: 1968519 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; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=Pi9PCPHr; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WbGhx72Hrz1yZl for ; Sat, 3 Aug 2024 05:53:05 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7809788C2F; Fri, 2 Aug 2024 21:52:10 +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="Pi9PCPHr"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6FC8C88C13; Fri, 2 Aug 2024 21:52:07 +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=-0.6 required=5.0 tests=BAYES_00, DATE_IN_PAST_06_12, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) (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 1E9E188C0F for ; Fri, 2 Aug 2024 21:52:05 +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=ansuelsmth@gmail.com Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-369c609d0c7so5744080f8f.3 for ; Fri, 02 Aug 2024 12:52:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722628324; x=1723233124; darn=lists.denx.de; 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=4Teuf3wh+jlnCCK3oJoJu0GluEUeNIQxEgMImDcPcQk=; b=Pi9PCPHrnmC0OF5T7D+XxSUWfv8gdma4qaEfUJEG6+5Mr3yFUXcOb2teYwuBqx4lfD SEe3udhKCk2umHkjHfljTTsai71WZd2mM6jLvsNcR3EpcLMkLVa0P8ia6uHhQ9V9xZul qQfvF3OPKlpjiqyFP2rzAVaOGXYbKl8z0IJ3ueSW0llChzRnwUnKbnjFwkH9l1D2EJJR mVk79HEsy3mQdfmNod1FDKtUbCIyQNSq+gL6bq45Cfut0s2KvcyNuepE9bJhumwF+6BN eaRLlS/auPEZNfC2GF0dbh4Wu4K4n9FSc92mtywX30z/QevYR2L3m4b7zomWZJvr3gVR gMuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722628324; x=1723233124; 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=4Teuf3wh+jlnCCK3oJoJu0GluEUeNIQxEgMImDcPcQk=; b=mUmXzApzNCFaAJHsCxt8OBIGRawp9n73U02THuHdTB5DLQn7gd7Su4ZyEKzhbdccHp f+X7QjAMWdtIdJexfgZdujZ8+WRfdghP2M0n9lBdcYeNCWWqkR1WwTu/bHPOrMSP/+mm 4czZrBsBCyG0XKzfMccIa2SrDr+E1CE9Wo9PzlBOcCCHpiGlq0+z+wuKKZ+U58dzRfaK DBn/Y5bwBYCJ5eurC24quPUpnOlarXwd4ZAG+f7t6M6ej1Md/+tmbbmRlT0mwMFTU9vl aBAxQC+JEtb5kabQWFo1wcMhQo7C5UX1Q6VPH0rglc8I7AOvWrnVN/MJLNZhi1/vT7GG YHqA== X-Forwarded-Encrypted: i=1; AJvYcCWUf9EKcW26pYWgqssqXHGrwvVpE3+msxGdIwKvQr00bklpkwpYvBHQZlmzY9TtkQk1PSK+KmUO+9J5hlotmVM+X4cCKA== X-Gm-Message-State: AOJu0Ywr4e3JCB3GTku5IhWgP9Fe92LfjjZPRDFDw1O8AEMeUGMhJGcs BrhG2MMP1C7adYr8EgBeiNTW9UJ0rEQDhOhTCYY/mJgMbEhnSaN6OUj3SQ== X-Google-Smtp-Source: AGHT+IHMFxoxwLaWJscAyA11WnL10VYUeNrYYzD1dws3A/v/ZyQQNnCMIOTYha+R8NtyvWYtqsmjAQ== X-Received: by 2002:a05:6000:402b:b0:368:6633:e23f with SMTP id ffacd0b85a97d-36bbc1a6749mr4327859f8f.38.1722628324381; Fri, 02 Aug 2024 12:52:04 -0700 (PDT) Received: from localhost.localdomain (host-87-6-196-30.retail.telecomitalia.it. [87.6.196.30]) by smtp.googlemail.com with ESMTPSA id ffacd0b85a97d-36bbd06d03fsm2643344f8f.91.2024.08.02.12.52.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Aug 2024 12:52:04 -0700 (PDT) From: Christian Marangi To: Lukasz Majewski , Sean Anderson , Ryder Lee , Weijie Gao , Chunfeng Yun , GSS_MTK_Uboot_upstream , Tom Rini , Christian Marangi , u-boot@lists.denx.de Subject: [PATCH 7/8] clk: mediatek: mt7622: add missing clock PERIBUS_SEL clock Date: Fri, 2 Aug 2024 15:48:31 +0200 Message-ID: <20240802134835.24006-8-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240802134835.24006-1-ansuelsmth@gmail.com> References: <20240802134835.24006-1-ansuelsmth@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 Add missing PERIBUS_SEL clock to match upstream linux clk ID order. Also convert pericfg to mux + gate implementation as now we have also mux on top of gates. Signed-off-by: Christian Marangi --- drivers/clk/mediatek/clk-mt7622.c | 22 +++++++++- include/dt-bindings/clock/mt7622-clk.h | 59 +++++++++++++------------- 2 files changed, 51 insertions(+), 30 deletions(-) diff --git a/drivers/clk/mediatek/clk-mt7622.c b/drivers/clk/mediatek/clk-mt7622.c index 5df62e64c9a..23b9787612a 100644 --- a/drivers/clk/mediatek/clk-mt7622.c +++ b/drivers/clk/mediatek/clk-mt7622.c @@ -422,6 +422,18 @@ static const struct mtk_gate infra_cgs[] = { }; /* pericfg */ +static const int peribus_ck_parents[] = { + CLK_TOP_SYSPLL1_D8, + CLK_TOP_SYSPLL1_D4, +}; + +#define PERI_MUX(_id, _parents, _reg, _shift, _width) \ + MUX_FLAGS(_id, _parents, _reg, _shift, _width, CLK_PARENT_TOPCKGEN) + +static const struct mtk_composite peri_muxes[] = { + PERI_MUX(CLK_PERIBUS_SEL, peribus_ck_parents, 0x05c, 0, 1), +}; + static const struct mtk_gate_regs peri0_cg_regs = { .set_ofs = 0x8, .clr_ofs = 0x10, @@ -602,6 +614,14 @@ static const struct mtk_clk_tree mt7622_infra_clk_tree = { .gates = infra_cgs, }; +static const struct mtk_clk_tree mt7622_peri_clk_tree = { + .xtal_rate = 25 * MHZ, + .muxes_offs = CLK_PERIBUS_SEL, + .gates_offs = CLK_PERI_THERM_PD, + .muxes = peri_muxes, + .gates = peri_cgs, +}; + static const struct mtk_clk_tree mt7622_clk_tree = { .xtal_rate = 25 * MHZ, .fdivs_offs = CLK_TOP_TO_USB3_SYS, @@ -658,7 +678,7 @@ static int mt7622_infracfg_probe(struct udevice *dev) static int mt7622_pericfg_probe(struct udevice *dev) { - return mtk_common_clk_gate_init(dev, &mt7622_clk_tree, peri_cgs); + return mtk_common_clk_infrasys_init(dev, &mt7622_peri_clk_tree); } static int mt7622_pciesys_probe(struct udevice *dev) diff --git a/include/dt-bindings/clock/mt7622-clk.h b/include/dt-bindings/clock/mt7622-clk.h index 4b6501c1020..cd11a1c901e 100644 --- a/include/dt-bindings/clock/mt7622-clk.h +++ b/include/dt-bindings/clock/mt7622-clk.h @@ -130,35 +130,36 @@ /* PERICFG */ -#define CLK_PERI_THERM_PD 0 -#define CLK_PERI_PWM1_PD 1 -#define CLK_PERI_PWM2_PD 2 -#define CLK_PERI_PWM3_PD 3 -#define CLK_PERI_PWM4_PD 4 -#define CLK_PERI_PWM5_PD 5 -#define CLK_PERI_PWM6_PD 6 -#define CLK_PERI_PWM7_PD 7 -#define CLK_PERI_PWM_PD 8 -#define CLK_PERI_AP_DMA_PD 9 -#define CLK_PERI_MSDC30_0_PD 10 -#define CLK_PERI_MSDC30_1_PD 11 -#define CLK_PERI_UART0_PD 12 -#define CLK_PERI_UART1_PD 13 -#define CLK_PERI_UART2_PD 14 -#define CLK_PERI_UART3_PD 15 -#define CLK_PERI_UART4_PD 16 -#define CLK_PERI_BTIF_PD 17 -#define CLK_PERI_I2C0_PD 18 -#define CLK_PERI_I2C1_PD 19 -#define CLK_PERI_I2C2_PD 20 -#define CLK_PERI_SPI1_PD 21 -#define CLK_PERI_AUXADC_PD 22 -#define CLK_PERI_SPI0_PD 23 -#define CLK_PERI_SNFI_PD 24 -#define CLK_PERI_NFI_PD 25 -#define CLK_PERI_NFIECC_PD 26 -#define CLK_PERI_FLASH_PD 27 -#define CLK_PERI_IRTX_PD 28 +#define CLK_PERIBUS_SEL 0 +#define CLK_PERI_THERM_PD 1 +#define CLK_PERI_PWM1_PD 2 +#define CLK_PERI_PWM2_PD 3 +#define CLK_PERI_PWM3_PD 4 +#define CLK_PERI_PWM4_PD 5 +#define CLK_PERI_PWM5_PD 6 +#define CLK_PERI_PWM6_PD 7 +#define CLK_PERI_PWM7_PD 8 +#define CLK_PERI_PWM_PD 9 +#define CLK_PERI_AP_DMA_PD 10 +#define CLK_PERI_MSDC30_0_PD 11 +#define CLK_PERI_MSDC30_1_PD 12 +#define CLK_PERI_UART0_PD 13 +#define CLK_PERI_UART1_PD 14 +#define CLK_PERI_UART2_PD 15 +#define CLK_PERI_UART3_PD 16 +#define CLK_PERI_UART4_PD 17 +#define CLK_PERI_BTIF_PD 18 +#define CLK_PERI_I2C0_PD 19 +#define CLK_PERI_I2C1_PD 20 +#define CLK_PERI_I2C2_PD 21 +#define CLK_PERI_SPI1_PD 22 +#define CLK_PERI_AUXADC_PD 23 +#define CLK_PERI_SPI0_PD 24 +#define CLK_PERI_SNFI_PD 25 +#define CLK_PERI_NFI_PD 26 +#define CLK_PERI_NFIECC_PD 27 +#define CLK_PERI_FLASH_PD 28 +#define CLK_PERI_IRTX_PD 29 /* APMIXEDSYS */ From patchwork Fri Aug 2 13:48:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Marangi X-Patchwork-Id: 1968520 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; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=SdXn3iq1; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WbGj825htz1yZl for ; Sat, 3 Aug 2024 05:53:16 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E211E88C4F; Fri, 2 Aug 2024 21:52:10 +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="SdXn3iq1"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8837E88BD6; Fri, 2 Aug 2024 21:52:08 +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=-0.6 required=5.0 tests=BAYES_00, DATE_IN_PAST_06_12, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [IPv6:2a00:1450:4864:20::333]) (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 4C6E488C59 for ; Fri, 2 Aug 2024 21:52:06 +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=ansuelsmth@gmail.com Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-428119da952so55186415e9.0 for ; Fri, 02 Aug 2024 12:52:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722628326; x=1723233126; darn=lists.denx.de; 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=lfH4aIp2Pym1F7OWELDXTty+Eh/EwM5/c+LsHcajr/k=; b=SdXn3iq1CjCqTBAQI1EI+qNtIrVL8al0reQmlAsDMkHAmqP5R852alLesQXvjv26ig EpwVmaQT3IHVA1ys9BPn7i6xaXheFLxXah9risgtOmvbsJspUQeGBPuBZK6tpfx9sj04 Tj5zeL2gjOwj6SkXKdp9QxziZz62jRWc8mMcIK4D5DeCJkTQjI9pj3eDUzDCJqfNa/Rz SHJTSNVdjXv9WLWP5cTzsdjNjdToibRVIHg7I3fZvzvAjl0p/eLKKOQKjzf7lYnpUWyn bF/cuW93awlGSeQ6DsLRGdLHaiGQzGEnf5hl2eZMCeoAdgz02L/ttj5I/L2u7P9IqBaS uiYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722628326; x=1723233126; 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=lfH4aIp2Pym1F7OWELDXTty+Eh/EwM5/c+LsHcajr/k=; b=iEhunz79E3bSuiOPyNA9R5FSPKhnGoaNyL8yMdKQe/v8w9VvOCGEHFvKCg6koDWMGX 8VlCYznef96gMo+adcrdJQeF6aiHvjgMr7hyaDWhJaP/r4NmpdLUyMrxYhwSfW9uPG/K hWquTU8s3edmoW+LqffAHBqCFVxtxN1cfui1px0il4cYs07S47oyWUqI8zftOtDuGqRu /Fai+triY5l8a76mMP9MopTQ7WkwW3gv/P3e1X/3uMF6rWwGM1mzTFt6b94cZ1nCd4ZP hhDvslnnx8VxiscmUJoIxfVF4N9LR6C0qL0ssJQRdHTai8W02f7cK1MK8aH5VqhF6lrT cXJw== X-Forwarded-Encrypted: i=1; AJvYcCV0AJOXwtjrBta6Vjftw+5c47MN/njQvgya7ruZ5mm6fM+4BYW8m88+fdMWl0zsFijDLm1iYl2InYRMuzePDuAcCMu1WQ== X-Gm-Message-State: AOJu0YxkbLeGArpUErV06dm/rWI2UBVLkOtxC816dk6hMMLnsBxVkvD+ YIaTRgigqM+e5vsKwNwHMireix0zD/kymJIEB+Rjaw6bXRLXzhVP X-Google-Smtp-Source: AGHT+IFfkOwaGRoLsuVYCiZh0c+OkbnZZY1jJizRUUbHfA7VKz358F1siU9HpI6rc69deODy48cpUA== X-Received: by 2002:a5d:634d:0:b0:368:5a86:c1b7 with SMTP id ffacd0b85a97d-36bbc1c22cbmr2774055f8f.55.1722628325579; Fri, 02 Aug 2024 12:52:05 -0700 (PDT) Received: from localhost.localdomain (host-87-6-196-30.retail.telecomitalia.it. [87.6.196.30]) by smtp.googlemail.com with ESMTPSA id ffacd0b85a97d-36bbd06d03fsm2643344f8f.91.2024.08.02.12.52.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Aug 2024 12:52:05 -0700 (PDT) From: Christian Marangi To: Lukasz Majewski , Sean Anderson , Ryder Lee , Weijie Gao , Chunfeng Yun , GSS_MTK_Uboot_upstream , Tom Rini , Christian Marangi , u-boot@lists.denx.de Subject: [PATCH 8/8] clk: mediatek: mt7622: add missing A1/2SYS clock ID Date: Fri, 2 Aug 2024 15:48:32 +0200 Message-ID: <20240802134835.24006-9-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240802134835.24006-1-ansuelsmth@gmail.com> References: <20240802134835.24006-1-ansuelsmth@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 Add missing A1/2SYS clock ID just as a reference for OF_UPSTREAM support. These clocks are not defined and are not usable as current clock topckgen OPs doesn't support gates. These special node won't ever be used by uboot hence just add them for reference. Signed-off-by: Christian Marangi Tested-by: Frank Wunderlich --- include/dt-bindings/clock/mt7622-clk.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/dt-bindings/clock/mt7622-clk.h b/include/dt-bindings/clock/mt7622-clk.h index cd11a1c901e..cdbcaef76eb 100644 --- a/include/dt-bindings/clock/mt7622-clk.h +++ b/include/dt-bindings/clock/mt7622-clk.h @@ -117,6 +117,8 @@ #define CLK_TOP_I2S1_MCK_DIV_PD 104 #define CLK_TOP_I2S2_MCK_DIV_PD 105 #define CLK_TOP_I2S3_MCK_DIV_PD 106 +#define CLK_TOP_A1SYS_HP_DIV_PD 107 +#define CLK_TOP_A2SYS_HP_DIV_PD 108 /* INFRACFG */