diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-08-06 12:33:16 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-08-06 12:33:16 +0200 |
| commit | 0dea9c7cf9820b43bf04810996cf8d732a4e0ee0 (patch) | |
| tree | 61179febedc33f493abd17ca088d00e4a65de897 /drivers | |
| parent | e188d2ec26e8cf6d4ba0908e76868e91b6999fdf (diff) | |
| parent | 8e04a039a9625f75cdc9274ad06c4b8084565848 (diff) | |
| download | barebox-0dea9c7cf9820b43bf04810996cf8d732a4e0ee0.tar.gz barebox-0dea9c7cf9820b43bf04810996cf8d732a4e0ee0.tar.xz | |
Merge branch 'for-next/ppc'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/i2c/busses/Kconfig | 9 | ||||
| -rw-r--r-- | drivers/net/fec_mpc5200.c | 2 | ||||
| -rw-r--r-- | drivers/serial/serial_mpc5xxx.c | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig index 39622863fb..181321b159 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig @@ -17,8 +17,13 @@ config I2C_AT91 depends on ARCH_AT91 config I2C_IMX - bool "MPC85xx/i.MX I2C Master driver" - depends on (ARCH_IMX && !ARCH_IMX1) || ARCH_MPC85XX + bool "MPC85xx/MPC5200/i.MX I2C Master driver" + depends on (ARCH_IMX && !ARCH_IMX1) || ARCH_MPC85XX || ARCH_MPC5200 + help + If you say yes to this option, support will be included for many + built-in I2C master controllers found in Freescale SoCs. This is true + for many i.MX ARM based SoCs, for MPC85xx and MPC5200 PowerPC based + SoCs. config I2C_MV64XXX bool "Marvell mv64xxx I2C Controller" diff --git a/drivers/net/fec_mpc5200.c b/drivers/net/fec_mpc5200.c index 14ef872927..30be8f77dc 100644 --- a/drivers/net/fec_mpc5200.c +++ b/drivers/net/fec_mpc5200.c @@ -14,7 +14,7 @@ #include <init.h> #include <driver.h> #include <mach/sdma.h> -#include <mach/clocks.h> +#include <mach/clock.h> #include <linux/phy.h> #include <linux/err.h> #include "fec_mpc5200.h" diff --git a/drivers/serial/serial_mpc5xxx.c b/drivers/serial/serial_mpc5xxx.c index f48255ba75..711163cefd 100644 --- a/drivers/serial/serial_mpc5xxx.c +++ b/drivers/serial/serial_mpc5xxx.c @@ -35,7 +35,7 @@ #include <init.h> #include <console.h> #include <xfuncs.h> -#include <mach/clocks.h> +#include <mach/clock.h> #include <linux/err.h> static int __mpc5xxx_serial_setbaudrate(struct mpc5xxx_psc *psc, int baudrate) |