From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 41956C77B73 for ; Tue, 30 May 2023 22:46:32 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3110286013; Wed, 31 May 2023 00:46:30 +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="UdWN4uZN"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0853D85561; Wed, 31 May 2023 00:46:28 +0200 (CEST) Received: from mail-io1-xd2b.google.com (mail-io1-xd2b.google.com [IPv6:2607:f8b0:4864:20::d2b]) (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 B372B86013 for ; Wed, 31 May 2023 00:46:25 +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=aford173@gmail.com Received: by mail-io1-xd2b.google.com with SMTP id ca18e2360f4ac-7748d634a70so346800639f.2 for ; Tue, 30 May 2023 15:46:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685486784; x=1688078784; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=AZuZ1nkRQYdWQnd/TafB0cXAHHG2IFdOHXcZQTavQFI=; b=UdWN4uZNRWM3YSg/zMpYO4UAlLRRDeHV4Js8qGztv6Q19XJTbxoJFr/9eX8IfirjHv tf+bCnXESpAGspHkJ4CzhC4y4IQ+nzX+j6/qndyxeUQ+iygkXxDL5MkPI+ma4ELNFWQV e70b/5fP1/GgZDjL8amZzpz+vsmT5iHHch0bTD/4I8F54MOtrPEvrS+CBCTtFTQCc+g9 08YxatCkMrE1NYxFwHN51TwXIzXYbCG4yzfxp7QHvc2bxr38hBHmYs1g5AHF5yQMZrM0 FfWZb0lYyA6RWgZTAX5i8q2n5XLC1KDI4q6kEfGOPqDQpTxTGRJS6rsaJpWZZhOm2Mmt 0mtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685486784; x=1688078784; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=AZuZ1nkRQYdWQnd/TafB0cXAHHG2IFdOHXcZQTavQFI=; b=SJJBdnnLeu9hcpcm1IgXFCTErGE3NiRJNkd7ZvBDhoneqnj3pCRGcztRM6kg8bKkod 3Yp+VpA+s/WYGrZ8SkSDTFbx7BQTGvDU232L4cEesVOwuEA5tDGJVd5gyrQFYi4EAU1d 1DOUSg6CSGcVtVg4pQFayWxP5cPwOrhh4lXHoFzGLiBxPinS2Hj9zA/XE1SeiAgs+un2 CrbABGm9LYIsNLre96C4OQPci/eg8zjYkEpzIPFNxDiNpQAmQaWV1VvK1TMd1LpZ89VC eAqV4bQzm/n6F07pKQsVO9s1KUhWsfVuJ406OjPaazVXniOcf4PKn+h40dr02UanftV6 rLZw== X-Gm-Message-State: AC+VfDxRGGcNhy7bfT7Qq+lZFeHrNkoqS/AuhYVzRnpgSQsn9A3Lpl7p KIrOJae4Ej/+TWAHL7bxoJN73xw+PCM= X-Google-Smtp-Source: ACHHUZ5LLPBC3z0HdPzQPJEzmdT/2oTpZX0JF162qwTvkezCOfDgJlffhsyggjtxqnJ139SPhRl8JA== X-Received: by 2002:a6b:6805:0:b0:763:5555:a6a2 with SMTP id d5-20020a6b6805000000b007635555a6a2mr2605518ioc.10.1685486783717; Tue, 30 May 2023 15:46:23 -0700 (PDT) Received: from aford-B741.lan ([2601:447:d001:897f:a03:64d7:b383:bf1d]) by smtp.gmail.com with ESMTPSA id t13-20020a05663801ed00b004090c67f155sm1020440jaq.91.2023.05.30.15.46.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 May 2023 15:46:23 -0700 (PDT) From: Adam Ford To: u-boot@lists.denx.de Cc: tharvey@gateworks.com, aford@beaconembedded.com, Adam Ford , Stefano Babic , Fabio Estevam , "NXP i.MX U-Boot Team" , Lukasz Majewski , Sean Anderson Subject: [PATCH 1/2] clk: imx8mp: Update clocks based on kernel 6.4-RC4 Date: Tue, 30 May 2023 17:45:57 -0500 Message-Id: <20230530224558.9340-1-aford173@gmail.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean There are some newer clocks added to the kernel recently, so to fix prepare for resycing the device trees, update the clock list. Since there are some minor changes to the USB clocks, update which USB clocks are enabled to match with the upstream kernel as well. Signed-off-by: Adam Ford diff --git a/drivers/clk/imx/clk-imx8mp.c b/drivers/clk/imx/clk-imx8mp.c index 09bef596f2..a21a3ce34b 100644 --- a/drivers/clk/imx/clk-imx8mp.c +++ b/drivers/clk/imx/clk-imx8mp.c @@ -337,7 +337,8 @@ static int imx8mp_clk_probe(struct udevice *dev) clk_dm(IMX8MP_CLK_UART2_ROOT, imx_clk_gate4("uart2_root_clk", "uart2", base + 0x44a0, 0)); clk_dm(IMX8MP_CLK_UART3_ROOT, imx_clk_gate4("uart3_root_clk", "uart3", base + 0x44b0, 0)); clk_dm(IMX8MP_CLK_UART4_ROOT, imx_clk_gate4("uart4_root_clk", "uart4", base + 0x44c0, 0)); - clk_dm(IMX8MP_CLK_USB_ROOT, imx_clk_gate4("usb_root_clk", "usb_core_ref", base + 0x44d0, 0)); + clk_dm(IMX8MP_CLK_USB_ROOT, imx_clk_gate2("usb_root_clk", "hsio_axi", base + 0x44d0, 0)); + clk_dm(IMX8MP_CLK_USB_SUSP, imx_clk_gate2("usb_suspend_clk", "clock-osc-24m", base + 0x44d0, 0)); clk_dm(IMX8MP_CLK_USB_PHY_ROOT, imx_clk_gate4("usb_phy_root_clk", "usb_phy_ref", base + 0x44f0, 0)); clk_dm(IMX8MP_CLK_USDHC1_ROOT, imx_clk_gate4("usdhc1_root_clk", "usdhc1", base + 0x4510, 0)); clk_dm(IMX8MP_CLK_USDHC2_ROOT, imx_clk_gate4("usdhc2_root_clk", "usdhc2", base + 0x4520, 0)); diff --git a/include/dt-bindings/clock/imx8mp-clock.h b/include/dt-bindings/clock/imx8mp-clock.h index 9d5cc2ddde..3f28ce685f 100644 --- a/include/dt-bindings/clock/imx8mp-clock.h +++ b/include/dt-bindings/clock/imx8mp-clock.h @@ -324,8 +324,18 @@ #define IMX8MP_CLK_CLKOUT2_SEL 317 #define IMX8MP_CLK_CLKOUT2_DIV 318 #define IMX8MP_CLK_CLKOUT2 319 - -#define IMX8MP_CLK_END 320 +#define IMX8MP_CLK_USB_SUSP 320 +#define IMX8MP_CLK_AUDIO_AHB_ROOT IMX8MP_CLK_AUDIO_ROOT +#define IMX8MP_CLK_AUDIO_AXI_ROOT 321 +#define IMX8MP_CLK_SAI1_ROOT 322 +#define IMX8MP_CLK_SAI2_ROOT 323 +#define IMX8MP_CLK_SAI3_ROOT 324 +#define IMX8MP_CLK_SAI5_ROOT 325 +#define IMX8MP_CLK_SAI6_ROOT 326 +#define IMX8MP_CLK_SAI7_ROOT 327 +#define IMX8MP_CLK_PDM_ROOT 328 +#define IMX8MP_CLK_MEDIA_LDB_ROOT 329 +#define IMX8MP_CLK_END 330 #define IMX8MP_CLK_AUDIOMIX_SAI1_IPG 0 #define IMX8MP_CLK_AUDIOMIX_SAI1_MCLK1 1 -- 2.39.2