From nobody Tue Mar 4 15:26:02 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Z6ff33Fkqz5qDfl; Tue, 04 Mar 2025 15:26:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z6ff31DwSz3pXt; Tue, 04 Mar 2025 15:26:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741101963; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/mGrRmOVLPokIjf16xaqzl+xLJIVIw7+L047syGI4c8=; b=hXlcDJqlIdRZbuZ9xIroDpw6l92vbMJhdNmpimuN5+h3QHWPbD0q5yRRyftnQikeuEiuin Rv1fONg5NEJb2oGrRRFXh8NhhBj+wWxnIlGnviakNYTkA+QnIPfW0PoSZKo8yDrRc6vbaR cbh0cMnFqKKeiUJJKDb0SSwfkyOD8cKtnrv7mtHfQExLHX2l0gcqMSWLJ05wEM4ouyn/cj jRNMJY9Ni6XxAqAn6UO3POcC7Rc/0oMVJaZ6a26hZ2H94B8+UUoErjMUYfyzGFElIkDG6j c76eLGNmo/qo+Z2MzW3fk9c8lD5M7KrqxYY0BbSnqukRYpLbrVRuAmCcKFTzvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741101963; a=rsa-sha256; cv=none; b=q0KW9U/cwRL8lOYipYFK1zM3Vj8FHEpiVSgPoCF4C7+w5yhVsAat7VLV4zeVCOEXmVwo6o xvA4TGLw2sEOWGTPw5qGaDzvumhWbIMvV10jwuJWm2FAJru7h8qsEjpQMvLDItP6i+aUbs gtboF33ZeW90WYKhiyqfatb+LCf3vhDg2046pAJcRAHS6dvjEHj5XA3po80M4B3SoPWyBm 7hq7+f5JAba4wW589m2qqt19WbPWS9dUz/dcW9dDs8n87cOLUqUrNPV2GBHlGvYZQ4EbB+ jHimrmaJNUyzZPHAmklUXhuGMAy4Ih0XS0GUm/ezxnYqBu46tDVuwrM4Yptl2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741101963; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/mGrRmOVLPokIjf16xaqzl+xLJIVIw7+L047syGI4c8=; b=ppipdjqRxAqIEvIjjPAuzPAfqDnW18fBo5/p+hUHGv4xPr7p5qFdfqv5jQumtYIVdUukA6 6SVtRg8aRGw71kRzSDigGrH10v34/SnOrvhs2pSsNhr4Qm+xdNvSxDslmq4b/yIqaT1R1J 4PznI0R+1iL7g9r4BVt+s19dMroIIfppNfMn5B7aaSBvuGmEjrv9QYgAna6x6ObhiTpFPl kmtzK99D1Q49EV0NYCFWNOgFZM56DcW/B5LfLaNTMjDKQm+KqylbJM8ka3iyYbxSTncCD5 LKq2UVJNFjU4sHLMatoVzgKqQ88II9t+N5HJbqJ0Ave77IwFLgD60c3h/j8XdA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Z6ff30lCGz86h; Tue, 04 Mar 2025 15:26:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 524FQ3DS011978; Tue, 4 Mar 2025 15:26:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 524FQ2OA011975; Tue, 4 Mar 2025 15:26:02 GMT (envelope-from git) Date: Tue, 4 Mar 2025 15:26:02 GMT Message-Id: <202503041526.524FQ2OA011975@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 3816452ecac6 - main - Revert "riscv: enable allwinner RTC" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3816452ecac64dcd2708c67fe0a1193d5e06feac Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=3816452ecac64dcd2708c67fe0a1193d5e06feac commit 3816452ecac64dcd2708c67fe0a1193d5e06feac Author: Mitchell Horne AuthorDate: 2025-03-04 15:20:55 +0000 Commit: Mitchell Horne CommitDate: 2025-03-04 15:25:56 +0000 Revert "riscv: enable allwinner RTC" It caused a regression on A10/A20 platforms. Revert until the proper fix can be determined. This reverts commit 9ddd516b886218af809dbf40eeda1ed388e2879c. PR: 285054 Reported by: mmel --- sys/arm/allwinner/aw_rtc.c | 24 ++++++++---------------- sys/riscv/allwinner/files.allwinner | 1 - sys/riscv/conf/std.allwinner | 1 - 3 files changed, 8 insertions(+), 18 deletions(-) diff --git a/sys/arm/allwinner/aw_rtc.c b/sys/arm/allwinner/aw_rtc.c index a13c0e7d926e..9938601f17ce 100644 --- a/sys/arm/allwinner/aw_rtc.c +++ b/sys/arm/allwinner/aw_rtc.c @@ -134,7 +134,6 @@ static struct ofw_compat_data compat_data[] = { { "allwinner,sun7i-a20-rtc", (uintptr_t) &a20_conf }, { "allwinner,sun6i-a31-rtc", (uintptr_t) &a31_conf }, { "allwinner,sun8i-h3-rtc", (uintptr_t) &h3_conf }, - { "allwinner,sun20i-d1-rtc", (uintptr_t) &h3_conf }, { "allwinner,sun50i-h5-rtc", (uintptr_t) &h3_conf }, { "allwinner,sun50i-h6-rtc", (uintptr_t) &h3_conf }, { NULL, 0 } @@ -148,13 +147,11 @@ struct aw_rtc_softc { static struct clk_fixed_def aw_rtc_osc32k = { .clkdef.id = 0, - .clkdef.name = "osc32k", .freq = 32768, }; static struct clk_fixed_def aw_rtc_iosc = { .clkdef.id = 2, - .clkdef.name = "iosc", }; static void aw_rtc_install_clocks(struct aw_rtc_softc *sc, device_t dev); @@ -252,29 +249,24 @@ aw_rtc_install_clocks(struct aw_rtc_softc *sc, device_t dev) { phandle_t node; int nclocks; - /* - * If the device tree gives us specific output names for the clocks, - * use them. - */ node = ofw_bus_get_node(dev); nclocks = ofw_bus_string_list_to_array(node, "clock-output-names", &clknames); - if (nclocks > 0) { - if (nclocks != 3) { - device_printf(dev, - "Found %d clocks instead of 3, aborting\n", - nclocks); - return; - } + /* No clocks to export */ + if (nclocks <= 0) + return; - aw_rtc_osc32k.clkdef.name = clknames[0]; - aw_rtc_iosc.clkdef.name = clknames[2]; + if (nclocks != 3) { + device_printf(dev, "Having only %d clocks instead of 3, aborting\n", nclocks); + return; } clkdom = clkdom_create(dev); + aw_rtc_osc32k.clkdef.name = clknames[0]; if (clknode_fixed_register(clkdom, &aw_rtc_osc32k) != 0) device_printf(dev, "Cannot register osc32k clock\n"); + aw_rtc_iosc.clkdef.name = clknames[2]; aw_rtc_iosc.freq = sc->conf->iosc_freq; if (clknode_fixed_register(clkdom, &aw_rtc_iosc) != 0) device_printf(dev, "Cannot register iosc clock\n"); diff --git a/sys/riscv/allwinner/files.allwinner b/sys/riscv/allwinner/files.allwinner index 73fa9660e2d2..423a89c10c78 100644 --- a/sys/riscv/allwinner/files.allwinner +++ b/sys/riscv/allwinner/files.allwinner @@ -1,6 +1,5 @@ arm/allwinner/aw_gpio.c optional gpio aw_gpio fdt -arm/allwinner/aw_rtc.c optional aw_rtc fdt arm/allwinner/aw_syscon.c optional syscon arm/allwinner/aw_sid.c optional aw_sid nvmem arm/allwinner/aw_timer.c optional aw_timer fdt diff --git a/sys/riscv/conf/std.allwinner b/sys/riscv/conf/std.allwinner index 2b1e0d4e09dc..1bf6b027a4cb 100644 --- a/sys/riscv/conf/std.allwinner +++ b/sys/riscv/conf/std.allwinner @@ -7,7 +7,6 @@ options SOC_ALLWINNER_D1 device aw_ccu # Allwinner clock controller device aw_gpio # Allwinner GPIO controller -device aw_rtc # Allwinner Real-time Clock device aw_sid # Allwinner Secure ID EFUSE device aw_timer # Allwinner Timer device aw_usbphy # Allwinner USB PHY