* Re: Updated status of the removal of plat headers
2012-10-16 23:00 Updated status of the removal of plat headers Tony Lindgren
@ 2012-10-17 0:24 ` Paul Walmsley
2012-10-17 15:43 ` [PATCH] arm: omap: move OMAP USB platform data to <linux/platform_data/omap-usb.h> Felipe Balbi
` (3 subsequent siblings)
4 siblings, 0 replies; 14+ messages in thread
From: Paul Walmsley @ 2012-10-17 0:24 UTC (permalink / raw)
To: Tony Lindgren
Cc: linux-omap, Jon Hunter, Omar Ramirez Luna, Igor Grinberg,
Felipe Balbi, Kishon Vijay Abraham I, Keshava Munegowda,
Tomi Valkeinen
Hi
On Tue, 16 Oct 2012, Tony Lindgren wrote:
> prcm.h Paul has posted patches for this, missing move of the header
>
> sdrc.h Paul has posted patches for this, missing move of the header
Just to clarify these, I've only posted 1 of 2 series to clean up prcm.h.
With luck the second one will be posted within a week.
Also I haven't yet posted a sdrc.h cleanup patch, but it's coming shortly.
- Paul
^ permalink raw reply [flat|nested] 14+ messages in thread* [PATCH] arm: omap: move OMAP USB platform data to <linux/platform_data/omap-usb.h>
2012-10-16 23:00 Updated status of the removal of plat headers Tony Lindgren
2012-10-17 0:24 ` Paul Walmsley
@ 2012-10-17 15:43 ` Felipe Balbi
2012-10-17 15:45 ` Felipe Balbi
2012-10-17 15:47 ` [PATCH v2] " Felipe Balbi
` (2 subsequent siblings)
4 siblings, 1 reply; 14+ messages in thread
From: Felipe Balbi @ 2012-10-17 15:43 UTC (permalink / raw)
To: Tony Lindgren
Cc: Linux OMAP Mailing List, Linux ARM Kernel Mailing List,
Felipe Balbi
In order to make single zImage work for ARM architecture,
we need to make sure we don't depend on private headers.
Move USB platform_data to <linux/platform_data/omap-usb.h>
and keep only internal functions in <plat/usb.h>.
Signed-off-by: Felipe Balbi <balbi@ti.com>
---
arch/arm/mach-omap2/usb-host.c | 1 +
arch/arm/mach-omap2/usb-musb.c | 1 +
arch/arm/mach-omap2/usb-tusb6010.c | 1 +
arch/arm/plat-omap/include/plat/usb.h | 126 +--------------------
drivers/mfd/omap-usb-host.c | 2 +-
drivers/usb/musb/am35x.c | 3 +-
drivers/usb/musb/musb_dsps.c | 3 +-
drivers/usb/musb/omap2430.h | 2 +-
.../linux/platform_data/usb-omap.h | 80 +++++--------
9 files changed, 36 insertions(+), 183 deletions(-)
copy arch/arm/plat-omap/include/plat/usb.h => include/linux/platform_data/usb-omap.h (69%)
diff --git a/arch/arm/mach-omap2/usb-host.c b/arch/arm/mach-omap2/usb-host.c
index 3c43449..e0c2cad 100644
--- a/arch/arm/mach-omap2/usb-host.c
+++ b/arch/arm/mach-omap2/usb-host.c
@@ -22,6 +22,7 @@
#include <linux/platform_device.h>
#include <linux/slab.h>
#include <linux/dma-mapping.h>
+#include <linux/platform_data/usb-omap.h>
#include <asm/io.h>
diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c
index 51da21c..4fcd3a6 100644
--- a/arch/arm/mach-omap2/usb-musb.c
+++ b/arch/arm/mach-omap2/usb-musb.c
@@ -23,6 +23,7 @@
#include <linux/clk.h>
#include <linux/dma-mapping.h>
#include <linux/io.h>
+#include <linux/platform_data/usb-omap.h>
#include <linux/usb/musb.h>
#include <plat/usb.h>
diff --git a/arch/arm/mach-omap2/usb-tusb6010.c b/arch/arm/mach-omap2/usb-tusb6010.c
index 805bea6..5e24289 100644
--- a/arch/arm/mach-omap2/usb-tusb6010.c
+++ b/arch/arm/mach-omap2/usb-tusb6010.c
@@ -15,6 +15,7 @@
#include <linux/platform_device.h>
#include <linux/gpio.h>
#include <linux/export.h>
+#include <linux/platform_data/usb-omap.h>
#include <linux/usb/musb.h>
diff --git a/arch/arm/plat-omap/include/plat/usb.h b/arch/arm/plat-omap/include/plat/usb.h
index 87ee140..550e40e 100644
--- a/arch/arm/plat-omap/include/plat/usb.h
+++ b/arch/arm/plat-omap/include/plat/usb.h
@@ -3,86 +3,15 @@
#ifndef __ASM_ARCH_OMAP_USB_H
#define __ASM_ARCH_OMAP_USB_H
-#include <linux/io.h>
#include <linux/platform_device.h>
-#include <linux/usb/musb.h>
-
-#define OMAP3_HS_USB_PORTS 3
-
-enum usbhs_omap_port_mode {
- OMAP_USBHS_PORT_MODE_UNUSED,
- OMAP_EHCI_PORT_MODE_PHY,
- OMAP_EHCI_PORT_MODE_TLL,
- OMAP_EHCI_PORT_MODE_HSIC,
- OMAP_OHCI_PORT_MODE_PHY_6PIN_DATSE0,
- OMAP_OHCI_PORT_MODE_PHY_6PIN_DPDM,
- OMAP_OHCI_PORT_MODE_PHY_3PIN_DATSE0,
- OMAP_OHCI_PORT_MODE_PHY_4PIN_DPDM,
- OMAP_OHCI_PORT_MODE_TLL_6PIN_DATSE0,
- OMAP_OHCI_PORT_MODE_TLL_6PIN_DPDM,
- OMAP_OHCI_PORT_MODE_TLL_3PIN_DATSE0,
- OMAP_OHCI_PORT_MODE_TLL_4PIN_DPDM,
- OMAP_OHCI_PORT_MODE_TLL_2PIN_DATSE0,
- OMAP_OHCI_PORT_MODE_TLL_2PIN_DPDM
-};
-
-struct usbhs_omap_board_data {
- enum usbhs_omap_port_mode port_mode[OMAP3_HS_USB_PORTS];
-
- /* have to be valid if phy_reset is true and portx is in phy mode */
- int reset_gpio_port[OMAP3_HS_USB_PORTS];
-
- /* Set this to true for ES2.x silicon */
- unsigned es2_compatibility:1;
-
- unsigned phy_reset:1;
-
- /*
- * Regulators for USB PHYs.
- * Each PHY can have a separate regulator.
- */
- struct regulator *regulator[OMAP3_HS_USB_PORTS];
-};
+#include <linux/platform_data/usb-omap.h>
#ifdef CONFIG_ARCH_OMAP2PLUS
-struct ehci_hcd_omap_platform_data {
- enum usbhs_omap_port_mode port_mode[OMAP3_HS_USB_PORTS];
- int reset_gpio_port[OMAP3_HS_USB_PORTS];
- struct regulator *regulator[OMAP3_HS_USB_PORTS];
- unsigned phy_reset:1;
-};
-
-struct ohci_hcd_omap_platform_data {
- enum usbhs_omap_port_mode port_mode[OMAP3_HS_USB_PORTS];
- unsigned es2_compatibility:1;
-};
-
-struct usbhs_omap_platform_data {
- enum usbhs_omap_port_mode port_mode[OMAP3_HS_USB_PORTS];
-
- struct ehci_hcd_omap_platform_data *ehci_data;
- struct ohci_hcd_omap_platform_data *ohci_data;
-};
struct usbtll_omap_platform_data {
enum usbhs_omap_port_mode port_mode[OMAP3_HS_USB_PORTS];
};
-/*-------------------------------------------------------------------------*/
-
-struct omap_musb_board_data {
- u8 interface_type;
- u8 mode;
- u16 power;
- unsigned extvbus:1;
- void (*set_phy_power)(u8 on);
- void (*clear_irq)(void);
- void (*set_mode)(u8 mode);
- void (*reset)(void);
-};
-
-enum musb_interface {MUSB_INTERFACE_ULPI, MUSB_INTERFACE_UTMI};
-
extern void usb_musb_init(struct omap_musb_board_data *board_data);
extern void usbhs_init(const struct usbhs_omap_board_data *pdata);
@@ -103,59 +32,6 @@ extern void am35x_musb_clear_irq(void);
extern void am35x_set_mode(u8 musb_mode);
extern void ti81xx_musb_phy_power(u8 on);
-/* AM35x */
-/* USB 2.0 PHY Control */
-#define CONF2_PHY_GPIOMODE (1 << 23)
-#define CONF2_OTGMODE (3 << 14)
-#define CONF2_NO_OVERRIDE (0 << 14)
-#define CONF2_FORCE_HOST (1 << 14)
-#define CONF2_FORCE_DEVICE (2 << 14)
-#define CONF2_FORCE_HOST_VBUS_LOW (3 << 14)
-#define CONF2_SESENDEN (1 << 13)
-#define CONF2_VBDTCTEN (1 << 12)
-#define CONF2_REFFREQ_24MHZ (2 << 8)
-#define CONF2_REFFREQ_26MHZ (7 << 8)
-#define CONF2_REFFREQ_13MHZ (6 << 8)
-#define CONF2_REFFREQ (0xf << 8)
-#define CONF2_PHYCLKGD (1 << 7)
-#define CONF2_VBUSSENSE (1 << 6)
-#define CONF2_PHY_PLLON (1 << 5)
-#define CONF2_RESET (1 << 4)
-#define CONF2_PHYPWRDN (1 << 3)
-#define CONF2_OTGPWRDN (1 << 2)
-#define CONF2_DATPOL (1 << 1)
-
-/* TI81XX specific definitions */
-#define USBCTRL0 0x620
-#define USBSTAT0 0x624
-
-/* TI816X PHY controls bits */
-#define TI816X_USBPHY0_NORMAL_MODE (1 << 0)
-#define TI816X_USBPHY_REFCLK_OSC (1 << 8)
-
-/* TI814X PHY controls bits */
-#define USBPHY_CM_PWRDN (1 << 0)
-#define USBPHY_OTG_PWRDN (1 << 1)
-#define USBPHY_CHGDET_DIS (1 << 2)
-#define USBPHY_CHGDET_RSTRT (1 << 3)
-#define USBPHY_SRCONDM (1 << 4)
-#define USBPHY_SINKONDP (1 << 5)
-#define USBPHY_CHGISINK_EN (1 << 6)
-#define USBPHY_CHGVSRC_EN (1 << 7)
-#define USBPHY_DMPULLUP (1 << 8)
-#define USBPHY_DPPULLUP (1 << 9)
-#define USBPHY_CDET_EXTCTL (1 << 10)
-#define USBPHY_GPIO_MODE (1 << 12)
-#define USBPHY_DPOPBUFCTL (1 << 13)
-#define USBPHY_DMOPBUFCTL (1 << 14)
-#define USBPHY_DPINPUT (1 << 15)
-#define USBPHY_DMINPUT (1 << 16)
-#define USBPHY_DPGPIO_PD (1 << 17)
-#define USBPHY_DMGPIO_PD (1 << 18)
-#define USBPHY_OTGVDET_EN (1 << 19)
-#define USBPHY_OTGSESSEND_EN (1 << 20)
-#define USBPHY_DATA_POLARITY (1 << 23)
-
#if defined(CONFIG_ARCH_OMAP1) && defined(CONFIG_USB)
u32 omap1_usb0_init(unsigned nwires, unsigned is_device);
u32 omap1_usb1_init(unsigned nwires);
diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c
index 23cec57..1d12d45 100644
--- a/drivers/mfd/omap-usb-host.c
+++ b/drivers/mfd/omap-usb-host.c
@@ -26,7 +26,7 @@
#include <linux/spinlock.h>
#include <linux/gpio.h>
#include <plat/cpu.h>
-#include <plat/usb.h>
+#include <linux/platform_data/usb.h>
#include <linux/pm_runtime.h>
#define USBHS_DRIVER_NAME "usbhs_omap"
diff --git a/drivers/usb/musb/am35x.c b/drivers/usb/musb/am35x.c
index 457f25e..0605fe3 100644
--- a/drivers/usb/musb/am35x.c
+++ b/drivers/usb/musb/am35x.c
@@ -34,8 +34,7 @@
#include <linux/platform_device.h>
#include <linux/dma-mapping.h>
#include <linux/usb/nop-usb-xceiv.h>
-
-#include <plat/usb.h>
+#include <linux/platform_data/usb-omap.h>
#include "musb_core.h"
diff --git a/drivers/usb/musb/musb_dsps.c b/drivers/usb/musb/musb_dsps.c
index 444346e..a67af21 100644
--- a/drivers/usb/musb/musb_dsps.c
+++ b/drivers/usb/musb/musb_dsps.c
@@ -38,13 +38,12 @@
#include <linux/pm_runtime.h>
#include <linux/module.h>
#include <linux/usb/nop-usb-xceiv.h>
+#include <linux/platform_data/usb-omap.h>
#include <linux/of.h>
#include <linux/of_device.h>
#include <linux/of_address.h>
-#include <plat/usb.h>
-
#include "musb_core.h"
#ifdef CONFIG_OF
diff --git a/drivers/usb/musb/omap2430.h b/drivers/usb/musb/omap2430.h
index b85f397..8ef6566 100644
--- a/drivers/usb/musb/omap2430.h
+++ b/drivers/usb/musb/omap2430.h
@@ -10,7 +10,7 @@
#ifndef __MUSB_OMAP243X_H__
#define __MUSB_OMAP243X_H__
-#include <plat/usb.h>
+#include <linux/platform_data/usb-omap.h>
/*
* OMAP2430-specific definitions
diff --git a/arch/arm/plat-omap/include/plat/usb.h b/include/linux/platform_data/usb-omap.h
similarity index 69%
copy from arch/arm/plat-omap/include/plat/usb.h
copy to include/linux/platform_data/usb-omap.h
index 87ee140..747831e 100644
--- a/arch/arm/plat-omap/include/plat/usb.h
+++ b/include/linux/platform_data/usb-omap.h
@@ -1,10 +1,28 @@
-// include/asm-arm/mach-omap/usb.h
-
-#ifndef __ASM_ARCH_OMAP_USB_H
-#define __ASM_ARCH_OMAP_USB_H
+/*
+ * usb-omap.h - Platform data for the various OMAP USB IPs
+ *
+ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com
+ *
+ * This software is distributed under the terms of the GNU General Public
+ * License ("GPL") version 2, as published by the Free Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __LINUX_PLATFORM_DATA_USB_OMAP_H
+#define __LINUX_PLATFORM_DATA_USB_OMAP_H
#include <linux/io.h>
-#include <linux/platform_device.h>
#include <linux/usb/musb.h>
#define OMAP3_HS_USB_PORTS 3
@@ -44,8 +62,6 @@ struct usbhs_omap_board_data {
struct regulator *regulator[OMAP3_HS_USB_PORTS];
};
-#ifdef CONFIG_ARCH_OMAP2PLUS
-
struct ehci_hcd_omap_platform_data {
enum usbhs_omap_port_mode port_mode[OMAP3_HS_USB_PORTS];
int reset_gpio_port[OMAP3_HS_USB_PORTS];
@@ -65,9 +81,6 @@ struct usbhs_omap_platform_data {
struct ohci_hcd_omap_platform_data *ohci_data;
};
-struct usbtll_omap_platform_data {
- enum usbhs_omap_port_mode port_mode[OMAP3_HS_USB_PORTS];
-};
/*-------------------------------------------------------------------------*/
struct omap_musb_board_data {
@@ -81,27 +94,10 @@ struct omap_musb_board_data {
void (*reset)(void);
};
-enum musb_interface {MUSB_INTERFACE_ULPI, MUSB_INTERFACE_UTMI};
-
-extern void usb_musb_init(struct omap_musb_board_data *board_data);
-
-extern void usbhs_init(const struct usbhs_omap_board_data *pdata);
-extern int omap_tll_enable(void);
-extern int omap_tll_disable(void);
-
-extern int omap4430_phy_power(struct device *dev, int ID, int on);
-extern int omap4430_phy_set_clk(struct device *dev, int on);
-extern int omap4430_phy_init(struct device *dev);
-extern int omap4430_phy_exit(struct device *dev);
-extern int omap4430_phy_suspend(struct device *dev, int suspend);
-
-#endif
-
-extern void am35x_musb_reset(void);
-extern void am35x_musb_phy_power(u8 on);
-extern void am35x_musb_clear_irq(void);
-extern void am35x_set_mode(u8 musb_mode);
-extern void ti81xx_musb_phy_power(u8 on);
+enum musb_interface {
+ MUSB_INTERFACE_ULPI,
+ MUSB_INTERFACE_UTMI
+};
/* AM35x */
/* USB 2.0 PHY Control */
@@ -156,24 +152,4 @@ extern void ti81xx_musb_phy_power(u8 on);
#define USBPHY_OTGSESSEND_EN (1 << 20)
#define USBPHY_DATA_POLARITY (1 << 23)
-#if defined(CONFIG_ARCH_OMAP1) && defined(CONFIG_USB)
-u32 omap1_usb0_init(unsigned nwires, unsigned is_device);
-u32 omap1_usb1_init(unsigned nwires);
-u32 omap1_usb2_init(unsigned nwires, unsigned alt_pingroup);
-#else
-static inline u32 omap1_usb0_init(unsigned nwires, unsigned is_device)
-{
- return 0;
-}
-static inline u32 omap1_usb1_init(unsigned nwires)
-{
- return 0;
-
-}
-static inline u32 omap1_usb2_init(unsigned nwires, unsigned alt_pingroup)
-{
- return 0;
-}
-#endif
-
-#endif /* __ASM_ARCH_OMAP_USB_H */
+#endif /* __LINUX_PLATFORM_DATA_USB_OMAP_H */
--
1.8.0.rc0
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [PATCH] arm: omap: move OMAP USB platform data to <linux/platform_data/omap-usb.h>
2012-10-17 15:43 ` [PATCH] arm: omap: move OMAP USB platform data to <linux/platform_data/omap-usb.h> Felipe Balbi
@ 2012-10-17 15:45 ` Felipe Balbi
0 siblings, 0 replies; 14+ messages in thread
From: Felipe Balbi @ 2012-10-17 15:45 UTC (permalink / raw)
To: Felipe Balbi
Cc: Tony Lindgren, Linux OMAP Mailing List,
Linux ARM Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 4783 bytes --]
Hi,
On Wed, Oct 17, 2012 at 06:43:41PM +0300, Felipe Balbi wrote:
> In order to make single zImage work for ARM architecture,
> we need to make sure we don't depend on private headers.
>
> Move USB platform_data to <linux/platform_data/omap-usb.h>
> and keep only internal functions in <plat/usb.h>.
>
> Signed-off-by: Felipe Balbi <balbi@ti.com>
> ---
> arch/arm/mach-omap2/usb-host.c | 1 +
> arch/arm/mach-omap2/usb-musb.c | 1 +
> arch/arm/mach-omap2/usb-tusb6010.c | 1 +
> arch/arm/plat-omap/include/plat/usb.h | 126 +--------------------
> drivers/mfd/omap-usb-host.c | 2 +-
> drivers/usb/musb/am35x.c | 3 +-
> drivers/usb/musb/musb_dsps.c | 3 +-
> drivers/usb/musb/omap2430.h | 2 +-
> .../linux/platform_data/usb-omap.h | 80 +++++--------
> 9 files changed, 36 insertions(+), 183 deletions(-)
> copy arch/arm/plat-omap/include/plat/usb.h => include/linux/platform_data/usb-omap.h (69%)
>
> diff --git a/arch/arm/mach-omap2/usb-host.c b/arch/arm/mach-omap2/usb-host.c
> index 3c43449..e0c2cad 100644
> --- a/arch/arm/mach-omap2/usb-host.c
> +++ b/arch/arm/mach-omap2/usb-host.c
> @@ -22,6 +22,7 @@
> #include <linux/platform_device.h>
> #include <linux/slab.h>
> #include <linux/dma-mapping.h>
> +#include <linux/platform_data/usb-omap.h>
>
> #include <asm/io.h>
>
> diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c
> index 51da21c..4fcd3a6 100644
> --- a/arch/arm/mach-omap2/usb-musb.c
> +++ b/arch/arm/mach-omap2/usb-musb.c
> @@ -23,6 +23,7 @@
> #include <linux/clk.h>
> #include <linux/dma-mapping.h>
> #include <linux/io.h>
> +#include <linux/platform_data/usb-omap.h>
> #include <linux/usb/musb.h>
>
> #include <plat/usb.h>
> diff --git a/arch/arm/mach-omap2/usb-tusb6010.c b/arch/arm/mach-omap2/usb-tusb6010.c
> index 805bea6..5e24289 100644
> --- a/arch/arm/mach-omap2/usb-tusb6010.c
> +++ b/arch/arm/mach-omap2/usb-tusb6010.c
> @@ -15,6 +15,7 @@
> #include <linux/platform_device.h>
> #include <linux/gpio.h>
> #include <linux/export.h>
> +#include <linux/platform_data/usb-omap.h>
>
> #include <linux/usb/musb.h>
>
> diff --git a/arch/arm/plat-omap/include/plat/usb.h b/arch/arm/plat-omap/include/plat/usb.h
> index 87ee140..550e40e 100644
> --- a/arch/arm/plat-omap/include/plat/usb.h
> +++ b/arch/arm/plat-omap/include/plat/usb.h
> @@ -3,86 +3,15 @@
> #ifndef __ASM_ARCH_OMAP_USB_H
> #define __ASM_ARCH_OMAP_USB_H
>
> -#include <linux/io.h>
> #include <linux/platform_device.h>
> -#include <linux/usb/musb.h>
> -
> -#define OMAP3_HS_USB_PORTS 3
> -
> -enum usbhs_omap_port_mode {
> - OMAP_USBHS_PORT_MODE_UNUSED,
> - OMAP_EHCI_PORT_MODE_PHY,
> - OMAP_EHCI_PORT_MODE_TLL,
> - OMAP_EHCI_PORT_MODE_HSIC,
> - OMAP_OHCI_PORT_MODE_PHY_6PIN_DATSE0,
> - OMAP_OHCI_PORT_MODE_PHY_6PIN_DPDM,
> - OMAP_OHCI_PORT_MODE_PHY_3PIN_DATSE0,
> - OMAP_OHCI_PORT_MODE_PHY_4PIN_DPDM,
> - OMAP_OHCI_PORT_MODE_TLL_6PIN_DATSE0,
> - OMAP_OHCI_PORT_MODE_TLL_6PIN_DPDM,
> - OMAP_OHCI_PORT_MODE_TLL_3PIN_DATSE0,
> - OMAP_OHCI_PORT_MODE_TLL_4PIN_DPDM,
> - OMAP_OHCI_PORT_MODE_TLL_2PIN_DATSE0,
> - OMAP_OHCI_PORT_MODE_TLL_2PIN_DPDM
> -};
> -
> -struct usbhs_omap_board_data {
> - enum usbhs_omap_port_mode port_mode[OMAP3_HS_USB_PORTS];
> -
> - /* have to be valid if phy_reset is true and portx is in phy mode */
> - int reset_gpio_port[OMAP3_HS_USB_PORTS];
> -
> - /* Set this to true for ES2.x silicon */
> - unsigned es2_compatibility:1;
> -
> - unsigned phy_reset:1;
> -
> - /*
> - * Regulators for USB PHYs.
> - * Each PHY can have a separate regulator.
> - */
> - struct regulator *regulator[OMAP3_HS_USB_PORTS];
> -};
> +#include <linux/platform_data/usb-omap.h>
>
> #ifdef CONFIG_ARCH_OMAP2PLUS
>
> -struct ehci_hcd_omap_platform_data {
> - enum usbhs_omap_port_mode port_mode[OMAP3_HS_USB_PORTS];
> - int reset_gpio_port[OMAP3_HS_USB_PORTS];
> - struct regulator *regulator[OMAP3_HS_USB_PORTS];
> - unsigned phy_reset:1;
> -};
> -
> -struct ohci_hcd_omap_platform_data {
> - enum usbhs_omap_port_mode port_mode[OMAP3_HS_USB_PORTS];
> - unsigned es2_compatibility:1;
> -};
> -
> -struct usbhs_omap_platform_data {
> - enum usbhs_omap_port_mode port_mode[OMAP3_HS_USB_PORTS];
> -
> - struct ehci_hcd_omap_platform_data *ehci_data;
> - struct ohci_hcd_omap_platform_data *ohci_data;
> -};
>
> struct usbtll_omap_platform_data {
> enum usbhs_omap_port_mode port_mode[OMAP3_HS_USB_PORTS];
> };
looks like should be moved too... I'll respin the patch.
--
balbi
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH v2] arm: omap: move OMAP USB platform data to <linux/platform_data/omap-usb.h>
2012-10-16 23:00 Updated status of the removal of plat headers Tony Lindgren
2012-10-17 0:24 ` Paul Walmsley
2012-10-17 15:43 ` [PATCH] arm: omap: move OMAP USB platform data to <linux/platform_data/omap-usb.h> Felipe Balbi
@ 2012-10-17 15:47 ` Felipe Balbi
2012-10-17 20:34 ` Tony Lindgren
2012-10-17 21:51 ` Updated status of the removal of plat headers Jon Hunter
2012-10-19 17:43 ` Omar Ramirez Luna
4 siblings, 1 reply; 14+ messages in thread
From: Felipe Balbi @ 2012-10-17 15:47 UTC (permalink / raw)
To: Tony Lindgren
Cc: Linux OMAP Mailing List, Linux ARM Kernel Mailing List,
Felipe Balbi
In order to make single zImage work for ARM architecture,
we need to make sure we don't depend on private headers.
Move USB platform_data to <linux/platform_data/omap-usb.h>
and keep only internal functions in <plat/usb.h>.
Signed-off-by: Felipe Balbi <balbi@ti.com>
---
arch/arm/mach-omap2/usb-host.c | 1 +
arch/arm/mach-omap2/usb-musb.c | 1 +
arch/arm/mach-omap2/usb-tusb6010.c | 1 +
arch/arm/plat-omap/include/plat/usb.h | 130 +--------------------
drivers/mfd/omap-usb-host.c | 2 +-
drivers/usb/musb/am35x.c | 3 +-
drivers/usb/musb/musb_dsps.c | 3 +-
drivers/usb/musb/omap2430.h | 2 +-
.../linux/platform_data/usb-omap.h | 84 +++++--------
9 files changed, 40 insertions(+), 187 deletions(-)
copy arch/arm/plat-omap/include/plat/usb.h => include/linux/platform_data/usb-omap.h (71%)
diff --git a/arch/arm/mach-omap2/usb-host.c b/arch/arm/mach-omap2/usb-host.c
index 3c43449..e0c2cad 100644
--- a/arch/arm/mach-omap2/usb-host.c
+++ b/arch/arm/mach-omap2/usb-host.c
@@ -22,6 +22,7 @@
#include <linux/platform_device.h>
#include <linux/slab.h>
#include <linux/dma-mapping.h>
+#include <linux/platform_data/usb-omap.h>
#include <asm/io.h>
diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c
index 51da21c..4fcd3a6 100644
--- a/arch/arm/mach-omap2/usb-musb.c
+++ b/arch/arm/mach-omap2/usb-musb.c
@@ -23,6 +23,7 @@
#include <linux/clk.h>
#include <linux/dma-mapping.h>
#include <linux/io.h>
+#include <linux/platform_data/usb-omap.h>
#include <linux/usb/musb.h>
#include <plat/usb.h>
diff --git a/arch/arm/mach-omap2/usb-tusb6010.c b/arch/arm/mach-omap2/usb-tusb6010.c
index 805bea6..5e24289 100644
--- a/arch/arm/mach-omap2/usb-tusb6010.c
+++ b/arch/arm/mach-omap2/usb-tusb6010.c
@@ -15,6 +15,7 @@
#include <linux/platform_device.h>
#include <linux/gpio.h>
#include <linux/export.h>
+#include <linux/platform_data/usb-omap.h>
#include <linux/usb/musb.h>
diff --git a/arch/arm/plat-omap/include/plat/usb.h b/arch/arm/plat-omap/include/plat/usb.h
index 87ee140..2d5c027 100644
--- a/arch/arm/plat-omap/include/plat/usb.h
+++ b/arch/arm/plat-omap/include/plat/usb.h
@@ -3,86 +3,11 @@
#ifndef __ASM_ARCH_OMAP_USB_H
#define __ASM_ARCH_OMAP_USB_H
-#include <linux/io.h>
#include <linux/platform_device.h>
-#include <linux/usb/musb.h>
-
-#define OMAP3_HS_USB_PORTS 3
-
-enum usbhs_omap_port_mode {
- OMAP_USBHS_PORT_MODE_UNUSED,
- OMAP_EHCI_PORT_MODE_PHY,
- OMAP_EHCI_PORT_MODE_TLL,
- OMAP_EHCI_PORT_MODE_HSIC,
- OMAP_OHCI_PORT_MODE_PHY_6PIN_DATSE0,
- OMAP_OHCI_PORT_MODE_PHY_6PIN_DPDM,
- OMAP_OHCI_PORT_MODE_PHY_3PIN_DATSE0,
- OMAP_OHCI_PORT_MODE_PHY_4PIN_DPDM,
- OMAP_OHCI_PORT_MODE_TLL_6PIN_DATSE0,
- OMAP_OHCI_PORT_MODE_TLL_6PIN_DPDM,
- OMAP_OHCI_PORT_MODE_TLL_3PIN_DATSE0,
- OMAP_OHCI_PORT_MODE_TLL_4PIN_DPDM,
- OMAP_OHCI_PORT_MODE_TLL_2PIN_DATSE0,
- OMAP_OHCI_PORT_MODE_TLL_2PIN_DPDM
-};
-
-struct usbhs_omap_board_data {
- enum usbhs_omap_port_mode port_mode[OMAP3_HS_USB_PORTS];
-
- /* have to be valid if phy_reset is true and portx is in phy mode */
- int reset_gpio_port[OMAP3_HS_USB_PORTS];
-
- /* Set this to true for ES2.x silicon */
- unsigned es2_compatibility:1;
-
- unsigned phy_reset:1;
-
- /*
- * Regulators for USB PHYs.
- * Each PHY can have a separate regulator.
- */
- struct regulator *regulator[OMAP3_HS_USB_PORTS];
-};
+#include <linux/platform_data/usb-omap.h>
#ifdef CONFIG_ARCH_OMAP2PLUS
-struct ehci_hcd_omap_platform_data {
- enum usbhs_omap_port_mode port_mode[OMAP3_HS_USB_PORTS];
- int reset_gpio_port[OMAP3_HS_USB_PORTS];
- struct regulator *regulator[OMAP3_HS_USB_PORTS];
- unsigned phy_reset:1;
-};
-
-struct ohci_hcd_omap_platform_data {
- enum usbhs_omap_port_mode port_mode[OMAP3_HS_USB_PORTS];
- unsigned es2_compatibility:1;
-};
-
-struct usbhs_omap_platform_data {
- enum usbhs_omap_port_mode port_mode[OMAP3_HS_USB_PORTS];
-
- struct ehci_hcd_omap_platform_data *ehci_data;
- struct ohci_hcd_omap_platform_data *ohci_data;
-};
-
-struct usbtll_omap_platform_data {
- enum usbhs_omap_port_mode port_mode[OMAP3_HS_USB_PORTS];
-};
-/*-------------------------------------------------------------------------*/
-
-struct omap_musb_board_data {
- u8 interface_type;
- u8 mode;
- u16 power;
- unsigned extvbus:1;
- void (*set_phy_power)(u8 on);
- void (*clear_irq)(void);
- void (*set_mode)(u8 mode);
- void (*reset)(void);
-};
-
-enum musb_interface {MUSB_INTERFACE_ULPI, MUSB_INTERFACE_UTMI};
-
extern void usb_musb_init(struct omap_musb_board_data *board_data);
extern void usbhs_init(const struct usbhs_omap_board_data *pdata);
@@ -103,59 +28,6 @@ extern void am35x_musb_clear_irq(void);
extern void am35x_set_mode(u8 musb_mode);
extern void ti81xx_musb_phy_power(u8 on);
-/* AM35x */
-/* USB 2.0 PHY Control */
-#define CONF2_PHY_GPIOMODE (1 << 23)
-#define CONF2_OTGMODE (3 << 14)
-#define CONF2_NO_OVERRIDE (0 << 14)
-#define CONF2_FORCE_HOST (1 << 14)
-#define CONF2_FORCE_DEVICE (2 << 14)
-#define CONF2_FORCE_HOST_VBUS_LOW (3 << 14)
-#define CONF2_SESENDEN (1 << 13)
-#define CONF2_VBDTCTEN (1 << 12)
-#define CONF2_REFFREQ_24MHZ (2 << 8)
-#define CONF2_REFFREQ_26MHZ (7 << 8)
-#define CONF2_REFFREQ_13MHZ (6 << 8)
-#define CONF2_REFFREQ (0xf << 8)
-#define CONF2_PHYCLKGD (1 << 7)
-#define CONF2_VBUSSENSE (1 << 6)
-#define CONF2_PHY_PLLON (1 << 5)
-#define CONF2_RESET (1 << 4)
-#define CONF2_PHYPWRDN (1 << 3)
-#define CONF2_OTGPWRDN (1 << 2)
-#define CONF2_DATPOL (1 << 1)
-
-/* TI81XX specific definitions */
-#define USBCTRL0 0x620
-#define USBSTAT0 0x624
-
-/* TI816X PHY controls bits */
-#define TI816X_USBPHY0_NORMAL_MODE (1 << 0)
-#define TI816X_USBPHY_REFCLK_OSC (1 << 8)
-
-/* TI814X PHY controls bits */
-#define USBPHY_CM_PWRDN (1 << 0)
-#define USBPHY_OTG_PWRDN (1 << 1)
-#define USBPHY_CHGDET_DIS (1 << 2)
-#define USBPHY_CHGDET_RSTRT (1 << 3)
-#define USBPHY_SRCONDM (1 << 4)
-#define USBPHY_SINKONDP (1 << 5)
-#define USBPHY_CHGISINK_EN (1 << 6)
-#define USBPHY_CHGVSRC_EN (1 << 7)
-#define USBPHY_DMPULLUP (1 << 8)
-#define USBPHY_DPPULLUP (1 << 9)
-#define USBPHY_CDET_EXTCTL (1 << 10)
-#define USBPHY_GPIO_MODE (1 << 12)
-#define USBPHY_DPOPBUFCTL (1 << 13)
-#define USBPHY_DMOPBUFCTL (1 << 14)
-#define USBPHY_DPINPUT (1 << 15)
-#define USBPHY_DMINPUT (1 << 16)
-#define USBPHY_DPGPIO_PD (1 << 17)
-#define USBPHY_DMGPIO_PD (1 << 18)
-#define USBPHY_OTGVDET_EN (1 << 19)
-#define USBPHY_OTGSESSEND_EN (1 << 20)
-#define USBPHY_DATA_POLARITY (1 << 23)
-
#if defined(CONFIG_ARCH_OMAP1) && defined(CONFIG_USB)
u32 omap1_usb0_init(unsigned nwires, unsigned is_device);
u32 omap1_usb1_init(unsigned nwires);
diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c
index 23cec57..1d12d45 100644
--- a/drivers/mfd/omap-usb-host.c
+++ b/drivers/mfd/omap-usb-host.c
@@ -26,7 +26,7 @@
#include <linux/spinlock.h>
#include <linux/gpio.h>
#include <plat/cpu.h>
-#include <plat/usb.h>
+#include <linux/platform_data/usb.h>
#include <linux/pm_runtime.h>
#define USBHS_DRIVER_NAME "usbhs_omap"
diff --git a/drivers/usb/musb/am35x.c b/drivers/usb/musb/am35x.c
index 457f25e..0605fe3 100644
--- a/drivers/usb/musb/am35x.c
+++ b/drivers/usb/musb/am35x.c
@@ -34,8 +34,7 @@
#include <linux/platform_device.h>
#include <linux/dma-mapping.h>
#include <linux/usb/nop-usb-xceiv.h>
-
-#include <plat/usb.h>
+#include <linux/platform_data/usb-omap.h>
#include "musb_core.h"
diff --git a/drivers/usb/musb/musb_dsps.c b/drivers/usb/musb/musb_dsps.c
index 444346e..a67af21 100644
--- a/drivers/usb/musb/musb_dsps.c
+++ b/drivers/usb/musb/musb_dsps.c
@@ -38,13 +38,12 @@
#include <linux/pm_runtime.h>
#include <linux/module.h>
#include <linux/usb/nop-usb-xceiv.h>
+#include <linux/platform_data/usb-omap.h>
#include <linux/of.h>
#include <linux/of_device.h>
#include <linux/of_address.h>
-#include <plat/usb.h>
-
#include "musb_core.h"
#ifdef CONFIG_OF
diff --git a/drivers/usb/musb/omap2430.h b/drivers/usb/musb/omap2430.h
index b85f397..8ef6566 100644
--- a/drivers/usb/musb/omap2430.h
+++ b/drivers/usb/musb/omap2430.h
@@ -10,7 +10,7 @@
#ifndef __MUSB_OMAP243X_H__
#define __MUSB_OMAP243X_H__
-#include <plat/usb.h>
+#include <linux/platform_data/usb-omap.h>
/*
* OMAP2430-specific definitions
diff --git a/arch/arm/plat-omap/include/plat/usb.h b/include/linux/platform_data/usb-omap.h
similarity index 71%
copy from arch/arm/plat-omap/include/plat/usb.h
copy to include/linux/platform_data/usb-omap.h
index 87ee140..0edc5a0 100644
--- a/arch/arm/plat-omap/include/plat/usb.h
+++ b/include/linux/platform_data/usb-omap.h
@@ -1,10 +1,28 @@
-// include/asm-arm/mach-omap/usb.h
-
-#ifndef __ASM_ARCH_OMAP_USB_H
-#define __ASM_ARCH_OMAP_USB_H
+/*
+ * usb-omap.h - Platform data for the various OMAP USB IPs
+ *
+ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com
+ *
+ * This software is distributed under the terms of the GNU General Public
+ * License ("GPL") version 2, as published by the Free Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __LINUX_PLATFORM_DATA_USB_OMAP_H
+#define __LINUX_PLATFORM_DATA_USB_OMAP_H
#include <linux/io.h>
-#include <linux/platform_device.h>
#include <linux/usb/musb.h>
#define OMAP3_HS_USB_PORTS 3
@@ -26,6 +44,10 @@ enum usbhs_omap_port_mode {
OMAP_OHCI_PORT_MODE_TLL_2PIN_DPDM
};
+struct usbtll_omap_platform_data {
+ enum usbhs_omap_port_mode port_mode[OMAP3_HS_USB_PORTS];
+};
+
struct usbhs_omap_board_data {
enum usbhs_omap_port_mode port_mode[OMAP3_HS_USB_PORTS];
@@ -44,8 +66,6 @@ struct usbhs_omap_board_data {
struct regulator *regulator[OMAP3_HS_USB_PORTS];
};
-#ifdef CONFIG_ARCH_OMAP2PLUS
-
struct ehci_hcd_omap_platform_data {
enum usbhs_omap_port_mode port_mode[OMAP3_HS_USB_PORTS];
int reset_gpio_port[OMAP3_HS_USB_PORTS];
@@ -65,9 +85,6 @@ struct usbhs_omap_platform_data {
struct ohci_hcd_omap_platform_data *ohci_data;
};
-struct usbtll_omap_platform_data {
- enum usbhs_omap_port_mode port_mode[OMAP3_HS_USB_PORTS];
-};
/*-------------------------------------------------------------------------*/
struct omap_musb_board_data {
@@ -81,27 +98,10 @@ struct omap_musb_board_data {
void (*reset)(void);
};
-enum musb_interface {MUSB_INTERFACE_ULPI, MUSB_INTERFACE_UTMI};
-
-extern void usb_musb_init(struct omap_musb_board_data *board_data);
-
-extern void usbhs_init(const struct usbhs_omap_board_data *pdata);
-extern int omap_tll_enable(void);
-extern int omap_tll_disable(void);
-
-extern int omap4430_phy_power(struct device *dev, int ID, int on);
-extern int omap4430_phy_set_clk(struct device *dev, int on);
-extern int omap4430_phy_init(struct device *dev);
-extern int omap4430_phy_exit(struct device *dev);
-extern int omap4430_phy_suspend(struct device *dev, int suspend);
-
-#endif
-
-extern void am35x_musb_reset(void);
-extern void am35x_musb_phy_power(u8 on);
-extern void am35x_musb_clear_irq(void);
-extern void am35x_set_mode(u8 musb_mode);
-extern void ti81xx_musb_phy_power(u8 on);
+enum musb_interface {
+ MUSB_INTERFACE_ULPI,
+ MUSB_INTERFACE_UTMI
+};
/* AM35x */
/* USB 2.0 PHY Control */
@@ -156,24 +156,4 @@ extern void ti81xx_musb_phy_power(u8 on);
#define USBPHY_OTGSESSEND_EN (1 << 20)
#define USBPHY_DATA_POLARITY (1 << 23)
-#if defined(CONFIG_ARCH_OMAP1) && defined(CONFIG_USB)
-u32 omap1_usb0_init(unsigned nwires, unsigned is_device);
-u32 omap1_usb1_init(unsigned nwires);
-u32 omap1_usb2_init(unsigned nwires, unsigned alt_pingroup);
-#else
-static inline u32 omap1_usb0_init(unsigned nwires, unsigned is_device)
-{
- return 0;
-}
-static inline u32 omap1_usb1_init(unsigned nwires)
-{
- return 0;
-
-}
-static inline u32 omap1_usb2_init(unsigned nwires, unsigned alt_pingroup)
-{
- return 0;
-}
-#endif
-
-#endif /* __ASM_ARCH_OMAP_USB_H */
+#endif /* __LINUX_PLATFORM_DATA_USB_OMAP_H */
--
1.8.0.rc0
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [PATCH v2] arm: omap: move OMAP USB platform data to <linux/platform_data/omap-usb.h>
2012-10-17 15:47 ` [PATCH v2] " Felipe Balbi
@ 2012-10-17 20:34 ` Tony Lindgren
2012-10-18 5:49 ` Felipe Balbi
0 siblings, 1 reply; 14+ messages in thread
From: Tony Lindgren @ 2012-10-17 20:34 UTC (permalink / raw)
To: Felipe Balbi; +Cc: Linux OMAP Mailing List, Linux ARM Kernel Mailing List
* Felipe Balbi <balbi@ti.com> [121017 08:54]:
> In order to make single zImage work for ARM architecture,
> we need to make sure we don't depend on private headers.
>
> Move USB platform_data to <linux/platform_data/omap-usb.h>
> and keep only internal functions in <plat/usb.h>.
Thanks, looks like I can't make this apply against v3.7-rc1:
patching file arch/arm/plat-omap/include/plat/usb.h
Hunk #1 FAILED at 1.
Hunk #2 FAILED at 26.
Hunk #3 FAILED at 44.
Hunk #4 FAILED at 65.
Hunk #5 FAILED at 81.
Hunk #6 succeeded at 28 with fuzz 2 (offset -128 lines).
5 out of 6 hunks FAILED -- rejects in file arch/arm/plat-omap/include/plat/usb.h
Can you please check it?
Regards,
Tony
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v2] arm: omap: move OMAP USB platform data to <linux/platform_data/omap-usb.h>
2012-10-17 20:34 ` Tony Lindgren
@ 2012-10-18 5:49 ` Felipe Balbi
2012-10-19 1:49 ` Tony Lindgren
0 siblings, 1 reply; 14+ messages in thread
From: Felipe Balbi @ 2012-10-18 5:49 UTC (permalink / raw)
To: Tony Lindgren
Cc: Felipe Balbi, Linux OMAP Mailing List,
Linux ARM Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 1608 bytes --]
Hi,
On Wed, Oct 17, 2012 at 01:34:04PM -0700, Tony Lindgren wrote:
> * Felipe Balbi <balbi@ti.com> [121017 08:54]:
> > In order to make single zImage work for ARM architecture,
> > we need to make sure we don't depend on private headers.
> >
> > Move USB platform_data to <linux/platform_data/omap-usb.h>
> > and keep only internal functions in <plat/usb.h>.
>
> Thanks, looks like I can't make this apply against v3.7-rc1:
>
> patching file arch/arm/plat-omap/include/plat/usb.h
> Hunk #1 FAILED at 1.
> Hunk #2 FAILED at 26.
> Hunk #3 FAILED at 44.
> Hunk #4 FAILED at 65.
> Hunk #5 FAILED at 81.
> Hunk #6 succeeded at 28 with fuzz 2 (offset -128 lines).
> 5 out of 6 hunks FAILED -- rejects in file arch/arm/plat-omap/include/plat/usb.h
>
> Can you please check it?
Are you sure you have a clean v3.7-rc1 ?
commit 9b1ebba0f43e7bf6a8fdd8aa84da65e5e0344fb7
Author: Felipe Balbi <balbi@ti.com>
Date: Fri Sep 28 09:51:01 2012 +0300
arm: omap: move OMAP USB platform data to <linux/platform_data/omap-usb.h>
In order to make single zImage work for ARM architecture,
we need to make sure we don't depend on private headers.
Move USB platform_data to <linux/platform_data/omap-usb.h>
and keep only internal functions in <plat/usb.h>.
Signed-off-by: Felipe Balbi <balbi@ti.com>
commit ddffeb8c4d0331609ef2581d84de4d763607bd37
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun Oct 14 14:41:04 2012 -0700
Linux 3.7-rc1
That's my branch. Patch is right on top of v3.7-rc1 commit.
--
balbi
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PATCH v2] arm: omap: move OMAP USB platform data to <linux/platform_data/omap-usb.h>
2012-10-18 5:49 ` Felipe Balbi
@ 2012-10-19 1:49 ` Tony Lindgren
2012-10-19 6:55 ` Felipe Balbi
0 siblings, 1 reply; 14+ messages in thread
From: Tony Lindgren @ 2012-10-19 1:49 UTC (permalink / raw)
To: Felipe Balbi; +Cc: Linux OMAP Mailing List, Linux ARM Kernel Mailing List
* Felipe Balbi <balbi@ti.com> [121017 22:56]:
> Hi,
>
> On Wed, Oct 17, 2012 at 01:34:04PM -0700, Tony Lindgren wrote:
> > * Felipe Balbi <balbi@ti.com> [121017 08:54]:
> > > In order to make single zImage work for ARM architecture,
> > > we need to make sure we don't depend on private headers.
> > >
> > > Move USB platform_data to <linux/platform_data/omap-usb.h>
> > > and keep only internal functions in <plat/usb.h>.
> >
> > Thanks, looks like I can't make this apply against v3.7-rc1:
> >
> > patching file arch/arm/plat-omap/include/plat/usb.h
> > Hunk #1 FAILED at 1.
> > Hunk #2 FAILED at 26.
> > Hunk #3 FAILED at 44.
> > Hunk #4 FAILED at 65.
> > Hunk #5 FAILED at 81.
> > Hunk #6 succeeded at 28 with fuzz 2 (offset -128 lines).
> > 5 out of 6 hunks FAILED -- rejects in file arch/arm/plat-omap/include/plat/usb.h
> >
> > Can you please check it?
>
> Are you sure you have a clean v3.7-rc1 ?
Yes. Figured it out, it fails to apply with quilt, but applies
with git.
But it does not compile with all configs though, and does
not remove plat/usb.h. Thanks anyways. I'll post a proper
series shortly with your patch fixed up.
Regards,
Tony
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v2] arm: omap: move OMAP USB platform data to <linux/platform_data/omap-usb.h>
2012-10-19 1:49 ` Tony Lindgren
@ 2012-10-19 6:55 ` Felipe Balbi
2012-10-19 15:56 ` Tony Lindgren
0 siblings, 1 reply; 14+ messages in thread
From: Felipe Balbi @ 2012-10-19 6:55 UTC (permalink / raw)
To: Tony Lindgren
Cc: Felipe Balbi, Linux OMAP Mailing List,
Linux ARM Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 1545 bytes --]
Hi,
On Thu, Oct 18, 2012 at 06:49:17PM -0700, Tony Lindgren wrote:
> * Felipe Balbi <balbi@ti.com> [121017 22:56]:
> > Hi,
> >
> > On Wed, Oct 17, 2012 at 01:34:04PM -0700, Tony Lindgren wrote:
> > > * Felipe Balbi <balbi@ti.com> [121017 08:54]:
> > > > In order to make single zImage work for ARM architecture,
> > > > we need to make sure we don't depend on private headers.
> > > >
> > > > Move USB platform_data to <linux/platform_data/omap-usb.h>
> > > > and keep only internal functions in <plat/usb.h>.
> > >
> > > Thanks, looks like I can't make this apply against v3.7-rc1:
> > >
> > > patching file arch/arm/plat-omap/include/plat/usb.h
> > > Hunk #1 FAILED at 1.
> > > Hunk #2 FAILED at 26.
> > > Hunk #3 FAILED at 44.
> > > Hunk #4 FAILED at 65.
> > > Hunk #5 FAILED at 81.
> > > Hunk #6 succeeded at 28 with fuzz 2 (offset -128 lines).
> > > 5 out of 6 hunks FAILED -- rejects in file arch/arm/plat-omap/include/plat/usb.h
> > >
> > > Can you please check it?
> >
> > Are you sure you have a clean v3.7-rc1 ?
>
> Yes. Figured it out, it fails to apply with quilt, but applies
> with git.
probably because of file rename.
> But it does not compile with all configs though, and does
> not remove plat/usb.h. Thanks anyways. I'll post a proper
> series shortly with your patch fixed up.
ok... I'll check it out. I kept the non-static functions in plat/usb.h
because they didn't belong on platform_data/usb-omap.h. What should be
done with those, then ? move to mach/ ?
--
balbi
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v2] arm: omap: move OMAP USB platform data to <linux/platform_data/omap-usb.h>
2012-10-19 6:55 ` Felipe Balbi
@ 2012-10-19 15:56 ` Tony Lindgren
0 siblings, 0 replies; 14+ messages in thread
From: Tony Lindgren @ 2012-10-19 15:56 UTC (permalink / raw)
To: Felipe Balbi; +Cc: Linux OMAP Mailing List, Linux ARM Kernel Mailing List
* Felipe Balbi <balbi@ti.com> [121019 00:01]:
> On Thu, Oct 18, 2012 at 06:49:17PM -0700, Tony Lindgren wrote:
> >
> > Yes. Figured it out, it fails to apply with quilt, but applies
> > with git.
>
> probably because of file rename.
Yeh so it seems.
> > But it does not compile with all configs though, and does
> > not remove plat/usb.h. Thanks anyways. I'll post a proper
> > series shortly with your patch fixed up.
>
> ok... I'll check it out. I kept the non-static functions in plat/usb.h
> because they didn't belong on platform_data/usb-omap.h. What should be
> done with those, then ? move to mach/ ?
I made a clean-up patch that creates local usb.h file for those
that applies before your patch.
Regards,
Tony
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: Updated status of the removal of plat headers
2012-10-16 23:00 Updated status of the removal of plat headers Tony Lindgren
` (2 preceding siblings ...)
2012-10-17 15:47 ` [PATCH v2] " Felipe Balbi
@ 2012-10-17 21:51 ` Jon Hunter
2012-10-17 22:02 ` Tony Lindgren
2012-10-19 17:43 ` Omar Ramirez Luna
4 siblings, 1 reply; 14+ messages in thread
From: Jon Hunter @ 2012-10-17 21:51 UTC (permalink / raw)
To: Tony Lindgren
Cc: linux-omap, Omar Ramirez Luna, Paul Walmsley, Igor Grinberg,
Felipe Balbi, Kishon Vijay Abraham I, Keshava Munegowda,
Tomi Valkeinen
Hi Tony,
On 10/16/2012 06:00 PM, Tony Lindgren wrote:
> Hi all,
>
> Here's a quick status update on the removal of remaining
> #include <plat/*.h> files. Most files are now fixed up, and
> we only have the following remaining:
>
> cpu.h wrapper only left, will be removed as soon as drivers are fixed
>
> dmtimer.h Jon is fixing this
I have patches ready for this. However, as you know I have a few timer
series cooking at the moment and just sent out the latest timer DT
series today [1][2].
I have also updated my timer fixes series [3] too, however, I was not
going to send out until the DT stuff is sorted. At the moment I have
included the dmtimer header patches with the fixes series as there are
some dependencies but this series has now grown into a 20+ patch series.
So if it is easier to manage, I could split this into a fixes series and
a clean-up series. Or if you only want the header stuff now, I could
send this and send the fixes and clean-up later.
Cheers
Jon
[1] http://marc.info/?l=linux-omap&m=135049690119218&w=2
[2] http://marc.info/?l=linux-omap&m=135049882020029&w=2
[3] http://marc.info/?l=linux-arm-kernel&m=134687192121865&w=2
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: Updated status of the removal of plat headers
2012-10-17 21:51 ` Updated status of the removal of plat headers Jon Hunter
@ 2012-10-17 22:02 ` Tony Lindgren
0 siblings, 0 replies; 14+ messages in thread
From: Tony Lindgren @ 2012-10-17 22:02 UTC (permalink / raw)
To: Jon Hunter
Cc: linux-omap, Omar Ramirez Luna, Paul Walmsley, Igor Grinberg,
Felipe Balbi, Kishon Vijay Abraham I, Keshava Munegowda,
Tomi Valkeinen
* Jon Hunter <jon-hunter@ti.com> [121017 14:53]:
> Hi Tony,
>
> On 10/16/2012 06:00 PM, Tony Lindgren wrote:
> > Hi all,
> >
> > Here's a quick status update on the removal of remaining
> > #include <plat/*.h> files. Most files are now fixed up, and
> > we only have the following remaining:
> >
> > cpu.h wrapper only left, will be removed as soon as drivers are fixed
> >
> > dmtimer.h Jon is fixing this
>
> I have patches ready for this. However, as you know I have a few timer
> series cooking at the moment and just sent out the latest timer DT
> series today [1][2].
>
> I have also updated my timer fixes series [3] too, however, I was not
> going to send out until the DT stuff is sorted. At the moment I have
> included the dmtimer header patches with the fixes series as there are
> some dependencies but this series has now grown into a 20+ patch series.
> So if it is easier to manage, I could split this into a fixes series and
> a clean-up series. Or if you only want the header stuff now, I could
> send this and send the fixes and clean-up later.
When they are ready, two separate pull requests against v3.7-rc1 for fixes
and cleanup would be perfect.
Thanks,
Tony
> [1] http://marc.info/?l=linux-omap&m=135049690119218&w=2
> [2] http://marc.info/?l=linux-omap&m=135049882020029&w=2
> [3] http://marc.info/?l=linux-arm-kernel&m=134687192121865&w=2
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: Updated status of the removal of plat headers
2012-10-16 23:00 Updated status of the removal of plat headers Tony Lindgren
` (3 preceding siblings ...)
2012-10-17 21:51 ` Updated status of the removal of plat headers Jon Hunter
@ 2012-10-19 17:43 ` Omar Ramirez Luna
2012-10-19 18:25 ` Tony Lindgren
4 siblings, 1 reply; 14+ messages in thread
From: Omar Ramirez Luna @ 2012-10-19 17:43 UTC (permalink / raw)
To: Tony Lindgren
Cc: linux-omap, Jon Hunter, Paul Walmsley, Igor Grinberg,
Felipe Balbi, Kishon Vijay Abraham I, Keshava Munegowda,
Tomi Valkeinen
Hi,
On 16 October 2012 18:00, Tony Lindgren <tony@atomide.com> wrote:
> Hi all,
>
> Here's a quick status update on the removal of remaining
> #include <plat/*.h> files. Most files are now fixed up, and
> we only have the following remaining:
>
> cpu.h wrapper only left, will be removed as soon as drivers are fixed
>
> dmtimer.h Jon is fixing this
>
> mailbox.h Omar, are you fixing this?
Yes, I'm taking this.
Regards,
Omar
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: Updated status of the removal of plat headers
2012-10-19 17:43 ` Omar Ramirez Luna
@ 2012-10-19 18:25 ` Tony Lindgren
0 siblings, 0 replies; 14+ messages in thread
From: Tony Lindgren @ 2012-10-19 18:25 UTC (permalink / raw)
To: Omar Ramirez Luna
Cc: linux-omap, Jon Hunter, Paul Walmsley, Igor Grinberg,
Felipe Balbi, Kishon Vijay Abraham I, Keshava Munegowda,
Tomi Valkeinen
* Omar Ramirez Luna <omar.luna@linaro.org> [121019 10:45]:
> Hi,
>
> On 16 October 2012 18:00, Tony Lindgren <tony@atomide.com> wrote:
> > Hi all,
> >
> > Here's a quick status update on the removal of remaining
> > #include <plat/*.h> files. Most files are now fixed up, and
> > we only have the following remaining:
> >
> > cpu.h wrapper only left, will be removed as soon as drivers are fixed
> >
> > dmtimer.h Jon is fixing this
> >
> > mailbox.h Omar, are you fixing this?
>
> Yes, I'm taking this.
OK thanks, a patch against v3.7-rc1 is preferred in case some
driver branches need it too.
Regards,
Tony
^ permalink raw reply [flat|nested] 14+ messages in thread