From nobody Mon May 16 12:09:50 2022 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 5A7011ADE409; Mon, 16 May 2022 12:09:52 +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 4L1yjq1wxWz4cTj; Mon, 16 May 2022 12:09:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652702991; 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=xCC42F2+0YIk7txpREcWgG/SuXXdIBH2CmiWfUPA01A=; b=pn/usuD2RN4GV4A8zjfMObcKfZh8eYVAjVFJOMogsiJQC5vGxsqBWTXQGZN8Z7OrqBAot6 gS0cbgZtGD3fvBSqKBn3cECkLFHYLKVJxI9k910WFYN49ixTLxg0M64ukYtjaKX0vDRCU2 7itLKFbW8BvWs9h/so6O8Klt8pfc8o4KbbbBdr/K7dblxXe3DFirho8273E8/O7O38qY4z 2b/n+J2oTdUKlvKhvIH9wclw7OQdYBXntuv8H+2Bq9qaeai0ig/uJl7KBJCgnpBpcgkL4i 8eJJT3On9yVjun7iKIUVP/lP9di2e22IGOm6Jo0gBkvGQBOuVH9h8AZc6KYMwQ== 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 C3D541F6FA; Mon, 16 May 2022 12:09:50 +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 24GC9oim035403; Mon, 16 May 2022 12:09:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24GC9oeo035402; Mon, 16 May 2022 12:09:50 GMT (envelope-from git) Date: Mon, 16 May 2022 12:09:50 GMT Message-Id: <202205161209.24GC9oeo035402@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 21e581b11c0e - stable/13 - vf_i2c: Make ext_resources non-optional 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 21e581b11c0ee2b093dadbb7062f66bc9d459513 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652702991; 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=xCC42F2+0YIk7txpREcWgG/SuXXdIBH2CmiWfUPA01A=; b=Ta+FMVe08kl3jz/uaWxQM/IU34I4quTaXZzKmhlwUs7lDYZtCsgj8inISjUWbca66cGrbY vem7MQwERKU4oQxZoDHr3kYIBWi4nbd+F5hfl+Q1hXPRcfCxzEGGNO+11tb1pjLtyoGJqq /PSsodRd151IRxwcGXR6mUfZwpsyQpj++d8aBqFR/fbm0SWChZdPBQQ8gwi0dLy8bj53eG 8gFsOQL6PJolTnMae+2VJaLBkXC9+MBAUd6BmX/m9pe+PxqdEzhi/FIOUUX4eZP/nuS2Vz T7FIzIq16IVK17zg6kJxli99N0sGfgFEGQ5MwbJbHoUSTEevQOBkj0oc9m6jWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652702991; a=rsa-sha256; cv=none; b=YuvLntHx33isoUubPupuu/Dc4TMD0nrCi/OOnraTmKhBoItwxaUmAWiE4iuUylw/7MZ0CI 42l8r0jhcheT3lrI9VKfBCzvna5oBEbBeKUSsDXfPfoXWmbnKe3nd56CB6oqGfaVi9BbJL 5ay2uw49I6TAWx34/ICVcoc8UQS17SSXx/epIw/zcm9KxEriiDoiC6UjXGp2nH7EpnJZHQ KQemaV8nMIXvyRnsFcCMSwt0eUIsq37a4AuGS5fR62t+0ErrmW0k4gIoqQSDG67oYGRPUY GwIxZHSe6oDLMRia2Ra2e7/CO+l9mhYP3+4y5UG2bKHToZu2ZC9y/pcVxcc22w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=21e581b11c0ee2b093dadbb7062f66bc9d459513 commit 21e581b11c0ee2b093dadbb7062f66bc9d459513 Author: Emmanuel Vadot AuthorDate: 2022-01-11 09:51:06 +0000 Commit: Emmanuel Vadot CommitDate: 2022-05-16 11:45:38 +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 (cherry picked from commit 4bcdfeb06fc7e7463904a8a89d7e45b277f21483) --- 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