From nobody Mon Feb 21 16:29:57 2022 X-Original-To: dev-commits-src-main@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 A383E19DE68D; Mon, 21 Feb 2022 16:29:58 +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 4K2SSj6M7Cz4h3D; Mon, 21 Feb 2022 16:29:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645460998; 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=/zUdcGuPwIZA/vhHQfdQdaqXgRgvveHm0UT5Ysn7T/A=; b=w/hSbQeskLGeRp02GChAzPfdJrm/nOoRafl3ZAHp9XB6SfP/UOGPjIDLxIc4KDHibFatec XEaSu9CCMvijoQVdc4pMIWZbJ+eCAIrXHB+9tDWGrrCqWjv135CAg/wo4eAeB8VqaShaHO h7iB2vxKjF3lwjObkKzoRELZ0oPfDpOnbtVVkh5kjRhu+4OEJX+9bpYS39Tv49UC2sMTSX zB0rMftD1xwr6kuOdxCUfItN2SbnrteHCyPWqjjDoX1pOS1Xz1QneEyi+ct3+tez9IQ5ko 8JUmsD28qVXccEBrQEJU59hRowsY1aBljoti4YlNBxugT+onkptRAV8uVL86ug== 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 7519913830; Mon, 21 Feb 2022 16:29:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21LGTv7e008586; Mon, 21 Feb 2022 16:29:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21LGTvI2008585; Mon, 21 Feb 2022 16:29:57 GMT (envelope-from git) Date: Mon, 21 Feb 2022 16:29:57 GMT Message-Id: <202202211629.21LGTvI2008585@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: 4bcdfeb06fc7 - main - vf_i2c: Make ext_resources non-optional List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 4bcdfeb06fc7e7463904a8a89d7e45b277f21483 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645460998; 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=/zUdcGuPwIZA/vhHQfdQdaqXgRgvveHm0UT5Ysn7T/A=; b=deDsYFu8HYD7037/JOxpX3H9P6c8d5NZ4YjF9+eOxB5fndDN7pOmYATSkMcoOFqNtND7DB gMYmrmOiHsZpfZdr/OFDvdRq3iGh5T+qAEVOn30DGjQGAdwlVsPjyfK6zXbNeBShft1obL +7gRzRAd09Bpic91CYSoTRZB5ltzmZNxSG+h0ygbNU7m84BT5Jse2hvYjv0yJVUw/W58RK GnQqio/nRYNkngUTxggiEEKXKqsbVBF+E7xKvGWsHTyWQHAW83VP5I1N3vz4X+Ol3yoi3o kJLjnzjqsgX2UegJzPLYq0rASjZTX8J7F5mcijfUYTAsprOpYgLPAhivrMsj9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645460998; a=rsa-sha256; cv=none; b=vdqcH8X+IJL8J+aZq277Qu3nSD20nVyPdq+NFaWe1W8Qi6QVIySrqoopOrTgPlqlZv9VmU M2LX9S7ZSjNM+DPsyakmJYF9hWMqgjecfWW7AwkuHWuAl2EaXKJqpeljxSp9ZWX4fHBUmH 0VWaxrcL9Vz5jj1J+hkrEa0ExzY1CVfCtxCOECsuC8CWHsmlG5NOa/36Houv+yu4UlJQXa NyIUVleHp9nEaWN2oYNvNzPj6EDTjkvZ05pko6bswjFukKHoS6DahVCPtfXsV30qmgboPR bIx2qk9Rx7KcxQwtq/f4jnCyIzxazg5s22lk5pyUKugLMzPLu2GGvyb80bNObw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=4bcdfeb06fc7e7463904a8a89d7e45b277f21483 commit 4bcdfeb06fc7e7463904a8a89d7e45b277f21483 Author: Emmanuel Vadot AuthorDate: 2022-01-11 09:51:06 +0000 Commit: Emmanuel Vadot CommitDate: 2022-02-21 16:29:02 +0000 vf_i2c: Make ext_resources non-optional EXT_RESOURCES have been introduced in 12-CURRENT and all supported releases have it enabled in their kernel config. MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D33832 --- sys/arm/freescale/vybrid/vf_i2c.c | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/sys/arm/freescale/vybrid/vf_i2c.c b/sys/arm/freescale/vybrid/vf_i2c.c index a2636dee0b03..ba2a72fb2757 100644 --- a/sys/arm/freescale/vybrid/vf_i2c.c +++ b/sys/arm/freescale/vybrid/vf_i2c.c @@ -57,9 +57,7 @@ __FBSDID("$FreeBSD$"); #include #include -#ifdef EXT_RESOURCES #include -#endif #include #include @@ -118,10 +116,8 @@ struct i2c_softc { struct resource *res[2]; bus_space_tag_t bst; bus_space_handle_t bsh; -#ifdef EXT_RESOURCES clk_t clock; uint32_t freq; -#endif device_t dev; device_t iicbus; struct mtx mutex; @@ -134,7 +130,6 @@ static struct resource_spec i2c_spec[] = { { -1, 0 } }; -#ifdef EXT_RESOURCES static struct i2c_div_type vf610_div_table[] = { { 0x00, 20 }, { 0x01, 22 }, { 0x02, 24 }, { 0x03, 26 }, { 0x04, 28 }, { 0x05, 30 }, { 0x09, 32 }, { 0x06, 34 }, @@ -150,7 +145,6 @@ static struct i2c_div_type vf610_div_table[] = { { 0x3C, 2304 }, { 0x3D, 2560 }, { 0x3E, 3072 }, { 0x3F, 3840 }, { 0x3F, 3840 }, { 0x7B, 4096 }, { 0x7D, 5120 }, { 0x7E, 6144 }, }; -#endif static const struct ofw_compat_data i2c_compat_data[] = { {"fsl,mvf600-i2c", HW_MVF600}, @@ -176,15 +170,12 @@ static int i2c_attach(device_t dev) { struct i2c_softc *sc; -#ifdef EXT_RESOURCES phandle_t node; -#endif int error; sc = device_get_softc(dev); sc->dev = dev; sc->hwtype = ofw_bus_search_compatible(dev, i2c_compat_data)->ocd_data; -#ifdef EXT_RESOURCES node = ofw_bus_get_node(dev); error = clk_get_by_ofw_index(dev, node, 0, &sc->clock); @@ -198,7 +189,6 @@ i2c_attach(device_t dev) else sc->freq = 100000; } -#endif mtx_init(&sc->mutex, device_get_nameunit(dev), "I2C", MTX_DEF); @@ -445,7 +435,6 @@ static uint32_t i2c_get_div_val(device_t dev) { struct i2c_softc *sc; -#ifdef EXT_RESOURCES uint64_t clk_freq; int error, i; @@ -469,14 +458,6 @@ i2c_get_div_val(device_t dev) break; return vf610_div_table[i].reg_val; -#else - sc = device_get_softc(dev); - - if (sc->hwtype == HW_VF610) - return 0x3F; - else - return 20; -#endif } static int