dm: Remove redefinitions of dev_xxx macros
Subsystems (16)
cover dm: Remove redefinitions of dev_xxx macros
dev_xxx is now defined to something other than debug, so its redefinition in linux/compat.h is problematic. This series mostly adds includes for dm/device_compat.h, if only linux/compat.h had previously been included. Some patches also fix remaining cases where dev_xxx had been called without a device. I have re-ordered includes to conform to [1]. CI is available at [2]. There's one failure, but it appears to be because fetching the docker file timed out. A passing run for that job is available at [3].
[1] https://www.denx.de/wiki/U-Boot/CodingStyle#Include_files
[2] https://dev.azure.com/seanga2/u-boot/_build/results?buildId=47&view=results
[3] https://dev.azure.com/seanga2/u-boot/_build/results?buildId=46&view=logs&j=a6c8f4b8-aab0-5875-641a-f1020f283ec1
Sean Anderson (16):
clk: sifive: Include device_compat.h
dm: syscon: Set LOG_CATEGORY
firmware: scmi: Include device_compat.h
mtd: mxs_nand: Fix not calling dev_xxx with a device
net: ldpaa_eth: Include device_compat.h
phy: Include device_compat.h
ram: imxrt: Include device_compat.h
spi: nsp_fspi: Include device_compat.h
spi: fsl_qspi: Include device_compat.h
tee: optee: Include device_compat.h
timer: Include device_compat.h
usb: xhci: Include device_compat.h
usb: musb-new: Include device_compat.h
usb: musb-new: mt85xx: Fix not calling dev_err with a device linux/compat.h: Remove redefinition of dev_xxx macros
dm: Don't undefine dev_xxx macros
drivers/clk/sifive/fu540-prci.c | 18 +++++++------- drivers/core/syscon-uclass.c | 2 ++ drivers/firmware/scmi/mailbox_agent.c | 1 + drivers/firmware/scmi/scmi_agent-uclass.c | 1 + drivers/firmware/scmi/smt.c | 1 + drivers/mtd/nand/raw/mxs_nand.c | 30 ++++++++++++----------- drivers/net/ldpaa_eth/ldpaa_eth.c | 16 ++++++------ drivers/phy/phy-uclass.c | 2 +- drivers/ram/imxrt_sdram.c | 1 + drivers/spi/fsl_qspi.c | 9 ++++--- drivers/spi/nxp_fspi.c | 7 +++--- drivers/tee/optee/core.c | 1 + drivers/timer/timer-uclass.c | 5 ++-- drivers/usb/host/xhci-mtk.c | 5 ++-- drivers/usb/host/xhci.c | 7 +++--- drivers/usb/musb-new/mt85xx.c | 7 +++--- drivers/usb/musb-new/musb_core.c | 2 ++ drivers/usb/musb-new/musb_dsps.c | 2 ++ drivers/usb/musb-new/musb_gadget.c | 2 ++ drivers/usb/musb-new/musb_gadget_ep0.c | 4 ++- drivers/usb/musb-new/musb_host.c | 2 ++ include/dm/device_compat.h | 20 --------------- include/linux/compat.h | 28 --------------------- 23 files changed, 75 insertions(+), 98 deletions(-)
Signature · 1 line
2.28.0
PATCH 1/16 clk: sifive: Include device_compat.h
Necessary for dev_xxx.
---
drivers/clk/sifive/fu540-prci.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/clk/sifive/fu540-prci.c +9 -9
@@ -29,23 +29,23 @@*/ #include <common.h> -#include <asm/io.h> -#include <asm/arch/reset.h> #include <clk-uclass.h> #include <clk.h> #include <div64.h> #include <dm.h> -#include <errno.h> -#include <reset-uclass.h> #include <dm/device.h> +#include <dm/device_compat.h> #include <dm/uclass.h> -#include <linux/delay.h> -#include <linux/err.h> - -#include <linux/math64.h> -#include <linux/clk/analogbits-wrpll-cln28hpc.h> #include <dt-bindings/clock/sifive-fu540-prci.h> #include <dt-bindings/reset/sifive-fu540-prci.h> +#include <errno.h> +#include <reset-uclass.h> +#include <asm/io.h> +#include <asm/arch/reset.h> +#include <linux/delay.h> +#include <linux/err.h> +#include <linux/math64.h> +#include <linux/clk/analogbits-wrpll-cln28hpc.h> /* * EXPECTED_CLK_PARENT_COUNT: how many parent clocks this driver expects:
Signature · 1 line
2.28.0
PATCH 1/16 clk: sifive: Include device_compat.h
Quoted 3 lines · Sean Anderson
Necessary for
dev_xxx.Signed-off-by Sean Anderson <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20201016/6ba0cde8/attachment.sig>
PATCH 2/16 dm: syscon: Set LOG_CATEGORY
In reply to Sean AndersonWe call log_debug, but do not have a category set.
---
drivers/core/syscon-uclass.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/core/syscon-uclass.c +2 -0
@@ -4,6 +4,8 @@* Written by Simon Glass <[email protected]> */ +#define LOG_CATEGORY UCLASS_SYSCON +#include <common.h> #include <log.h> #include <syscon.h>
Signature · 1 line
2.28.0
PATCH 2/16 dm: syscon: Set LOG_CATEGORY
Quoted 8 lines · Sean Anderson
We call
log_debug, but do not have a category set.Signed-off-by Sean Anderson <[email protected]>---
drivers/core/syscon-uclass.c | 2 ++ 1 file changed, 2 insertions(+)
PATCH 2/16 dm: syscon: Set LOG_CATEGORY
In reply to Sean AndersonQuoted 4 lines · Sean Anderson
We call
log_debug, but do not have a category set.Signed-off-by Sean Anderson <[email protected]>Reviewed-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20201016/77255dcc/attachment.sig>
PATCH 3/16 firmware: scmi: Include device_compat.h
In reply to Sean AndersonThis header is necessary for the dev_xxx macros.
---
drivers/firmware/scmi/mailbox_agent.c | 1 + drivers/firmware/scmi/scmi_agent-uclass.c | 1 + drivers/firmware/scmi/smt.c | 1 + 3 files changed, 3 insertions(+)
drivers/firmware/scmi/mailbox_agent.c +1 -0
@@ -5,6 +5,7 @@#include <common.h> #include <dm.h> +#include <dm/device_compat.h> #include <errno.h> #include <mailbox.h> #include <scmi_agent.h>
drivers/firmware/scmi/scmi_agent-uclass.c +1 -0
@@ -5,6 +5,7 @@#include <common.h> #include <dm.h> +#include <dm/device_compat.h> #include <errno.h> #include <scmi_agent-uclass.h> #include <scmi_protocols.h>
drivers/firmware/scmi/smt.c +1 -0
@@ -7,6 +7,7 @@#include <common.h> #include <cpu_func.h> #include <dm.h> +#include <dm/device_compat.h> #include <errno.h> #include <scmi_agent.h> #include <asm/cache.h>
Signature · 1 line
2.28.0
PATCH 3/16 firmware: scmi: Include device_compat.h
Quoted 11 lines · Sean Anderson
This header is necessary for the
dev_xxxmacros.Signed-off-by Sean Anderson <[email protected]>---
drivers/firmware/scmi/mailbox_agent.c | 1 + drivers/firmware/scmi/scmi_agent-uclass.c | 1 + drivers/firmware/scmi/smt.c | 1 + 3 files changed, 3 insertions(+)
PATCH 3/16 firmware: scmi: Include device_compat.h
In reply to Sean AndersonQuoted 4 lines · Sean Anderson
This header is necessary for the
dev_xxxmacros.Signed-off-by Sean Anderson <[email protected]>Reviewed-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20201016/e5797976/attachment.sig>
PATCH 4/16 mtd: mxs_nand: Fix not calling dev_xxx with a device
In reply to Sean AndersonThis includes device_compat.h, and fixes several calls to dev_xxx.
---
drivers/mtd/nand/raw/mxs_nand.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-)
drivers/mtd/nand/raw/mxs_nand.c +16 -14
@@ -16,19 +16,20 @@#include <common.h> #include <cpu_func.h> #include <dm.h> +#include <dm/device_compat.h> +#include <malloc.h> +#include <mxs_nand.h> +#include <asm/arch/clock.h> +#include <asm/arch/imx-regs.h> +#include <asm/arch/sys_proto.h> #include <asm/cache.h> +#include <asm/io.h> +#include <asm/mach-imx/regs-bch.h> +#include <asm/mach-imx/regs-gpmi.h> +#include <linux/errno.h> #include <linux/mtd/rawnand.h> #include <linux/sizes.h> #include <linux/types.h> -#include <malloc.h> -#include <linux/errno.h> -#include <asm/io.h> -#include <asm/arch/clock.h> -#include <asm/arch/imx-regs.h> -#include <asm/mach-imx/regs-bch.h> -#include <asm/mach-imx/regs-gpmi.h> -#include <asm/arch/sys_proto.h> -#include <mxs_nand.h> #define MXS_NAND_DMA_DESCRIPTOR_COUNT 4
@@ -115,13 +116,14 @@ static uint32_t mxs_nand_aux_status_offset(void)return (MXS_NAND_METADATA_SIZE +0x3 ) & ~0x3 ; } -static inline bool mxs_nand_bbm_in_data_chunk (struct bch_geometry *geo,struct mtd_info *mtd, -unsigned int *chunk_num) +static inline bool mxs_nand_bbm_in_data_chunk (struct bch_geometry *geo, +struct mtd_info *mtd, +unsigned int *chunk_num) {unsigned int i, j;if (geo->ecc_chunk0_size != geo->ecc_chunkn_size) { -dev_err (this->dev,"The size of chunk0 must equal to chunkn\n" ); +dev_err (mtd->dev,"The size of chunk0 must equal to chunkn\n" );return false; }
@@ -135,7 +137,7 @@ static inline bool mxs_nand_bbm_in_data_chunk(struct bch_geometry *geo, struct mif (j < geo->ecc_chunkn_size *8 ) { *chunk_num = i +1 ; -dev_dbg (this->dev,"Set ecc to %d and bbm in chunk %d\n" , +dev_dbg (mtd->dev,"Set ecc to %d and bbm in chunk %d\n" , geo->ecc_strength, *chunk_num);return true; }
@@ -1118,7 +1120,7 @@ static int mxs_nand_set_geometry(struct mtd_info *mtd, struct bch_geometry *geo)if ((!(chip->ecc_strength_ds >0 && chip->ecc_step_ds >0 ) && mtd->oobsize <1024 ) || nand_info->legacy_bch_geometry) { -dev_warn (this->dev,"use legacy bch geometry\n" ); +dev_warn (mtd->dev,"use legacy bch geometry\n" );return mxs_nand_legacy_calc_ecc_layout (geo, mtd); }
Signature · 1 line
2.28.0
PATCH 4/16 mtd: mxs_nand: Fix not calling dev_xxx with a device
Quoted 3 lines · Sean Anderson
This includes
device_compat.h, and fixes several calls todev_xxx.Signed-off-by Sean Anderson <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20201016/6b177e80/attachment.sig>
PATCH 5/16 net: ldpaa_eth: Include device_compat.h
In reply to Sean AndersonNecessary for dev_xxx.
---
drivers/net/ldpaa_eth/ldpaa_eth.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/net/ldpaa_eth/ldpaa_eth.c +8 -8
@@ -6,20 +6,20 @@#include <common.h> #include <cpu_func.h> +#include <dm/device_compat.h> +#include <fsl-mc/fsl_dpmac.h> +#include <fsl-mc/ldpaa_wriop.h> +#include <hwconfig.h> #include <log.h> +#include <malloc.h> +#include <miiphy.h> +#include <net.h> +#include <phy.h> #include <asm/io.h> #include <asm/types.h> -#include <malloc.h> -#include <net.h> -#include <hwconfig.h> -#include <phy.h> -#include <miiphy.h> #include <linux/bug.h> #include <linux/compat.h> -#include <fsl-mc/fsl_dpmac.h> #include <linux/delay.h> - -#include <fsl-mc/ldpaa_wriop.h> #include "ldpaa_eth.h" #ifdef CONFIG_PHYLIB
Signature · 1 line
2.28.0
PATCH 5/16 net: ldpaa_eth: Include device_compat.h
Quoted 3 lines · Sean Anderson
Necessary for
dev_xxx.Signed-off-by Sean Anderson <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20201016/ed06baf7/attachment.sig>
PATCH 6/16 phy: Include device_compat.h
In reply to Sean AndersonNecessary for dev_xxx.
---
drivers/phy/phy-uclass.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/phy/phy-uclass.c +1 -1
@@ -6,9 +6,9 @@#include <common.h> #include <dm.h> +#include <dm/device_compat.h> #include <dm/devres.h> #include <generic-phy.h> -#include <log.h> static inline struct phy_ops *phy_dev_ops (struct udevice *dev) {
Signature · 1 line
2.28.0
PATCH 6/16 phy: Include device_compat.h
Quoted 3 lines · Sean Anderson
Necessary for
dev_xxx.Signed-off-by Sean Anderson <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20201016/2cdf5509/attachment.sig>
PATCH 7/16 ram: imxrt: Include device_compat.h
In reply to Sean AndersonNecessary for dev_xxx.
---
drivers/ram/imxrt_sdram.c | 1 + 1 file changed, 1 insertion(+)
drivers/ram/imxrt_sdram.c +1 -0
@@ -7,6 +7,7 @@#include <common.h> #include <clk.h> #include <dm.h> +#include <dm/device_compat.h> #include <init.h> #include <log.h> #include <ram.h>
Signature · 1 line
2.28.0
PATCH 7/16 ram: imxrt: Include device_compat.h
Quoted 3 lines · Sean Anderson
Necessary for
dev_xxx.Signed-off-by Sean Anderson <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20201016/2df0f503/attachment.sig>
PATCH 8/16 spi: nsp_fspi: Include device_compat.h
In reply to Sean AndersonNecessary for dev_xxx.
---
drivers/spi/nxp_fspi.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/spi/nxp_fspi.c +4 -3
@@ -34,12 +34,13 @@*/ #include <common.h> -#include <asm/io.h> +#include <clk.h> +#include <dm.h> +#include <dm/device_compat.h> #include <malloc.h> #include <spi.h> #include <spi-mem.h> -#include <dm.h> -#include <clk.h> +#include <asm/io.h> #include <linux/bitops.h> #include <linux/kernel.h> #include <linux/sizes.h>
Signature · 1 line
2.28.0
PATCH 8/16 spi: nsp_fspi: Include device_compat.h
Quoted 8 lines
-----Original Message-----
From: Sean Anderson <[email protected]>
Sent: Monday, October 5, 2020 7:10 AM
To: u-boot at lists.denx.de
Cc: Sean Anderson <[email protected]>; Jagan Teki <[email protected]>; Kuldeep Singh <[email protected]>
Subject: [EXT] [PATCH 08/16] spi:nsp_fspi: Includedevice_compat.h
s/nsp_fspi/nxp_fspi
-Kuldeep
PATCH 8/16 spi: nxp_fspi: Include device_compat.h
In reply to Sean AndersonQuoted 3 lines · Sean Anderson
Necessary for
dev_xxx.Signed-off-by Sean Anderson <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20201016/1d1dcce8/attachment.sig>
PATCH 9/16 spi: fsl_qspi: Include device_compat.h
In reply to Sean AndersonNecessary for dev_xxx.
---
drivers/spi/fsl_qspi.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/spi/fsl_qspi.c +5 -4
@@ -24,19 +24,20 @@*/ #include <common.h> +#include <dm.h> +#include <dm/device_compat.h> #include <log.h> -#include <asm/io.h> +#include <spi.h> +#include <spi-mem.h> #include <linux/bitops.h> #include <linux/delay.h> #include <linux/libfdt.h> #include <linux/sizes.h> #include <linux/iopoll.h> -#include <dm.h> #include <linux/iopoll.h> #include <linux/sizes.h> #include <linux/err.h> -#include <spi.h> -#include <spi-mem.h> +#include <asm/io.h> DECLARE_GLOBAL_DATA_PTR ;
Signature · 1 line
2.28.0
PATCH 9/16 spi: fsl_qspi: Include device_compat.h
Quoted 3 lines · Sean Anderson
Necessary for
dev_xxx.Signed-off-by Sean Anderson <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20201016/63fdb886/attachment.sig>
PATCH 10/16 tee: optee: Include device_compat.h
In reply to Sean AndersonNecessary for dev_xxx.
---
drivers/tee/optee/core.c | 1 + 1 file changed, 1 insertion(+)
drivers/tee/optee/core.c +1 -0
@@ -5,6 +5,7 @@#include <common.h> #include <dm.h> +#include <dm/device_compat.h> #include <log.h> #include <malloc.h> #include <tee.h>
Signature · 1 line
2.28.0
PATCH 10/16 tee: optee: Include device_compat.h
Quoted 8 lines · Sean Anderson
Necessary for
dev_xxx.Signed-off-by Sean Anderson <[email protected]>---
drivers/tee/optee/core.c | 1 + 1 file changed, 1 insertion(+)
PATCH 10/16 tee: optee: Include device_compat.h
In reply to Sean AndersonQuoted 4 lines · Sean Anderson
Necessary for
dev_xxx.Signed-off-by Sean Anderson <[email protected]>Reviewed-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20201016/81a3907e/attachment.sig>
PATCH 10/16 tee: optee: Include device_compat.h
In reply to Sean AndersonHi Sean,
Quoted 22 lines · Sean Anderson
Necessary for
dev_xxx.Signed-off-by Sean Anderson <[email protected]>---
drivers/tee/optee/core.c | 1 + 1 file changed, 1 insertion(+)drivers/tee/optee/core.c +1
-1@@ -5,6 +5,7 @@#include <common.h> #include <dm.h> +#include <dm/device_compat.h> #include <log.h> #include <malloc.h> #include <tee.h> --
Quoted 2 lines
2.28.0
Signature · 8 lines
Best regards - Freundliche Gr?sse - Meilleures salutations Igor Opaniuk mailto: igor.opaniuk at gmail.com skype: igor.opanyuk +380 (93) 836 40 67 http://ua.linkedin.com/in/iopaniuk
PATCH 11/16 timer: Include device_compat.h
In reply to Sean AndersonNecessary for dev_xxx.
---
drivers/timer/timer-uclass.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/timer/timer-uclass.c +3 -2
@@ -4,14 +4,15 @@*/ #include <common.h> +#include <clk.h> #include <cpu.h> #include <dm.h> -#include <init.h> #include <dm/lists.h> +#include <dm/device_compat.h> #include <dm/device-internal.h> #include <dm/root.h> -#include <clk.h> #include <errno.h> +#include <init.h> #include <timer.h> #include <linux/err.h>
Signature · 1 line
2.28.0
PATCH 11/16 timer: Include device_compat.h
Quoted 8 lines · Sean Anderson
Necessary for
dev_xxx.Signed-off-by Sean Anderson <[email protected]>---
drivers/timer/timer-uclass.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
Also sorting the includes
PATCH 11/16 timer: Include device_compat.h
In reply to Sean AndersonQuoted 4 lines · Sean Anderson
Necessary for
dev_xxx.Signed-off-by Sean Anderson <[email protected]>Reviewed-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20201016/39d72a52/attachment.sig>
PATCH 12/16 usb: xhci: Include device_compat.h
In reply to Sean AndersonThis header is necessary for the dev_xxx macros.
---
drivers/usb/host/xhci-mtk.c | 5 +++-- drivers/usb/host/xhci.c | 7 ++++--- 2 files changed, 7 insertions(+), 5 deletions(-)
drivers/usb/host/xhci-mtk.c +3 -2
@@ -7,15 +7,16 @@#include <clk.h> #include <common.h> #include <dm.h> +#include <dm/device_compat.h> #include <dm/devres.h> #include <generic-phy.h> #include <malloc.h> +#include <power/regulator.h> #include <usb.h> +#include <usb/xhci.h> #include <linux/errno.h> #include <linux/compat.h> -#include <power/regulator.h> #include <linux/iopoll.h> -#include <usb/xhci.h> /* IPPC (IP Port Control) registers */ #define IPPC_IP_PW_CTRL0 0x00
drivers/usb/host/xhci.c +4 -3
@@ -22,11 +22,13 @@#include <common.h> #include <cpu_func.h> #include <dm.h> +#include <dm/device_compat.h> #include <log.h> -#include <asm/byteorder.h> -#include <usb.h> #include <malloc.h> +#include <usb.h> +#include <usb/xhci.h> #include <watchdog.h> +#include <asm/byteorder.h> #include <asm/cache.h> #include <asm/unaligned.h> #include <linux/bitops.h>
@@ -34,7 +36,6 @@#include <linux/delay.h> #include <linux/errno.h> #include <linux/iopoll.h> -#include <usb/xhci.h> #ifndef CONFIG_USB_MAX_CONTROLLER_COUNT #define CONFIG_USB_MAX_CONTROLLER_COUNT 1
Signature · 1 line
2.28.0
PATCH 12/16 usb: xhci: Include device_compat.h
Quoted 3 lines · Sean Anderson
This header is necessary for the
dev_xxxmacros.Signed-off-by Sean Anderson <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20201016/f1e8d720/attachment.sig>
PATCH 13/16 usb: musb-new: Include device_compat.h
In reply to Sean AndersonThis was included, but was ifdef'd out. We also need dm.h for struct udevice.
---
drivers/usb/musb-new/musb_core.c | 2 ++ drivers/usb/musb-new/musb_dsps.c | 2 ++ drivers/usb/musb-new/musb_gadget.c | 2 ++ drivers/usb/musb-new/musb_gadget_ep0.c | 4 +++- drivers/usb/musb-new/musb_host.c | 2 ++ 5 files changed, 11 insertions(+), 1 deletion(-)
drivers/usb/musb-new/musb_core.c +2 -0
@@ -80,6 +80,8 @@#include <linux/io.h> #else #include <common.h> +#include <dm.h> +#include <dm/device_compat.h> #include <usb.h> #include <linux/bitops.h> #include <linux/bug.h>
drivers/usb/musb-new/musb_dsps.c +2 -0
@@ -32,6 +32,8 @@#include <plat/usb.h> #else #include <common.h> +#include <dm.h> +#include <dm/device_compat.h> #include <asm/omap_musb.h> #include "linux-compat.h" #endif
drivers/usb/musb-new/musb_gadget.c +2 -0
@@ -23,6 +23,8 @@#include <linux/slab.h> #else #include <common.h> +#include <dm.h> +#include <dm/device_compat.h> #include <linux/bug.h> #include <linux/usb/ch9.h> #include "linux-compat.h"
drivers/usb/musb-new/musb_gadget_ep0.c +3 -1
@@ -19,8 +19,10 @@#include <linux/interrupt.h> #else #include <common.h> -#include "linux-compat.h" +#include <dm.h> +#include <dm/device_compat.h> #include <asm/processor.h> +#include "linux-compat.h" #endif #include "musb_core.h"
drivers/usb/musb-new/musb_host.c +2 -0
@@ -22,6 +22,8 @@#include <linux/dma-mapping.h> #else #include <common.h> +#include <dm.h> +#include <dm/device_compat.h> #include <usb.h> #include <linux/bug.h> #include "linux-compat.h"
Signature · 1 line
2.28.0
PATCH 13/16 usb: musb-new: Include device_compat.h
Quoted 4 lines · Sean Anderson
This was included, but was ifdef'd out. We also need
dm.hfor struct udevice.Signed-off-by Sean Anderson <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20201016/6d323a05/attachment.sig>
PATCH 14/16 usb: musb-new: mt85xx: Fix not calling dev_err with a device
In reply to Sean AndersonThis driver doesn't use DM (in the correct places), so we use a device and not a udevice. We also need to include device_compat.h
---
drivers/usb/musb-new/mt85xx.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/usb/musb-new/mt85xx.c +4 -3
@@ -12,6 +12,7 @@#include <common.h> #include <clk.h> #include <dm.h> +#include <dm/device_compat.h> #include <dm/lists.h> #include <dm/root.h> #include <linux/delay.h>
@@ -244,17 +245,17 @@ static int mtk_musb_init(struct musb *musb) ret =clk_enable (&glue->usbpllclk);if (ret) { -dev_err (dev,"failed to enable usbpll clock\n" ); +dev_err (musb->controller,"failed to enable usbpll clock\n" );return ret; } ret =clk_enable (&glue->usbmcuclk);if (ret) { -dev_err (dev,"failed to enable usbmcu clock\n" ); +dev_err (musb->controller,"failed to enable usbmcu clock\n" );return ret; } ret =clk_enable (&glue->usbclk);if (ret) { -dev_err (dev,"failed to enable usb clock\n" ); +dev_err (musb->controller,"failed to enable usb clock\n" );return ret; }
Signature · 1 line
2.28.0
PATCH 14/16 usb: musb-new: mt85xx: Fix not calling dev_err with a device
Quoted 4 lines · Sean Anderson
This driver doesn't use DM (in the correct places), so we use a device and not a udevice. We also need to include
device_compat.hSigned-off-by Sean Anderson <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20201016/ebf9be02/attachment.sig>
PATCH 15/16 linux/compat.h: Remove redefinition of dev_xxx macros
In reply to Sean AndersonAll users of these functions now include dm/device_compat.h directly.
---
include/linux/compat.h | 28 ---------------------------- 1 file changed, 28 deletions(-)
include/linux/compat.h +0 -28
@@ -24,34 +24,6 @@ struct p_current{extern struct p_current *current; -/* avoid conflict with <dm/device.h> */ -#ifdef dev_dbg -#undef dev_dbg -#endif -#ifdef dev_vdbg -#undef dev_vdbg -#endif -#ifdef dev_info -#undef dev_info -#endif -#ifdef dev_err -#undef dev_err -#endif -#ifdef dev_warn -#undef dev_warn -#endif - -#define dev_dbg(dev, fmt, args...) \ - debug(fmt, ##args) -#define dev_vdbg(dev, fmt, args...) \ - debug(fmt, ##args) -#define dev_info(dev, fmt, args...) \ - printf(fmt, ##args) -#define dev_err(dev, fmt, args...) \ - printf(fmt, ##args) -#define dev_warn(dev, fmt, args...) \ - printf(fmt, ##args) -#define GFP_ATOMIC ((gfp_t) 0)#define GFP_KERNEL ((gfp_t) 0)#define GFP_NOFS ((gfp_t) 0)
Signature · 1 line
2.28.0
PATCH 15/16 linux/compat.h: Remove redefinition of dev_xxx macros
Quoted 9 lines · Sean Anderson
All users of these functions now include
dm/device_compat.hdirectly.Signed-off-by Sean Anderson <[email protected]>---
include/linux/compat.h | 28 ---------------------------- 1 file changed, 28 deletions(-)
PATCH 15/16 linux/compat.h: Remove redefinition of dev_xxx macros
In reply to Sean AndersonQuoted 4 lines · Sean Anderson
All users of these functions now include
dm/device_compat.hdirectly.Signed-off-by Sean Anderson <[email protected]>Reviewed-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20201016/d1286546/attachment.sig>
PATCH 16/16 dm: Don't undefine dev_xxx macros
In reply to Sean AndersonNow that linux/compat.h does not define these macros, we do not need to undefine them.
---
include/dm/device_compat.h | 20 -------------------- 1 file changed, 20 deletions(-)
include/dm/device_compat.h +0 -20
@@ -15,26 +15,6 @@#include <linux/build_bug.h> #include <linux/compat.h> -/* -* REVISIT: -* remove the following after resolving conflicts with <linux/compat.h> -*/ -#ifdef dev_dbg -#undef dev_dbg -#endif -#ifdef dev_vdbg -#undef dev_vdbg -#endif -#ifdef dev_info -#undef dev_info -#endif -#ifdef dev_err -#undef dev_err -#endif -#ifdef dev_warn -#undef dev_warn -#endif -/* * Define a new identifier which can be tested on by C code. A similar * definition is made for DEBUG in <log.h>.
Signature · 1 line
2.28.0
PATCH 16/16 dm: Don't undefine dev_xxx macros
Quoted 10 lines · Sean Anderson
Now that
linux/compat.hdoes not define these macros, we do not need to undefine them.Signed-off-by Sean Anderson <[email protected]>---
include/dm/device_compat.h | 20 -------------------- 1 file changed, 20 deletions(-)
PATCH 16/16 dm: Don't undefine dev_xxx macros
In reply to Sean AndersonQuoted 5 lines · Sean Anderson
Now that
linux/compat.hdoes not define these macros, we do not need to undefine them.Signed-off-by Sean Anderson <[email protected]>Reviewed-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20201016/be34af18/attachment.sig>
PATCH 1/3 arm: fsl-layerscape: Include device_compat.h in soc.c
In reply to Sean AndersonNecessary for dev_xxx.
--- arch/arm/cpu/armv8/fsl-layerscape/soc.c | 1 + 1 file changed, 1 insertion(+)
arch/arm/cpu/armv8/fsl-layerscape/soc.c +1 -0
@@ -37,6 +37,7 @@#include <env_internal.h> #endif #include <dm.h> +#include <dm/device_compat.h> #include <linux/err.h> #if defined(CONFIG_TFABOOT ) || defined(CONFIG_GIC_V3_ITS )DECLARE_GLOBAL_DATA_PTR ;
Signature · 1 line
2.17.1
PATCH 1/3 arm: fsl-layerscape: Include device_compat.h in soc.c
Quoted 3 lines · Tom Rini
Necessary for
dev_xxx.Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20201016/47b57c20/attachment.sig>
PATCH 2/3 clk: at91: Include device_compat.h in compat.c
In reply to Tom RiniNecessary for dev_xxx.
--- drivers/clk/at91/compat.c | 1 + 1 file changed, 1 insertion(+)
drivers/clk/at91/compat.c +1 -0
@@ -9,6 +9,7 @@#include <common.h> #include <clk-uclass.h> #include <dm.h> +#include <dm/device_compat.h> #include <dm/lists.h> #include <dm/util.h> #include <mach/at91_pmc.h>
Signature · 1 line
2.17.1
PATCH 2/3 clk: at91: Include device_compat.h in compat.c
Quoted 3 lines · Tom Rini
Necessary for
dev_xxx.Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20201016/7da94c11/attachment.sig>
PATCH 3/3 usb: dwc3: Include device_compat.h in dwc3-octeon-glue.c
In reply to Tom RiniNecessary for dev_xxx.
--- drivers/usb/host/dwc3-octeon-glue.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/host/dwc3-octeon-glue.c +1 -0
@@ -13,6 +13,7 @@#include <errno.h> #include <usb.h> #include <asm/io.h> +#include <dm/device_compat.h> #include <dm/lists.h> #include <dm/of_access.h> #include <linux/bitfield.h>
Signature · 1 line
2.17.1
PATCH 3/3 usb: dwc3: Include device_compat.h in dwc3-octeon-glue.c
Quoted 3 lines · Tom Rini
Necessary for
dev_xxx.Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20201016/8b929c84/attachment.sig>