Merge branch 'neuros' of...

Merge branch 'neuros' of ssh://git@git.neuros.com.cn/git/git-pub/osd20/linux-davinci-2.6 into neuros

arch/arm/boot/Makefile

@@ -83,10 +83,15 @@ initrd:
 	@test "$(INITRD)" != "" || \
 	(echo You must specify INITRD; exit -1)
 
-install: $(obj)/Image
-	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \
+#install: $(obj)/Image
+#	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \
 	$(obj)/Image System.map "$(INSTALL_PATH)"
 
+#NT_PORT
+install: $(obj)/uImage
+	@$(CONFIG_SHELL) $(obj)/install.sh $(KERNELRELEASE) \
+	 $(obj)/uImage System.map "$(PRJROOT)/images"
+
 zinstall: $(obj)/zImage
 	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \
 	$(obj)/zImage System.map "$(INSTALL_PATH)"

arch/arm/boot/install.sh

@@ -20,6 +20,13 @@
 #   $4 - default install path (blank if root directory)
 #
 
+#NT_PORT
+if [ "`basename $2`" = "uImage" ]; then
+    echo "Install uImage to $4"
+    cp $2 $4/uImage
+    exit
+fi
+
 # User may have a custom install script
 if [ -x ~/bin/${CROSS_COMPILE}installkernel ]; then exec ~/bin/${CROSS_COMPILE}installkernel "$@"; fi
 if [ -x /sbin/${CROSS_COMPILE}installkernel ]; then exec /sbin/${CROSS_COMPILE}installkernel "$@"; fi

arch/arm/configs/ntosd_644xA_defconfig

@@ -989,8 +989,8 @@ CONFIG_USB_MUSB_SOC=y
 #
 # DaVinci 644x USB support
 #
-# CONFIG_USB_MUSB_HOST is not set
-CONFIG_USB_MUSB_PERIPHERAL=y
+CONFIG_USB_MUSB_HOST=y
+# CONFIG_USB_MUSB_PERIPHERAL=y
 # CONFIG_USB_MUSB_OTG is not set
 CONFIG_USB_GADGET_MUSB_HDRC=y
 # CONFIG_MUSB_PIO_ONLY is not set

drivers/net/Kconfig

@@ -919,7 +919,7 @@ config SMC91X
 
 config TI_DAVINCI_EMAC
 	tristate "TI DaVinci EMAC Support"
-	depends on NETDEVICES && MACH_NTOSD_644XA
+	depends on NETDEVICES && (MACH_DAVINCI_EVM || MACH_NTOSD_644XA)
 	help
 	  This driver supports TI's DaVinci Ethernet .
 

drivers/usb/musb/davinci.c

@@ -155,6 +155,16 @@ static DECLARE_WORK(evm_vbus_work, evm_deferred_drvvbus);
 #endif	/* modified board */
 #endif	/* EVM */
 
+#ifdef CONFIG_MACH_NTOSD_644XA
+static void ntosd_644XA_deferred_drvbus(struct work_struct *ignored)
+{
+        gpio_direction_output(GPIO(46),!vbus_state);
+        gpio_set_value(GPIO(46),!vbus_state);
+        vbus_state = !vbus_state;
+}
+static DECLARE_WORK(ntosd_644XA_vbus_work, ntosd_644XA_deferred_drvbus);
+#endif
+
 static void davinci_source_power(struct musb *musb, int is_on, int immediate)
 {
 	if (is_on)
@@ -182,6 +192,15 @@ static void davinci_source_power(struct musb *musb, int is_on, int immediate)
 			schedule_work(&evm_vbus_work);
 #endif
 	}
+#endif
+#ifdef CONFIG_MACH_NTOSD_644XA
+	printk("ntosd_644xa source power: is_on = %d, immediate = %d\n", is_on, immediate);
+	if(immediate) {
+	    gpio_direction_output(GPIO(46), !is_on);
+	    gpio_set_value(GPIO(46), !is_on);
+	} else {
+	    schedule_work(&ntosd_644XA_vbus_work);
+	}
 #endif
 	if (immediate)
 		vbus_state = is_on;

drivers/usb/musb/musb_core.c

@@ -1992,6 +1992,8 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl)
 	if (status < 0)
 		goto fail2;
 
+	INIT_WORK(&musb->irq_work, musb_irq_work);
+
 	/* attach to the IRQ */
 	if (request_irq (nIrq, musb->isr, 0, dev->bus_id, musb)) {
 		dev_err(dev, "request_irq %d failed!\n", nIrq);
@@ -2071,7 +2073,6 @@ fail:
 		return status;
 	}
 
-	INIT_WORK(&musb->irq_work, musb_irq_work);
 
 #ifdef CONFIG_SYSFS
 	status = device_create_file(dev, &dev_attr_mode);