From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757483Ab3AYOQG (ORCPT ); Fri, 25 Jan 2013 09:16:06 -0500 Received: from moutng.kundenserver.de ([212.227.17.8]:60110 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757288Ab3AYOQC (ORCPT ); Fri, 25 Jan 2013 09:16:02 -0500 From: Arnd Bergmann To: linux-arm-kernel@list.infradead.org Cc: linux-kernel@vger.kernel.org, Arnd Bergmann , Dmitry Torokhov , Vojtech Pavlik , Ben Dooks Subject: [PATCH 17/19] input/joystick: use get_cycles on ARM Date: Fri, 25 Jan 2013 14:14:34 +0000 Message-Id: <1359123276-15833-18-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.8.0 In-Reply-To: <1359123276-15833-1-git-send-email-arnd@arndb.de> References: <1359123276-15833-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:h5znFgLVtf7GKIa2kaw3rPR1KQsaR2pcV45jwYMU2Ho 3D+SiP8RX1t9sAGyXdRyME9i9LC0IOnoYr6/FuMxZu3KJbW4eJ TajdtKIpSkqJkEUoz8m5Eb5B2bPUTbDWUArzC7RTxu7YGHe9Os hLJQlxSWBZfxzpxuT78FeGqG/DVB8XOnidWQtVleGk9QtSDVnV /8ckf7sZd59BRtJ8rYUGjmwxPNZtEihpdhWVbsCj2wIXnBUUe2 /TWspuaM7BHYyr54viBJ564i8epJq34w8/JFhFdxuvQT7W828L XU5vX78EuqUDRBdHT8N50nCgqaCzjNQRMtmXvaqYdDzIkFh9Ds Vc/c2xR/+MyCu0j6DETlEKwbLD1JBM1kxWN3odxb3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org ARM normally has an accurate clock source, so we can theoretically use analog joysticks more accurately and at the same time avoid the build warning #warning Precise timer not defined for this architecture. from the joystick driver. Now, why anybody would use that driver no ARM I have no idea, but Ben Dooks enabled it in the s3c2410_defconfig along with a bunch of other drivers, even though that platform has neither ISA nor PCI support. It still seems to be the right thing to fix this quirk. Signed-off-by: Arnd Bergmann Cc: Dmitry Torokhov Cc: Vojtech Pavlik Cc: Ben Dooks --- drivers/input/joystick/analog.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/input/joystick/analog.c b/drivers/input/joystick/analog.c index 358cd7e..9c3e3c1 100644 --- a/drivers/input/joystick/analog.c +++ b/drivers/input/joystick/analog.c @@ -158,14 +158,10 @@ static unsigned int get_time_pit(void) #define GET_TIME(x) rdtscl(x) #define DELTA(x,y) ((y)-(x)) #define TIME_NAME "TSC" -#elif defined(__alpha__) +#elif defined(__alpha__) || defined(CONFIG_MN10300) || defined(CONFIG_ARM) #define GET_TIME(x) do { x = get_cycles(); } while (0) #define DELTA(x,y) ((y)-(x)) -#define TIME_NAME "PCC" -#elif defined(CONFIG_MN10300) -#define GET_TIME(x) do { x = get_cycles(); } while (0) -#define DELTA(x, y) ((x) - (y)) -#define TIME_NAME "TSC" +#define TIME_NAME "get_cycles" #else #define FAKE_TIME static unsigned long analog_faketime = 0; -- 1.8.0