tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

ARM: imx: move EHCI platform defines out of platform_data header

The platform_data header usb-ehci-mxc.h has a lot of stuff used by only
IMX platform code. They shouldn't be really in this header but a IMX
platform local header. Create ehci.h and move these stuff into it.

Signed-off-by: Shawn Guo <shawn.guo@freescale.com>

Shawn Guo 641dfe8b e1b24377

+75 -46
+1
arch/arm/mach-imx/ehci-imx25.c
··· 17 17 #include <linux/io.h> 18 18 #include <linux/platform_data/usb-ehci-mxc.h> 19 19 20 + #include "ehci.h" 20 21 #include "hardware.h" 21 22 22 23 #define USBCTRL_OTGBASE_OFFSET 0x600
+1
arch/arm/mach-imx/ehci-imx27.c
··· 17 17 #include <linux/io.h> 18 18 #include <linux/platform_data/usb-ehci-mxc.h> 19 19 20 + #include "ehci.h" 20 21 #include "hardware.h" 21 22 22 23 #define USBCTRL_OTGBASE_OFFSET 0x600
+1
arch/arm/mach-imx/ehci-imx31.c
··· 17 17 #include <linux/io.h> 18 18 #include <linux/platform_data/usb-ehci-mxc.h> 19 19 20 + #include "ehci.h" 20 21 #include "hardware.h" 21 22 22 23 #define USBCTRL_OTGBASE_OFFSET 0x600
+1
arch/arm/mach-imx/ehci-imx35.c
··· 17 17 #include <linux/io.h> 18 18 #include <linux/platform_data/usb-ehci-mxc.h> 19 19 20 + #include "ehci.h" 20 21 #include "hardware.h" 21 22 22 23 #define USBCTRL_OTGBASE_OFFSET 0x600
+1
arch/arm/mach-imx/ehci-imx5.c
··· 17 17 #include <linux/io.h> 18 18 #include <linux/platform_data/usb-ehci-mxc.h> 19 19 20 + #include "ehci.h" 20 21 #include "hardware.h" 21 22 22 23 #define MXC_OTG_OFFSET 0
+50
arch/arm/mach-imx/ehci.h
··· 1 + #ifndef __MACH_IMX_EHCI_H 2 + #define __MACH_IMX_EHCI_H 3 + 4 + /* values for portsc field */ 5 + #define MXC_EHCI_PHY_LOW_POWER_SUSPEND (1 << 23) 6 + #define MXC_EHCI_FORCE_FS (1 << 24) 7 + #define MXC_EHCI_UTMI_8BIT (0 << 28) 8 + #define MXC_EHCI_UTMI_16BIT (1 << 28) 9 + #define MXC_EHCI_SERIAL (1 << 29) 10 + #define MXC_EHCI_MODE_UTMI (0 << 30) 11 + #define MXC_EHCI_MODE_PHILIPS (1 << 30) 12 + #define MXC_EHCI_MODE_ULPI (2 << 30) 13 + #define MXC_EHCI_MODE_SERIAL (3 << 30) 14 + 15 + /* values for flags field */ 16 + #define MXC_EHCI_INTERFACE_DIFF_UNI (0 << 0) 17 + #define MXC_EHCI_INTERFACE_DIFF_BI (1 << 0) 18 + #define MXC_EHCI_INTERFACE_SINGLE_UNI (2 << 0) 19 + #define MXC_EHCI_INTERFACE_SINGLE_BI (3 << 0) 20 + #define MXC_EHCI_INTERFACE_MASK (0xf) 21 + 22 + #define MXC_EHCI_POWER_PINS_ENABLED (1 << 5) 23 + #define MXC_EHCI_PWR_PIN_ACTIVE_HIGH (1 << 6) 24 + #define MXC_EHCI_OC_PIN_ACTIVE_LOW (1 << 7) 25 + #define MXC_EHCI_TTL_ENABLED (1 << 8) 26 + 27 + #define MXC_EHCI_INTERNAL_PHY (1 << 9) 28 + #define MXC_EHCI_IPPUE_DOWN (1 << 10) 29 + #define MXC_EHCI_IPPUE_UP (1 << 11) 30 + #define MXC_EHCI_WAKEUP_ENABLED (1 << 12) 31 + #define MXC_EHCI_ITC_NO_THRESHOLD (1 << 13) 32 + 33 + #define MXC_USBCTRL_OFFSET 0 34 + #define MXC_USB_PHY_CTR_FUNC_OFFSET 0x8 35 + #define MXC_USB_PHY_CTR_FUNC2_OFFSET 0xc 36 + #define MXC_USBH2CTRL_OFFSET 0x14 37 + 38 + #define MX5_USBOTHER_REGS_OFFSET 0x800 39 + 40 + /* USB_PHY_CTRL_FUNC2*/ 41 + #define MX5_USB_UTMI_PHYCTRL1_PLLDIV_MASK 0x3 42 + #define MX5_USB_UTMI_PHYCTRL1_PLLDIV_SHIFT 0 43 + 44 + int mx51_initialize_usb_hw(int port, unsigned int flags); 45 + int mx25_initialize_usb_hw(int port, unsigned int flags); 46 + int mx31_initialize_usb_hw(int port, unsigned int flags); 47 + int mx35_initialize_usb_hw(int port, unsigned int flags); 48 + int mx27_initialize_usb_hw(int port, unsigned int flags); 49 + 50 + #endif /* __MACH_IMX_EHCI_H */
+1
arch/arm/mach-imx/mach-armadillo5x0.c
··· 50 50 #include "common.h" 51 51 #include "devices-imx31.h" 52 52 #include "crmregs-imx3.h" 53 + #include "ehci.h" 53 54 #include "hardware.h" 54 55 #include "iomux-mx3.h" 55 56 #include "ulpi.h"
+1
arch/arm/mach-imx/mach-cpuimx27.c
··· 36 36 37 37 #include "common.h" 38 38 #include "devices-imx27.h" 39 + #include "ehci.h" 39 40 #include "eukrea-baseboards.h" 40 41 #include "hardware.h" 41 42 #include "iomux-mx27.h"
+1
arch/arm/mach-imx/mach-cpuimx35.c
··· 39 39 40 40 #include "common.h" 41 41 #include "devices-imx35.h" 42 + #include "ehci.h" 42 43 #include "eukrea-baseboards.h" 43 44 #include "hardware.h" 44 45 #include "iomux-mx35.h"
+1
arch/arm/mach-imx/mach-eukrea_cpuimx25.c
··· 35 35 36 36 #include "common.h" 37 37 #include "devices-imx25.h" 38 + #include "ehci.h" 38 39 #include "eukrea-baseboards.h" 39 40 #include "hardware.h" 40 41 #include "iomux-mx25.h"
+1
arch/arm/mach-imx/mach-imx27_visstrim_m10.c
··· 43 43 44 44 #include "common.h" 45 45 #include "devices-imx27.h" 46 + #include "ehci.h" 46 47 #include "hardware.h" 47 48 #include "iomux-mx27.h" 48 49
+1
arch/arm/mach-imx/mach-mx25_3ds.c
··· 39 39 40 40 #include "common.h" 41 41 #include "devices-imx25.h" 42 + #include "ehci.h" 42 43 #include "hardware.h" 43 44 #include "iomux-mx25.h" 44 45 #include "mx25.h"
+1
arch/arm/mach-imx/mach-mx27_3ds.c
··· 40 40 #include "3ds_debugboard.h" 41 41 #include "common.h" 42 42 #include "devices-imx27.h" 43 + #include "ehci.h" 43 44 #include "hardware.h" 44 45 #include "iomux-mx27.h" 45 46 #include "ulpi.h"
+1
arch/arm/mach-imx/mach-mx31_3ds.c
··· 40 40 #include "3ds_debugboard.h" 41 41 #include "common.h" 42 42 #include "devices-imx31.h" 43 + #include "ehci.h" 43 44 #include "hardware.h" 44 45 #include "iomux-mx3.h" 45 46 #include "ulpi.h"
+1
arch/arm/mach-imx/mach-mx31lilly.c
··· 45 45 #include "board-mx31lilly.h" 46 46 #include "common.h" 47 47 #include "devices-imx31.h" 48 + #include "ehci.h" 48 49 #include "hardware.h" 49 50 #include "iomux-mx3.h" 50 51 #include "ulpi.h"
+1
arch/arm/mach-imx/mach-mx31lite.c
··· 42 42 #include "board-mx31lite.h" 43 43 #include "common.h" 44 44 #include "devices-imx31.h" 45 + #include "ehci.h" 45 46 #include "hardware.h" 46 47 #include "iomux-mx3.h" 47 48 #include "ulpi.h"
+1
arch/arm/mach-imx/mach-mx31moboard.c
··· 47 47 #include "board-mx31moboard.h" 48 48 #include "common.h" 49 49 #include "devices-imx31.h" 50 + #include "ehci.h" 50 51 #include "hardware.h" 51 52 #include "iomux-mx3.h" 52 53 #include "ulpi.h"
+1
arch/arm/mach-imx/mach-mx35_3ds.c
··· 50 50 #include "3ds_debugboard.h" 51 51 #include "common.h" 52 52 #include "devices-imx35.h" 53 + #include "ehci.h" 53 54 #include "hardware.h" 54 55 #include "iomux-mx35.h" 55 56
+1
arch/arm/mach-imx/mach-pca100.c
··· 36 36 37 37 #include "common.h" 38 38 #include "devices-imx27.h" 39 + #include "ehci.h" 39 40 #include "hardware.h" 40 41 #include "iomux-mx27.h" 41 42 #include "ulpi.h"
+1
arch/arm/mach-imx/mach-pcm037.c
··· 45 45 46 46 #include "common.h" 47 47 #include "devices-imx31.h" 48 + #include "ehci.h" 48 49 #include "hardware.h" 49 50 #include "iomux-mx3.h" 50 51 #include "pcm037.h"
+1
arch/arm/mach-imx/mach-pcm038.c
··· 36 36 #include "board-pcm038.h" 37 37 #include "common.h" 38 38 #include "devices-imx27.h" 39 + #include "ehci.h" 39 40 #include "hardware.h" 40 41 #include "iomux-mx27.h" 41 42 #include "ulpi.h"
+1
arch/arm/mach-imx/mach-pcm043.c
··· 35 35 36 36 #include "common.h" 37 37 #include "devices-imx35.h" 38 + #include "ehci.h" 38 39 #include "hardware.h" 39 40 #include "iomux-mx35.h" 40 41 #include "ulpi.h"
+1
arch/arm/mach-imx/mach-vpr200.c
··· 34 34 35 35 #include "common.h" 36 36 #include "devices-imx35.h" 37 + #include "ehci.h" 37 38 #include "hardware.h" 38 39 #include "iomux-mx35.h" 39 40
+1
arch/arm/mach-imx/mx31moboard-devboard.c
··· 24 24 25 25 #include "common.h" 26 26 #include "devices-imx31.h" 27 + #include "ehci.h" 27 28 #include "hardware.h" 28 29 #include "iomux-mx3.h" 29 30 #include "ulpi.h"
+1
arch/arm/mach-imx/mx31moboard-marxbot.c
··· 28 28 29 29 #include "common.h" 30 30 #include "devices-imx31.h" 31 + #include "ehci.h" 31 32 #include "hardware.h" 32 33 #include "iomux-mx3.h" 33 34 #include "ulpi.h"
+1
arch/arm/mach-imx/mx31moboard-smartbot.c
··· 28 28 #include "board-mx31moboard.h" 29 29 #include "common.h" 30 30 #include "devices-imx31.h" 31 + #include "ehci.h" 31 32 #include "hardware.h" 32 33 #include "iomux-mx3.h" 33 34 #include "ulpi.h"
-46
include/linux/platform_data/usb-ehci-mxc.h
··· 1 1 #ifndef __INCLUDE_ASM_ARCH_MXC_EHCI_H 2 2 #define __INCLUDE_ASM_ARCH_MXC_EHCI_H 3 3 4 - /* values for portsc field */ 5 - #define MXC_EHCI_PHY_LOW_POWER_SUSPEND (1 << 23) 6 - #define MXC_EHCI_FORCE_FS (1 << 24) 7 - #define MXC_EHCI_UTMI_8BIT (0 << 28) 8 - #define MXC_EHCI_UTMI_16BIT (1 << 28) 9 - #define MXC_EHCI_SERIAL (1 << 29) 10 - #define MXC_EHCI_MODE_UTMI (0 << 30) 11 - #define MXC_EHCI_MODE_PHILIPS (1 << 30) 12 - #define MXC_EHCI_MODE_ULPI (2 << 30) 13 - #define MXC_EHCI_MODE_SERIAL (3 << 30) 14 - 15 - /* values for flags field */ 16 - #define MXC_EHCI_INTERFACE_DIFF_UNI (0 << 0) 17 - #define MXC_EHCI_INTERFACE_DIFF_BI (1 << 0) 18 - #define MXC_EHCI_INTERFACE_SINGLE_UNI (2 << 0) 19 - #define MXC_EHCI_INTERFACE_SINGLE_BI (3 << 0) 20 - #define MXC_EHCI_INTERFACE_MASK (0xf) 21 - 22 - #define MXC_EHCI_POWER_PINS_ENABLED (1 << 5) 23 - #define MXC_EHCI_PWR_PIN_ACTIVE_HIGH (1 << 6) 24 - #define MXC_EHCI_OC_PIN_ACTIVE_LOW (1 << 7) 25 - #define MXC_EHCI_TTL_ENABLED (1 << 8) 26 - 27 - #define MXC_EHCI_INTERNAL_PHY (1 << 9) 28 - #define MXC_EHCI_IPPUE_DOWN (1 << 10) 29 - #define MXC_EHCI_IPPUE_UP (1 << 11) 30 - #define MXC_EHCI_WAKEUP_ENABLED (1 << 12) 31 - #define MXC_EHCI_ITC_NO_THRESHOLD (1 << 13) 32 - 33 - #define MXC_USBCTRL_OFFSET 0 34 - #define MXC_USB_PHY_CTR_FUNC_OFFSET 0x8 35 - #define MXC_USB_PHY_CTR_FUNC2_OFFSET 0xc 36 - #define MXC_USBH2CTRL_OFFSET 0x14 37 - 38 - #define MX5_USBOTHER_REGS_OFFSET 0x800 39 - 40 - /* USB_PHY_CTRL_FUNC2*/ 41 - #define MX5_USB_UTMI_PHYCTRL1_PLLDIV_MASK 0x3 42 - #define MX5_USB_UTMI_PHYCTRL1_PLLDIV_SHIFT 0 43 - 44 4 struct mxc_usbh_platform_data { 45 5 int (*init)(struct platform_device *pdev); 46 6 int (*exit)(struct platform_device *pdev); ··· 8 48 unsigned int portsc; 9 49 struct usb_phy *otg; 10 50 }; 11 - 12 - int mx51_initialize_usb_hw(int port, unsigned int flags); 13 - int mx25_initialize_usb_hw(int port, unsigned int flags); 14 - int mx31_initialize_usb_hw(int port, unsigned int flags); 15 - int mx35_initialize_usb_hw(int port, unsigned int flags); 16 - int mx27_initialize_usb_hw(int port, unsigned int flags); 17 51 18 52 #endif /* __INCLUDE_ASM_ARCH_MXC_EHCI_H */ 19 53