omap3evm: fix compilation warning for omap3evm_flash_init
Subsystems (6)
PATCH 1/2 omap3evm: fix compilation warning for omap3evm_flash_init
omap3evm_flash_init() was earlier defined in seperate file but now need to merge to board_omap3evm.c file.
Removing it to fix the compilation. It should be added back with function definitions.
--- arch/arm/mach-omap2/board-omap3evm.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)
arch/arm/mach-omap2/board-omap3evm.c +0 -1
@@ -324,7 +324,6 @@ static void __init omap3_evm_init(void)/* Setup EHCI phy reset padconfig */ omap_cfg_reg (AF4_34XX_GPIO135_OUT );usb_ehci_init (&ehci_pdata); -omap3evm_flash_init ();ads7846_dev_init (); }
Signature · 1 line
1.6.2.4
PATCH 2/2 omap3: Add CHIP_GE_OMAP3430ES3 for HSUSB
OMAP3 HSUSB ports can be individually programmed in PHY or TLL mode in ES3.0 onwards whereas this is not supported in ES2.1 and earlier versions.
CHIP_GE_OMAP3430ES3 is added to program this behavior at runtime.
Also updated the existing macros to use the priviously defined *_GE_* logic instead of repeating the same logic again.
---
This is required to compile EHCI driver. EHCI driver patch "support for ES3.x" used CHIP_GE_OMAP3430ES2 and so this patch is also required.
arch/arm/plat-omap/include/mach/cpu.h | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-)
arch/arm/plat-omap/include/mach/cpu.h +3 -4
@@ -414,10 +414,9 @@ IS_OMAP_TYPE(3430, 0x3430)* chips at ES2 and beyond, but not, for example, any OMAP lines after * OMAP3. */ -#define CHIP_GE_OMAP3430ES2 (CHIP_IS_OMAP3430ES2 | \ - CHIP_IS_OMAP3430ES3_0 | \ - CHIP_IS_OMAP3430ES3_1) -#define CHIP_GE_OMAP3430ES3_1 (CHIP_IS_OMAP3430ES3_1) +#define CHIP_GE_OMAP3430ES3_1 (CHIP_IS_OMAP3430ES3_1) +#define CHIP_GE_OMAP3430ES3 (CHIP_IS_OMAP3430ES3_0 | CHIP_GE_OMAP3430ES3_1) +#define CHIP_GE_OMAP3430ES2 (CHIP_IS_OMAP3430ES2 | CHIP_GE_OMAP3430ES3)int omap_chip_is (struct omap_chip_id oci);
Signature · 1 line
1.6.2.4
PATCH 3/4 ehci: fix kernel panic in ehci_probe
hcd_priv_size has to be sizeof(struct ehci_hcd).
- .hcd_priv_size = sizeof(struct ehci_hcd_omap), + .hcd_priv_size = sizeof(struct ehci_hcd),
Without this kernel panic is observed in probe function.
--- drivers/usb/host/ehci-omap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/usb/host/ehci-omap.c +1 -1
@@ -748,7 +748,7 @@ static struct platform_driver ehci_hcd_omap_driver = {static const struct hc_driver ehci_omap_hc_driver = { .description = hcd_name, .product_desc ="OMAP-EHCI Host Controller" , - .hcd_priv_size =sizeof (struct ehci_hcd_omap ), + .hcd_priv_size =sizeof (struct ehci_hcd ),/* * generic hardware linkage
Signature · 1 line
1.6.2.4
PATCH 4/4 ehci: update driver with another generic change
Update the OMAP EHCI driver in accordance with below patch introduced in generic EHCI driver.
commit 914b701280a76f96890ad63eb0fa99bf204b961c
USB: EHCI: use the new clear_tt_buffer interface
Without this EHCI becomes unusable when a compound device DELL USB keyboard)is connected and disconnected.
--- drivers/usb/host/ehci-omap.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
drivers/usb/host/ehci-omap.c +2 -0
@@ -784,6 +784,8 @@ static const struct hc_driver ehci_omap_hc_driver = { .hub_control = ehci_hub_control, .bus_suspend = ehci_bus_suspend, .bus_resume = ehci_bus_resume, + + .clear_tt_buffer_complete = ehci_clear_tt_buffer_complete, };MODULE_ALIAS ("platform:omap-ehci" );
Signature · 1 line
1.6.2.4
Tony Lindgren
maintainerPATCH 4/4 ehci: update driver with another generic change
This patch has been applied to the linux-omap
by youw fwiendly patch wobot.
Branch in linux-omap: ehci
Initial commit ID (Likely to change): a358a2fbabd366a0a05b6dc7228410d49072e679
PatchWorks
http://patchwork.kernel.org/patch/49254/
Git (Likely to change, and takes a while to get mirrored)
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=a358a2fbabd366a0a05b6dc7228410d49072e679
Tony Lindgren
maintainerPATCH 3/4 ehci: fix kernel panic in ehci_probe
In reply to Ajay Kumar GuptaThis patch has been applied to the linux-omap
by youw fwiendly patch wobot.
Branch in linux-omap: ehci
Initial commit ID (Likely to change): 1a8b7bc0808fbd5bcc0b9bcbb6d3a8dc6f915881
PatchWorks
http://patchwork.kernel.org/patch/49257/
Git (Likely to change, and takes a while to get mirrored)
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=1a8b7bc0808fbd5bcc0b9bcbb6d3a8dc6f915881
Tony Lindgren
maintainerRe: [PATCH 2/2] omap3: Add CHIP_GE_OMAP3430ES3 for HSUSB
In reply to Ajay Kumar GuptaQuoted 8 lines · Ajay Kumar Gupta
OMAP3 HSUSB ports can be individually programmed in PHY or TLL mode in ES3.0 onwards whereas this is not supported in ES2.1 and earlier versions.
CHIP_GE_OMAP3430ES3is added to program this behavior at runtime.Also updated the existing macros to use the priviously defined *_GE_* logic instead of repeating the same logic again.
Please use the omap_rev() test instead.
Tony
Quoted 30 lines
Signed-off-by Ajay Kumar Gupta <[email protected]>---
This is required to compile EHCI driver. EHCI driver patch "support for ES3.x" usedCHIP_GE_OMAP3430ES2and so this patch is also required.arch/arm/plat-omap/include/mach/cpu.h | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-)arch/arm/plat-omap/include/mach/cpu.h +3
-4@@ -414,10 +414,9 @@ IS_OMAP_TYPE(3430, 0x3430)* chips at ES2 and beyond, but not, for example, any OMAP lines after * OMAP3. */ -#define CHIP_GE_OMAP3430ES2 (CHIP_IS_OMAP3430ES2 | \ - CHIP_IS_OMAP3430ES3_0 | \ - CHIP_IS_OMAP3430ES3_1) -#define CHIP_GE_OMAP3430ES3_1 (CHIP_IS_OMAP3430ES3_1) +#define CHIP_GE_OMAP3430ES3_1 (CHIP_IS_OMAP3430ES3_1) +#define CHIP_GE_OMAP3430ES3 (CHIP_IS_OMAP3430ES3_0 | CHIP_GE_OMAP3430ES3_1) +#define CHIP_GE_OMAP3430ES2 (CHIP_IS_OMAP3430ES2 | CHIP_GE_OMAP3430ES3)int omap_chip_is (struct omap_chip_id oci);Signature · 1 line
1.6.2.4
Tony,
Quoted 8 lines
-----Original Message-----
From: Gupta, Ajay Kumar
Sent: Tuesday, September 22, 2009 6:42 PM
To: [email protected]
Cc: [email protected]; [email protected]; [email protected]; Gupta, Ajay Kumar
Subject: [PATCH 1/2] omap3evm: fix compilation warning foromap3evm_flash_init
Please read the patch indexes as,
[PATCH 1/2] ==> [PATCH 1/4]
[PATCH 2/2] ==> [PATCH 2/4]
and they all are against linux-omap tree as of today.
-Ajay
Quoted 28 lines
omap3evm_flash_init()was earlier defined in seperate file but now need to merge toboard_omap3evm.cfile.Removing it to fix the compilation. It should be added back with function definitions.
Signed-off-by Ajay Kumar Gupta <[email protected]>--- arch/arm/mach-omap2/board-omap3evm.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)arch/arm/mach- renamed from arch/arm/mach-omap2/board-omap3evm.c +0
-0
omap2/board-omap3evm.c
index 7b4e16c..62a6f32 100644arch/arm/mach-omap2/board-omap3evm.c +0
-2@@ -324,7 +324,6 @@ static void __init omap3_evm_init(void)/* Setup EHCI phy reset padconfig */ omap_cfg_reg (AF4_34XX_GPIO135_OUT );usb_ehci_init (&ehci_pdata); -omap3evm_flash_init ();ads7846_dev_init (); } --1.6.2.4
Tony Lindgren
maintainerPATCH 1/2 omap3evm: fix compilation warning for
In reply to Ajay Kumar GuptaThis patch has been applied to the linux-omap
by youw fwiendly patch wobot.
Branch in linux-omap: ehci
Initial commit ID (Likely to change): 737dc8f4612fce487afdb1a1a8d982c6a54202df
PatchWorks
http://patchwork.kernel.org/patch/49255/
Git (Likely to change, and takes a while to get mirrored)
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=737dc8f4612fce487afdb1a1a8d982c6a54202df