From patchwork Tue Feb 13 22:02: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: 13555757 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 92CFA626DA for ; Tue, 13 Feb 2024 22:02:59 +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=1707861784; cv=none; b=ZUbbS8qRZAl4IL+owfUpqKHj78U7KXYKR/bJfcNmmRff8JtIjseEqKiyQOwliu4nviokdIdyYir505VzVCLZHoGeiChA2Be9YmdfhS7ZDTdI5BMt0dUfeJNuExJQr5xxkqXGSeWRYan3z6JB7rGkoI49NeykguslrxCPBsWovag= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707861784; c=relaxed/simple; bh=s46cqh5WXM0+I/dyk3J0iZj7PDngod2/SdoD02i9s4s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iD2D1McpXPS4L9lesZ3buu/iJ2mvWbJgvW+VJkmVobh967XrzWUStRA5IIqG35vkBt2l3vcGZ6MlapMX9AFJBRVs/UiiYbDRN++kEgqAuFrCM9+8TxCh3oTOdpB/8PfGQRZ1bHWrKJlCmVz10H2l/IGYHAq8BDANqu63vlf1Dy8= 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=lYIG+yiq; 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="lYIG+yiq" 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=3iz4DCLUOGZx4OfgLPz/FN/m99Q5bIPUkOtswq6lKVY=; b=lYIG+y iqbN1lyV1utz9rereyEYAd59LbFW5OzbV3JEFK7Dd1MC72lMz3wsYntlJcX/T0J9 /i9rvsZyitRLDq4RSqp9jOwTNmd3zdjBJpPzdd+39jK7ZYiT/B7+CH+g+KV22Dyg WZqZ29LPlEySsfSIe+2JhT2eWiYN2fNd5zORlNaRwU1Md1Grv6gELo6I4dH7+YSA HbyBK/cKZC/XHnUAcfWveZdLfDimgO2opfMlvvZcO+HFHG+wSo8H3v/2P2k3nyRx jlddt/Uo0xhJyIpuDJFytV+iyBCqsfrmbBC5E2/mk/ZXNMOLLrKjeM3owX59cdE2 0gob7Hj/RPNleoqg== Received: (qmail 1211754 invoked from network); 13 Feb 2024 23:02:51 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 13 Feb 2024 23:02:51 +0100 X-UD-Smtp-Session: l3s3148p1@T/g0jkoRwN8ujnsZ From: Wolfram Sang To: linux-renesas-soc@vger.kernel.org Cc: Lee Jones , Wolfram Sang , linux-kernel@vger.kernel.org Subject: [PATCH v2 1/6] mfd: tmio: Remove obsolete platform_data Date: Tue, 13 Feb 2024 23:02:20 +0100 Message-ID: <20240213220221.2380-9-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240213220221.2380-8-wsa+renesas@sang-engineering.com> References: <20240213220221.2380-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 Reviewed-by: Geert Uytterhoeven --- 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 Tue Feb 13 22:02: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: 13555756 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 15A38627E4 for ; Tue, 13 Feb 2024 22:02:59 +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=1707861783; cv=none; b=iL+SvKle8MwI5o25mQUUhLVxXDk+iE3JVtHqbwoSYBRhNtgDZ6dRIgfyGi/SisSNqv7hy8vBk/NsxRpfuz3O7NstWZvM+i+fZ9GEN7X56Ov1SfChF0olSV31qak+iT/vjqhErq1u/sefiRtwvGDsc3eDVBcttldd1i/eStpx7DY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707861783; c=relaxed/simple; bh=hpce4kBYHxjPck6QzyV4av0S8wG/q4mb39UZeFb/XX4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=InhzZf3t44BmUyefiGV/lElVE/J+ZbC3mL7wNy0E7aXyH3hKHQa2w54FW6BU8TDJdbA4pciYL6yC7xgLrygLbKK/3T24olaV5SupoP3ioXaYF19NFhXgiVrgNs+ykiwWC+E0fXYMHkxjfNoeiG6zbUE5IIbOXCaCP3bNnHv8UAA= 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=YX/tgL5l; 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="YX/tgL5l" 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=vQkmh2vsmn/J5N6MTBGNu3z1ML3BmhRPZQnF3hlOJK8=; b=YX/tgL 5lBgJPY5mdMuLXoO63/NGZ37Juv2wLBIefaQQn5QDEBirDYbGJK9CxEz6Xqb+U44 BWtLABjp32jfNL0F5X/5+G6QjvsV06Eb2gN2vJeethhw85FxHu9+x0Zt+lUt+hvq uz73krUF/tM2Y14jT2BC85Euf1H+XQlbXubcIz3vJQkB5dSrFlZe8/P0ly7nyJa/ 0nz6akXlyWmr23xeqGjUMa4pR1A1B1HKzZDtDdkM6HRmhd6woNGm7+Rn/nBFARH1 tL949dnqGXF1xrx7LjZ9dai8GrL0F/s/UmHthpxcGAC7RvJKYDjuVm2PxOPPL4MG vBcrrtr6u6eNesTg== Received: (qmail 1211785 invoked from network); 13 Feb 2024 23:02:52 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 13 Feb 2024 23:02:52 +0100 X-UD-Smtp-Session: l3s3148p1@g45CjkoRyt8ujnsZ From: Wolfram Sang To: linux-renesas-soc@vger.kernel.org Cc: Lee Jones , Wolfram Sang , linux-kernel@vger.kernel.org Subject: [PATCH v2 2/6] mfd: tmio: Remove obsolete io accessors Date: Tue, 13 Feb 2024 23:02:21 +0100 Message-ID: <20240213220221.2380-10-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240213220221.2380-8-wsa+renesas@sang-engineering.com> References: <20240213220221.2380-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 Reviewed-by: Geert Uytterhoeven --- 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 Tue Feb 13 22:02:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 13555758 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 91580627E7 for ; Tue, 13 Feb 2024 22:03:00 +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=1707861784; cv=none; b=ful3FPMM2cCBOSt/6FJuo7nPjM0PtiY7guM1CUfECi8Z9PrF8FQbm69ifJa8IcTuT7t39DFWl+P/jDa+84bR5lHiqr9+pUKqBreJEHaGFSsOZO2K+Q6Y0E3FCXS0p2kYOJGiuRHN8irPHA2XP4BiljGFx6NtgUGl/f0dPBzI47A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707861784; c=relaxed/simple; bh=4Cv/DKAqwiMA7u3CWshnEujZInnSy/3vqqV9OZtXUZw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZToEbakG+8Jn+6/x2mjfSSMlhGtitmKG5qEdwWqFBJQn6054m6Aj2xiBnsh2tv6LMQVcDlrLJkBgutaVpVKyOG20/qMHe+yrIggsg0hMdK6Ax1ZDe7zg1CxVItKkoagl+bF0pee9MyEcqklQSCRWrqiEFvv7euqAQQff3Ip8Lgk= 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=Vn+ARP2H; 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="Vn+ARP2H" 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=QVjbmkicP3lKRzsUEP3UTuSHN1nf5jzXesx7Ut3oggE=; b=Vn+ARP 2HJ1vJa25RDdk83FJ+sBNhL0XdCu0s8FlqER6BLSUkqR8pHNwYxxKD8pPB33M8YE Pds3/xRfold0LAcpDpz289HO7ei2aGrj5wCvuzNs4RnaYL1syPLPj5LYb8jAGRfz VAiQ+Cg9PSammZQvuj3EY2Vjp1qFkuqL8gyzaJ00/JNJdR6+3Z0uFTLrKwZTkjpB TqCD4+VCNpyQ+gaU9ZXNJ9zT33zR0g0ASbSt6w2Zf4agbiQkMxb4YOggXKJxhq1d JBxg5ihgDVC6aD5fsXQpuzzAnsB3cPVQNyC3jeBJkqTFLw4n1D3BqANfK7/fc874 Q0pXfz/EK6kqBpNw== Received: (qmail 1211814 invoked from network); 13 Feb 2024 23:02:53 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 13 Feb 2024 23:02:53 +0100 X-UD-Smtp-Session: l3s3148p1@a5pQjkoR1t8ujnsZ 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 v2 3/6] mmc: tmio/sdhi: Fix includes Date: Tue, 13 Feb 2024 23:02:22 +0100 Message-ID: <20240213220221.2380-11-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240213220221.2380-8-wsa+renesas@sang-engineering.com> References: <20240213220221.2380-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 Acked-by: Ulf Hansson Reviewed-by: Geert Uytterhoeven --- 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 Tue Feb 13 22:02:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 13555760 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 CD2A4627F1 for ; Tue, 13 Feb 2024 22:03:02 +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=1707861785; cv=none; b=bogYBXWJ3BZEeyTSDa2NhXo5tKTxK6pmwsAo8TUohrYuVbIpBHvLXmaaPnhBFYf7JBxLrgOQ/Ohc2wl+O6vBU9Y2aosv8zsLa6rVGcOpDvc+xmrLpzKpRm4G3kafW4g+CtOQce6eh4WMyKIfVw3Cd9lF1l61ijoKFZa1MJWe5Z4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707861785; c=relaxed/simple; bh=9BkYvB+uMFeysje96+EWS5EYkFxP2C5VX5ZTt7WVJk8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eVA/uVBfKoNVq8ktnRElc/acltbi5//lUAVT3kIEXS4l8o9p6vYGONCKjLCZo09hKCPxdUUNrHIhHvZoYNfZSm9qDROGa9HN3lTBk2Ta23Z9HMdi2Vu8zLlYQeZBMvGP/MlR8x+SI4RXQVZP1Suatfce4DWxLDfSMkBCP5FbT0Q= 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=OS9fjj4Z; 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="OS9fjj4Z" 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=4RGadmFK42r7+jXSlrZncVcHuT2aHeZYPed3MG7JgOs=; b=OS9fjj 4ZZt3P08tRewexJkJjRCtY2el7kSiRedyWwnX0BdgUQucqacWQiy/DToLADzf4YQ RjBzjpaW9TO3lz9flsurlOuASgb1YfARdV33lmpSHO1fAZ8iVewHYs43EprpDLPL bruB4BsyWY9wy6F3ayRNWoV3hu2F+26g/uWvbzX0kxXtPhg2uvb4GiYnl3OGP44B y3wBEFYV6XnQHWWNzYKPzEKXm6qlWGb5tqpnRtndPnA3uoy/Uno664yGZCer+Pyf I+hHzqgDFtciCaf2b7heUpxMsryLb6RO06FZ63mcy1sEqQsC4lktk5D+hdYJGSIN v61Mib7k0K8v916w== Received: (qmail 1211865 invoked from network); 13 Feb 2024 23:02:54 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 13 Feb 2024 23:02:54 +0100 X-UD-Smtp-Session: l3s3148p1@FXBhjkoR5N8ujnsZ From: Wolfram Sang To: linux-renesas-soc@vger.kernel.org Cc: Lee Jones , Wolfram Sang , linux-kernel@vger.kernel.org Subject: [PATCH v2 4/6] mfd: tmio: Update include files Date: Tue, 13 Feb 2024 23:02:23 +0100 Message-ID: <20240213220221.2380-12-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240213220221.2380-8-wsa+renesas@sang-engineering.com> References: <20240213220221.2380-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 Reviewed-by: Geert Uytterhoeven --- 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 Tue Feb 13 22:02:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 13555761 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 5FFD2627E1 for ; Tue, 13 Feb 2024 22:03:01 +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=1707861785; cv=none; b=mqQnBqezWgUdiWyWa3hBx0iqyZASPneqPlEdjck1jyVP/+Z0UU7a8G5WzgJNbB/4HYhRVsdrSKuZDXm2ae+v/e3g5zJJ5HfZuOAjQzCRdISa+54HAT+R+PH15zpgh8oAMGgGM/FmMTRb+Pm+EdgRSTFADW2HuhFu9FiTanOxlbU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707861785; c=relaxed/simple; bh=0DPP6Qz0Q9rQtsigtC4nC1BLzOQOC0N9GzcWL+h1pnU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aHfeDhWjeM7/f7wqpOB3wRlDN15ynJAUMDfkfTycpKQHLRAa3pzWsurlhZuCZfoWPPDHAB5qJ9BI9tNcvI8rqpMc65tXaBTVT/swinpQwcRN2TqE54tfBQOpPgBf2jtdLcmcWT2mTxgJn+fNYTwsNG3RHtY7wP52CLscWZ1qf0E= 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=XfrCeWhB; 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="XfrCeWhB" 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=/R9rxQeU7BUXa1RMmyrPVN4ROjK67IZpHdMoXe0Wxtc=; b=XfrCeW hBihKHw8R7S+6MDbH8eYSnLmoJcX28MPmqGsPpBB11dz48CygGM7WS/xviFXFbZr l+aruclM51+T/aLFe+ZrF8DNVO07pSfHomT8xmy+hSGiz8FpQXzGEKOoMABMpIKd ZC76cGTFUKUotao8nHsKXn1iQ91beVFE21JSfho9guu/wULbCkJLY17YPiuY4++6 t6Sy+AkWq2l7WON11uYUVPmOJrIGhL1aLEAsMgY3zSKN6po9EhGmpu2ukEoUoGUU w6vOGMs3Nb734IQG6qI5u3Swyfh5fnwuuLtjfCdPfKStl5MlhRbaUEkmhXi7tQqs ynLZ6fZN3HpgEcYA== Received: (qmail 1211894 invoked from network); 13 Feb 2024 23:02:55 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 13 Feb 2024 23:02:55 +0100 X-UD-Smtp-Session: l3s3148p1@lOVujkoR8N8ujnsZ From: Wolfram Sang To: linux-renesas-soc@vger.kernel.org Cc: Lee Jones , Wolfram Sang , linux-kernel@vger.kernel.org Subject: [PATCH v2 5/6] mfd: tmio: Sanitize comments Date: Tue, 13 Feb 2024 23:02:24 +0100 Message-ID: <20240213220221.2380-13-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240213220221.2380-8-wsa+renesas@sang-engineering.com> References: <20240213220221.2380-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 Reviewed-by: Geert Uytterhoeven --- 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 Tue Feb 13 22:02:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 13555762 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 04447629EE for ; Tue, 13 Feb 2024 22:03:05 +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=1707861788; cv=none; b=CCZ31usJIMtU97QpSlUra83B7Y45AhtmVJV2Xl0cXs6AWC5wodQr3IlAMOTkQuTDaltIn4+iB9mBLN/rVOf6PZq+Z/UVugqj3wwO8yGpzICPz6KXDyyX2LdHw4pFzHjsfFozxFgvdFOyoFM2FWrl+33vSkwIHpDdmBNWxG8Chvw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707861788; c=relaxed/simple; bh=/NbPIAmNtikp+MPwHZ9GZ2HCof6dRoexpNHYP4pdtFI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sbUhJHUyJ5yw0YZctdQsg95zOKV3Ig8FO5fDDsy6DHsqL9//6xMLXAP1Z5UDOQ/w+nszKGR3poifGp/Vb70Izj315YZrOUFplgooYlgjFkOvaVK7/3rQYiUb/w5khYV8A18zCOuc1UlzCZpcMtGQHqYAOSA8vKuX2Z3v0O82a4Y= 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=eOsDf8H8; 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="eOsDf8H8" 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=8RxXVKDkgKtVpBldpmsRbkKgOxCKxWWUezfoGXGqq3A=; b=eOsDf8 H8q2fpvBzLPYOA+dpU9LNZnDLX4fBAEqXfG+LZ/npjnBPxcJi8fGQjSk6H14vSYo 7qJnfOlfH1SiC/QV6ICRoyCxG18lbJv5NHFXkr8L8L6LvqPbyZxUcHF3A5iBCqsd /MRYQvrrLMAWNyI1083/xEpqW8BcKDpQYxKMc5KB4bYIOeIoSUGVnMB97qYhnyIJ is4wyX/d84px45T5H8JESgX3MRHUtQ6gscT4Ot0MRVrCeMoGRRXCXuBbRXwqJttT xMyfBmXjtwO1NQQ7cE+HYuzk2XAhQocDGw79hhCR8LFRBYAvvy1rzoHjJAa+hD8t rryjYc8lU1ikANmg== Received: (qmail 1211928 invoked from network); 13 Feb 2024 23:02:57 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 13 Feb 2024 23:02:57 +0100 X-UD-Smtp-Session: l3s3148p1@XyyPjkoR/t8ujnsZ From: Wolfram Sang To: linux-renesas-soc@vger.kernel.org Cc: Lee Jones , Wolfram Sang , Ulf Hansson , John Paul Adrian Glaubitz , Yoshinori Sato , Rich Felker , 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 v2 6/6] mfd: tmio: Move header to platform_data Date: Tue, 13 Feb 2024 23:02:25 +0100 Message-ID: <20240213220221.2380-14-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240213220221.2380-8-wsa+renesas@sang-engineering.com> References: <20240213220221.2380-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: Ulf Hansson # For MMC Acked-by: John Paul Adrian Glaubitz Reviewed-by: Geert Uytterhoeven --- 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 73d898383e51..fb672e0bb0c1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -22153,7 +22153,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