Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/2218606/?format=api
{ "id": 2218606, "url": "http://patchwork.ozlabs.org/api/patches/2218606/?format=api", "web_url": "http://patchwork.ozlabs.org/project/uboot/patch/20260401-casey-ccf-clk-prep-v2-2-16a78c8c62da@linaro.org/", "project": { "id": 18, "url": "http://patchwork.ozlabs.org/api/projects/18/?format=api", "name": "U-Boot", "link_name": "uboot", "list_id": "u-boot.lists.denx.de", "list_email": "u-boot@lists.denx.de", "web_url": null, "scm_url": null, "webscm_url": null, "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20260401-casey-ccf-clk-prep-v2-2-16a78c8c62da@linaro.org>", "list_archive_url": null, "date": "2026-04-01T14:34:03", "name": "[v2,2/7] clk: move U-Boot CCF to clk/uccf", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "8a87184137fe037e0898e0c29253abd08fa646dc", "submitter": { "id": 90679, "url": "http://patchwork.ozlabs.org/api/people/90679/?format=api", "name": "Casey Connolly", "email": "casey.connolly@linaro.org" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/uboot/patch/20260401-casey-ccf-clk-prep-v2-2-16a78c8c62da@linaro.org/mbox/", "series": [ { "id": 498343, "url": "http://patchwork.ozlabs.org/api/series/498343/?format=api", "web_url": "http://patchwork.ozlabs.org/project/uboot/list/?series=498343", "date": "2026-04-01T14:34:02", "name": "clk: prepare for adding Linux CCF port", "version": 2, "mbox": "http://patchwork.ozlabs.org/series/498343/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2218606/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2218606/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<u-boot-bounces@lists.denx.de>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@legolas.ozlabs.org", "Authentication-Results": [ "legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256\n header.s=google header.b=KVX9oB/c;\n\tdkim-atps=neutral", "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de\n (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de;\n envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org)", "phobos.denx.de;\n dmarc=pass (p=none dis=none) header.from=linaro.org", "phobos.denx.de;\n spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de", "phobos.denx.de;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=linaro.org header.i=@linaro.org header.b=\"KVX9oB/c\";\n\tdkim-atps=neutral", "phobos.denx.de;\n dmarc=pass (p=none dis=none) header.from=linaro.org", "phobos.denx.de;\n spf=pass smtp.mailfrom=casey.connolly@linaro.org" ], "Received": [ "from phobos.denx.de (phobos.denx.de\n [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fm6vJ6FR6z1yCp\n\tfor <incoming@patchwork.ozlabs.org>; Thu, 02 Apr 2026 01:34:36 +1100 (AEDT)", "from h2850616.stratoserver.net (localhost [IPv6:::1])\n\tby phobos.denx.de (Postfix) with ESMTP id 48F998412A;\n\tWed, 1 Apr 2026 16:34:20 +0200 (CEST)", "by phobos.denx.de (Postfix, from userid 109)\n id 8080284109; Wed, 1 Apr 2026 16:34:18 +0200 (CEST)", "from mail-wm1-x333.google.com (mail-wm1-x333.google.com\n [IPv6:2a00:1450:4864:20::333])\n (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits))\n (No client certificate requested)\n by phobos.denx.de (Postfix) with ESMTPS id 39C7A840AB\n for <u-boot@lists.denx.de>; Wed, 1 Apr 2026 16:34:15 +0200 (CEST)", "by mail-wm1-x333.google.com with SMTP id\n 5b1f17b1804b1-48558d6ef83so70099265e9.3\n for <u-boot@lists.denx.de>; Wed, 01 Apr 2026 07:34:15 -0700 (PDT)", "from lion.localdomain (p4fc3dd86.dip0.t-ipconnect.de.\n [79.195.221.134]) by smtp.gmail.com with ESMTPSA id\n 5b1f17b1804b1-4887e80a63esm161821795e9.3.2026.04.01.07.34.13\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Wed, 01 Apr 2026 07:34:14 -0700 (PDT)" ], "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,\n DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED,\n SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=linaro.org; s=google; t=1775054055; x=1775658855; darn=lists.denx.de;\n h=cc:to:in-reply-to:references:message-id:content-transfer-encoding\n :mime-version:subject:date:from:from:to:cc:subject:date:message-id\n :reply-to; bh=OCnS3ZlhvvW3XbeEgO9yZIoCnqN7iRGngRVh2eKOPzw=;\n b=KVX9oB/ck6mn3WNQwUFtPzPxhjAz+GczSidHDOo3LoxU0LLbaFvxIIN6IH1wZnh3s4\n NdRSKRKBhQnYSnJPgAjag36MZHMHtMeggZPxGtnBvPLVkGeWmMAHvR5uv2wdcXgmTXMV\n e7S67eFH1nDolAMY4IWEKcfen2O2Cg7v+3msea6fl2wG6i5r3ThcORQTRDZ1aklper/M\n if7G69kYbdBBQvZr2hBFTMLY4efFcFDANZ1KI7uKCmZfVjD3E/kA9s+pjZFXFDMkI16P\n Kp7v8TAKaHxt33fKJhDF2P7eQN+eihu0xhLzEZsH7X7C2fS8T8gvrBjALtj54HzoI0dS\n otAg==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1775054055; x=1775658855;\n h=cc:to:in-reply-to:references:message-id:content-transfer-encoding\n :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to\n :cc:subject:date:message-id:reply-to;\n bh=OCnS3ZlhvvW3XbeEgO9yZIoCnqN7iRGngRVh2eKOPzw=;\n b=lWRKG6uSRTbuXc2ZwsK8hghSP6uKgcnCehOWox/JmFTsmVmYyRGjy/OP2nJ9HBN8qV\n wknTISS+A40E3EkJoF2uzI1YxnYvGsFzb5jv03qtqjsVCHeDgZ8yfruY4TDmSWQRgmM5\n wxbrxGU7cr7UGZMzsoCDMSGFiscpjmSWVMYRQoAx0m3xZBIsZq4XyFYHmLMTvEMzVPzB\n n/j5ZN4KlwHb5LaruhMEkMdwMqqdDN9bM24/MAUHzVa8dq+gKyJISbOCPBkgavZBoN65\n TQkL/Nv+feXwZMtcMBR2k5A1T7VTz38iNn/QzNKiZ5fS1WO2tKv2uv656FE3zbXy3s65\n bLtQ==", "X-Forwarded-Encrypted": "i=1;\n AJvYcCU/0UOTzardB/cF4lkYc+DTlH2UngzfU3+sJ4Vm3Q/suYPTDw3bY0KcaSwnxApIh8RO2HTMf+c=@lists.denx.de", "X-Gm-Message-State": "AOJu0Yxu/kbIjn2JaOJx6PJpx2k4hfUnKxqxmMNTW5i7iQS7b/K29hG/\n +2zYJ6eWJfuooWKesVhoAPShTSS3FblBSBAApDxFuia/hwXRVJjgpI78g88X6o3cOec=", "X-Gm-Gg": "ATEYQzwH5T3Rqu6/e70g9uDnlJfbR3eeuIws82i5nH4iI2LNRtOergwACH5K89715GO\n sxPFTysUcOenYPSBp7bdP1B/Myvyc1NAhHLGmp4efgYBGWmuOndmh+dt5f77HTGGFicY1jLv15h\n ixUjTKPRjrIEsa7mYu2WpRRIvndRaCIFZTH71s61akYOGotdFE4UWaFRxIl3C+fzRpnfYNY+SPw\n cLk6+fOQEoHm3ScvHBF4gTt2oLfKECITsCvd67lvQsmtEBGR5SG0gIdni6nTVklX6Ou0Qul0/Nn\n uIIClshxUhn9lzky/ceZNGdtL4V39QV2HLjGTVaI9DsV0DOJWndlYXQCL8l1xS+Uy7vpqPOpr7j\n mbf5uR/nlOX8COXm/sJnCx1W2Vpt2D2O5H+FS35HOIBJPS0Pih4+2P7Fd12kypN6iVI+awm8wWZ\n DCQiFxolUEJjF3te//pxuBpG7rLXKb/vcPuuqk+7l7KTEJ5Fs1usbBT+gRI4i1MY1QmUmC", "X-Received": "by 2002:a05:600d:8:b0:486:ffa3:594 with SMTP id\n 5b1f17b1804b1-488835b760amr57222135e9.23.1775054055029;\n Wed, 01 Apr 2026 07:34:15 -0700 (PDT)", "From": "Casey Connolly <casey.connolly@linaro.org>", "Date": "Wed, 01 Apr 2026 16:34:03 +0200", "Subject": "[PATCH v2 2/7] clk: move U-Boot CCF to clk/uccf", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=\"utf-8\"", "Content-Transfer-Encoding": "7bit", "Message-Id": "<20260401-casey-ccf-clk-prep-v2-2-16a78c8c62da@linaro.org>", "References": "<20260401-casey-ccf-clk-prep-v2-0-16a78c8c62da@linaro.org>", "In-Reply-To": "<20260401-casey-ccf-clk-prep-v2-0-16a78c8c62da@linaro.org>", "To": "Tom Rini <trini@konsulko.com>, Lukasz Majewski <lukma@denx.de>,\n Marek Vasut <marex@denx.de>", "Cc": "Casey Connolly <casey.connolly@linaro.org>,\n Neil Armstrong <neil.armstrong@linaro.org>,\n Quentin Schulz <quentin.schulz@cherry.de>,\n Mattijs Korpershoek <mkorpershoek@kernel.org>, u-boot@lists.denx.de,\n u-boot-amlogic@groups.io, u-boot-qcom@groups.io", "X-Mailer": "b4 0.15-dev-47773", "X-Developer-Signature": "v=1; a=openpgp-sha256; l=9240;\n i=casey.connolly@linaro.org; h=from:subject:message-id;\n bh=/RAbNGoLPbHbhn8quS6iAUljDwLpWmzJA+HtFCQI1Qk=;\n b=owGbwMvMwCFYaeA6f6eBkTjjabUkhsyzOo/2HEm18d9l41qb89ejsib5SFZxWFt3pUNrL4f6U\n dfp4tc6SlkYBDkYZMUUWcRPLLNsWnvZXmP7ggswc1iZQIYwcHEKwETSGhj+J588eaNvw6r159WW\n 5hvMS0nRmpKhefiN0o5uh9+S6akz4xn+u/XaJu7JK605Mun6+etTfKtXOUz55a1ussD8LsPl1i3\n FYgA=", "X-Developer-Key": "i=casey.connolly@linaro.org; a=openpgp;\n fpr=83B24DA7FE145076BC38BB250CD904EB673A7C47", "X-BeenThere": "u-boot@lists.denx.de", "X-Mailman-Version": "2.1.39", "Precedence": "list", "List-Id": "U-Boot discussion <u-boot.lists.denx.de>", "List-Unsubscribe": "<https://lists.denx.de/options/u-boot>,\n <mailto:u-boot-request@lists.denx.de?subject=unsubscribe>", "List-Archive": "<https://lists.denx.de/pipermail/u-boot/>", "List-Post": "<mailto:u-boot@lists.denx.de>", "List-Help": "<mailto:u-boot-request@lists.denx.de?subject=help>", "List-Subscribe": "<https://lists.denx.de/listinfo/u-boot>,\n <mailto:u-boot-request@lists.denx.de?subject=subscribe>", "Errors-To": "u-boot-bounces@lists.denx.de", "Sender": "\"U-Boot\" <u-boot-bounces@lists.denx.de>", "X-Virus-Scanned": "clamav-milter 0.103.8 at phobos.denx.de", "X-Virus-Status": "Clean" }, "content": "Prepare for the introduction of full CCF support by moving the existing\nU-Boot CCF support to a uccf subdirectory.\n\nDue to a number of incompatibilities it won't be possible to support\nexisting U-Boot CCF clocks with the full CCF, this allows us to support\nboth. While it may make sense to remove U-Boot CCF in the future, it may\nbe necessary to continue supporting it to meet space/memory requirements\nin SPL for some platforms.\n\nSigned-off-by: Casey Connolly <casey.connolly@linaro.org>\n---\n drivers/clk/Kconfig | 51 +++++++---------------\n drivers/clk/Makefile | 7 ++-\n drivers/clk/uccf/Kconfig | 22 ++++++++++\n drivers/clk/uccf/Makefile | 11 +++++\n drivers/clk/{ => uccf}/clk-composite.c | 0\n drivers/clk/{ => uccf}/clk-divider.c | 0\n drivers/clk/{ => uccf}/clk-fixed-factor.c | 0\n drivers/clk/{ => uccf}/clk-gate.c | 0\n drivers/clk/{ => uccf}/clk-mux.c | 0\n drivers/clk/{ => uccf}/clk.c | 0\n .../{clk_sandbox_ccf.c => uccf/clk_sandbox_uccf.c} | 2 +-\n include/sandbox-clk.h | 2 +-\n 12 files changed, 54 insertions(+), 41 deletions(-)", "diff": "diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig\nindex c88931c8ec4d..5cc76cd55cc8 100644\n--- a/drivers/clk/Kconfig\n+++ b/drivers/clk/Kconfig\n@@ -10,8 +10,24 @@ config CLK\n \t a particular clock rate and check on available clocks. Clocks can\n \t feed into other clocks in a tree structure, with multiplexers to\n \t choose the source for each clock.\n \n+source \"drivers/clk/uccf/Kconfig\"\n+\n+config SANDBOX_CLK_CCF\n+\tbool \"Sandbox U-Boot Common Clock Framework [uCCF] support\"\n+\tdepends on SANDBOX && (CLK_CCF || CLK_CCF_FULL)\n+\thelp\n+\t Enable this option if you want to test the Linux kernel's Common\n+\t Clock Framework [CCF] code in U-Boot's Sandbox clock driver.\n+\n+config CLK_COMPOSITE_CCF\n+\tbool \"Common Clock Framework [CCF] composite clk support\"\n+\tdepends on CLK_CCF || CLK_CCF_FULL\n+\thelp\n+\t Enable this option if you want to (re-)use the Linux kernel's Common\n+\t Clock Framework [CCF] composite code in U-Boot's clock driver.\n+\n config CLK_AUTO_ID\n \tbool \"Enable support of an unique clock id with several provider\"\n \tdepends on CLK\n \thelp\n@@ -66,35 +82,8 @@ config CLK_BOSTON\n \tselect SYSCON\n \thelp\n \t Enable this to support the clocks\n \n-config SPL_CLK_CCF\n-\tbool \"SPL Common Clock Framework [CCF] support\"\n-\tdepends on SPL\n-\thelp\n-\t Enable this option if you want to (re-)use the Linux kernel's Common\n-\t Clock Framework [CCF] code in U-Boot's SPL.\n-\n-config SPL_CLK_COMPOSITE_CCF\n-\tbool \"SPL Common Clock Framework [CCF] composite clk support\"\n-\tdepends on SPL_CLK_CCF\n-\thelp\n-\t Enable this option if you want to (re-)use the Linux kernel's Common\n-\t Clock Framework [CCF] composite code in U-Boot's SPL.\n-\n-config CLK_CCF\n-\tbool \"Common Clock Framework [CCF] support\"\n-\thelp\n-\t Enable this option if you want to (re-)use the Linux kernel's Common\n-\t Clock Framework [CCF] code in U-Boot's clock driver.\n-\n-config CLK_COMPOSITE_CCF\n-\tbool \"Common Clock Framework [CCF] composite clk support\"\n-\tdepends on CLK_CCF\n-\thelp\n-\t Enable this option if you want to (re-)use the Linux kernel's Common\n-\t Clock Framework [CCF] composite code in U-Boot's clock driver.\n-\n config CLK_GPIO\n \tbool \"GPIO-controlled clock gate driver\"\n \tdepends on CLK\n \thelp\n@@ -180,16 +169,8 @@ config CLK_OCTEON\n \tdefault y\n \thelp\n \t Enable this to support the clocks on Octeon MIPS platforms.\n \n-config SANDBOX_CLK_CCF\n-\tbool \"Sandbox Common Clock Framework [CCF] support\"\n-\tdepends on SANDBOX\n-\tselect CLK_CCF\n-\thelp\n-\t Enable this option if you want to test the Linux kernel's Common\n-\t Clock Framework [CCF] code in U-Boot's Sandbox clock driver.\n-\n config CLK_SCMI\n \tbool \"Enable SCMI clock driver\"\n \tdepends on CLK\n \tdepends on SCMI_FIRMWARE\ndiff --git a/drivers/clk/Makefile b/drivers/clk/Makefile\nindex f96d57a3223a..30991e9f55d7 100644\n--- a/drivers/clk/Makefile\n+++ b/drivers/clk/Makefile\n@@ -6,14 +6,14 @@\n \n obj-$(CONFIG_$(PHASE_)CLK) += clk-uclass.o\n obj-$(CONFIG_$(PHASE_)CLK) += clk_fixed_rate.o\n obj-$(CONFIG_$(PHASE_)CLK) += clk_fixed_factor.o\n-obj-$(CONFIG_$(PHASE_)CLK_CCF) += clk.o clk-divider.o clk-mux.o clk-gate.o\n-obj-$(CONFIG_$(PHASE_)CLK_CCF) += clk-fixed-factor.o\n-obj-$(CONFIG_$(PHASE_)CLK_COMPOSITE_CCF) += clk-composite.o\n obj-$(CONFIG_$(PHASE_)CLK_GPIO) += clk-gpio.o\n obj-$(CONFIG_$(PHASE_)CLK_STUB) += clk-stub.o\n \n+# U-Boot/IMX \"micro\" CCF port\n+obj-$(CONFIG_$(PHASE_)CLK_CCF) += uccf/\n+\n obj-y += adi/\n obj-y += airoha/\n obj-y += analogbits/\n obj-$(CONFIG_$(PHASE_)MACH_IMX) += imx/\n@@ -57,7 +57,6 @@ obj-$(CONFIG_CLK_XLNX_CLKWZRD) += clk-xlnx-clock-wizard.o\n obj-$(CONFIG_CLK_ZYNQ) += clk_zynq.o\n obj-$(CONFIG_CLK_ZYNQMP) += clk_zynqmp.o\n obj-$(CONFIG_CLK_ICS8N3QV01) += ics8n3qv01.o\n obj-$(CONFIG_MACH_PIC32) += clk_pic32.o\n-obj-$(CONFIG_SANDBOX_CLK_CCF) += clk_sandbox_ccf.o\n obj-$(CONFIG_SANDBOX) += clk_sandbox.o\n obj-$(CONFIG_SANDBOX) += clk_sandbox_test.o\ndiff --git a/drivers/clk/uccf/Kconfig b/drivers/clk/uccf/Kconfig\nnew file mode 100644\nindex 000000000000..bf4a634a403f\n--- /dev/null\n+++ b/drivers/clk/uccf/Kconfig\n@@ -0,0 +1,22 @@\n+\n+\n+config SPL_CLK_CCF\n+\tbool \"SPL U-Boot Common Clock Framework [uCCF] support\"\n+\tdepends on SPL\n+\thelp\n+\t Enable this option if you want to (re-)use the Linux kernel's Common\n+\t Clock Framework [CCF] code in U-Boot's SPL.\n+\n+config SPL_CLK_COMPOSITE_CCF\n+\tbool \"SPL U-Boot Common Clock Framework [uCCF] composite clk support\"\n+\tdepends on SPL_CLK_CCF\n+\thelp\n+\t Enable this option if you want to (re-)use the Linux kernel's Common\n+\t Clock Framework [CCF] composite code in U-Boot's SPL.\n+\n+config CLK_CCF\n+\tbool \"U-Boot Common Clock Framework [uCCF] support\"\n+\thelp\n+\t Enable this option if you want to (re-)use the Linux kernel's Common\n+\t Clock Framework [CCF] code in U-Boot's clock driver.\n+\ndiff --git a/drivers/clk/uccf/Makefile b/drivers/clk/uccf/Makefile\nnew file mode 100644\nindex 000000000000..02440b5e322c\n--- /dev/null\n+++ b/drivers/clk/uccf/Makefile\n@@ -0,0 +1,11 @@\n+# SPDX-License-Identifier: GPL-2.0+\n+#\n+# Copyright (c) 2015 Google, Inc\n+# Wolfgang Denk, DENX Software Engineering, wd@denx.de.\n+#\n+\n+obj-$(CONFIG_$(PHASE_)CLK_CCF) += clk.o clk-divider.o clk-mux.o clk-gate.o\n+obj-$(CONFIG_$(PHASE_)CLK_CCF) += clk-fixed-factor.o\n+obj-$(CONFIG_$(PHASE_)CLK_COMPOSITE_CCF) += clk-composite.o\n+\n+obj-$(CONFIG_SANDBOX_CLK_CCF) += clk_sandbox_uccf.o\ndiff --git a/drivers/clk/clk-composite.c b/drivers/clk/uccf/clk-composite.c\nsimilarity index 100%\nrename from drivers/clk/clk-composite.c\nrename to drivers/clk/uccf/clk-composite.c\ndiff --git a/drivers/clk/clk-divider.c b/drivers/clk/uccf/clk-divider.c\nsimilarity index 100%\nrename from drivers/clk/clk-divider.c\nrename to drivers/clk/uccf/clk-divider.c\ndiff --git a/drivers/clk/clk-fixed-factor.c b/drivers/clk/uccf/clk-fixed-factor.c\nsimilarity index 100%\nrename from drivers/clk/clk-fixed-factor.c\nrename to drivers/clk/uccf/clk-fixed-factor.c\ndiff --git a/drivers/clk/clk-gate.c b/drivers/clk/uccf/clk-gate.c\nsimilarity index 100%\nrename from drivers/clk/clk-gate.c\nrename to drivers/clk/uccf/clk-gate.c\ndiff --git a/drivers/clk/clk-mux.c b/drivers/clk/uccf/clk-mux.c\nsimilarity index 100%\nrename from drivers/clk/clk-mux.c\nrename to drivers/clk/uccf/clk-mux.c\ndiff --git a/drivers/clk/clk.c b/drivers/clk/uccf/clk.c\nsimilarity index 100%\nrename from drivers/clk/clk.c\nrename to drivers/clk/uccf/clk.c\ndiff --git a/drivers/clk/clk_sandbox_ccf.c b/drivers/clk/uccf/clk_sandbox_uccf.c\nsimilarity index 98%\nrename from drivers/clk/clk_sandbox_ccf.c\nrename to drivers/clk/uccf/clk_sandbox_uccf.c\nindex 9b8036d41aac..9c74ed940acd 100644\n--- a/drivers/clk/clk_sandbox_ccf.c\n+++ b/drivers/clk/uccf/clk_sandbox_uccf.c\n@@ -112,9 +112,9 @@ static const struct clk_ops clk_gate2_ops = {\n \t.disable = clk_gate2_disable,\n \t.get_rate = clk_generic_get_rate,\n };\n \n-struct clk *sandbox_clk_register_gate2(struct device *dev, const char *name,\n+struct clk *sandbox_clk_register_gate2(struct udevice *dev, const char *name,\n \t\t\t\t const char *parent_name,\n \t\t\t\t unsigned long flags, void __iomem *reg,\n \t\t\t\t u8 bit_idx, u8 cgr_val,\n \t\t\t\t u8 clk_gate2_flags)\ndiff --git a/include/sandbox-clk.h b/include/sandbox-clk.h\nindex c2616c27a44a..eb02a474c741 100644\n--- a/include/sandbox-clk.h\n+++ b/include/sandbox-clk.h\n@@ -57,9 +57,9 @@ static inline struct clk *sandbox_clk_gate(const char *name, const char *parent,\n \treturn clk_register_gate(NULL, name, parent, CLK_SET_RATE_PARENT,\n \t\t\t\t reg, bit_idx, clk_gate_flags, NULL);\n }\n \n-struct clk *sandbox_clk_register_gate2(struct device *dev, const char *name,\n+struct clk *sandbox_clk_register_gate2(struct udevice *dev, const char *name,\n \t\t\t\t const char *parent_name,\n \t\t\t\t unsigned long flags,\n \t\t\t\t void __iomem *reg, u8 bit_idx,\n \t\t\t\t u8 cgr_val, u8 clk_gate_flags);\n", "prefixes": [ "v2", "2/7" ] }