From owner-svn-src-head@freebsd.org Thu Nov 26 17:19:48 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8BAEF469C14; Thu, 26 Nov 2020 17:19:48 +0000 (UTC) (envelope-from manu@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Chkyr2Sv3z4m19; Thu, 26 Nov 2020 17:19:48 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 47C8426E43; Thu, 26 Nov 2020 17:19:48 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0AQHJmES000365; Thu, 26 Nov 2020 17:19:48 GMT (envelope-from manu@FreeBSD.org) Received: (from manu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0AQHJm1d000364; Thu, 26 Nov 2020 17:19:48 GMT (envelope-from manu@FreeBSD.org) Message-Id: <202011261719.0AQHJm1d000364@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: manu set sender to manu@FreeBSD.org using -f From: Emmanuel Vadot Date: Thu, 26 Nov 2020 17:19:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r368067 - head/sys/arm/allwinner X-SVN-Group: head X-SVN-Commit-Author: manu X-SVN-Commit-Paths: head/sys/arm/allwinner X-SVN-Commit-Revision: 368067 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Nov 2020 17:19:48 -0000 Author: manu Date: Thu Nov 26 17:19:47 2020 New Revision: 368067 URL: https://svnweb.freebsd.org/changeset/base/368067 Log: arm: allwinner: a23 timer functions are only used for arm64 Modified: head/sys/arm/allwinner/a10_timer.c Modified: head/sys/arm/allwinner/a10_timer.c ============================================================================== --- head/sys/arm/allwinner/a10_timer.c Thu Nov 26 17:19:30 2020 (r368066) +++ head/sys/arm/allwinner/a10_timer.c Thu Nov 26 17:19:47 2020 (r368067) @@ -119,8 +119,10 @@ static uint64_t timer_read_counter64(struct a10_timer_ static void a10_timer_eventtimer_setup(struct a10_timer_softc *sc); #endif +#if defined(__aarch64__) static void a23_timer_timecounter_setup(struct a10_timer_softc *sc); static u_int a23_timer_get_timecount(struct timecounter *tc); +#endif static int a10_timer_irq(void *); static int a10_timer_probe(device_t); @@ -138,6 +140,7 @@ static struct timecounter a10_timer_timecounter = { .tc_quality = 1000, }; +#if defined(__aarch64__) static struct timecounter a23_timer_timecounter = { .tc_name = "a10_timer timer0", .tc_get_timecount = a23_timer_get_timecount, @@ -146,6 +149,7 @@ static struct timecounter a23_timer_timecounter = { /* We want it to be selected over the arm generic timecounter */ .tc_quality = 2000, }; +#endif #define A10_TIMER_MEMRES 0 #define A10_TIMER_IRQRES 1 @@ -158,7 +162,9 @@ static struct resource_spec a10_timer_spec[] = { static struct ofw_compat_data compat_data[] = { {"allwinner,sun4i-a10-timer", A10_TIMER}, +#if defined(__aarch64__) {"allwinner,sun8i-a23-timer", A23_TIMER}, +#endif {NULL, 0}, }; @@ -374,6 +380,7 @@ a10_timer_timer_stop(struct eventtimer *et) * Timecounter functions for A23 and above */ +#if defined(__aarch64__) static void a23_timer_timecounter_setup(struct a10_timer_softc *sc) { @@ -415,6 +422,7 @@ a23_timer_get_timecount(struct timecounter *tc) /* Counter count backwards */ return (~0u - val); } +#endif /* * Timecounter functions for A10 and A13, using the 64 bits counter