From patchwork Tue Dec 12 08:20:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikita Shubin via B4 Relay X-Patchwork-Id: 177168 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp7582357vqy; Tue, 12 Dec 2023 00:25:20 -0800 (PST) X-Google-Smtp-Source: AGHT+IEVJ6DjC+OaMiFtyX91k2yFY816czPpoJ79WdN2JOI1bMkK32VUM7wGzQpSDH1pgR1+v7Lc X-Received: by 2002:a05:6808:448e:b0:3b8:6096:f8a with SMTP id eq14-20020a056808448e00b003b860960f8amr8090212oib.49.1702369520193; Tue, 12 Dec 2023 00:25:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702369520; cv=none; d=google.com; s=arc-20160816; b=K8o9eBXBTE978JmgO3+19lBbmUNXwwmHbheZdqI2IF3BPeW/oGSlWq6p/hVD/BGH9v yTS4r8Kt2Q0jeGrMC0Xf7zejcjrFtPRzxO2YU3EYmwPeRkm8/MYMgSxBxVo8e75Jg53U JeEql5WT9dgxp0PaLrpMt829xnOf1Z3f8vXHg79ocqlbyhoCpppDozGz/TpeY5KqAoh6 iQHpS9PAcuDigpthP8q5HJKruR9wOiUcUt6lEAyQNcaWhU0wHBlpFo1GBEiOGcmr7tNl /Sajnk5GQB8NNKf/zfJLTRGt1/oDe4m3SPp1HIY+sirbMYUla4rUHxzKls7F8oAbFE3G tDDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:reply-to:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=dkFDdmVrJpGeuOuZ+DOydHny9rPMSipI1+93HN6WkEQ=; fh=1i6CCfhhYVPdfVqtZnG8+os5cMiICx9pZiagnp3m4Do=; b=Y8b4iCAOMq7x3ani5/D+O2NlNgR348iRkZMzbu9vx5GexEoShHKqaRnymN3fmdg/kw TBL40CjALloHgNzJXNQK0pY5OP7K4dUoNECYH/nGvWaiiWCLK8FW/CoiR3RwNzuRqAoc fylzPDa55LYFoXku0wSMLrf+hwChhTE/mEM5Pm7h+mSw8QFEOdqnBEUekGtybAHz09ju hmkrwWEooLA4VsyjQlOl/zjQRwck7Sh8vekRx3cXMJ+Jioabesab5ccgoJ5M/hcgLE+i gmzmlHUSJ+CmHjQumyS9IepAH0XKJGHlgvC8LKy7GWt6WXKWLiuOqghOk6VQZSsMSiPc zBng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=bMkuXrUC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from morse.vger.email (morse.vger.email. [23.128.96.31]) by mx.google.com with ESMTPS id cm25-20020a056a00339900b006ce11062b36si7467424pfb.228.2023.12.12.00.25.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Dec 2023 00:25:20 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=bMkuXrUC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id 6BDB080219CF; Tue, 12 Dec 2023 00:25:16 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346171AbjLLIYj (ORCPT + 99 others); Tue, 12 Dec 2023 03:24:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37316 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346097AbjLLIWH (ORCPT ); Tue, 12 Dec 2023 03:22:07 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 03F02EB for ; Tue, 12 Dec 2023 00:22:09 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPS id 7BEB5C32791; Tue, 12 Dec 2023 08:22:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1702369326; bh=9ute/1bGOtjO25p99pXUCKMJ0N82xWZ9Win5PXJgY0Y=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=bMkuXrUCU6CLjhLT5tlaQVvocjj9retrSBJ1kx0U6GsBkgAFpdPzd/Pd9I1hRhvAE oVf6ZWQizZ3jJlyVodLdpR544D5hRM4F2/VMDNhmG2apGtXWic1Ti/BHbtfNpkNWx8 bDcO4vKgruEeoy/J9hbHqV2Tl62r4+SM4r3X6avbKoBzR60AYYeMz5+PlyteG/LARu 59yYRyLVUijsIlVrK6somlkiTqY07ZyLKFGVMBhBEZRrKWnQO0D4L9OrdXpzvIOuD8 gE47rHNW7zErXoR5J4WAd+j2QTd+6gzFAi/4Qa0vdEclFpvba0QGwa4L8TW4nHGXGD NdgUhdxtowNIQ== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6CDEBC4332F; Tue, 12 Dec 2023 08:22:06 +0000 (UTC) From: Nikita Shubin via B4 Relay Date: Tue, 12 Dec 2023 11:20:55 +0300 Subject: [PATCH v6 38/40] ARM: ep93xx: soc: drop defines MIME-Version: 1.0 Message-Id: <20231212-ep93xx-v6-38-c307b8ac9aa8@maquefel.me> References: <20231212-ep93xx-v6-0-c307b8ac9aa8@maquefel.me> In-Reply-To: <20231212-ep93xx-v6-0-c307b8ac9aa8@maquefel.me> To: Nikita Shubin , Linus Walleij , Dmitry Torokhov , =?utf-8?q?Uwe_Kleine-K=C3=B6ni?= =?utf-8?q?g?= , Sergey Shtylyov Cc: Andy Shevchenko , Thierry Reding , linux-kernel@vger.kernel.org, Arnd Bergmann X-Mailer: b4 0.13-dev-e3e53 X-Developer-Signature: v=1; a=ed25519-sha256; t=1702369322; l=3033; i=nikita.shubin@maquefel.me; s=20230718; h=from:subject:message-id; bh=6XiaHQokkrEF1VJqw8MFtxq6mielfCuEj4N2Lba9alA=; =?utf-8?q?b=3DzSkREaj8xpUr?= =?utf-8?q?TpUCazb8FQpgZWA8Kt50/UtRGuNsNe0Ze6tHxltxhi6haKk0VA4WPsmG45qqlsF9?= sH47E8I9BDm3NqsUfiH7qPx5xUFY0ZRYALAhBMWE3SO407QVr2OE X-Developer-Key: i=nikita.shubin@maquefel.me; a=ed25519; pk=vqf5YIUJ7BJv3EJFaNNxWZgGuMgDH6rwufTLflwU9ac= X-Endpoint-Received: by B4 Relay for nikita.shubin@maquefel.me/20230718 with auth_id=65 X-Original-From: Nikita Shubin Reply-To: X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Tue, 12 Dec 2023 00:25:16 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785063821981978697 X-GMAIL-MSGID: 1785063821981978697 From: Nikita Shubin Remove unnecessary defines, as we dropped board files. Signed-off-by: Nikita Shubin --- include/linux/platform_data/eth-ep93xx.h | 10 --------- include/linux/platform_data/keypad-ep93xx.h | 32 ----------------------------- include/linux/soc/cirrus/ep93xx.h | 13 ------------ 3 files changed, 55 deletions(-) diff --git a/include/linux/platform_data/eth-ep93xx.h b/include/linux/platform_data/eth-ep93xx.h deleted file mode 100644 index 8eef637a804d..000000000000 --- a/include/linux/platform_data/eth-ep93xx.h +++ /dev/null @@ -1,10 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _LINUX_PLATFORM_DATA_ETH_EP93XX -#define _LINUX_PLATFORM_DATA_ETH_EP93XX - -struct ep93xx_eth_data { - unsigned char dev_addr[6]; - unsigned char phy_id; -}; - -#endif diff --git a/include/linux/platform_data/keypad-ep93xx.h b/include/linux/platform_data/keypad-ep93xx.h deleted file mode 100644 index 3054fced8509..000000000000 --- a/include/linux/platform_data/keypad-ep93xx.h +++ /dev/null @@ -1,32 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef __KEYPAD_EP93XX_H -#define __KEYPAD_EP93XX_H - -struct matrix_keymap_data; - -/* flags for the ep93xx_keypad driver */ -#define EP93XX_KEYPAD_DISABLE_3_KEY (1<<0) /* disable 3-key reset */ -#define EP93XX_KEYPAD_DIAG_MODE (1<<1) /* diagnostic mode */ -#define EP93XX_KEYPAD_BACK_DRIVE (1<<2) /* back driving mode */ -#define EP93XX_KEYPAD_TEST_MODE (1<<3) /* scan only column 0 */ -#define EP93XX_KEYPAD_AUTOREPEAT (1<<4) /* enable key autorepeat */ - -/** - * struct ep93xx_keypad_platform_data - platform specific device structure - * @keymap_data: pointer to &matrix_keymap_data - * @debounce: debounce start count; terminal count is 0xff - * @prescale: row/column counter pre-scaler load value - * @flags: see above - */ -struct ep93xx_keypad_platform_data { - struct matrix_keymap_data *keymap_data; - unsigned int debounce; - unsigned int prescale; - unsigned int flags; - unsigned int clk_rate; -}; - -#define EP93XX_MATRIX_ROWS (8) -#define EP93XX_MATRIX_COLS (8) - -#endif /* __KEYPAD_EP93XX_H */ diff --git a/include/linux/soc/cirrus/ep93xx.h b/include/linux/soc/cirrus/ep93xx.h index da8bdfc36526..a9b8d2709797 100644 --- a/include/linux/soc/cirrus/ep93xx.h +++ b/include/linux/soc/cirrus/ep93xx.h @@ -2,7 +2,6 @@ #ifndef _SOC_EP93XX_H #define _SOC_EP93XX_H -struct platform_device; struct regmap; enum ep93xx_soc_model { @@ -36,16 +35,4 @@ struct ep93xx_regmap_adev { #define to_ep93xx_regmap_adev(_adev) \ container_of((_adev), struct ep93xx_regmap_adev, adev) -#ifdef CONFIG_ARCH_EP93XX -int ep93xx_i2s_acquire(void); -void ep93xx_i2s_release(void); -unsigned int ep93xx_chip_revision(void); - -#else -static inline int ep93xx_i2s_acquire(void) { return 0; } -static inline void ep93xx_i2s_release(void) {} -static inline unsigned int ep93xx_chip_revision(void) { return 0; } - -#endif - #endif