From: balbi@ti.com (Felipe Balbi)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 1/7] consolidate definitions and structures to share among platforms
Date: Wed, 20 Jul 2011 13:59:34 +0300 [thread overview]
Message-ID: <20110720105933.GJ764@legolas.emea.dhcp.ti.com> (raw)
In-Reply-To: <1311160106-4898-2-git-send-email-tony.lin@freescale.com>
Hi,
On Wed, Jul 20, 2011 at 07:08:20PM +0800, Tony Lin wrote:
> move common definitions and data structures used for mxs and mxc
> platforms to fsl_device.h from mxc_ehci.h
> so that these definitions and structures could be shared without
> duplicated copies.
>
> Signed-off-by: Tony Lin <tony.lin@freescale.com>
>
> ---
> arch/arm/plat-mxc/include/mach/mxc_ehci.h | 19 -------------------
> include/linux/fsl_devices.h | 21 +++++++++++++++++++++
> 2 files changed, 21 insertions(+), 19 deletions(-)
>
> diff --git a/arch/arm/plat-mxc/include/mach/mxc_ehci.h b/arch/arm/plat-mxc/include/mach/mxc_ehci.h
> index 2c159dc..8775807 100644
> --- a/arch/arm/plat-mxc/include/mach/mxc_ehci.h
> +++ b/arch/arm/plat-mxc/include/mach/mxc_ehci.h
> @@ -1,17 +1,6 @@
> #ifndef __INCLUDE_ASM_ARCH_MXC_EHCI_H
> #define __INCLUDE_ASM_ARCH_MXC_EHCI_H
>
> -/* values for portsc field */
> -#define MXC_EHCI_PHY_LOW_POWER_SUSPEND (1 << 23)
> -#define MXC_EHCI_FORCE_FS (1 << 24)
> -#define MXC_EHCI_UTMI_8BIT (0 << 28)
> -#define MXC_EHCI_UTMI_16BIT (1 << 28)
> -#define MXC_EHCI_SERIAL (1 << 29)
> -#define MXC_EHCI_MODE_UTMI (0 << 30)
> -#define MXC_EHCI_MODE_PHILIPS (1 << 30)
> -#define MXC_EHCI_MODE_ULPI (2 << 30)
> -#define MXC_EHCI_MODE_SERIAL (3 << 30)
> -
> /* values for flags field */
> #define MXC_EHCI_INTERFACE_DIFF_UNI (0 << 0)
> #define MXC_EHCI_INTERFACE_DIFF_BI (1 << 0)
> @@ -39,14 +28,6 @@
> #define MX5_USB_UTMI_PHYCTRL1_PLLDIV_MASK 0x3
> #define MX5_USB_UTMI_PHYCTRL1_PLLDIV_SHIFT 0
>
> -struct mxc_usbh_platform_data {
> - int (*init)(struct platform_device *pdev);
> - int (*exit)(struct platform_device *pdev);
> -
> - unsigned int portsc;
> - struct otg_transceiver *otg;
> -};
> -
> int mx51_initialize_usb_hw(int port, unsigned int flags);
> int mx25_initialize_usb_hw(int port, unsigned int flags);
> int mx31_initialize_usb_hw(int port, unsigned int flags);
> diff --git a/include/linux/fsl_devices.h b/include/linux/fsl_devices.h
> index fffdf00..c138988 100644
> --- a/include/linux/fsl_devices.h
> +++ b/include/linux/fsl_devices.h
> @@ -103,6 +103,27 @@ struct fsl_usb2_platform_data {
>
> #define FLS_USB2_WORKAROUND_ENGCM09152 (1 << 0)
>
> +/* values for portsc field */
> +#define MXC_EHCI_PHY_LOW_POWER_SUSPEND (1 << 23)
> +#define MXC_EHCI_FORCE_FS (1 << 24)
> +#define MXC_EHCI_UTMI_8BIT (0 << 28)
> +#define MXC_EHCI_UTMI_16BIT (1 << 28)
> +#define MXC_EHCI_SERIAL (1 << 29)
> +#define MXC_EHCI_MODE_UTMI (0 << 30)
> +#define MXC_EHCI_MODE_PHILIPS (1 << 30)
> +#define MXC_EHCI_MODE_ULPI (2 << 30)
> +#define MXC_EHCI_MODE_SERIAL (3 << 30)
> +
> +struct mxc_usbh_platform_data {
> + int (*init)(struct platform_device *pdev);
> + int (*exit)(struct platform_device *pdev);
> +
> + unsigned int portsc;
> + struct otg_transceiver *otg;
> + int (*plt_get_usb_connect_status)(void);
> + void (*plt_usb_disconnect_detect)(int enable);
> +};
> +
> struct spi_device;
>
> struct fsl_spi_platform_data {
I believe this patch will cause build breakage since ehci-mxc.c doesn't
include <linux/fsl_devices.h> ??
--
balbi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 490 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20110720/8d49f4ef/attachment.sig>
next prev parent reply other threads:[~2011-07-20 10:59 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-20 11:08 [PATCH 0/7] ARM: mx28: add usb host function Tony Lin
2011-07-20 10:57 ` Felipe Balbi
2011-07-20 11:08 ` [PATCH 1/7] consolidate definitions and structures to share among platforms Tony Lin
2011-07-20 10:59 ` Felipe Balbi [this message]
2011-07-20 11:03 ` Lin Tony-B19295
2011-07-20 11:16 ` Felipe Balbi
2011-07-20 11:21 ` Lin Tony-B19295
2011-07-20 11:08 ` [PATCH 2/7] enable usb1 phy power supply Tony Lin
2011-07-20 11:01 ` Felipe Balbi
2011-07-20 11:41 ` Wolfram Sang
2011-07-22 2:16 ` Lin Tony-B19295
2011-07-20 19:08 ` Sascha Hauer
2011-07-22 2:20 ` Lin Tony-B19295
2011-07-20 11:08 ` [PATCH 3/7] add usb phy clocks to clock tree Tony Lin
2011-07-20 11:02 ` Felipe Balbi
2011-07-20 11:05 ` Lin Tony-B19295
2011-07-20 19:10 ` Sascha Hauer
2011-07-22 6:02 ` Lin Tony-B19295
2011-07-22 9:18 ` Sascha Hauer
2011-07-20 11:08 ` [PATCH 4/7] mx28: add usb host phy functions Tony Lin
2011-07-20 11:12 ` Felipe Balbi
2011-07-20 19:26 ` Sascha Hauer
2011-07-22 2:23 ` Lin Tony-B19295
2011-07-21 6:04 ` Lothar Waßmann
2011-07-20 11:08 ` [PATCH 5/7] ehci mxc: make it more flexible to be used for mx28 Tony Lin
2011-07-20 11:05 ` Arnaud Patard (Rtp)
2011-07-20 11:08 ` Lin Tony-B19295
2011-07-20 11:45 ` Wolfram Sang
2011-07-20 11:14 ` Felipe Balbi
2011-07-20 11:21 ` Lin Tony-B19295
2011-07-20 11:23 ` Felipe Balbi
2011-07-20 11:25 ` Lin Tony-B19295
2011-07-20 11:27 ` Felipe Balbi
2011-07-20 13:59 ` Alan Stern
2011-07-22 5:18 ` Lin Tony-B19295
2011-07-20 19:41 ` Sascha Hauer
2011-07-20 11:08 ` [PATCH 6/7] add macro definitions according to ehci-mxc driver change Tony Lin
2011-07-20 19:43 ` Sascha Hauer
2011-07-21 6:06 ` Lothar Waßmann
2011-07-20 11:08 ` [PATCH 7/7] add usb host function to default config Tony Lin
2011-07-20 20:07 ` [PATCH 0/7] ARM: mx28: add usb host function Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110720105933.GJ764@legolas.emea.dhcp.ti.com \
--to=balbi@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).