Updated status of the removal of plat headers

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

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 <[email protected]>

---
 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%)

arch/arm/mach-omap2/usb-host.c +1 -0

index 3c43449..e0c2cad 100644
@@ -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>
 

arch/arm/mach-omap2/usb-musb.c +1 -0

index 51da21c..4fcd3a6 100644
@@ -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>

arch/arm/mach-omap2/usb-tusb6010.c +1 -0

index 805bea6..5e24289 100644
@@ -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>
 

arch/arm/plat-omap/include/plat/usb.h +1 -51

index 87ee140..550e40e 100644
@@ -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;
-};
-

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>.

Quoted 5 lines · 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>.

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?

Hi,

Quoted 18 lines · Tony Lindgren

Quoted 5 lines · 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>.

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

Quoted 1 line

Can you please check it?

Are you sure you have a clean v3.7-rc1 ?

Quoted 21 lines · Felipe Balbi

Hi,

Quoted 18 lines · Tony Lindgren

Quoted 5 lines · 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>.

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

Quoted 3 lines

Quoted 1 line

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.

Quoted 3 lines · Tony Lindgren

Yes. Figured it out, it fails to apply with quilt, but applies with git.

probably because of file rename.

Quoted 3 lines

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/ ?

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

Hi Tony,

Quoted 9 lines · Tony Lindgren

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.

[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

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?

Hi,

Quoted 6 lines · Tony Lindgren

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:

Quoted 5 lines

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.