Merge branch 'for-next/misc'

Conflicts:
	scripts/Makefile

33 files changed, 43 insertions, 11 deletions

diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index f9cf2d1436..9ba18a3c6e 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -29,6 +29,7 @@
 #include <init.h>
 #include <errno.h>
 #include <io.h>
+#include <of.h>
 #include <malloc.h>
 #include <scsi.h>
 #include <linux/ctype.h>
@@ -375,7 +376,7 @@ static int ahci_init_port(struct ahci_port *ahci_port)
 	ret = wait_on_timeout(WAIT_LINKUP,
 			(ahci_port_read(ahci_port, PORT_SCR_STAT) & 0xf) == 0x3);
 	if (ret) {
-		ahci_port_info(ahci_port, "SATA link timeout\n");;
+		ahci_port_info(ahci_port, "SATA link timeout\n");
 		ret = -ETIMEDOUT;
 		goto err_init;
 	}
diff --git a/drivers/ata/ide-sff.c b/drivers/ata/ide-sff.c
index a7f2647afd..3d5932e278 100644
--- a/drivers/ata/ide-sff.c
+++ b/drivers/ata/ide-sff.c
@@ -1,6 +1,7 @@
 #include <common.h>
 #include <ata_drive.h>
 #include <io.h>
+#include <errno.h>
 #include <clock.h>
 #include <disks.h>
 #include <malloc.h>
diff --git a/drivers/ata/pata-imx.c b/drivers/ata/pata-imx.c
index 0e348069fe..7f9e39b503 100644
--- a/drivers/ata/pata-imx.c
+++ b/drivers/ata/pata-imx.c
@@ -30,6 +30,7 @@
 #include <ata_drive.h>
 #include <platform_ide.h>
 #include <io.h>
+#include <of.h>
 #include <linux/err.h>
 #include <linux/clk.h>
 
diff --git a/drivers/ata/sata-imx.c b/drivers/ata/sata-imx.c
index ef7989e610..b7bd1107cc 100644
--- a/drivers/ata/sata-imx.c
+++ b/drivers/ata/sata-imx.c
@@ -1,6 +1,7 @@
 #include <common.h>
 #include <ata_drive.h>
 #include <io.h>
+#include <of.h>
 #include <clock.h>
 #include <disks.h>
 #include <driver.h>
diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index 4357020241..b383d09c3e 100644
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <driver.h>
 #include <errno.h>
+#include <of.h>
 
 LIST_HEAD(bus_list);
 EXPORT_SYMBOL(bus_list);
diff --git a/drivers/base/driver.c b/drivers/base/driver.c
index 80e0ea882f..4250fb0912 100644
--- a/drivers/base/driver.c
+++ b/drivers/base/driver.c
@@ -30,6 +30,7 @@
 #include <linux/ctype.h>
 #include <errno.h>
 #include <fs.h>
+#include <of.h>
 #include <linux/list.h>
 #include <complete.h>
 #include <pinctrl.h>
diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 34a79b2caa..e053ec7bbc 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -20,6 +20,7 @@
 #include <driver.h>
 #include <errno.h>
 #include <init.h>
+#include <of.h>
 
 static int platform_probe(struct device_d *dev)
 {
diff --git a/drivers/eeprom/at24.c b/drivers/eeprom/at24.c
index 4b2afc4775..5e5b359d94 100644
--- a/drivers/eeprom/at24.c
+++ b/drivers/eeprom/at24.c
@@ -435,6 +435,8 @@ static int at24_probe(struct device_d *dev)
 
 	devfs_create(&at24->cdev);
 
+	of_parse_partitions(&at24->cdev, dev->device_node);
+
 	return 0;
 
 err_clients:
diff --git a/drivers/gpio/gpio-imx.c b/drivers/gpio/gpio-imx.c
index 063a81c896..a71492a3c3 100644
--- a/drivers/gpio/gpio-imx.c
+++ b/drivers/gpio/gpio-imx.c
@@ -23,6 +23,7 @@
 #include <common.h>
 #include <errno.h>
 #include <io.h>
+#include <of.h>
 #include <gpio.h>
 #include <init.h>
 
diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c
index c607bcba1a..f657c287f7 100644
--- a/drivers/i2c/busses/i2c-imx.c
+++ b/drivers/i2c/busses/i2c-imx.c
@@ -34,6 +34,7 @@
 #include <common.h>
 #include <driver.h>
 #include <init.h>
+#include <of.h>
 #include <malloc.h>
 #include <types.h>
 #include <xfuncs.h>
diff --git a/drivers/i2c/i2c.c b/drivers/i2c/i2c.c
index ccc484480f..3b9f601f68 100644
--- a/drivers/i2c/i2c.c
+++ b/drivers/i2c/i2c.c
@@ -22,6 +22,7 @@
 #include <malloc.h>
 #include <xfuncs.h>
 #include <init.h>
+#include <of.h>
 
 #include <i2c/i2c.h>
 
diff --git a/drivers/mci/imx-esdhc.c b/drivers/mci/imx-esdhc.c
index 8da7097c43..7664e7be4c 100644
--- a/drivers/mci/imx-esdhc.c
+++ b/drivers/mci/imx-esdhc.c
@@ -24,6 +24,7 @@
 #include <common.h>
 #include <driver.h>
 #include <init.h>
+#include <of.h>
 #include <malloc.h>
 #include <mci.h>
 #include <clock.h>
diff --git a/drivers/mci/mci-core.c b/drivers/mci/mci-core.c
index cfae91b2ea..a232679571 100644
--- a/drivers/mci/mci-core.c
+++ b/drivers/mci/mci-core.c
@@ -34,6 +34,7 @@
 #include <asm/byteorder.h>
 #include <block.h>
 #include <disks.h>
+#include <of.h>
 #include <linux/err.h>
 
 #define MAX_BUFFER_NUMBER 0xffffffff
@@ -831,7 +832,7 @@ static void mci_extract_card_capacity_from_csd(struct mci *mci)
 		mci->capacity = (csize + 1) << (cmult + 2);
 	}
 
-	mci->capacity *= 1 << UNSTUFF_BITS(mci->csd, 80, 4);;
+	mci->capacity *= 1 << UNSTUFF_BITS(mci->csd, 80, 4);
 	dev_dbg(&mci->dev, "Capacity: %u MiB\n", (unsigned)(mci->capacity >> 20));
 }
 
diff --git a/drivers/mci/mxs.c b/drivers/mci/mxs.c
index 1b935f7ce6..bf928e80ff 100644
--- a/drivers/mci/mxs.c
+++ b/drivers/mci/mxs.c
@@ -570,6 +570,7 @@ static int mxs_mci_probe(struct device_d *hw_dev)
 	/* feed forward the platform specific values */
 	host->voltages = pd->voltages;
 	host->host_caps = pd->caps;
+	host->devname = pd->devname;
 
 	mxs_mci->clk = clk_get(hw_dev, NULL);
 	if (IS_ERR(mxs_mci->clk))
diff --git a/drivers/mfd/mc13xxx.c b/drivers/mfd/mc13xxx.c
index cf4c02aa05..bfbd328323 100644
--- a/drivers/mfd/mc13xxx.c
+++ b/drivers/mfd/mc13xxx.c
@@ -21,6 +21,7 @@
 #include <xfuncs.h>
 #include <errno.h>
 #include <malloc.h>
+#include <of.h>
 
 #include <i2c/i2c.h>
 #include <spi/spi.h>
diff --git a/drivers/mfd/stmpe-i2c.c b/drivers/mfd/stmpe-i2c.c
index 3a2db923fd..c1e7d9ece4 100644
--- a/drivers/mfd/stmpe-i2c.c
+++ b/drivers/mfd/stmpe-i2c.c
@@ -19,6 +19,7 @@
 #include <driver.h>
 #include <xfuncs.h>
 #include <errno.h>
+#include <of.h>
 
 #include <i2c/i2c.h>
 #include <mfd/stmpe-i2c.h>
diff --git a/drivers/mtd/core.c b/drivers/mtd/core.c
index f63b10e9cd..33f900e732 100644
--- a/drivers/mtd/core.c
+++ b/drivers/mtd/core.c
@@ -25,6 +25,7 @@
 #include <ioctl.h>
 #include <nand.h>
 #include <errno.h>
+#include <of.h>
 
 #include "mtd.h"
 
diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index 1e3bc936f1..959401138d 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -17,6 +17,7 @@
 #include <common.h>
 #include <init.h>
 #include <driver.h>
+#include <of.h>
 #include <spi/spi.h>
 #include <spi/flash.h>
 #include <xfuncs.h>
diff --git a/drivers/mtd/devices/mtd_dataflash.c b/drivers/mtd/devices/mtd_dataflash.c
index d785e33dae..cdc0120c53 100644
--- a/drivers/mtd/devices/mtd_dataflash.c
+++ b/drivers/mtd/devices/mtd_dataflash.c
@@ -17,6 +17,7 @@
 #include <linux/err.h>
 #include <errno.h>
 #include <io.h>
+#include <of.h>
 #include <clock.h>
 
 #include <spi/spi.h>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 5d7d20f08d..c62641684e 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -62,7 +62,7 @@ config DRIVER_NET_SMC91111
 
 config DRIVER_NET_DAVINCI_EMAC
 	bool "TI Davinci/OMAP EMAC ethernet driver"
-	depends on ARCH_DAVINCI || ARCH_OMAP3
+	depends on ARCH_OMAP3
 	select PHYLIB
 
 config DRIVER_NET_DM9K
diff --git a/drivers/net/altera_tse.c b/drivers/net/altera_tse.c
index 1a442781a9..6978e2a2ea 100644
--- a/drivers/net/altera_tse.c
+++ b/drivers/net/altera_tse.c
@@ -376,7 +376,7 @@ static int tse_eth_send(struct eth_device *edev, void *packet, int length)
 
 	alt_sgdma_do_sync_transfer(tx_sgdma, tx_desc_cur);
 
-	return 0;;
+	return 0;
 }
 
 static void tse_eth_halt(struct eth_device *edev)
diff --git a/drivers/net/netx_eth.c b/drivers/net/netx_eth.c
index 9ca9bce1f8..309f4cb738 100644
--- a/drivers/net/netx_eth.c
+++ b/drivers/net/netx_eth.c
@@ -86,7 +86,7 @@ static int netx_eth_send (struct eth_device *edev,
 #endif
 	val = PFIFO_REG( PFIFO_BASE(CON_FIFO_PORT_LO(xcno)) );
 	if((val & FIFO_PTR_ERROR_MASK) & 0x8)
-		printf("error sending frame: %d\n",val);
+		printf("error sending frame: %u\n", val);
 
 	return 0;
 }
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
index 6163a50652..87072be289 100644
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -82,7 +82,7 @@ struct phy_device *mdiobus_scan(struct mii_bus *bus, int addr)
 		return bus->phy_map[addr];
 
 	phydev = get_phy_device(bus, addr);
-	if (IS_ERR(phydev) || phydev == NULL)
+	if (IS_ERR(phydev))
 		return phydev;
 
 	bus->phy_map[addr] = phydev;
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index db00e38bbc..2a33054589 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -217,7 +217,7 @@ struct phy_device *get_phy_device(struct mii_bus *bus, int addr)
 
 	/* If the phy_id is mostly Fs, there is no device there */
 	if ((phy_id & 0x1fffffff) == 0x1fffffff)
-		return NULL;
+		return ERR_PTR(-ENODEV);
 
 	dev = phy_device_create(bus, addr, phy_id);
 
@@ -254,7 +254,7 @@ int phy_device_connect(struct eth_device *edev, struct mii_bus *bus, int addr,
 	if (!edev->phydev) {
 		if (addr >= 0) {
 			dev = mdiobus_scan(bus, addr);
-			if (!dev) {
+			if (IS_ERR(dev)) {
 				ret = -EIO;
 				goto fail;
 			}
@@ -273,7 +273,7 @@ int phy_device_connect(struct eth_device *edev, struct mii_bus *bus, int addr,
 					continue;
 
 				dev = mdiobus_scan(bus, i);
-				if (!dev || dev->attached_dev)
+				if (IS_ERR(dev) || dev->attached_dev)
 					continue;
 
 				dev->attached_dev = edev;
@@ -304,7 +304,7 @@ int phy_device_connect(struct eth_device *edev, struct mii_bus *bus, int addr,
 	return 0;
 
 fail:
-	if (dev)
+	if (!IS_ERR(dev))
 		dev->attached_dev = NULL;
 	puts("Unable to find a PHY (unknown ID?)\n");
 	return ret;
diff --git a/drivers/pinctrl/imx-iomux-v3.c b/drivers/pinctrl/imx-iomux-v3.c
index 1223c02730..7fcbb98d03 100644
--- a/drivers/pinctrl/imx-iomux-v3.c
+++ b/drivers/pinctrl/imx-iomux-v3.c
@@ -20,6 +20,7 @@
 #include <common.h>
 #include <init.h>
 #include <io.h>
+#include <of.h>
 #include <pinctrl.h>
 #include <malloc.h>
 #include <mach/iomux-v3.h>
diff --git a/drivers/pinctrl/pinctrl.c b/drivers/pinctrl/pinctrl.c
index 7c797d35bc..7f76d5a681 100644
--- a/drivers/pinctrl/pinctrl.c
+++ b/drivers/pinctrl/pinctrl.c
@@ -19,6 +19,8 @@
 #include <common.h>
 #include <malloc.h>
 #include <pinctrl.h>
+#include <errno.h>
+#include <of.h>
 
 static LIST_HEAD(pinctrl_list);
 
diff --git a/drivers/serial/serial_imx.c b/drivers/serial/serial_imx.c
index 01c7cc7fea..8468fa0adc 100644
--- a/drivers/serial/serial_imx.c
+++ b/drivers/serial/serial_imx.c
@@ -20,6 +20,7 @@
 #include <malloc.h>
 #include <notifier.h>
 #include <io.h>
+#include <of.h>
 #include <linux/err.h>
 #include <linux/clk.h>
 
diff --git a/drivers/spi/imx_spi.c b/drivers/spi/imx_spi.c
index 1c6b68448b..c0c2ed7c49 100644
--- a/drivers/spi/imx_spi.c
+++ b/drivers/spi/imx_spi.c
@@ -20,6 +20,7 @@
 #include <spi/spi.h>
 #include <xfuncs.h>
 #include <io.h>
+#include <of.h>
 #include <errno.h>
 #include <malloc.h>
 #include <gpio.h>
diff --git a/drivers/usb/gadget/dfu.c b/drivers/usb/gadget/dfu.c
index e05187900b..e15fc41b82 100644
--- a/drivers/usb/gadget/dfu.c
+++ b/drivers/usb/gadget/dfu.c
@@ -61,7 +61,7 @@
 #define DFU_TEMPFILE "/dfu_temp"
 
 static int dfualt;
-static int dfufd = -EINVAL;;
+static int dfufd = -EINVAL;
 static struct usb_dfu_dev *dfu_devs;
 static int dfu_num_alt;
 static int dfudetach;
diff --git a/drivers/usb/imx/chipidea-imx.c b/drivers/usb/imx/chipidea-imx.c
index a0dab70337..d8209d174b 100644
--- a/drivers/usb/imx/chipidea-imx.c
+++ b/drivers/usb/imx/chipidea-imx.c
@@ -15,6 +15,8 @@
 #include <common.h>
 #include <init.h>
 #include <io.h>
+#include <of.h>
+#include <errno.h>
 #include <driver.h>
 #include <usb/usb.h>
 #include <usb/ehci.h>
diff --git a/drivers/usb/imx/imx-usb-misc.c b/drivers/usb/imx/imx-usb-misc.c
index 68c8c4bebd..ed44d78b0f 100644
--- a/drivers/usb/imx/imx-usb-misc.c
+++ b/drivers/usb/imx/imx-usb-misc.c
@@ -16,6 +16,8 @@
 #include <common.h>
 #include <init.h>
 #include <io.h>
+#include <of.h>
+#include <errno.h>
 #include <usb/chipidea-imx.h>
 #include <mach/imx6-regs.h>
 #include <mach/iomux-mx6.h>
diff --git a/drivers/usb/imx/imx-usb-phy.c b/drivers/usb/imx/imx-usb-phy.c
index 776bfe5167..a573c7fe52 100644
--- a/drivers/usb/imx/imx-usb-phy.c
+++ b/drivers/usb/imx/imx-usb-phy.c
@@ -15,6 +15,8 @@
 #include <common.h>
 #include <init.h>
 #include <io.h>
+#include <of.h>
+#include <errno.h>
 #include <driver.h>
 #include <malloc.h>
 #include <linux/clk.h>
diff --git a/drivers/watchdog/imxwd.c b/drivers/watchdog/imxwd.c
index 78f0f38290..f5910ac0a9 100644
--- a/drivers/watchdog/imxwd.c
+++ b/drivers/watchdog/imxwd.c
@@ -15,6 +15,7 @@
 #include <common.h>
 #include <init.h>
 #include <io.h>
+#include <of.h>
 #include <errno.h>
 #include <malloc.h>
 #include <watchdog.h>