summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/Makefile4
-rw-r--r--drivers/clocksource/Kconfig2
-rw-r--r--drivers/firmware/zynqmp-fpga.c2
-rw-r--r--drivers/i2c/Makefile3
-rw-r--r--drivers/input/Kconfig1
-rw-r--r--drivers/mci/Kconfig6
-rw-r--r--drivers/mfd/da9063.c16
-rw-r--r--drivers/mfd/superio.c4
-rw-r--r--drivers/misc/Kconfig1
-rw-r--r--drivers/mtd/nand/nand_base.c4
-rw-r--r--drivers/net/Kconfig3
-rw-r--r--drivers/nvme/host/core.c2
-rw-r--r--drivers/pinctrl/Kconfig20
-rw-r--r--drivers/pinctrl/pinctrl-tegra30.c4
-rw-r--r--drivers/spi/spi.c2
-rw-r--r--drivers/usb/dwc3/Kconfig2
-rw-r--r--drivers/usb/misc/Kconfig1
17 files changed, 43 insertions, 34 deletions
diff --git a/drivers/Makefile b/drivers/Makefile
index 5a52225ee0..08a17ff459 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -8,8 +8,8 @@ obj-y += mtd/
obj-y += usb/
obj-$(CONFIG_DISK) += ata/
obj-$(CONFIG_SPI) += spi/
-obj-$(CONFIG_I2C) += i2c/
-obj-$(CONFIG_MCI) += mci/
+obj-y += i2c/
+obj-y += mci/
obj-$(CONFIG_VIDEO) += video/
obj-y += clk/
obj-y += clocksource/
diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
index 43c5bfc973..44a6cef6fb 100644
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@ -73,7 +73,7 @@ config CLOCKSOURCE_ATMEL_PIT
config CLOCKSOURCE_ARMV8_TIMER
bool
default y
- depends on ARM && (CPU_64v8 || CPU_V7)
+ depends on ARM && CPU_V8
config CLOCKSOURCE_ARM_GLOBAL_TIMER
bool
diff --git a/drivers/firmware/zynqmp-fpga.c b/drivers/firmware/zynqmp-fpga.c
index 887865883a..1728e2a954 100644
--- a/drivers/firmware/zynqmp-fpga.c
+++ b/drivers/firmware/zynqmp-fpga.c
@@ -136,7 +136,7 @@ static int is_bin_header_valid(const u32 *bin_header, size_t size,
return 0;
for (i = 0; i < ARRAY_SIZE(bin_format); i++)
- if (bin_header != (byte_order == XILINX_BYTE_ORDER_BIT) ?
+ if (bin_header[i] != (byte_order == XILINX_BYTE_ORDER_BIT) ?
bin_format[i] : __swab32(bin_format[i]))
return 0;
diff --git a/drivers/i2c/Makefile b/drivers/i2c/Makefile
index c93653414e..b887e75573 100644
--- a/drivers/i2c/Makefile
+++ b/drivers/i2c/Makefile
@@ -1,2 +1,3 @@
-obj-$(CONFIG_I2C) += i2c.o i2c-smbus.o busses/ algos/ muxes/
+obj-y += busses/
+obj-$(CONFIG_I2C) += i2c.o i2c-smbus.o algos/ muxes/
obj-$(CONFIG_I2C_MUX) += i2c-mux.o
diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
index be061683fb..e40032d91b 100644
--- a/drivers/input/Kconfig
+++ b/drivers/input/Kconfig
@@ -66,6 +66,7 @@ config KEYBOARD_USB
config INPUT_SPECIALKEYS
bool "Special keys handler"
+ select POLLER
select INPUT
help
Say Y here to handle key events like KEY_RESTART and KEY_POWER.
diff --git a/drivers/mci/Kconfig b/drivers/mci/Kconfig
index 4a71a46097..33b700d7a6 100644
--- a/drivers/mci/Kconfig
+++ b/drivers/mci/Kconfig
@@ -97,9 +97,6 @@ config MCI_IMX_ESDHC_PIO
help
mostly useful for debugging. Normally you should use DMA.
-config MCI_IMX_ESDHC_PBL
- bool
-
config MCI_OMAP_HSMMC
bool "OMAP HSMMC"
depends on ARCH_OMAP4 || ARCH_OMAP3 || ARCH_AM33XX
@@ -163,3 +160,6 @@ config MCI_STM32_SDMMC2
say Y or M here.
endif
+
+config MCI_IMX_ESDHC_PBL
+ bool
diff --git a/drivers/mfd/da9063.c b/drivers/mfd/da9063.c
index e1343bac76..967ca9ac51 100644
--- a/drivers/mfd/da9063.c
+++ b/drivers/mfd/da9063.c
@@ -402,13 +402,15 @@ static int da9063_probe(struct device_d *dev)
restart_handler_register(&priv->restart);
- priv->gpio.base = -1;
- priv->gpio.ngpio = 5;
- priv->gpio.ops = &da9063_gpio_ops;
- priv->gpio.dev = dev;
- ret = gpiochip_add(&priv->gpio);
- if (ret)
- goto on_error;
+ if (IS_ENABLED(CONFIG_GPIOLIB)) {
+ priv->gpio.base = -1;
+ priv->gpio.ngpio = 5;
+ priv->gpio.ops = &da9063_gpio_ops;
+ priv->gpio.dev = dev;
+ ret = gpiochip_add(&priv->gpio);
+ if (ret)
+ goto on_error;
+ }
if (IS_ENABLED(CONFIG_OFDEVICE) && dev->device_node)
return of_platform_populate(dev->device_node, NULL, dev);
diff --git a/drivers/mfd/superio.c b/drivers/mfd/superio.c
index 12d74b40f6..ab94a4fa8f 100644
--- a/drivers/mfd/superio.c
+++ b/drivers/mfd/superio.c
@@ -24,7 +24,7 @@ struct device_d *superio_func_add(struct superio_chip *siochip, const char *name
return dev;
}
-EXPORT_SYMBOL(superio_func_add)
+EXPORT_SYMBOL(superio_func_add);
static int superio_reg_read(void *ctx, unsigned int reg, unsigned int *val)
{
@@ -95,4 +95,4 @@ void superio_chip_add(struct superio_chip *siochip)
pr_warn("registering %s regmap cdev failed: %s\n",
chipname, strerror(-ret));
}
-EXPORT_SYMBOL(superio_chip_add)
+EXPORT_SYMBOL(superio_chip_add);
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index b76198b10a..87674a2a29 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -25,6 +25,7 @@ config DEV_MEM
config UBOOTVAR
bool "U-Boot environment storage"
+ depends on OFTREE
help
This driver exposes U-Boot environment variable storage as a
single mmap-able device, hiding various low-level details
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index 6b7d01919c..00f0f75884 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -407,7 +407,7 @@ static int nand_block_markbad_lowlevel(struct mtd_info *mtd, loff_t ofs)
}
/* Mark block bad in BBT */
- if (chip->bbt) {
+ if (IS_ENABLED(CONFIG_NAND_BBT) && chip->bbt) {
res = nand_markbad_bbt(mtd, ofs);
if (!ret)
ret = res;
@@ -458,7 +458,7 @@ static int nand_block_markgood_lowlevel(struct mtd_info *mtd, loff_t ofs)
}
/* Mark block good in BBT */
- if (chip->bbt) {
+ if (IS_ENABLED(CONFIG_NAND_BBT) && chip->bbt) {
ret = nand_markgood_bbt(mtd, ofs);
if (ret)
return ret;
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 62e522a302..5823320b03 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -90,8 +90,9 @@ endif
config DRIVER_NET_DESIGNWARE_EQOS
bool "Designware Designware Ethernet QoS support"
depends on HAS_DMA
+ depends on COMMON_CLK
+ depends on OFTREE
select PHYLIB
- select OFTREE
help
This option enables support for the Synopsys
Designware Ethernet Quality-of-Service (GMAC4).
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index d2c2b6f306..257679fae8 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -20,7 +20,7 @@ int nvme_submit_sync_cmd(struct nvme_ctrl *ctrl,
return __nvme_submit_sync_cmd(ctrl, cmd, NULL, buffer, bufflen, 0,
NVME_QID_ADMIN);
}
-EXPORT_SYMBOL_GPL(nvme_sec_submit);
+EXPORT_SYMBOL_GPL(nvme_submit_sync_cmd);
static int nvme_identify_ctrl(struct nvme_ctrl *dev, struct nvme_id_ctrl **id)
{
diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index 95c6708f4a..fd75ea6a4f 100644
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@ -17,16 +17,6 @@ config PINCTRL_AT91
help
The pinmux controller found on AT91 SoCs.
-config PINCTRL_AT91PIO4
- bool "AT91 PIO4 pinctrl driver"
- depends on OFDEVICE
- depends on ARCH_AT91
- select GPIOLIB
- select OF_GPIO
- help
- Say Y here to enable the at91 pinctrl/gpio driver for Atmel PIO4
- controller available on sama5d2 SoC.
-
config PINCTRL_BCM283X
bool "GPIO and pinmux support for BCM283X"
depends on ARCH_BCM283X
@@ -55,6 +45,16 @@ comment "OFDEVICE is not enabled."
comment "Without device tree support PINCTRL won't do anything"
endif
+config PINCTRL_AT91PIO4
+ bool "AT91 PIO4 pinctrl driver"
+ depends on ARCH_AT91
+ depends on OFDEVICE
+ select GPIOLIB
+ select OF_GPIO
+ help
+ Say Y here to enable the at91 pinctrl/gpio driver for Atmel PIO4
+ controller available on sama5d2 SoC.
+
config PINCTRL_MXS
bool "MXS pinctrl"
depends on ARCH_MXS
diff --git a/drivers/pinctrl/pinctrl-tegra30.c b/drivers/pinctrl/pinctrl-tegra30.c
index ffb04eebbf..278ea8c4a0 100644
--- a/drivers/pinctrl/pinctrl-tegra30.c
+++ b/drivers/pinctrl/pinctrl-tegra30.c
@@ -388,7 +388,7 @@ static const struct tegra_drive_pingroup tegra30_drive_groups[] = {
DRV_PG(vi1, 0x8c8, -1, -1, -1, 14, 5, 19, 5, 24, 4, 28, 4),
};
-static const struct pinctrl_tegra30_drvdata tegra30_drvdata = {
+__maybe_unused static const struct pinctrl_tegra30_drvdata tegra30_drvdata = {
.pingrps = tegra30_pin_groups,
.num_pingrps = ARRAY_SIZE(tegra30_pin_groups),
.drvgrps = tegra30_drive_groups,
@@ -632,7 +632,7 @@ static const struct tegra_drive_pingroup tegra124_drive_groups[] = {
DRV_PG(ao4, 0x9c8, 2, 3, 4, 12, 7, 20, 7, 28, 2, 30, 2),
};
-static const struct pinctrl_tegra30_drvdata tegra124_drvdata = {
+__maybe_unused static const struct pinctrl_tegra30_drvdata tegra124_drvdata = {
.pingrps = tegra124_pin_groups,
.num_pingrps = ARRAY_SIZE(tegra124_pin_groups),
.drvgrps = tegra124_drive_groups,
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index d9311d4af5..bd615b4e99 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -283,7 +283,7 @@ int spi_register_controller(struct spi_controller *ctrl)
return status;
}
-EXPORT_SYMBOL(spi_register_ctrl);
+EXPORT_SYMBOL(spi_register_controller);
struct spi_controller *spi_get_controller(int bus)
{
diff --git a/drivers/usb/dwc3/Kconfig b/drivers/usb/dwc3/Kconfig
index 09da121374..1b11f391fa 100644
--- a/drivers/usb/dwc3/Kconfig
+++ b/drivers/usb/dwc3/Kconfig
@@ -1,6 +1,7 @@
config USB_DWC3
tristate "DesignWare USB3 DRD Core Support"
depends on USB && HAS_DMA
+ depends on OFDEVICE
select USB_XHCI
help
Say Y or M here if your system has a Dual Role SuperSpeed
@@ -29,6 +30,7 @@ config USB_DWC3_GADGET
config USB_DWC3_DUAL_ROLE
bool "Dual Role mode"
+ depends on USB_GADGET
help
This is the default mode of working of DWC3 controller where
both host and gadget features are enabled.
diff --git a/drivers/usb/misc/Kconfig b/drivers/usb/misc/Kconfig
index 7d6c9da594..270606f50b 100644
--- a/drivers/usb/misc/Kconfig
+++ b/drivers/usb/misc/Kconfig
@@ -6,6 +6,7 @@ comment "USB Miscellaneous drivers"
config USB_HUB_USB251XB
bool "USB251XB Hub Controller Configuration Driver"
depends on I2C
+ depends on OFDEVICE
select NLS
help
This option enables support for configuration via SMBus of the