From nobody Thu Sep 21 16:00:17 2023 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 4Rs0V96zBGz4tcm7; Thu, 21 Sep 2023 16:00:17 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rs0V94CP6z4Rqd; Thu, 21 Sep 2023 16:00:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695312017; 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=98Nmz5lDUu7O2hh9G1B5Z+PeJkSE6fiEeTloM0DwZR4=; b=lhnq1lVlZKfJat9fz9UMUmYBJJXRfktbYMNUgABkjwb6dEo79hfvym7YQ08J8So5GWxugE IIEEJbxKY0yMMfmgwNqjvTvbmaiGQ/mqox5vlJyCIfB0jjYdpbyQTGSIA2XreEUwUSicHd LIlDLC+6CU1wKAB1wFSJsVKG3jDfxFePhh/pQNRxaIhJ1IQXmKh/UyQYt3KEkFzpbGmASu E6EWNRz2lMMBvu28xy1ArgKYCYRdypjdkT0KmFEX7ayTyOZtj830qhpNK6x8bmutVFPZiX QZlN3BycdS/2vWq/21w/W+NkvZdQlcnXoemsCFVz8k0gfOhFSa1tpi/40MhvNg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695312017; a=rsa-sha256; cv=none; b=UUNWGkakh6D4hwjp8yuj5KnaEmohUUKVrbr1PLlMcAeXeVQgI8BbxDfYhFvuL9JJj9XEzy ET+EK34DPFPdfyovyY3P8Z++kuODKVWLxZy2VYX+L3DW1QeXBJ+smBiWNfUUiPx6+0dEUu HAsf69cno68wezLwCNGbeOOuklIiJZq8S3JeaaEyIGtcWZgRQ7wylbU4aRmLcq4COG5l9B 3orikXbzbxaT0CeyC7ogql3M2FYNKXOh+mZMo1q2ww7h/VcRu2Lcx0K0SNrCJVG6j7Xtgj 9Zj31f3svttK8t9HNY8XOeqoIwWwb5FQ9dl/tfTYvXNvUSZxIEdGzXz/kRihgQ== 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=1695312017; 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=98Nmz5lDUu7O2hh9G1B5Z+PeJkSE6fiEeTloM0DwZR4=; b=o7OwUCCodh1C/KLVBKMFYnQva4U95UfuwPS66Gg8Jz97RbnFYcbmdP3E0lxX3o7XILdeh1 ZoMikC6TT2C047YpYevCpFjxUBYzUQg9TtcTMpWwqf8KQpkWg8d3ePp4zEEm7BfNtbooxR aerksV75Li1DpeoLzUzzyr6qjSxvQspO0+HkJ6Efhq4KsuWh+L7gr4UZp58H5rrIfjC858 wovE0A97MPSOwszpAxSnrTPH57FrvU2qxYdWl0/67PtDh9ZQ5wktcb64wlJ1vNrRhDYCTO syNYou2MRtcnsURTu/RISIPTDLYMfmGP0hANgX6cc67eP+yTRYpuSeASrvQ+Kg== 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 4Rs0V93JZczlTM; Thu, 21 Sep 2023 16:00:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38LG0Hj4050211; Thu, 21 Sep 2023 16:00:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38LG0HhR050203; Thu, 21 Sep 2023 16:00:17 GMT (envelope-from git) Date: Thu, 21 Sep 2023 16:00:17 GMT Message-Id: <202309211600.38LG0HhR050203@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 3d2ccc352db5 - main - arm64: rockchip: rk3399_pmucru: Use GATE macro 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3d2ccc352db54b9fb11c4c1373a577e3e9d25114 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=3d2ccc352db54b9fb11c4c1373a577e3e9d25114 commit 3d2ccc352db54b9fb11c4c1373a577e3e9d25114 Author: Emmanuel Vadot AuthorDate: 2023-09-21 10:58:48 +0000 Commit: Emmanuel Vadot CommitDate: 2023-09-21 15:49:32 +0000 arm64: rockchip: rk3399_pmucru: Use GATE macro It make it easier to read the code and the register number --- sys/arm64/rockchip/clk/rk3399_pmucru.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/sys/arm64/rockchip/clk/rk3399_pmucru.c b/sys/arm64/rockchip/clk/rk3399_pmucru.c index 64df47468efd..9af438254a02 100644 --- a/sys/arm64/rockchip/clk/rk3399_pmucru.c +++ b/sys/arm64/rockchip/clk/rk3399_pmucru.c @@ -46,6 +46,8 @@ #include +#define CRU_CLKGATE_CON(x) (0x100 + (x) * 0x4) + /* GATES */ #define PCLK_PMU 20 @@ -58,13 +60,13 @@ static struct rk_cru_gate rk3399_pmu_gates[] = { /* PMUCRU_CLKGATE_CON1 */ - CRU_GATE(PCLK_PMU, "pclk_pmu", "pclk_pmu_src", 0x104, 0) - CRU_GATE(PCLK_GPIO0_PMU, "pclk_gpio0_pmu", "pclk_pmu_src", 0x104, 3) - CRU_GATE(PCLK_GPIO1_PMU, "pclk_gpio1_pmu", "pclk_pmu_src", 0x104, 4) - CRU_GATE(PCLK_I2C0_PMU, "pclk_i2c0_pmu", "pclk_pmu_src", 0x104, 7) - CRU_GATE(PCLK_I2C4_PMU, "pclk_i2c4_pmu", "pclk_pmu_src", 0x104, 8) - CRU_GATE(PCLK_I2C8_PMU, "pclk_i2c8_pmu", "pclk_pmu_src", 0x104, 9) - CRU_GATE(PCLK_RKPWM_PMU, "pclk_rkpwm_pmu", "pclk_pmu_src", 0x104, 10) + GATE(PCLK_PMU, "pclk_pmu", "pclk_pmu_src", 1, 0), + GATE(PCLK_GPIO0_PMU, "pclk_gpio0_pmu", "pclk_pmu_src", 1, 3), + GATE(PCLK_GPIO1_PMU, "pclk_gpio1_pmu", "pclk_pmu_src", 1, 4), + GATE(PCLK_I2C0_PMU, "pclk_i2c0_pmu", "pclk_pmu_src", 1, 7), + GATE(PCLK_I2C4_PMU, "pclk_i2c4_pmu", "pclk_pmu_src", 1, 8), + GATE(PCLK_I2C8_PMU, "pclk_i2c8_pmu", "pclk_pmu_src", 1, 9), + GATE(PCLK_RKPWM_PMU, "pclk_rkpwm_pmu", "pclk_pmu_src", 1, 10) }; /*