diff options
| author | Tom Rini <[email protected]> | 2023-05-31 12:32:38 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-05-31 12:32:38 -0400 |
| commit | 06af8fcf6ce2833dc4e8a897a1467248c86d0205 (patch) | |
| tree | cfa3fdb741c0a333fc2601153a10ef8ca0870ca0 /drivers | |
| parent | 7eac2e46ecf67c1f1b36a3bd31dde75ec7441bcf (diff) | |
| parent | f1671205fa44084b334027a267c86e5be2ea7c1a (diff) | |
Merge branch '2023-05-31-code-cleanups' into next
- Correct some header double-inclusion guards and remove some dead (or
in the case of ti816x, unmaintained) code.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/i2c/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/net/ti/davinci_emac.c | 4 | ||||
| -rw-r--r-- | drivers/pinctrl/exynos/pinctrl-exynos.h | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig index 05b14d2451c..5e81698143a 100644 --- a/drivers/i2c/Kconfig +++ b/drivers/i2c/Kconfig @@ -744,7 +744,6 @@ config SYS_I2C_SPEED config SYS_I2C_BUS_MAX int "Max I2C busses" depends on ARCH_OMAP2PLUS || ARCH_SOCFPGA - default 2 if TI816X default 3 if OMAP34XX || AM33XX || AM43XX default 4 if ARCH_SOCFPGA || OMAP44XX default 5 if OMAP54XX diff --git a/drivers/net/ti/davinci_emac.c b/drivers/net/ti/davinci_emac.c index 29d2fc9b54e..034877a7690 100644 --- a/drivers/net/ti/davinci_emac.c +++ b/drivers/net/ti/davinci_emac.c @@ -833,9 +833,9 @@ static int davinci_emac_probe(struct udevice *dev) #endif } -#if defined(CONFIG_TI816X) || (defined(CONFIG_DRIVER_TI_EMAC_USE_RMII) && \ +#if defined(CONFIG_DRIVER_TI_EMAC_USE_RMII) && \ defined(CONFIG_MACH_DAVINCI_DA850_EVM) && \ - !defined(CONFIG_DRIVER_TI_EMAC_RMII_NO_NEGOTIATE)) + !defined(CONFIG_DRIVER_TI_EMAC_RMII_NO_NEGOTIATE) for (i = 0; i < num_phy; i++) { if (phy[i].is_phy_connected(i)) phy[i].auto_negotiate(i); diff --git a/drivers/pinctrl/exynos/pinctrl-exynos.h b/drivers/pinctrl/exynos/pinctrl-exynos.h index a7788b76d90..cbc5174b48c 100644 --- a/drivers/pinctrl/exynos/pinctrl-exynos.h +++ b/drivers/pinctrl/exynos/pinctrl-exynos.h @@ -6,7 +6,7 @@ */ #ifndef __PINCTRL_EXYNOS_H_ -#define __PINCTRL_EXYNOS__H_ +#define __PINCTRL_EXYNOS_H_ #define PIN_CON 0x00 /* Offset of pin function register */ #define PIN_DAT 0x04 /* Offset of pin data register */ |