USB: mach: Move the mach headers to common location

As part of moving the headers from mach directory
to a common location compilation issues are arising.

Make the changes which are relevant for USB with
its own header files and also dependent header
files.

Change-Id: Ieef7d04ffdfda249f434e0676fec6da8d8b9cf2c
Signed-off-by: Sujeet Kumar <ksujeet@codeaurora.org>

drivers/char/diag/diag_dci.c

@@ -27,7 +27,7 @@
 #include <asm/current.h>
 #include <soc/qcom/restart.h>
 #ifdef CONFIG_DIAG_OVER_USB
-#include <mach/usbdiag.h>
+#include <linux/usb/usbdiag.h>
 #endif
 #include "diagchar_hdlc.h"
 #include "diagmem.h"

drivers/char/diag/diagchar_core.c

@@ -23,7 +23,7 @@
 #include <linux/sched.h>
 #include <linux/ratelimit.h>
 #ifdef CONFIG_DIAG_OVER_USB
-#include <mach/usbdiag.h>
+#include <linux/usb/usbdiag.h>
 #endif
 #include <asm/current.h>
 #include "diagchar_hdlc.h"

drivers/char/diag/diagfwd.c

@@ -25,7 +25,7 @@
 #include <linux/of.h>
 #include <linux/kmemleak.h>
 #ifdef CONFIG_DIAG_OVER_USB
-#include <mach/usbdiag.h>
+#include <linux/usb/usbdiag.h>
 #endif
 #include <soc/qcom/socinfo.h>
 #include <soc/qcom/smd.h>

drivers/char/diag/diagfwd_bridge.c

@@ -20,7 +20,7 @@
 #include <linux/platform_device.h>
 #include <linux/smux.h>
 #ifdef CONFIG_DIAG_OVER_USB
-#include <mach/usbdiag.h>
+#include <linux/usb/usbdiag.h>
 #endif
 #include "diagchar.h"
 #include "diagmem.h"

drivers/char/diag/diagfwd_hsic.c

@@ -23,7 +23,7 @@
 #include <linux/smux.h>
 #include <asm/current.h>
 #ifdef CONFIG_DIAG_OVER_USB
-#include <mach/usbdiag.h>
+#include <linux/usb/usbdiag.h>
 #endif
 #include "diagchar_hdlc.h"
 #include "diagmem.h"

drivers/char/diag/diagfwd_hsic.h

@@ -13,7 +13,7 @@
 #ifndef DIAGFWD_HSIC_H
 #define DIAGFWD_HSIC_H
 
-#include <mach/diag_bridge.h>
+#include <linux/usb/diag_bridge.h>
 
 #define N_MDM_WRITE	8
 #define N_MDM_READ	1

drivers/char/diag/diagfwd_smux.c

@@ -1,4 +1,4 @@
-/* Copyright (c) 2012, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2012,2014 The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -14,7 +14,8 @@
 #include <linux/diagchar.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
-#include <mach/usbdiag.h>
+#include <linux/usb/usbdiag.h>
+
 #include "diagchar.h"
 #include "diagfwd.h"
 #include "diagfwd_smux.h"

drivers/coresight/coresight-tmc.c

@@ -36,7 +36,7 @@
 #include <linux/usb/usb_qdss.h>
 #include <linux/dma-mapping.h>
 #include <linux/msm-sps.h>
-#include <mach/usb_bam.h>
+#include <linux/usb_bam.h>
 #include <soc/qcom/memory_dump.h>
 
 #include "coresight-priv.h"

drivers/platform/msm/usb_bam.c

@@ -21,9 +21,9 @@
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/usb/msm_hsusb.h>
-#include <mach/usb_bam.h>
 #include <linux/msm-sps.h>
 #include <linux/ipa.h>
+#include <linux/usb_bam.h>
 #include <linux/workqueue.h>
 #include <linux/dma-mapping.h>
 #include <soc/qcom/smsm.h>

drivers/usb/chipidea/udc.c

@@ -25,7 +25,7 @@
 #include <linux/usb/chipidea.h>
 #include <linux/usb/msm_hsusb.h>
 #include <linux/tracepoint.h>
-#include <mach/usb_trace.h>
+#include <linux/qcom/usb_trace.h>
 
 #include "ci.h"
 #include "udc.h"

drivers/usb/gadget/android.c

@@ -32,7 +32,7 @@
 #include <linux/usb/gadget.h>
 #include <linux/usb/android.h>
 
-#include <mach/diag_dload.h>
+#include <linux/qcom/diag_dload.h>
 
 #include "gadget_chips.h"
 

drivers/usb/gadget/ci13xxx_udc.c

@@ -67,7 +67,8 @@
 #include <linux/usb/otg.h>
 #include <linux/usb/msm_hsusb.h>
 #include <linux/tracepoint.h>
-#include <mach/usb_trace.h>
+#include <linux/qcom/usb_trace.h>
+
 #include "ci13xxx_udc.h"
 
 /******************************************************************************

drivers/usb/gadget/f_acm.c

@@ -5,7 +5,7 @@
  * Copyright (C) 2008 by David Brownell
  * Copyright (C) 2008 by Nokia Corporation
  * Copyright (C) 2009 by Samsung Electronics
- * Copyright (c) 2011 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011, 2014 The Linux Foundation. All rights reserved.
  * Author: Michal Nazarewicz (mina86@mina86.com)
  *
  * This software is distributed under the terms of the GNU General
@@ -20,8 +20,8 @@
 #include <linux/module.h>
 #include <linux/device.h>
 #include <linux/err.h>
-#include <mach/usb_gadget_xport.h>
 
+#include "usb_gadget_xport.h"
 #include "u_serial.h"
 #include "gadget_chips.h"
 

drivers/usb/gadget/f_diag.c

@@ -2,7 +2,7 @@
  * Diag Function Device - Route ARM9 and ARM11 DIAG messages
  * between HOST and DEVICE.
  * Copyright (C) 2007 Google, Inc.
- * Copyright (c) 2008-2013, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2008-2014, The Linux Foundation. All rights reserved.
  * Author: Brian Swetland <swetland@google.com>
  * This software is licensed under the terms of the GNU General Public
  * License version 2, as published by the Free Software Foundation, and
@@ -20,8 +20,7 @@
 #include <linux/platform_device.h>
 #include <linux/ratelimit.h>
 
-#include <mach/usbdiag.h>
-
+#include <linux/usb/usbdiag.h>
 #include <linux/usb/composite.h>
 #include <linux/usb/gadget.h>
 #include <linux/workqueue.h>

drivers/usb/gadget/f_gps.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2013, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2014, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -16,8 +16,8 @@
 #include <linux/device.h>
 #include <linux/spinlock.h>
 
-#include <mach/usb_gadget_xport.h>
 
+#include "usb_gadget_xport.h"
 #include "u_rmnet.h"
 #include "gadget_chips.h"
 

drivers/usb/gadget/f_qdss.c

@@ -21,7 +21,7 @@
 #include "gadget_chips.h"
 #include "f_qdss.h"
 #include "u_qdss.c"
-#include <mach/usb_gadget_xport.h>
+#include "usb_gadget_xport.h"
 
 static unsigned int nr_qdss_ports;
 static unsigned int no_data_bam_ports;

drivers/usb/gadget/f_rmnet.c

@@ -15,10 +15,9 @@
 #include <linux/kernel.h>
 #include <linux/device.h>
 #include <linux/spinlock.h>
+#include <linux/usb_bam.h>
 
-#include <mach/usb_gadget_xport.h>
-#include <mach/usb_bam.h>
-
+#include "usb_gadget_xport.h"
 #include "u_ether.h"
 #include "u_rmnet.h"
 #include "gadget_chips.h"

drivers/usb/gadget/f_serial.c

@@ -14,8 +14,8 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/device.h>
-#include <mach/usb_gadget_xport.h>
 
+#include "usb_gadget_xport.h"
 #include "u_serial.h"
 #include "gadget_chips.h"
 

drivers/usb/gadget/u_bam.c

@@ -24,11 +24,11 @@
 
 #include <soc/qcom/bam_dmux.h>
 
-#include <mach/usb_gadget_xport.h>
 #include <linux/usb/msm_hsusb.h>
 #include <linux/usb/rmnet_ctrl_qti.h>
-#include <mach/usb_bam.h>
+#include <linux/usb_bam.h>
 
+#include "usb_gadget_xport.h"
 #include "u_rmnet.h"
 
 #define BAM_N_PORTS	1

drivers/usb/gadget/u_bam_data.c

@@ -22,8 +22,7 @@
 #include <linux/usb/gadget.h>
 
 #include <soc/qcom/bam_dmux.h>
-
-#include <mach/usb_bam.h>
+#include <linux/usb_bam.h>
 
 #include "u_bam_data.h"
 

drivers/usb/gadget/u_bam_data.h

@@ -13,7 +13,7 @@
 #ifndef __U_BAM_DATA_H
 #define __U_BAM_DATA_H
 
-#include <mach/usb_gadget_xport.h>
+#include "usb_gadget_xport.h"
 
 enum function_type {
 	USB_FUNC_ECM,

drivers/usb/gadget/u_ctrl_hsic.c

@@ -19,8 +19,9 @@
 #include <linux/debugfs.h>
 #include <linux/bitops.h>
 #include <linux/termios.h>
-#include <mach/usb_bridge.h>
-#include <mach/usb_gadget_xport.h>
+#include <linux/usb/usb_bridge.h>
+
+#include "usb_gadget_xport.h"
 
 /* from cdc-acm.h */
 #define ACM_CTRL_RTS		(1 << 1)	/* unused with full duplex */

drivers/usb/gadget/u_ctrl_hsuart.c

@@ -20,7 +20,7 @@
 #include <linux/smux.h>
 #include <linux/completion.h>
 
-#include <mach/usb_gadget_xport.h>
+#include "usb_gadget_xport.h"
 
 #define CH_OPENED 0
 #define CH_READY 1

drivers/usb/gadget/u_data_hsic.c

@@ -20,9 +20,10 @@
 #include <linux/debugfs.h>
 #include <linux/bitops.h>
 #include <linux/termios.h>
-#include <mach/usb_bridge.h>
-#include <mach/usb_gadget_xport.h>
+#include <linux/usb/usb_bridge.h>
+
 #include "f_qdss.h"
+#include "usb_gadget_xport.h"
 
 static unsigned int no_data_ports;
 

drivers/usb/gadget/u_data_hsuart.c

@@ -1,4 +1,4 @@
-/* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -22,7 +22,7 @@
 #include <linux/smux.h>
 #include <linux/completion.h>
 
-#include <mach/usb_gadget_xport.h>
+#include "usb_gadget_xport.h"
 
 static unsigned int num_data_ports;
 

drivers/usb/gadget/u_qdss.c

@@ -1,4 +1,4 @@
-/* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -13,7 +13,8 @@
 #include <linux/kernel.h>
 #include <linux/device.h>
 #include <linux/usb/msm_hsusb.h>
-#include <mach/usb_bam.h>
+#include <linux/usb_bam.h>
+
 #include "gadget_chips.h"
 
 struct  usb_qdss_bam_connect_info {

drivers/usb/host/ehci-msm2.c

@@ -44,7 +44,6 @@
 #include <linux/usb/msm_hsusb.h>
 #include <linux/of.h>
 
-#include <mach/msm_iomap.h>
 #include <linux/debugfs.h>
 
 #include "ehci.h"

drivers/usb/host/hbm.c

@@ -1,4 +1,4 @@
-/* Copyright (c) 2013, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2013-2014 The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -13,7 +13,7 @@
 
 #include <linux/kernel.h>
 #include <linux/usb/hbm.h>
-#include <mach/usb_bam.h>
+#include <linux/usb_bam.h>
 
 /**
  *  USB HBM Hardware registers.

drivers/usb/misc/diag_bridge.c

@@ -25,7 +25,7 @@
 #include <linux/uaccess.h>
 #include <linux/usb.h>
 #include <linux/debugfs.h>
-#include <mach/diag_bridge.h>
+#include <linux/usb/diag_bridge.h>
 
 #define DRIVER_DESC	"USB host diag bridge driver"
 #define DRIVER_VERSION	"1.0"

drivers/usb/misc/mdm_ctrl_bridge.c

@@ -24,7 +24,7 @@
 #include <linux/usb/cdc.h>
 #include <linux/termios.h>
 #include <asm/unaligned.h>
-#include <mach/usb_bridge.h>
+#include <linux/usb/usb_bridge.h>
 
 #define ACM_CTRL_DTR		(1 << 0)
 #define DEFAULT_READ_URB_LENGTH	4096

drivers/usb/misc/mdm_data_bridge.c

@@ -19,7 +19,7 @@
 #include <linux/platform_device.h>
 #include <linux/uaccess.h>
 #include <linux/ratelimit.h>
-#include <mach/usb_bridge.h>
+#include <linux/usb/usb_bridge.h>
 
 #define MAX_RX_URBS			100
 #define RMNET_RX_BUFSIZE		2048

drivers/usb/phy/phy-msm-usb.c

@@ -48,7 +48,7 @@
 #include <linux/mhl_8334.h>
 #include <linux/qpnp/qpnp-adc.h>
 
-#include <mach/msm_bus.h>
+#include <linux/msm-bus.h>
 
 #define MSM_USB_BASE	(motg->regs)
 #define DRIVER_NAME	"msm_otg"

include/linux/qcom/usb_trace.h

@@ -1,6 +1,5 @@
-/* include/asm-arm/arch-msm/usbtrace.h
- *
- * Copyright (c) 2013, The Linux Foundation. All rights reserved.
+/*
+ * Copyright (c) 2013,2014, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and

include/linux/usb/usbdiag.h

@@ -1,6 +1,6 @@
-/* include/asm-arm/arch-msm/usbdiag.h
- *
- * Copyright (c) 2008-2010, 2012-2013,The Linux Foundation. All rights reserved.
+/*
+ * Copyright (c) 2008-2010, 2012-2014, The Linux Foundation.
+ * All rights reserved.
  *
  * All source code in this file is licensed under the following license except
  * where indicated.