diff options
| author | Tom Rini <trini@konsulko.com> | 2021-01-04 09:11:35 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-01-04 09:11:35 -0500 |
| commit | 2e57549a9c34200358d26366f494c3bdcfdea93c (patch) | |
| tree | 7a284f3e0381db0a431b74b2418b797375431026 /drivers | |
| parent | 21e1cae7902e6a9b1d7cf47cf4764e6fe7d3452a (diff) | |
| parent | acff02c6dd05740ba5fbfaa6e2dd87c01b5c3257 (diff) | |
Merge branch '2021-01-04-minor-fixes'
- Assorted fixes
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/nvme/nvme.h | 8 | ||||
| -rw-r--r-- | drivers/usb/Kconfig | 2 |
2 files changed, 1 insertions, 9 deletions
diff --git a/drivers/nvme/nvme.h b/drivers/nvme/nvme.h index 0e8cb221a7a..aa4b3bac679 100644 --- a/drivers/nvme/nvme.h +++ b/drivers/nvme/nvme.h @@ -535,28 +535,20 @@ struct nvme_completion { */ static inline u64 nvme_readq(__le64 volatile *regs) { -#if BITS_PER_LONG == 64 - return readq(regs); -#else __u32 *ptr = (__u32 *)regs; u64 val_lo = readl(ptr); u64 val_hi = readl(ptr + 1); return val_lo + (val_hi << 32); -#endif } static inline void nvme_writeq(const u64 val, __le64 volatile *regs) { -#if BITS_PER_LONG == 64 - writeq(val, regs); -#else __u32 *ptr = (__u32 *)regs; u32 val_lo = lower_32_bits(val); u32 val_hi = upper_32_bits(val); writel(val_lo, ptr); writel(val_hi, ptr + 1); -#endif } struct nvme_bar { diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig index fedc0134f5f..6e291198abe 100644 --- a/drivers/usb/Kconfig +++ b/drivers/usb/Kconfig @@ -60,7 +60,7 @@ config DM_USB_GADGET mode) config SPL_DM_USB_GADGET - bool "Enable driver model for USB Gadget in sPL" + bool "Enable driver model for USB Gadget in SPL" depends on SPL_DM_USB help Enable driver model for USB Gadget in SPL |