From patchwork Sat Aug 3 08:43:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Marangi X-Patchwork-Id: 1968691 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=hpzM+abf; 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 4Wbg7G0mPyz1ybX for ; Sat, 3 Aug 2024 21:13:46 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 496C188CAB; Sat, 3 Aug 2024 13:13:07 +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="hpzM+abf"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id BE0EE88CAB; Sat, 3 Aug 2024 13:13:05 +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,UPPERCASE_50_75 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 4229488C8B for ; Sat, 3 Aug 2024 13:13: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-wm1-x331.google.com with SMTP id 5b1f17b1804b1-428e0d184b4so19356335e9.2 for ; Sat, 03 Aug 2024 04:13:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722683583; x=1723288383; 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=hpzM+abfj1bEwykDhGdItm/jxpSvr7uE8Hby2RGuu8TZoyljeWGMzQZALGdv7t3Rk9 px/N/MbW5Ior9JEckWh5v4HLVvtLJ+oP2nDmluxUdlF0/jjp//BuZIq8Ttfk2Zxi7VKC Gep7Ru1VP7qADFO8J3ZedXj27+jx+sVU4lDqWnGd0yySkxnKRnnVOIcYhS6MfL/6IV/M pVbJpCNjh0E+6M2kfcyol5dIZpWCOP3/bSyxA1w34rPVYq/Z94BhTsZw8y/vNr1DrTST 5BJCYbJHpBE6RtsEKxfKJBwz0eWRo/g89IfAbXO2MNSAOza/+Eu0fWAs5kZ7GJLp5aPc 7Uhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722683583; x=1723288383; 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=ORhil6VGuaBgQGq7zvZA11F1A6VzkOi9VQ07GAZ/Mmh7XAITp4tVAUA2Y4tfxpsV6K /lqijLVvJbndQvXD4TdwroNpo2FwYv9R3FmaDbwRGv6bHhN4B7TCvChP/lCfPQPllW5w eK+6VYUhhQhtRHaowKN69zXZ9R4uLxBa/MwKg5CTE5SYvytlSZ4DUAGojd13pbl7kWRF z55GzdIp6Borh26v/NWGoCF8zAUpjdG0o564Jtx5dJCbh6shqjHqYL7JZtcJKAWQAs2E oFgomixS7lOB6druIM+asyHcPZyzvVAsJDvWzs7vF7CyTHVXRxGZ7/DXxXEaeLYgkQU6 JOOg== X-Forwarded-Encrypted: i=1; AJvYcCUL388XPH6GqmwVgacEipjegb1nvGjOO6qXBdy62hJ0l9kpRUwgwL0XTodCEoCYqALK5KQsMhnLzNJFQTd/mEvL6zwrgQ== X-Gm-Message-State: AOJu0YzPAoKGa+eSSOIHOnArZG3z9TxgwW7OcJrS7etYbl5dQwzM85dg fpCzYi95zI7fjEDnop91Oo4Nglk7KMsTU0Bwa4StNVzYy84cA9xW X-Google-Smtp-Source: AGHT+IEAE3nK/hI5oeFYrxmRHso95FIZisvxRjneRvV41b3R4l5LUU7CRMmAffKsIYaBu/1dpXrkhg== X-Received: by 2002:a05:600c:3111:b0:426:5c9b:dee6 with SMTP id 5b1f17b1804b1-428e6b7f2c7mr40694525e9.26.1722683582378; Sat, 03 Aug 2024 04:13:02 -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 5b1f17b1804b1-428e6d648a0sm63835655e9.10.2024.08.03.04.13.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Aug 2024 04:13: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 v2 1/8] clk: mediatek: mt7622: fix broken peri_cgs clk with XTAL parents Date: Sat, 3 Aug 2024 10:43:19 +0200 Message-ID: <20240803084329.1688-2-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240803084329.1688-1-ansuelsmth@gmail.com> References: <20240803084329.1688-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 Sat Aug 3 08:43:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Marangi X-Patchwork-Id: 1968692 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=HGoRXHif; 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 4Wbg7S1Nzqz1ybX for ; Sat, 3 Aug 2024 21:13:56 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B915E88C87; Sat, 3 Aug 2024 13:13: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="HGoRXHif"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A6C7588C6D; Sat, 3 Aug 2024 13:13: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=-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 autolearn=ham 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 321C088CBF for ; Sat, 3 Aug 2024 13:13:04 +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-3687fb526b9so4472907f8f.0 for ; Sat, 03 Aug 2024 04:13:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722683584; x=1723288384; 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=HGoRXHifB81ofo9yyyplBtKqGG25NL2HMQzQnGfu369lGY4btWpTEAmvHP1N4KAPo/ Hi9wPPDyXHXuVTIMcGCfg9FGEuDoBwdb65t++iSCtQMtr/vXiH4zhWmgnkMAaw1aS7cC p1jmxD2bItfc4R8vFDioP0m/tnQn37dJRCtUm5QtluO4tCwovpXPvLsYoWaSmJf+L9bB usyl3xBMl3bsB9eGzCqhnqGX8ZTqcdQjZKepa16HMsON55ET29jsWuC3Sz4nG5qGBOdS Yftahz4k/d9wyiG+EdjFu1uhpWa02bu4HUNJZ8jaT+mu2o3GwATjDPc4c57DNVMfhoku x+Cw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722683584; x=1723288384; 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=XMsRIeszm5EzZrzF0VRj4j43QCSCj8fRHray9DMbIrBXWirBinsfffr7p0H9xYUt18 DKVZtixskJimhTpSLQIO7b1or2rXzuCQRlkyVqk04UkkDaKLrFyzzXjH0e582CGS7vVs eKT8hkuSOabnKaLAQpTE1Il+d8faBeQfaa3COVl/R/hRe6m1xOVC0iwmjiT5AtVzCExz N82lmchB8/rzIf/WUhuuB63T5FGwQsKQL1DxUFEeCIbVC5OYFz28vMF3Ohce7NIuHOSh zBjsHa4U5roKZHvoFcZ2uqpy9ZVF6DytDEJqz690QYVMzrSJNcnSGXU3ZrG9xyxPCEQn JHSw== X-Forwarded-Encrypted: i=1; AJvYcCWdfmC55weeLz1OlbzYIT0gwjNZMZvHH4mkwpbjYYOB1/S3ghw5BzFGbCSHUhiCHCb5VC60YM4=@lists.denx.de X-Gm-Message-State: AOJu0YwfAPLmMCLwBiF5W6pYB2IaTYm1s1p2CuFIK+sb+jZVBGmsWyyn sh27rc5aUfRl60OEZOQ0JdF79LJJXoQ22RPS58WOGjUH0IrKPxYg X-Google-Smtp-Source: AGHT+IGEYseUTfHHAs0zZdsvhRtoyvSernVu8PRv/sRT0T4xVXHbzTB0W/zhiazi2V+nVOOItDg9RQ== X-Received: by 2002:a5d:42ce:0:b0:36b:a3f1:eb with SMTP id ffacd0b85a97d-36bbc1d2e59mr3550272f8f.53.1722683583600; Sat, 03 Aug 2024 04:13: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 5b1f17b1804b1-428e6d648a0sm63835655e9.10.2024.08.03.04.13.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Aug 2024 04:13:03 -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 v2 2/8] clk: mediatek: mt7622: rename AUDIO_AWB3 to AUDIO_AWB2 Date: Sat, 3 Aug 2024 10:43:20 +0200 Message-ID: <20240803084329.1688-3-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240803084329.1688-1-ansuelsmth@gmail.com> References: <20240803084329.1688-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 Sat Aug 3 08:43:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Marangi X-Patchwork-Id: 1968693 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=UmOq+HnS; 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 4Wbg7g2r0Nz1ybX for ; Sat, 3 Aug 2024 21:14:07 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 41E9C88CC0; Sat, 3 Aug 2024 13:13:09 +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="UmOq+HnS"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D1FF188C6D; Sat, 3 Aug 2024 13:13: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=-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 autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) (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 C5EC088C74 for ; Sat, 3 Aug 2024 13:13: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-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-428e1915e18so18689695e9.1 for ; Sat, 03 Aug 2024 04:13:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722683585; x=1723288385; 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=UmOq+HnSm2envsQWli2ECtMgzKv7yk383pFclkPgtMZs96uJOrmtb+Mdt4rCkGyK0e wo6vG8Mf5hKrMdcXnuj2dL8DD1u3zKHPDk43SUACPqqzBgndQw/87mcsxVCyVaNwKszY vZ5I7hw+hxkd7mvvWNwQL3ed6h2GsX4pvqqFLRKT+9VgGrq0ibiq/0Ky//BpLVsO12Dl LO4DGwso1HzQ1t2CItqqqz5xLJ6SJxqukRwB1Muqqtiz0iWzej+79rOGceZCjoyATHfx A4vJqeDNguu/fm9vZE8nCLz8j8hk06SEze5TmsWNZOuhxBeFumS0nFX9Wixhw3pgnYql PXgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722683585; x=1723288385; 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=eSpOxnb/pLUGCxcb5+qjXCdwtxzkhD29NMyr9QlzaPIt7E+URE33qnyCyV1ZS7sEeb PQDUKc84T5ucVKrUunDkkwD83puwaAxzU/uOAhix61cw44ww2rfsnPf+ac3vUvIshhIL cXok5YB6ItJMXumKmvdcmbCic8PMPmkpmtCCcbY4HqdTEVosQMMO9HoBLn3HMLVTXomk uBfCli7dDnNv53RubQMOxOJqKBDO27EZjyhWWz/OK64RKzi1i6TUOloBx4tt6F6+Xwo/ b5iOjRooGVIw1sV2r6fhrdO6m3lOiKm1korLbetmqQnht7HOF9tSC2iJzBgcx0tlBozS GDUg== X-Forwarded-Encrypted: i=1; AJvYcCU5OL4iYumql2036KTLMl3AI4uPf0ou9+Ow8if5FUwAPwX7mill6EAMs3fDi1ige/rj7PAr/9GE4DmFSp60XV4txzPwCw== X-Gm-Message-State: AOJu0YyNd89mSyM5BjsLppKeWch/+R04LGnRRVdRTivYv/ECQes75Rgc 9sR+LBdEck0WMca20cXGFL5pnNy90S5NEqeBrAvxe9q3zbhxKXiR X-Google-Smtp-Source: AGHT+IHUvK+cmgHBq15K0imERxgQS60PZnPuuVjixzMXwNQT1L7WDHP6tIn0awV118khfyFA9VCiQA== X-Received: by 2002:a05:600c:4e90:b0:428:314:f08e with SMTP id 5b1f17b1804b1-428e6af4c75mr33191945e9.5.1722683584873; Sat, 03 Aug 2024 04:13: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 5b1f17b1804b1-428e6d648a0sm63835655e9.10.2024.08.03.04.13.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Aug 2024 04:13: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 v2 3/8] clk: mediatek: mt7622: move INFRA_TRNG to the bottom Date: Sat, 3 Aug 2024 10:43:21 +0200 Message-ID: <20240803084329.1688-4-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240803084329.1688-1-ansuelsmth@gmail.com> References: <20240803084329.1688-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 Sat Aug 3 08:43:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Marangi X-Patchwork-Id: 1968694 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=YKxSATdm; 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 4Wbg7s67XCz1ybX for ; Sat, 3 Aug 2024 21:14:17 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id AAA4288C93; Sat, 3 Aug 2024 13:13: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="YKxSATdm"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A487C88CC9; Sat, 3 Aug 2024 13:13:09 +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 autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [IPv6:2a00:1450:4864:20::330]) (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 D9F2F88C45 for ; Sat, 3 Aug 2024 13:13: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-x330.google.com with SMTP id 5b1f17b1804b1-4266dc7591fso57775805e9.0 for ; Sat, 03 Aug 2024 04:13:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722683586; x=1723288386; 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=YKxSATdm81Qj2wnQNEsC1WHEsKdcJBXAhOe+2CdDNCOIN2DqEs5xtMzPeDXMMHx/0s jS6JJ47UshfB4xYb8pglEL4jSUDDtH5LFHFNUCO2Md5A0u3q42hDEKRfDOq9gLjRhmKO DJKi0nS/QYH812DxQ8GzD0C46ctM+TXWr6ngQwtGYGsGE1bRw43BvWOALoZw/RUFAxoq JnQULR5uUl6oF8oOsnxPA5DLzEsheQRlFtzuGgUdqglXsjM5lEieW3wmdMlancpizMXo 5JI/ZTA40LKzpKK6pADOuwL8tSNGcZzors2r9ZYcGo1cBC3laOnwH6PqHW/zDR/ljhp+ 4FNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722683586; x=1723288386; 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=olP0VrClGArerrpvmT0P0+Z3ku7KxYBnHYT5o2IhQOM1u7dB7uJNYd0XhlR+tuksNo tzR+BESSfxnOtiVDudZQLyAeSpghqT/tFCp/II7kYWarFetmDiDwW1gFvXz7KtmazPyi xKtwKNYAZ9t9tpDxZ8rBifFjKgt/IfMpx0330gTi0M3Y5E0k8kFW5T+7Ad5UywHjz99V +sHhOZ/x1Lx5WZbTq+Aza9Wu44ulB9oRMiUtaz6FtUTkk19hVFNIcNloxugTYkofyTtr Ki13P4p18s9tOEwlMsYacOVDy/VaWveYKeI0/3vCE5xeg0YsyjM098Xne/6RdOqfH5/1 eLOg== X-Forwarded-Encrypted: i=1; AJvYcCWcYRR72QiQ8UoQbAilmE2luh673Vte9ZG1XNIQJ7whJWlgjHCmdqO5KTIjq+svrA5qPFipuVukr0nQyZp6zPKLmdmUDw== X-Gm-Message-State: AOJu0Yw4Tyi/uuJ9UCL5pI5q+vLKZphBnCNL9tXy6jlKs0YAsye9Mi99 ufhKNDvOKWGhDlZmcZglD/YDwXD65OvPH3W81jW24iv71K+lES6r X-Google-Smtp-Source: AGHT+IGhld0v0OJECw8G+gxiq4J2bGgWvXB/ropiZzhcIrZbtEkTdTFnPAVT+NmXIFXyx88eu9dBtA== X-Received: by 2002:a05:600c:3ca8:b0:426:5dde:627a with SMTP id 5b1f17b1804b1-428e6b7a333mr45233435e9.23.1722683586137; Sat, 03 Aug 2024 04:13:06 -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 5b1f17b1804b1-428e6d648a0sm63835655e9.10.2024.08.03.04.13.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Aug 2024 04:13: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 v2 4/8] clk: mediatek: mt7622: add missing clock define for MAIN_CORE_EN Date: Sat, 3 Aug 2024 10:43:22 +0200 Message-ID: <20240803084329.1688-5-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240803084329.1688-1-ansuelsmth@gmail.com> References: <20240803084329.1688-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 Sat Aug 3 08:43:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Marangi X-Patchwork-Id: 1968695 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=E+0ZeGsb; 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 4Wbg835LbRz1ybX for ; Sat, 3 Aug 2024 21:14:27 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1B67A88CBF; Sat, 3 Aug 2024 13:13:12 +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="E+0ZeGsb"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A4DCE88C89; Sat, 3 Aug 2024 13:13:10 +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 autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-lj1-x22a.google.com (mail-lj1-x22a.google.com [IPv6:2a00:1450:4864:20::22a]) (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 9B1C488C6D for ; Sat, 3 Aug 2024 13:13: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=ansuelsmth@gmail.com Received: by mail-lj1-x22a.google.com with SMTP id 38308e7fff4ca-2ef27bfd15bso113670091fa.2 for ; Sat, 03 Aug 2024 04:13:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722683588; x=1723288388; 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=E+0ZeGsb5XwqJZSUdM7L7HOUkY8RjJqky+nkaGz8qbM0UIgxlDvyHJImo708z5Nd0b apHUIDhEPZh3MeZjrhLfpLYEZX+/cu8w5Lz/ajh0OYTJ1Zb7hCPH4NjR/L4PBWLiIWWD 9sUuncEqMA+JLoSokPyMRTqiAL/kzGXYyvMnrbuvOTwCHXVYt05KI2N6XHkmmAQJiRNY Hw8s6mAGUcrnVUtg1CJKQ1b8aArFrU3Gj6MQN4dUExS6w45FODSCggyXRSkBGvVASiw4 oFL7q/fFic0HV3gEG9TCgvxX1CzUp0hSEaIDL7k4b3o+8AsrO0e5SpzIrmHrLkOLmTzX RG6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722683588; x=1723288388; 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=aPf/B84KKIEyX7alDd9nGZNpECJUkBrsOj79Wk1VrmdsvQyWK8udEyQOM8LrpuNvRN ypKN4DMwom4gTt5A5ELtW2J79uEE9gE9IvdEu3GAqhgGb94VqhcrfoEYI+4X9knN0leL wWpt29K+/WRA7Zxu8iXnOeOc6CwUrc/9Xr1taQKnpQi3AdeLtzUHA2jwvc+28cU3FYMn YD/fmzZCvv2d+LRnY1OWSS1E16sLx1ANP2JO/l/lGSFXGNApERTCQe/aRIsZsSAAjmiP hOAfPU7ahSCNBJ880NllnY1NEFWHrul+ufCGBaQZThMZbTglT1e8wzLeEzu1v5EbIjE9 zHxg== X-Forwarded-Encrypted: i=1; AJvYcCWmxDMW/MNZvfZMiePSyuUokIG2Cw94pFGq4QfXTXEiMZqWheXNPGOiDHw0wIheerfdWm4tgq/jPDfsnjJIf3l/35FYBg== X-Gm-Message-State: AOJu0YxBD/kThzCZcxgVimjbvc26RaHmeGE/kTaRjusTfWQLf/x9PF/n /7qWNfpyGABtTJTUfChdCCucZ6lve2IifDDRqq3u3/U/omHi3WZEV+9l7g== X-Google-Smtp-Source: AGHT+IHRVlLn9PeSoMpHZqyE9qm9a3xbQ5AeAQOYwp+0N5e/rqvKhIfXiwuC/MmX3fE9cx4DKK8tvA== X-Received: by 2002:a2e:720a:0:b0:2ee:7dfe:d99c with SMTP id 38308e7fff4ca-2f15ab0c434mr46080281fa.31.1722683587449; Sat, 03 Aug 2024 04:13:07 -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 5b1f17b1804b1-428e6d648a0sm63835655e9.10.2024.08.03.04.13.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Aug 2024 04:13:07 -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 v2 5/8] clk: mediatek: mt7622: add missing clock MUX1_SEL Date: Sat, 3 Aug 2024 10:43:23 +0200 Message-ID: <20240803084329.1688-6-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240803084329.1688-1-ansuelsmth@gmail.com> References: <20240803084329.1688-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 Sat Aug 3 08:43:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Marangi X-Patchwork-Id: 1968696 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=DQnM2DQr; 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 4Wbg8D5hR2z1ybX for ; Sat, 3 Aug 2024 21:14:36 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7528588CD0; Sat, 3 Aug 2024 13:13:12 +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="DQnM2DQr"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 863B488C86; Sat, 3 Aug 2024 13:13:11 +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 autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) (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 6AD7188C9D for ; Sat, 3 Aug 2024 13:13:09 +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-x32c.google.com with SMTP id 5b1f17b1804b1-428e1915e18so18689985e9.1 for ; Sat, 03 Aug 2024 04:13:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722683589; x=1723288389; 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=DQnM2DQrNIuDvSLSMzLEyoTa3aimSFt8SRDIWQgyGQxb+VZyQKbqVZw541yvknWt09 T8sOSOmnCB+ZS3bPfpLJ2VDhW59Sta8MEJM2uikRh1XeZJ9p51RvQvsAVVBRMfo2EVVr QvoSTxnJ3vX+0+skliBrwubZKV4I6sIqN8Dn6ldvLNER40gMJ5DqoVYz5PntcyNN089j ywdXEPVCC6z3NFaXkOObXR6dG3dTVqKCdqJ3kPKkV2CMmKpugwN4V3aD1dp+3hK+LhWW RC7iWyJYn8XgSho17JNC8x619PLtmEwcrGVE+Uz5Zxdo2Cp05hbtVB6iSd3tmeDwTOnl YmYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722683589; x=1723288389; 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=sxHd8lISxVCJM2Jj8zeL2MEZ2RXr3c/oCKgs+PS4t3Ip7vMiyIWi0R7JYFYoy224O6 gMGqPOpgA8dSIMuVkTQMZ2O6Ir6AFk+z6viZG3QTW98TywsM/HSf1QnSrH2ANZdWUUxb azCL7CuEumD7xgsuSu70kFkiwn3Mjb2uewrwlLQzsCoYfuLxAkY/ZCEYPQRTacCmMJY8 dxvwlUcqf4jBjRMaH4G6vwmRBPe9mBeIJ4fYn9nB2C9W94qXki1m6+J1izxoMaGjT6kf +r0hBOmkbPY8aBsL81Q0bzLVgL2lCsyBYTb+DJ6MgjrKMAW9kINe6x6S6ryiOnSLncGo hV6w== X-Forwarded-Encrypted: i=1; AJvYcCU9o8ffQ6qj8g5LHvKpG1zvGN8rGMz6Q2qMvDyE9WuMArQJD84RGguWA+JQjzIocqdW2nQ49UZ3RvGfVThYvGkLEv9RlA== X-Gm-Message-State: AOJu0YzjkNQkReSwQynWZrjyFWIMg8ywhyfQSymUxxiU1Y+EqWvFxzsd XCO1ygcUGS5lvOQNKxplpT7pAVWdFN0jfvk4h8i0FDQSY83c9mX+ X-Google-Smtp-Source: AGHT+IHuhG4PRSgG9qf1fxlR2KNq3pQFLQNp7FInU9hLCF+FhQGS2CzymNcSt+oFwGwVQyknkTe8yw== X-Received: by 2002:a05:600c:458c:b0:426:62c6:4341 with SMTP id 5b1f17b1804b1-428e6b30e41mr42485855e9.20.1722683588708; Sat, 03 Aug 2024 04:13:08 -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 5b1f17b1804b1-428e6d648a0sm63835655e9.10.2024.08.03.04.13.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Aug 2024 04:13:08 -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 v2 6/8] clk: mediatek: mt7622: add missing clock PERI_UART4_PD Date: Sat, 3 Aug 2024 10:43:24 +0200 Message-ID: <20240803084329.1688-7-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240803084329.1688-1-ansuelsmth@gmail.com> References: <20240803084329.1688-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 Sat Aug 3 08:43: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: 1968697 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=eW+r4rD9; 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 4Wbg8Q06Pdz1ybX for ; Sat, 3 Aug 2024 21:14:46 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E1E6288CC9; Sat, 3 Aug 2024 13:13:13 +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="eW+r4rD9"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9FE2788CD5; Sat, 3 Aug 2024 13:13:12 +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 autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) (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 AA98688C6D for ; Sat, 3 Aug 2024 13:13: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=ansuelsmth@gmail.com Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-4280b3a7efaso61412175e9.0 for ; Sat, 03 Aug 2024 04:13:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722683590; x=1723288390; 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=eW+r4rD9sCPU/4YcD/i/Esx2kPCvdoS0nPzu2f7KkBHmoI8ZY9Dn3sqGcJnXp8zzMH 3qwxeV01Pcmk78fpQadYiZ21XLcTtXSNcWy+5FGxQ0ddKuj0MJgsLoGeJm/MhQ2NF1S5 byM/yBBbmlWXNbOr69rB2AaQ6y2qK1xugGL702A9UTT0R3LNYUfZEm/5s/33IyR+gkPp fmDSsvb65iIcDyfHgJePvyTFck4pYzF7dl8KOSyVWzfB7W2+LmD3o2v4blVROgISc89E OW2Qk/RHrP1k4W71YRJcFE7pYutGBWvSFkGudCO1pf3DqkEvcLT2Fp3dpSe0Qgl6VSub Rdkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722683590; x=1723288390; 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=J2Np5SI/VGCwtgtl0L2I4OPvBL+wCb2AzFE6T1CeqlNOf5ee+b54Jkw9pkHLiPl83T uqy/w8qlX4WzY29yzPyrEOi6BTS2FguIY9yJwbrbZRPsXx+9hgmUkuQsoxkzONplJXke uHN9iLp8uW1ZKjOt0IHMVLvgVMnHEalK4m/pmM5ZpeQh2Hp4cakAOV6ky7pyDsc7lMIV Yd/bN/hqyH+zGaE9am38jZhxfnRN1YVGvnP3xLx6nzOyzOcmHkY/blYomLxqtfn3BPvt Lib0KfU7uokrU7SOJPOo3plxLhVQhCB0OhJq7p6LuotaBFHiY+K7qLbx1fLGE7S2aYgE +TPw== X-Forwarded-Encrypted: i=1; AJvYcCVz3e4SeBWkODOxY7OAQ4FbqHXsU6yQvHhYVUBzO1nerN94mM0f0+m6U1c+4lHxMMQX6aVlmP4A+mj8jqi9xcDZxXUyaQ== X-Gm-Message-State: AOJu0YyB9wYCbSF2Umn19CSS3KnsjXiH9CX0yyImZxE4lUNlwyYMgw1P lhJOUpD7DGwcN8LK8HbhwuSHird4skIK9LI4mpWeRMmHFlDaxrzdxTR4zA== X-Google-Smtp-Source: AGHT+IEgY67WpgAI2aALxECDHqxJuL3P/aVE/LDaqXNVnx4qYfY9vfgIVKkXL3JM5C/lSuNYaNMreQ== X-Received: by 2002:adf:a3d7:0:b0:368:4ed7:2acb with SMTP id ffacd0b85a97d-36bbc0c6b33mr3486882f8f.5.1722683590009; Sat, 03 Aug 2024 04:13:10 -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 5b1f17b1804b1-428e6d648a0sm63835655e9.10.2024.08.03.04.13.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Aug 2024 04:13:09 -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 v2 7/8] clk: mediatek: mt7622: add missing clock PERIBUS_SEL clock Date: Sat, 3 Aug 2024 10:43:25 +0200 Message-ID: <20240803084329.1688-8-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240803084329.1688-1-ansuelsmth@gmail.com> References: <20240803084329.1688-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 Sat Aug 3 08:43: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: 1968698 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=GYQ8JOIP; 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 4Wbg8b1HbMz1ybX for ; Sat, 3 Aug 2024 21:14:55 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 54A9388CCA; Sat, 3 Aug 2024 13:13:15 +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="GYQ8JOIP"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E6C8288CD1; Sat, 3 Aug 2024 13:13:13 +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 autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) (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 ED4FF88C45 for ; Sat, 3 Aug 2024 13:13:11 +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-x434.google.com with SMTP id ffacd0b85a97d-3683f56b9bdso4636161f8f.1 for ; Sat, 03 Aug 2024 04:13:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722683591; x=1723288391; 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=GYQ8JOIPOcfCUb7OFGOsJao9zhNc8OGdPLar6ZZtgeM87v8Qm1bgqKe2fwyYdw0fz9 t+x6qZhFMdKW2dUC2bkEn4GBRqo07qgwfIYrHM0Z+dkzVlLsSqUEIu0lFj1Q6ZMnK6WT U0rvSCqHxR1KtoYNvPkyWdWmzPg3SJxmhbBZAE+9fCCxXig5Q+UwRkPT0ypxkV5TyWQm IDIJpEs47MZMhogoF7FWIdfKdzFG/+erPHRFAPAdnyEtgCzjZT2Uf+knC5cu0fxnyNQt VOQTakZNmTL3kVOXRUM5XoZT3WOHkiHyotsc/Hwfz7ugloTZJUZ3CccnSK4vdjeibwwz Y6og== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722683591; x=1723288391; 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=auVWMbtT29K1k157Bx/bn9MJFTwEil3IuXQeKu/5RwMxj1SuLaJffDiaorYiNYtyVI aUEcz2bMj2jTm7SEOSNmtKGeAHuCmgsowovJFkVaT1wKS8ekV2tF+NaXZsCPfWQmnDuJ IIUEylzX3MD+SMDKMMcylx1c6VtcLxWIDwsitioCcO/3n1aPHMd9kgzrpzVdrk5W7Zeq lz7Du1HyG48mh63GSALS/OF2HifOQ+GZ1jWzdjq31atqD2xbVTTkRm3EZTTWxvgxdG/8 vHUjDSY8yZUFxxclXm+wfct+zz4ssv+G0LVBbk6sPlF7HtOQOc98IjkCi29d35RHiMs8 QRJQ== X-Forwarded-Encrypted: i=1; AJvYcCUgzWyl1FFCQSa7Wl1P/xomoNHf4fPc+YBdnSfjzftedbkXDsVIF525k9e9nc86N/Fi35mvsDEpkNo5YYD6pMbo+eFM9w== X-Gm-Message-State: AOJu0Yzl8sHdKDr5dzddW5/aevny4ygR/I3PQ67BLw92BpIsTfsLSs60 2NTOD5gSc0GeEWNNM1KWINsERxw12TYsZzcgZKOelwHECIohI0a+ X-Google-Smtp-Source: AGHT+IEhC6WZWZm4QILUt8tE6BRY+XN41LOxs/Z1De0E3jf4vaX8AUrbGdkzyku+DQZ5hU7FMtSytQ== X-Received: by 2002:a05:6000:124c:b0:360:7971:7e2c with SMTP id ffacd0b85a97d-36bbc194918mr4166537f8f.54.1722683591298; Sat, 03 Aug 2024 04:13:11 -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 5b1f17b1804b1-428e6d648a0sm63835655e9.10.2024.08.03.04.13.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Aug 2024 04:13:11 -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 v2 8/8] clk: mediatek: mt7622: add missing A1/2SYS clock ID Date: Sat, 3 Aug 2024 10:43:26 +0200 Message-ID: <20240803084329.1688-9-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240803084329.1688-1-ansuelsmth@gmail.com> References: <20240803084329.1688-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 --- 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 */