From patchwork Fri Feb 9 01:58:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 13550790 X-Patchwork-Delegate: geert@linux-m68k.org Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6ECEA4C80 for ; Fri, 9 Feb 2024 01:58:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707443936; cv=none; b=u/EaKnthXqCj5wSl7e6LtafLXkmXk3haacbcp66/UYfHRXjewj2tPTdLvOLmgPjVnJ8IBq15GkIF3vCn4zH4ETsoMNpUi0S1b6oDKIQBLs1qzfvocf0ILk8WPmBXO8/xfXvY/fH/qsgLLTzY+zcPHCtQncp/qL2wLC02hS2/cF8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707443936; c=relaxed/simple; bh=9K4qlpEjpmKzBQgUkXVOyjVzOou7v33BoUG8m6CCbGg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Nfzgjyto8YJ5DciCs88kurPr0h1e5vgs4+cPgqQ7+stMq6XK2WNVrtXxThnTgxqwCTHhGeExiaIffgInEzkuQT5fDZyC3VlhIrGPxcWzv2Yucwg93LT8eIuxz5Lzz1UtJMkQvh/mPVZoyj/cTCl/88fQcB6JghCAGYaz9hkRn6w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=Jd8arB0i; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="Jd8arB0i" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= sang-engineering.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; s=k1; bh=hIePBzSeO/3D5e76oY9PllApDN+OlYoSau4JtfpyyAk=; b=Jd8arB 0i5IIIb0whlyKCAitOeYKO1e7xb+GvxxzHcNJ5DKkhmkybovHTeuPK7r9ojaZ2aU CpnWUxAFKB1/6PCrDrnbQ2kQc0vcNH2wEn0rFZ5CrA5bmBMt/7Pn66V8puLBNg9h BdL9loFJI/xBSBM3m+R8V1RH7g1s4VgBvLLzWSkGe+DuVrj+rzhXsYNpQtxMGTWu w/VMNozjtDk0iVULKmdrXMCUq6UboeoP8VuRkWi701M0A3Lva9cQiq+44+C3dSCh FzPAvuzvJxNkgr2na5+7VqJi98JBaCDacvKeHm3g8p3vrXgRZ8jp2fOdehLdU/Gc rU2drZp6BMsFEaLQ== Received: (qmail 2792299 invoked from network); 9 Feb 2024 02:58:45 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 9 Feb 2024 02:58:45 +0100 X-UD-Smtp-Session: l3s3148p1@TGKaROkQdLMujnsZ From: Wolfram Sang To: linux-renesas-soc@vger.kernel.org Cc: Lee Jones , Wolfram Sang , linux-kernel@vger.kernel.org Subject: [PATCH 1/6] mfd: tmio: remove obsolete platform_data Date: Fri, 9 Feb 2024 02:58:16 +0100 Message-ID: <20240209015817.14627-9-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240209015817.14627-8-wsa+renesas@sang-engineering.com> References: <20240209015817.14627-8-wsa+renesas@sang-engineering.com> Precedence: bulk X-Mailing-List: linux-renesas-soc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 With commit 8971bb812e3c ("mfd: remove toshiba tmio drivers"), all users of platform data for NAND and framebuffers are gone. So, remove definitions from the header, too. Signed-off-by: Wolfram Sang Acked-by: Lee Jones --- include/linux/mfd/tmio.h | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/include/linux/mfd/tmio.h b/include/linux/mfd/tmio.h index eace8ea6cda0..bc53323293a3 100644 --- a/include/linux/mfd/tmio.h +++ b/include/linux/mfd/tmio.h @@ -103,31 +103,4 @@ struct tmio_mmc_data { void (*set_pwr)(struct platform_device *host, int state); void (*set_clk_div)(struct platform_device *host, int state); }; - -/* - * data for the NAND controller - */ -struct tmio_nand_data { - struct nand_bbt_descr *badblock_pattern; - struct mtd_partition *partition; - unsigned int num_partitions; - const char *const *part_parsers; -}; - -#define FBIO_TMIO_ACC_WRITE 0x7C639300 -#define FBIO_TMIO_ACC_SYNC 0x7C639301 - -struct tmio_fb_data { - int (*lcd_set_power)(struct platform_device *fb_dev, - bool on); - int (*lcd_mode)(struct platform_device *fb_dev, - const struct fb_videomode *mode); - int num_modes; - struct fb_videomode *modes; - - /* in mm: size of screen */ - int height; - int width; -}; - #endif From patchwork Fri Feb 9 01:58:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 13550792 X-Patchwork-Delegate: geert@linux-m68k.org Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 76BD64C9A for ; Fri, 9 Feb 2024 01:58:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707443937; cv=none; b=F1g4j/bOKEbKoOu/1sA27r95OXNQ4fjGSTWjJ4wgTAlzSc0CIyaC7kR3AsgxSsL7sDdEd4oP9dwKcON8HD25MrzRz9hrc//PGf1bBq3zbl2SKNT9iJS6Fy0+QmedPHPBpKcoem8sh+dGqLZWbqwrUibhAceg7DrHL9PTeOE5PlM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707443937; c=relaxed/simple; bh=tx1y8XIKZpKJJSnn8pZsRsa5tD0WChElb9EzS5FTCLk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=U/tI92uNTv6PLFMwvWOyc03sSf8ucjuSqlWfWd+XNhUzgWRmEO9qe0J4IFyhfEFDV2yyoDvPTCwyCWuC98xSH9qEdRqgAZDlcpDuj7Jbjcw3wTn8zs+t1YbaQXNtltgUUQhgvNKOVhh7oa6Y5yseIN/GCXurpe76VaeB01E0E50= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=h4uP91W1; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="h4uP91W1" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= sang-engineering.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; s=k1; bh=GdRahbPRK6CXKlo5juA9L5bxxYgoIlufylxqn5g6A/o=; b=h4uP91 W1EEyi79vNV8J69KBbbBbu36JmCGt4KuTHJX+6eKDo1A7CHTbih2zhb6/cMRKWCx XYcvjEr573QjqAkP4CLFedwTolmnPIauC3uKrY5NMbTFF+chw///fgT1nffeJ9Fs zrAV1It6ZH0YtyvwSnJdYH7o9pTDD3rjbCMI5NucMr6bjrYdDOLfn4KKbUu5Gpd8 LbPSvhuuuQN8O6mSbowAZmUFaukHETzSrlpGZf2R0WeuqOe+3wEHoBm3phjjgLWL SIsHxnPPan+TEHh9GcZR2cBPiClCk7AO2kENZRkIOMBoZpIRSIor8ILkSlDZVyPV fBvMfKa9O27v7EdA== Received: (qmail 2792329 invoked from network); 9 Feb 2024 02:58:45 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 9 Feb 2024 02:58:45 +0100 X-UD-Smtp-Session: l3s3148p1@5vSoROkQhLMujnsZ From: Wolfram Sang To: linux-renesas-soc@vger.kernel.org Cc: Lee Jones , Wolfram Sang , linux-kernel@vger.kernel.org Subject: [PATCH 2/6] mfd: tmio: remove obsolete io accessors Date: Fri, 9 Feb 2024 02:58:17 +0100 Message-ID: <20240209015817.14627-10-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240209015817.14627-8-wsa+renesas@sang-engineering.com> References: <20240209015817.14627-8-wsa+renesas@sang-engineering.com> Precedence: bulk X-Mailing-List: linux-renesas-soc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Since commit 568494db6809 ("mtd: remove tmio_nand driver") and commit aceae7848624 ("fbdev: remove tmiofb driver"), these accessors have no users anymore. Remove them. Signed-off-by: Wolfram Sang Acked-by: Lee Jones --- include/linux/mfd/tmio.h | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/include/linux/mfd/tmio.h b/include/linux/mfd/tmio.h index bc53323293a3..4223315d2b2a 100644 --- a/include/linux/mfd/tmio.h +++ b/include/linux/mfd/tmio.h @@ -10,31 +10,6 @@ #include #include -#define tmio_ioread8(addr) readb(addr) -#define tmio_ioread16(addr) readw(addr) -#define tmio_ioread16_rep(r, b, l) readsw(r, b, l) -#define tmio_ioread32(addr) \ - (((u32)readw((addr))) | (((u32)readw((addr) + 2)) << 16)) - -#define tmio_iowrite8(val, addr) writeb((val), (addr)) -#define tmio_iowrite16(val, addr) writew((val), (addr)) -#define tmio_iowrite16_rep(r, b, l) writesw(r, b, l) -#define tmio_iowrite32(val, addr) \ - do { \ - writew((val), (addr)); \ - writew((val) >> 16, (addr) + 2); \ - } while (0) - -#define sd_config_write8(base, shift, reg, val) \ - tmio_iowrite8((val), (base) + ((reg) << (shift))) -#define sd_config_write16(base, shift, reg, val) \ - tmio_iowrite16((val), (base) + ((reg) << (shift))) -#define sd_config_write32(base, shift, reg, val) \ - do { \ - tmio_iowrite16((val), (base) + ((reg) << (shift))); \ - tmio_iowrite16((val) >> 16, (base) + ((reg + 2) << (shift))); \ - } while (0) - /* tmio MMC platform flags */ /* * Some controllers can support a 2-byte block size when the bus width From patchwork Fri Feb 9 01:58:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 13550791 X-Patchwork-Delegate: geert@linux-m68k.org Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C467A4C6F for ; Fri, 9 Feb 2024 01:58:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707443936; cv=none; b=mq/LmM0+9T3zo1rtNzu6m9dVPMksB4FOEsACWkbZ6a/wT9DXWfAAj2ZouNTtcYhVzDjHxl6O8UeRImh5vN3yqGF9rz6A9jt7gWhsUJa5ol5JL6u51YGTNmRQKtHfSmeQgmieiTjWiLWWy424WklAGjuXKxAEcfTxucaH/Cw4DAg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707443936; c=relaxed/simple; bh=eSZ0UF6f5wQGVbK3MfAk9QDVqW9e5WhVYigroBv8fqI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=G2uE+zkwP6kgVEnjDse+7fuZqWlM4KJPQomXHTyN0lS/uoVYG30i0deks+mBZxN+wfQ5Z5nC2K95j3ANWX9cYxUVDZN1xEvs0PLbuvQlsKeIH80ReJi4u5kP3KYUEsffOiIpNMvTA6q3HUFf3KsMw7FsBQee1c1wvJHhxCWu7uE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=aRDeMm8c; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="aRDeMm8c" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= sang-engineering.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; s=k1; bh=CIb4fU6aD0u2MIHraJnpW3RoUetuKj7I8/j6aS5bid0=; b=aRDeMm 8ckmE3LrbwdHQVF8R4F1jFHuz5IRDxgnWhnXMqBpjOCB0kRZTup//rVr8rWNHMA9 bBALwyWYF/ICF9XYrPM4YPNYyVtIu+dZl9ZmVVjH4psT3Gaa+nAcVGDw9DZl8KDX NYGuntN7nJ3J/wPRzn6nW3bMfbxHPMNx3lBm9aMTW/gVgoCcmpn+Lhcc0Sfg9yXs w9WVSY0gznAr7ru5iQA5s43oXZgDmvSoQByRQllkBBt8OvlZTAAskN+FWdStE8hm fruHuYxSCGMr0BPFzBmX1UL5r6UQCvGDC6goizkzCUUe/6V3SJorfVH78C6Yg6KF E6gea8JBxNcHg3oQ== Received: (qmail 2792359 invoked from network); 9 Feb 2024 02:58:47 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 9 Feb 2024 02:58:47 +0100 X-UD-Smtp-Session: l3s3148p1@I++6ROkQlLMujnsZ From: Wolfram Sang To: linux-renesas-soc@vger.kernel.org Cc: Lee Jones , Wolfram Sang , kernel test robot , Ulf Hansson , linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/6] mmc: tmio/sdhi: fix includes Date: Fri, 9 Feb 2024 02:58:18 +0100 Message-ID: <20240209015817.14627-11-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240209015817.14627-8-wsa+renesas@sang-engineering.com> References: <20240209015817.14627-8-wsa+renesas@sang-engineering.com> Precedence: bulk X-Mailing-List: linux-renesas-soc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 TMIO uses an of_* function, and SDHI uses pm_runtime functions. Add the includes directly, so we can clean up another header properly. Sort the pagemap include while we are here. Reported-by: kernel test robot Closes: https://lore.kernel.org/oe-kbuild-all/202402070323.JpYfFtkQ-lkp@intel.com/ Signed-off-by: Wolfram Sang --- drivers/mmc/host/renesas_sdhi_internal_dmac.c | 3 ++- drivers/mmc/host/renesas_sdhi_sys_dmac.c | 3 ++- drivers/mmc/host/tmio_mmc_core.c | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/host/renesas_sdhi_internal_dmac.c b/drivers/mmc/host/renesas_sdhi_internal_dmac.c index 53d34c3eddce..24e1c17908d7 100644 --- a/drivers/mmc/host/renesas_sdhi_internal_dmac.c +++ b/drivers/mmc/host/renesas_sdhi_internal_dmac.c @@ -16,8 +16,9 @@ #include #include #include -#include #include +#include +#include #include #include diff --git a/drivers/mmc/host/renesas_sdhi_sys_dmac.c b/drivers/mmc/host/renesas_sdhi_sys_dmac.c index 9cf7f9feab72..c18581897f8a 100644 --- a/drivers/mmc/host/renesas_sdhi_sys_dmac.c +++ b/drivers/mmc/host/renesas_sdhi_sys_dmac.c @@ -16,8 +16,9 @@ #include #include #include -#include #include +#include +#include #include #include diff --git a/drivers/mmc/host/tmio_mmc_core.c b/drivers/mmc/host/tmio_mmc_core.c index be7f18fd4836..c39141a5bd23 100644 --- a/drivers/mmc/host/tmio_mmc_core.c +++ b/drivers/mmc/host/tmio_mmc_core.c @@ -37,6 +37,7 @@ #include #include #include +#include #include #include #include From patchwork Fri Feb 9 01:58:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 13550794 X-Patchwork-Delegate: geert@linux-m68k.org Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 12E715224 for ; Fri, 9 Feb 2024 01:58:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707443938; cv=none; b=plJDYrWGdyHVH6Rj3EqiJjeWejJuo8E7G5ndcrGFQBOzI5EzJbV1y2SlOykYe+xAPL6SiBiAD4k29GRr8pU8s4eNJJCig7W05YBntACEu3ca1SWBkTuSZ8hgDIsRwBMowVU8+Z0qEfSKmNiTsgsMhQh3zq3BpIhT9x+BbwSx/eQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707443938; c=relaxed/simple; bh=5q5yd0uOzVxkeI+Nq9RNmm4/GaFC28QWASMAQnWNh2g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Y8rCFT38jY9si9STyv6n16LGgbBQVo3JP6lZl/zpAjVcQha4cerrZaDSFVShsHIslvVwM4fLpD8w7A2EJHc/NcB784Lu24XDtfR3cuXPysoDOZ6j/s+Z9M/p9Ijsx9VDqH9tlQyVuoQ4imvA0PfOfMUroqrlSEHDq/8Mi3I0dII= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=PyAYN5U3; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="PyAYN5U3" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= sang-engineering.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; s=k1; bh=zEZx/yqiZ/Xq8ZRCg9io5VCbk6EfjKXq2ELvwxjA4iA=; b=PyAYN5 U37seEOUaME4GyephpapNYQLQOE/26KcINTRci+ysjZP5cC6uPGTdzLWL66xSywE RAz0rb9p4ROA/vO5e+0zrzUnKj0I8EMe3GmJkEJpmyFt4ynDXlsg23fwtIOcSkXm 3VZiJ14PeesQ/rcHos+xy69pKbgss7MIUNK0KDkbA88SGuHuJI4w34WRcyGEOXFS 7oLAMdkdJ+ORyVRQrtUqTFd+PSzVCUREyrZ5Yg5lH5cFWKJ6nX0NMUYOIaB53NFH RCIKd4xuOFOnfS2XSzzUjd8usPauzsxqnvmcMSwd8m9j42kmmu/QVYWpKUaZtThr C7VAgrWztdj+dlog== Received: (qmail 2792400 invoked from network); 9 Feb 2024 02:58:47 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 9 Feb 2024 02:58:47 +0100 X-UD-Smtp-Session: l3s3148p1@RRvHROkQmLMujnsZ From: Wolfram Sang To: linux-renesas-soc@vger.kernel.org Cc: Lee Jones , Wolfram Sang , linux-kernel@vger.kernel.org Subject: [PATCH 4/6] mfd: tmio: update include files Date: Fri, 9 Feb 2024 02:58:19 +0100 Message-ID: <20240209015817.14627-12-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240209015817.14627-8-wsa+renesas@sang-engineering.com> References: <20240209015817.14627-8-wsa+renesas@sang-engineering.com> Precedence: bulk X-Mailing-List: linux-renesas-soc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Remove meanwhile unneeded includes, only add types.h for dma_addr_t. Also, remove an obsolete forward declaration while here. Signed-off-by: Wolfram Sang Acked-by: Lee Jones --- include/linux/mfd/tmio.h | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/include/linux/mfd/tmio.h b/include/linux/mfd/tmio.h index 4223315d2b2a..f71d4e507dcb 100644 --- a/include/linux/mfd/tmio.h +++ b/include/linux/mfd/tmio.h @@ -2,13 +2,8 @@ #ifndef MFD_TMIO_H #define MFD_TMIO_H -#include -#include -#include -#include -#include #include -#include +#include /* tmio MMC platform flags */ /* @@ -59,8 +54,6 @@ /* Some controllers have a CBSY bit */ #define TMIO_MMC_HAVE_CBSY BIT(11) -struct dma_chan; - /* * data for the MMC controller */ From patchwork Fri Feb 9 01:58:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 13550795 X-Patchwork-Delegate: geert@linux-m68k.org Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8BC4ACA66 for ; Fri, 9 Feb 2024 01:58:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707443940; cv=none; b=As4PHayCtSVRp+SmN4+r1YQfYNvt0UV7TrpWS6XOvuD8+tX/nP52ehE3+XbLw7F/Xs+5fTxkLw0Nwvhi+bGWYx3tD9IHuP3nbFlD20cvPYeIEkZtllI/rSz9xunyxDOnN+nB3SpGp80pWNwYhf7Tt3sl76Hlx0IFMzJhCIp7+CM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707443940; c=relaxed/simple; bh=UxX6J0lf2fRxDy/VkE8jOTXGeQ82iNLc+jLezLzr2Ng=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=V+cqXdaOpKMEO++MCiXrNocJSxyESDXdJ29p4XhtAJsAIRPenLy7nXou4jo6d1e5tXe8HI2yR6SmQORkz5CFnal/bYxQzj7qrgDTzHI7Zis1BA3fGaqghxV0J284LpkP/Vp8sQc5xm8pYEHhXEjoliMusO93j7T4uM6/C3IF26c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=XG1bmh/z; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="XG1bmh/z" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= sang-engineering.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; s=k1; bh=4/BUBmbZ/LSwVFmUWyfewKl+qpPxom7Xk9eOiW4h+3Y=; b=XG1bmh /zImcO1EwLJ4iaT/pb3K5soRNHnb+FUcMMq8vmLLL2FJ3O7f7LXj9gyqldqJMlxP 6PRNllvlS5s5hObf5cZ0KIxuSasHvFmDbc2UoA668EYzVtvdwp4ggX/VVuucVvLD 5XirYoicHnlyKcqedOs72No3yynX7nZtq3WfkC3b60pyCx9z57RvoUjfvTYVLdDU QKnwgAwUfTR1aV8Zg7H2Tun4FunauTviJJpylbGvIiXAhnHviPmchLqJre9e4+uV 5FTyHw63KILLNK8maOEoRFnsaZvHW1BMo+J2rnrXdf8UlS6sXKSn0ecJNVTRSit7 uQkjYh4LtN9BA4GQ== Received: (qmail 2792426 invoked from network); 9 Feb 2024 02:58:48 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 9 Feb 2024 02:58:48 +0100 X-UD-Smtp-Session: l3s3148p1@loDSROkQpLMujnsZ From: Wolfram Sang To: linux-renesas-soc@vger.kernel.org Cc: Lee Jones , Wolfram Sang , linux-kernel@vger.kernel.org Subject: [PATCH 5/6] mfd: tmio: sanitize comments Date: Fri, 9 Feb 2024 02:58:20 +0100 Message-ID: <20240209015817.14627-13-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240209015817.14627-8-wsa+renesas@sang-engineering.com> References: <20240209015817.14627-8-wsa+renesas@sang-engineering.com> Precedence: bulk X-Mailing-List: linux-renesas-soc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Reformat the comments to utilize the maximum line length and use single line comments where appropriate. Remove superfluous comments, too. Signed-off-by: Wolfram Sang Acked-by: Lee Jones --- include/linux/mfd/tmio.h | 32 +++++++++++--------------------- 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/include/linux/mfd/tmio.h b/include/linux/mfd/tmio.h index f71d4e507dcb..1cf418643da9 100644 --- a/include/linux/mfd/tmio.h +++ b/include/linux/mfd/tmio.h @@ -5,23 +5,23 @@ #include #include -/* tmio MMC platform flags */ +/* TMIO MMC platform flags */ + /* - * Some controllers can support a 2-byte block size when the bus width - * is configured in 4-bit mode. + * Some controllers can support a 2-byte block size when the bus width is + * configured in 4-bit mode. */ #define TMIO_MMC_BLKSZ_2BYTES BIT(1) -/* - * Some controllers can support SDIO IRQ signalling. - */ + +/* Some controllers can support SDIO IRQ signalling */ #define TMIO_MMC_SDIO_IRQ BIT(2) /* Some features are only available or tested on R-Car Gen2 or later */ #define TMIO_MMC_MIN_RCAR2 BIT(3) /* - * Some controllers require waiting for the SD bus to become - * idle before writing to some registers. + * Some controllers require waiting for the SD bus to become idle before + * writing to some registers. */ #define TMIO_MMC_HAS_IDLE_WAIT BIT(4) @@ -32,31 +32,21 @@ */ #define TMIO_MMC_USE_BUSY_TIMEOUT BIT(5) -/* - * Some controllers have CMD12 automatically - * issue/non-issue register - */ +/* Some controllers have CMD12 automatically issue/non-issue register */ #define TMIO_MMC_HAVE_CMD12_CTRL BIT(7) /* Controller has some SDIO status bits which must be 1 */ #define TMIO_MMC_SDIO_STATUS_SETBITS BIT(8) -/* - * Some controllers have a 32-bit wide data port register - */ +/* Some controllers have a 32-bit wide data port register */ #define TMIO_MMC_32BIT_DATA_PORT BIT(9) -/* - * Some controllers allows to set SDx actual clock - */ +/* Some controllers allows to set SDx actual clock */ #define TMIO_MMC_CLK_ACTUAL BIT(10) /* Some controllers have a CBSY bit */ #define TMIO_MMC_HAVE_CBSY BIT(11) -/* - * data for the MMC controller - */ struct tmio_mmc_data { void *chan_priv_tx; void *chan_priv_rx; From patchwork Fri Feb 9 01:58:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 13550796 X-Patchwork-Delegate: geert@linux-m68k.org Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D6A67DF54 for ; Fri, 9 Feb 2024 01:58:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707443941; cv=none; b=YISUzt/o89DjzGr+2QlwIf8DTtrwGK+6BN4UlhxI2bbtdW/n7Ey95nAq8VrLHcv7ABuQHlf5ko1lh/py05mDo/dhKo1h1hjscxHMehyza6lJmx0ME4kw/beh2ZNw7eMihiGgBBsJJN7u0anZoPL/9cPB3FujsRrDGy76gZPNYMA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707443941; c=relaxed/simple; bh=SdbG9XdTgsmi/m+Z6SqJr3mvhfWsfVyKpPHNbYOm654=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=K2QM2MoOd53ZQZA8F9hw3EjCdkxf3qwTaWQdTAJZP0NkU5C/kuHJRaEnJSpjaATFz7yWPCx5jqH109XpVFZbAoBMco8815CFDx2zYrFbWRAozVy21xpn2Z5S4FvmG/XD6G5dETa6ysCqX3a/1IZFTlbfdEr0AFE5dPNkUFg8c7E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=Iox36Hg/; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="Iox36Hg/" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= sang-engineering.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; s=k1; bh=MtqptyUg7Zbji3L0/wBt+9hPJj3DsBY9y6z8pFeNZcs=; b=Iox36H g/En18mplOU7iYg0TILOF3fFS8q9nhsLvyiAjOdWppylTf1wRwZLX2zfUUcQoIe+ 3clJzADQ53HEXCmw+IofTusak2GLVpEvD+r4pO1XbXCsN5xWasg7qpf1iO9HmsmV rQPoWda30s4cb30CPxFtNSmEz7VydlWl1G6/3X7m7ySNpD3vUFaa1xZAVPwr75Sc NzJTdEDK90qK3HK4W7p5d8Y3N0caqOMLgamXtdlzO2jIhE58HJ40fWYqzPhPP4uV AYVfJ7HGVnQX5mJ6GOBGVERKZojKDiw12pMOuheu/LVBDmXOmYsVE6PvOwHZ23P9 X02UUX+xhha2OOAQ== Received: (qmail 2792439 invoked from network); 9 Feb 2024 02:58:50 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 9 Feb 2024 02:58:50 +0100 X-UD-Smtp-Session: l3s3148p1@bBzuROkQqLMujnsZ From: Wolfram Sang To: linux-renesas-soc@vger.kernel.org Cc: Lee Jones , Wolfram Sang , Yoshinori Sato , Rich Felker , John Paul Adrian Glaubitz , Ulf Hansson , Kunihiko Hayashi , Masami Hiramatsu , linux-kernel@vger.kernel.org, linux-sh@vger.kernel.org, linux-mmc@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 6/6] mfd: tmio: move header to platform_data Date: Fri, 9 Feb 2024 02:58:21 +0100 Message-ID: <20240209015817.14627-14-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240209015817.14627-8-wsa+renesas@sang-engineering.com> References: <20240209015817.14627-8-wsa+renesas@sang-engineering.com> Precedence: bulk X-Mailing-List: linux-renesas-soc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 All the MFD components are gone from the header meanwhile. Only the MMC relevant data is left which makes it a platform_data for the MMC controller. Move the header to the now fitting directory. Signed-off-by: Wolfram Sang Acked-by: Lee Jones Acked-by: John Paul Adrian Glaubitz --- MAINTAINERS | 2 +- arch/sh/boards/board-sh7757lcr.c | 2 +- arch/sh/boards/mach-ap325rxa/setup.c | 2 +- arch/sh/boards/mach-ecovec24/setup.c | 2 +- arch/sh/boards/mach-kfr2r09/setup.c | 2 +- arch/sh/boards/mach-migor/setup.c | 2 +- arch/sh/boards/mach-se/7724/setup.c | 2 +- drivers/mmc/host/renesas_sdhi_core.c | 2 +- drivers/mmc/host/renesas_sdhi_internal_dmac.c | 2 +- drivers/mmc/host/renesas_sdhi_sys_dmac.c | 2 +- drivers/mmc/host/tmio_mmc_core.c | 2 +- drivers/mmc/host/uniphier-sd.c | 2 +- include/linux/{mfd => platform_data}/tmio.h | 0 13 files changed, 12 insertions(+), 12 deletions(-) rename include/linux/{mfd => platform_data}/tmio.h (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 960512bec428..c4e20abd177b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -22154,7 +22154,7 @@ L: linux-renesas-soc@vger.kernel.org S: Supported F: drivers/mmc/host/renesas_sdhi* F: drivers/mmc/host/tmio_mmc* -F: include/linux/mfd/tmio.h +F: include/linux/platform_data/tmio.h TMP401 HARDWARE MONITOR DRIVER M: Guenter Roeck diff --git a/arch/sh/boards/board-sh7757lcr.c b/arch/sh/boards/board-sh7757lcr.c index f39c8196efdf..4014c042d2a5 100644 --- a/arch/sh/boards/board-sh7757lcr.c +++ b/arch/sh/boards/board-sh7757lcr.c @@ -14,9 +14,9 @@ #include #include #include -#include #include #include +#include #include #include #include diff --git a/arch/sh/boards/mach-ap325rxa/setup.c b/arch/sh/boards/mach-ap325rxa/setup.c index 645cccf3da88..bb5004a8ac02 100644 --- a/arch/sh/boards/mach-ap325rxa/setup.c +++ b/arch/sh/boards/mach-ap325rxa/setup.c @@ -24,10 +24,10 @@ #include #include #include -#include #include #include #include +#include #include #include #include diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c index 30d117f9ad7e..6f13557eecd6 100644 --- a/arch/sh/boards/mach-ecovec24/setup.c +++ b/arch/sh/boards/mach-ecovec24/setup.c @@ -17,13 +17,13 @@ #include #include #include -#include #include #include #include #include #include #include +#include #include #include #include diff --git a/arch/sh/boards/mach-kfr2r09/setup.c b/arch/sh/boards/mach-kfr2r09/setup.c index 6b775eae85c0..70236859919d 100644 --- a/arch/sh/boards/mach-kfr2r09/setup.c +++ b/arch/sh/boards/mach-kfr2r09/setup.c @@ -22,10 +22,10 @@ #include #include #include -#include #include #include #include +#include #include #include #include diff --git a/arch/sh/boards/mach-migor/setup.c b/arch/sh/boards/mach-migor/setup.c index 773ee767d0c4..1853e6319a66 100644 --- a/arch/sh/boards/mach-migor/setup.c +++ b/arch/sh/boards/mach-migor/setup.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include @@ -14,7 +15,6 @@ #include #include #include -#include #include #include #include diff --git a/arch/sh/boards/mach-se/7724/setup.c b/arch/sh/boards/mach-se/7724/setup.c index 787ddd3c627a..e500feb91053 100644 --- a/arch/sh/boards/mach-se/7724/setup.c +++ b/arch/sh/boards/mach-se/7724/setup.c @@ -21,9 +21,9 @@ #include #include #include -#include #include #include +#include #include #include #include diff --git a/drivers/mmc/host/renesas_sdhi_core.c b/drivers/mmc/host/renesas_sdhi_core.c index c675dec587ef..f84f60139bcf 100644 --- a/drivers/mmc/host/renesas_sdhi_core.c +++ b/drivers/mmc/host/renesas_sdhi_core.c @@ -22,13 +22,13 @@ #include #include #include -#include #include #include #include #include #include #include +#include #include #include #include diff --git a/drivers/mmc/host/renesas_sdhi_internal_dmac.c b/drivers/mmc/host/renesas_sdhi_internal_dmac.c index 24e1c17908d7..97cd55fec0bf 100644 --- a/drivers/mmc/host/renesas_sdhi_internal_dmac.c +++ b/drivers/mmc/host/renesas_sdhi_internal_dmac.c @@ -11,12 +11,12 @@ #include #include #include -#include #include #include #include #include #include +#include #include #include #include diff --git a/drivers/mmc/host/renesas_sdhi_sys_dmac.c b/drivers/mmc/host/renesas_sdhi_sys_dmac.c index c18581897f8a..68e31c37cce6 100644 --- a/drivers/mmc/host/renesas_sdhi_sys_dmac.c +++ b/drivers/mmc/host/renesas_sdhi_sys_dmac.c @@ -11,12 +11,12 @@ #include #include #include -#include #include #include #include #include #include +#include #include #include #include diff --git a/drivers/mmc/host/tmio_mmc_core.c b/drivers/mmc/host/tmio_mmc_core.c index c39141a5bd23..0c4397b3cffd 100644 --- a/drivers/mmc/host/tmio_mmc_core.c +++ b/drivers/mmc/host/tmio_mmc_core.c @@ -31,7 +31,6 @@ #include #include #include -#include #include #include #include @@ -39,6 +38,7 @@ #include #include #include +#include #include #include #include diff --git a/drivers/mmc/host/uniphier-sd.c b/drivers/mmc/host/uniphier-sd.c index 1404989e6151..bd231dbe90ba 100644 --- a/drivers/mmc/host/uniphier-sd.c +++ b/drivers/mmc/host/uniphier-sd.c @@ -9,11 +9,11 @@ #include #include #include -#include #include #include #include #include +#include #include #include #include diff --git a/include/linux/mfd/tmio.h b/include/linux/platform_data/tmio.h similarity index 100% rename from include/linux/mfd/tmio.h rename to include/linux/platform_data/tmio.h