From nobody Wed Sep 07 07:59:42 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 4MMvmb5vtdz4bsCV; Wed, 7 Sep 2022 07:59:43 +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 4MMvmZ6vQ3z477S; Wed, 7 Sep 2022 07:59:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662537583; 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=GDjjunAzMu0OFcWYSRU84M+I+YK/3P1EXKKBwHNcMec=; b=tvwbInyZK9xWEUMm8Xcz98gf64jJl3dJ0/+Sj8//oD57Kp7vnvNrxBg6/QZy4z8aP5HMNO iKFp76/TW1aFj5MH5AGUxKGp8cjJzW+i8KPsljBL9i4elZYGEtwR5hqKlR7lqKSslW0AQQ cccPtPtdPUddeOPIyje4FvjwiH1NfGP3sJuMAOypr+QQ+fVXJuJ0XviD12p1jxMDdAUlt/ RhEfC3iegr8WclkOThWSl/u+Gty7zWwRemD8DlzUWGiaAo33UfsCmJuChhu6cISh/5n367 BoG04yAR3V/95i1MF3aIY21TcMyXUsSP7F0tcMCXmy9yFAemR3ktEbZs+MTPnw== 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 4MMvmZ5wNMzS7B; Wed, 7 Sep 2022 07:59:42 +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 2877xg7n082047; Wed, 7 Sep 2022 07:59:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2877xgBH082046; Wed, 7 Sep 2022 07:59:42 GMT (envelope-from git) Date: Wed, 7 Sep 2022 07:59:42 GMT Message-Id: <202209070759.2877xgBH082046@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Kornel=20Dul=C4=99ba?= Subject: git: 59c2babcabdc - main - mv_twsi: Use the clock API on armv7 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: kd X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 59c2babcabdc646f9429d795612a40ea6b32d75e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662537583; 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=GDjjunAzMu0OFcWYSRU84M+I+YK/3P1EXKKBwHNcMec=; b=fUcqWN1Z6nJCjXa/vtH22PFdp87jpMs0AxP72b/zCTrlYWo1vV7PC+AdOlRRVt/MH2bJFm 6f7CNtiVjXk45Oc8NCDSH64cL02BParS11ph+4n1p5qYtpZKF/aTeucfpoPTb+blcqceQR VebFX9ItjfnTUT2/yswuuq4jM6KJpCzvEYXpJIrN9BGP8HWB9dUB1ccULqbCeDgZu7OnmW DIj82fznxQcnb/n3kjMaaFXPteI7wtsBMPNjElFb7XhIHKXnJUJci5HclWEyOsjbJ2GPEk EfILS1IJA07K0I9YutArydP0qTkOBxHZgQodPcnmJi+xAFF4XAx5sR0IWiGyYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662537583; a=rsa-sha256; cv=none; b=hx8YjN6pTgFulI1fmCWJ+IWyU4mfaJ8CXrek05BsirTwfBlSPyE1DwZB/rVnI6Y0aS33h/ aem7qGx/LPUqDJsVYndMb2AdP/Wu+J8WFyPtEsTy5gcN1BHOY8CGOCxxO7CAI2n/FqmtxK ZOxXwtr3GNfICY6plqdlVbg3rLR9dy9ift+qGuhRg5dzWZUkm2IIb8eenUIsCIu/bb8hbe XvESkPf/X6STEsVdwj/1sAzlL3pE6MrAsMNT0CtlK1bKdglJixllb2XF8EIeRYHRg7urnX sXjTVZeORmQmU8VGyq8VBlVDdAAm7lW4M5D347ldm1UxxKy8rVDKGqfScmNM3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kd: URL: https://cgit.FreeBSD.org/src/commit/?id=59c2babcabdc646f9429d795612a40ea6b32d75e commit 59c2babcabdc646f9429d795612a40ea6b32d75e Author: Albert Jakieła AuthorDate: 2022-07-11 13:45:28 +0000 Commit: Kornel Dulęba CommitDate: 2022-09-07 07:44:59 +0000 mv_twsi: Use the clock API on armv7 With the addition of clkgen devices to the Armada38x, there is no longer any need to use the get_tclk() hack. Reviewed by: manu Obtained from: Semihalf Differential Revision: https://reviews.freebsd.org/D36456 --- sys/dev/iicbus/twsi/mv_twsi.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/sys/dev/iicbus/twsi/mv_twsi.c b/sys/dev/iicbus/twsi/mv_twsi.c index 2b4724d266cc..b2bd73a7df65 100644 --- a/sys/dev/iicbus/twsi/mv_twsi.c +++ b/sys/dev/iicbus/twsi/mv_twsi.c @@ -157,11 +157,7 @@ mv_twsi_cal_baud_rate(struct twsi_softc *sc, const uint32_t target, /* Calculate baud rate. */ m0 = n0 = 4; /* Default values on reset */ diff0 = 0xffffffff; -#ifdef __aarch64__ clk_get_freq(sc->clk_core, &clk); -#else - clk = get_tclk(); -#endif for (n = 0; n < 8; n++) { for (m = 0; m < 16; m++) { @@ -184,14 +180,11 @@ static int mv_twsi_attach(device_t dev) { struct twsi_softc *sc; -#ifdef __aarch64__ int error; -#endif sc = device_get_softc(dev); sc->dev = dev; -#ifdef __aarch64__ /* Activate clock */ error = clk_get_by_ofw_index(dev, 0, 0, &sc->clk_core); if (error != 0) { @@ -211,7 +204,6 @@ mv_twsi_attach(device_t dev) return (error); } } -#endif mv_twsi_cal_baud_rate(sc, TWSI_BAUD_RATE_SLOW, &sc->baud_rate[IIC_SLOW]); mv_twsi_cal_baud_rate(sc, TWSI_BAUD_RATE_FAST, &sc->baud_rate[IIC_FAST]);