diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2020-06-11 07:35:39 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-06-11 07:35:39 +0200 |
| commit | 1fb15fcfe9ecb079b88df7eb01f1e29144cd8f96 (patch) | |
| tree | 651ae01bac7ed264934baccd0fccbfeec6905da6 /drivers | |
| parent | d6757bacf8180b17692682c58dd6a9938d0c3c1d (diff) | |
| parent | aa2cd910c7465eaf6de04da1b4d110205ad63c77 (diff) | |
| download | barebox-1fb15fcfe9ecb079b88df7eb01f1e29144cd8f96.tar.gz barebox-1fb15fcfe9ecb079b88df7eb01f1e29144cd8f96.tar.xz | |
Merge branch 'for-next/sandbox-compile-test'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/clocksource/arm_global_timer.c | 1 | ||||
| -rw-r--r-- | drivers/ddr/fsl/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/mtd/nand/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/mtd/nand/nand_base.c | 1 | ||||
| -rw-r--r-- | drivers/net/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/usb/host/xhci.h | 14 |
6 files changed, 8 insertions, 13 deletions
diff --git a/drivers/clocksource/arm_global_timer.c b/drivers/clocksource/arm_global_timer.c index 44e3a3c762..78cd72d3eb 100644 --- a/drivers/clocksource/arm_global_timer.c +++ b/drivers/clocksource/arm_global_timer.c @@ -20,7 +20,6 @@ #include <clock.h> #include <linux/clk.h> #include <io.h> -#include <asm/system.h> #define GT_COUNTER0 0x00 #define GT_COUNTER1 0x04 diff --git a/drivers/ddr/fsl/Kconfig b/drivers/ddr/fsl/Kconfig index 09920bb863..b12bf8f777 100644 --- a/drivers/ddr/fsl/Kconfig +++ b/drivers/ddr/fsl/Kconfig @@ -1,5 +1,6 @@ config DDR_FSL bool "Freescale DDR support" if COMPILE_TEST + depends on ARM if DDR_FSL diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig index fff9903d1d..b81e72d6b7 100644 --- a/drivers/mtd/nand/Kconfig +++ b/drivers/mtd/nand/Kconfig @@ -98,7 +98,7 @@ config MTD_NAND_OMAP_ELM config NAND_ORION bool prompt "Marvell Orion NAND driver" - depends on ARCH_KIRKWOOD || COMPILE_TEST + depends on ARM && (ARCH_KIRKWOOD || COMPILE_TEST) help Support for the Orion NAND controller, present in Kirkwood SoCs. diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index 00f0f75884..3f4c787f49 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -1688,6 +1688,7 @@ static int nand_read(struct mtd_info *mtd, loff_t from, size_t len, nand_get_device(mtd, FL_READING); ops.len = len; ops.datbuf = buf; + ops.ooblen = 0; ops.oobbuf = NULL; ops.mode = MTD_OPS_PLACE_OOB; ret = nand_do_read_ops(mtd, from, &ops); diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 9bb4985275..76509a52a1 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -155,6 +155,7 @@ config DRIVER_NET_ETHOC config DRIVER_NET_FEC_IMX bool "i.MX FEC Ethernet driver" depends on ARCH_HAS_FEC_IMX || COMPILE_TEST + depends on HAS_DMA select PHYLIB config DRIVER_NET_FSL_FMAN @@ -180,6 +181,7 @@ config DRIVER_NET_KS8851_MLL config DRIVER_NET_MACB bool "macb Ethernet driver" depends on HAS_MACB || COMPILE_TEST + depends on HAS_DMA select PHYLIB config DRIVER_NET_MICREL diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h index 886cbef14c..9ffbb103d5 100644 --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h @@ -17,8 +17,8 @@ #define HOST_XHCI_H_ #include <asm/types.h> -#include <asm/cache.h> #include <io.h> +#include <io-64-nonatomic-lo-hi.h> #include <linux/list.h> #define MAX_EP_CTX_NUM 31 @@ -1113,10 +1113,7 @@ static inline u64 xhci_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); + return lo_hi_readq(regs); #endif } @@ -1125,12 +1122,7 @@ static inline void xhci_writeq(__le64 volatile *regs, const u64 val) #if BITS_PER_LONG == 64 writeq(val, regs); #else - __u32 *ptr = (__u32 *)regs; - u32 val_lo = lower_32_bits(val); - /* FIXME */ - u32 val_hi = upper_32_bits(val); - writel(val_lo, ptr); - writel(val_hi, ptr + 1); + lo_hi_writeq(val, regs); #endif } |