Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F20F8C4338F for ; Thu, 19 Aug 2021 18:58:14 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3DAB66109E for ; Thu, 19 Aug 2021 18:58:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 3DAB66109E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 96ABD81FC6; Thu, 19 Aug 2021 20:58:11 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id DA01F82051; Thu, 19 Aug 2021 20:58:09 +0200 (CEST) Received: from mail-qk1-f182.google.com (mail-qk1-f182.google.com [209.85.222.182]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id D27F280F4B for ; Thu, 19 Aug 2021 20:58:05 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tom.rini@gmail.com Received: by mail-qk1-f182.google.com with SMTP id o123so8222288qkf.12 for ; Thu, 19 Aug 2021 11:58:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=IUa0eFgix1qV1LeCWDsnyJrUgX5X+TlUUXuI/sbTqYA=; b=BYrdCjBycxK0tAlo2LalTVUF/XsRumdWri1oCSHNFhpqbL7WKwMD4OQc+9ZrS8vCVX 4IqtevRV4NGVWclkpf8YAyM2fDA5BfwMeZr8riEUflUSjGhvNrX6rYpLa3ddiZxOLeNX 8aAQcqQimvM/cNuSsZg2xTC+nRMjDGxm4a9jKQstaBITaw3IcpdkTCjbjTK9IWft8pvy g5ZtOqwzy2S1svmuyMqQH1q2F6m6+akT3xGmiBmEv0JCd+7j7AxfFLw0euhweki59u9M rjRSHssOIEF826AXsZ0Hf0IXkilc7LUVwlcnywINwPaD7wii43T5FZU1hVHh0tQtvvAa kXLg== X-Gm-Message-State: AOAM530d8vmJxzCvYm/DLfXm4lI1wNX0zJdOECjmRLAFuoiv90d/waIW zctDRYQiYkO9n3TL5TJuG6e9KONuX5Jj X-Google-Smtp-Source: ABdhPJxtRS6H9sF4ivP2QPOY2hytvpcL8+sHpdXoRPmveYJUVMKI94rkptqMLkgTTuFfvrWi44Gecw== X-Received: by 2002:a37:9c8c:: with SMTP id f134mr5037852qke.349.1629399484181; Thu, 19 Aug 2021 11:58:04 -0700 (PDT) Received: from bill-the-cat.lan (2603-6081-7b01-cbda-599d-dbbd-fe12-cbbd.res6.spectrum.com. [2603:6081:7b01:cbda:599d:dbbd:fe12:cbbd]) by smtp.gmail.com with ESMTPSA id g1sm1672906qti.56.2021.08.19.11.58.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Aug 2021 11:58:03 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH] i8042: Do not abuse CONFIG namespace Date: Thu, 19 Aug 2021 14:58:00 -0400 Message-Id: <20210819185800.32032-1-trini@konsulko.com> X-Mailer: git-send-email 2.17.1 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean This driver uses the CONFIG namespace to set the chips internal CONFIG namespace related bits. However, CONFIG is reserved for the top-level Kconfig based configuration system. Use CFG as the namespace here instead to avoid pollution. Signed-off-by: Tom Rini --- drivers/input/i8042.c | 4 ++-- include/i8042.h | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/input/i8042.c b/drivers/input/i8042.c index 565d99e7e57f..d3743dc37f72 100644 --- a/drivers/input/i8042.c +++ b/drivers/input/i8042.c @@ -150,8 +150,8 @@ static int kbd_reset(int quirk) else if ((quirk & QUIRK_DUP_POR) && config == KBD_POR) config = kbd_cmd_read(CMD_RD_CONFIG); - config |= CONFIG_AT_TRANS; - config &= ~(CONFIG_KIRQ_EN | CONFIG_MIRQ_EN); + config |= CFG_AT_TRANS; + config &= ~(CFG_KIRQ_EN | CFG_MIRQ_EN); if (kbd_cmd_write(CMD_WR_CONFIG, config)) goto err; diff --git a/include/i8042.h b/include/i8042.h index 8d69fa13bc2a..687632058c95 100644 --- a/include/i8042.h +++ b/include/i8042.h @@ -20,12 +20,12 @@ #define STATUS_IBF (1 << 1) /* Configuration byte bit defines */ -#define CONFIG_KIRQ_EN (1 << 0) -#define CONFIG_MIRQ_EN (1 << 1) -#define CONFIG_SET_BIST (1 << 2) -#define CONFIG_KCLK_DIS (1 << 4) -#define CONFIG_MCLK_DIS (1 << 5) -#define CONFIG_AT_TRANS (1 << 6) +#define CFG_KIRQ_EN (1 << 0) +#define CFG_MIRQ_EN (1 << 1) +#define CFG_SET_BIST (1 << 2) +#define CFG_KCLK_DIS (1 << 4) +#define CFG_MCLK_DIS (1 << 5) +#define CFG_AT_TRANS (1 << 6) /* i8042 commands */ #define CMD_RD_CONFIG 0x20 /* read configuration byte */ -- 2.17.1