* linux-next: manual merge of the usb tree with the omap tree
@ 2010-12-23 6:18 ` Stephen Rothwell
0 siblings, 0 replies; 44+ messages in thread
From: Stephen Rothwell @ 2010-12-23 6:18 UTC (permalink / raw)
To: Greg KH
Cc: linux-next, linux-kernel, Anand Gadiyar, Felipe Balbi,
Tony Lindgren, linux-omap
Hi Greg,
Today's linux-next merge of the usb tree got a conflict in
arch/arm/mach-omap2/clock3xxx_data.c and
arch/arm/mach-omap2/clock44xx_data.c between various commits from the omap
tree and various commits from the usb tree.
I did a quick fix (which may be completely wrong - see below).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-omap2/clock3xxx_data.c
index 9ab817e,0579604..0000000
--- a/arch/arm/mach-omap2/clock3xxx_data.c
+++ b/arch/arm/mach-omap2/clock3xxx_data.c
@@@ -3275,17 -3267,18 +3275,18 @@@ static struct omap_clk omap3xxx_clks[]
CLK(NULL, "gfx_l3_ick", &gfx_l3_ick, CK_3430ES1),
CLK(NULL, "gfx_cg1_ck", &gfx_cg1_ck, CK_3430ES1),
CLK(NULL, "gfx_cg2_ck", &gfx_cg2_ck, CK_3430ES1),
- CLK(NULL, "sgx_fck", &sgx_fck, CK_3430ES2 | CK_3517),
- CLK(NULL, "sgx_ick", &sgx_ick, CK_3430ES2 | CK_3517),
+ CLK(NULL, "sgx_fck", &sgx_fck, CK_3430ES2PLUS | CK_3517 | CK_36XX),
+ CLK(NULL, "sgx_ick", &sgx_ick, CK_3430ES2PLUS | CK_3517 | CK_36XX),
CLK(NULL, "d2d_26m_fck", &d2d_26m_fck, CK_3430ES1),
- CLK(NULL, "modem_fck", &modem_fck, CK_343X),
- CLK(NULL, "sad2d_ick", &sad2d_ick, CK_343X),
- CLK(NULL, "mad2d_ick", &mad2d_ick, CK_343X),
+ CLK(NULL, "modem_fck", &modem_fck, CK_34XX | CK_36XX),
+ CLK(NULL, "sad2d_ick", &sad2d_ick, CK_34XX | CK_36XX),
+ CLK(NULL, "mad2d_ick", &mad2d_ick, CK_34XX | CK_36XX),
CLK(NULL, "gpt10_fck", &gpt10_fck, CK_3XXX),
CLK(NULL, "gpt11_fck", &gpt11_fck, CK_3XXX),
- CLK(NULL, "cpefuse_fck", &cpefuse_fck, CK_3430ES2 | CK_AM35XX),
- CLK(NULL, "ts_fck", &ts_fck, CK_3430ES2 | CK_AM35XX),
- CLK(NULL, "usbtll_fck", &usbtll_fck, CK_3430ES2 | CK_AM35XX),
+ CLK(NULL, "cpefuse_fck", &cpefuse_fck, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
+ CLK(NULL, "ts_fck", &ts_fck, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
+ CLK(NULL, "usbtll_fck", &usbtll_fck, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
+ CLK("ehci-omap.0", "usbtll_fck", &usbtll_fck, CK_3430ES2 | CK_AM35XX),
CLK("omap-mcbsp.1", "prcm_fck", &core_96m_fck, CK_3XXX),
CLK("omap-mcbsp.5", "prcm_fck", &core_96m_fck, CK_3XXX),
CLK(NULL, "core_96m_fck", &core_96m_fck, CK_3XXX),
@@@ -3309,26 -3302,27 +3310,27 @@@
CLK(NULL, "core_12m_fck", &core_12m_fck, CK_3XXX),
CLK("omap_hdq.0", "fck", &hdq_fck, CK_3XXX),
CLK(NULL, "ssi_ssr_fck", &ssi_ssr_fck_3430es1, CK_3430ES1),
- CLK(NULL, "ssi_ssr_fck", &ssi_ssr_fck_3430es2, CK_3430ES2),
+ CLK(NULL, "ssi_ssr_fck", &ssi_ssr_fck_3430es2, CK_3430ES2PLUS | CK_36XX),
CLK(NULL, "ssi_sst_fck", &ssi_sst_fck_3430es1, CK_3430ES1),
- CLK(NULL, "ssi_sst_fck", &ssi_sst_fck_3430es2, CK_3430ES2),
+ CLK(NULL, "ssi_sst_fck", &ssi_sst_fck_3430es2, CK_3430ES2PLUS | CK_36XX),
CLK(NULL, "core_l3_ick", &core_l3_ick, CK_3XXX),
- CLK("musb_hdrc", "ick", &hsotgusb_ick_3430es1, CK_3430ES1),
- CLK("musb_hdrc", "ick", &hsotgusb_ick_3430es2, CK_3430ES2PLUS | CK_36XX),
+ CLK("musb-omap2430", "ick", &hsotgusb_ick_3430es1, CK_3430ES1),
- CLK("musb-omap2430", "ick", &hsotgusb_ick_3430es2, CK_3430ES2),
++ CLK("musb-omap2430", "ick", &hsotgusb_ick_3430es2, CK_3430ES2PLUS | CK_36XX),
CLK(NULL, "sdrc_ick", &sdrc_ick, CK_3XXX),
CLK(NULL, "gpmc_fck", &gpmc_fck, CK_3XXX),
- CLK(NULL, "security_l3_ick", &security_l3_ick, CK_343X),
- CLK(NULL, "pka_ick", &pka_ick, CK_343X),
+ CLK(NULL, "security_l3_ick", &security_l3_ick, CK_34XX | CK_36XX),
+ CLK(NULL, "pka_ick", &pka_ick, CK_34XX | CK_36XX),
CLK(NULL, "core_l4_ick", &core_l4_ick, CK_3XXX),
- CLK(NULL, "usbtll_ick", &usbtll_ick, CK_3430ES2 | CK_AM35XX),
+ CLK(NULL, "usbtll_ick", &usbtll_ick, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
+ CLK("ehci-omap.0", "usbtll_ick", &usbtll_ick, CK_3430ES2 | CK_AM35XX),
- CLK("mmci-omap-hs.2", "ick", &mmchs3_ick, CK_3430ES2 | CK_AM35XX),
- CLK(NULL, "icr_ick", &icr_ick, CK_343X),
- CLK("omap-aes", "ick", &aes2_ick, CK_343X),
- CLK("omap-sham", "ick", &sha12_ick, CK_343X),
- CLK(NULL, "des2_ick", &des2_ick, CK_343X),
+ CLK("mmci-omap-hs.2", "ick", &mmchs3_ick, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
+ CLK(NULL, "icr_ick", &icr_ick, CK_34XX | CK_36XX),
+ CLK("omap-aes", "ick", &aes2_ick, CK_34XX | CK_36XX),
+ CLK("omap-sham", "ick", &sha12_ick, CK_34XX | CK_36XX),
+ CLK(NULL, "des2_ick", &des2_ick, CK_34XX | CK_36XX),
CLK("mmci-omap-hs.1", "ick", &mmchs2_ick, CK_3XXX),
CLK("mmci-omap-hs.0", "ick", &mmchs1_ick, CK_3XXX),
- CLK(NULL, "mspro_ick", &mspro_ick, CK_343X),
+ CLK(NULL, "mspro_ick", &mspro_ick, CK_34XX | CK_36XX),
CLK("omap_hdq.0", "ick", &hdq_ick, CK_3XXX),
CLK("omap2_mcspi.4", "ick", &mcspi4_ick, CK_3XXX),
CLK("omap2_mcspi.3", "ick", &mcspi3_ick, CK_3XXX),
@@@ -3361,14 -3355,17 +3363,17 @@@
CLK("omapdss", "video_fck", &dss_96m_fck, CK_3XXX),
CLK("omapdss", "dss2_fck", &dss2_alwon_fck, CK_3XXX),
CLK("omapdss", "ick", &dss_ick_3430es1, CK_3430ES1),
- CLK("omapdss", "ick", &dss_ick_3430es2, CK_3430ES2 | CK_AM35XX),
- CLK(NULL, "cam_mclk", &cam_mclk, CK_343X),
- CLK(NULL, "cam_ick", &cam_ick, CK_343X),
- CLK(NULL, "csi2_96m_fck", &csi2_96m_fck, CK_343X),
- CLK(NULL, "usbhost_120m_fck", &usbhost_120m_fck, CK_3430ES2 | CK_AM35XX),
+ CLK("omapdss", "ick", &dss_ick_3430es2, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
+ CLK(NULL, "cam_mclk", &cam_mclk, CK_34XX | CK_36XX),
+ CLK(NULL, "cam_ick", &cam_ick, CK_34XX | CK_36XX),
+ CLK(NULL, "csi2_96m_fck", &csi2_96m_fck, CK_34XX | CK_36XX),
+ CLK(NULL, "usbhost_120m_fck", &usbhost_120m_fck, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
+ CLK("ehci-omap.0", "hs_fck", &usbhost_120m_fck, CK_3430ES2 | CK_AM35XX),
- CLK(NULL, "usbhost_48m_fck", &usbhost_48m_fck, CK_3430ES2 | CK_AM35XX),
+ CLK(NULL, "usbhost_48m_fck", &usbhost_48m_fck, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
+ CLK("ehci-omap.0", "fs_fck", &usbhost_48m_fck, CK_3430ES2 | CK_AM35XX),
- CLK(NULL, "usbhost_ick", &usbhost_ick, CK_3430ES2 | CK_AM35XX),
+ CLK(NULL, "usbhost_ick", &usbhost_ick, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
+ CLK("ehci-omap.0", "usbhost_ick", &usbhost_ick, CK_3430ES2 | CK_AM35XX),
- CLK(NULL, "usim_fck", &usim_fck, CK_3430ES2),
+ CLK(NULL, "usim_fck", &usim_fck, CK_3430ES2PLUS | CK_36XX),
CLK(NULL, "gpt1_fck", &gpt1_fck, CK_3XXX),
CLK(NULL, "wkup_32k_fck", &wkup_32k_fck, CK_3XXX),
CLK(NULL, "gpio1_dbck", &gpio1_dbck, CK_3XXX),
diff --cc arch/arm/mach-omap2/clock44xx_data.c
index c426adc,bfcd19f..0000000
--- a/arch/arm/mach-omap2/clock44xx_data.c
+++ b/arch/arm/mach-omap2/clock44xx_data.c
@@@ -3198,6 -2937,10 +3198,7 @@@ static struct omap_clk omap44xx_clks[]
CLK(NULL, "uart3_fck", &uart3_fck, CK_443X),
CLK(NULL, "uart4_fck", &uart4_fck, CK_443X),
CLK(NULL, "usb_host_fs_fck", &usb_host_fs_fck, CK_443X),
+ CLK("ehci-omap.0", "fs_fck", &usb_host_fs_fck, CK_443X),
- CLK(NULL, "usb_host_hs_utmi_p3_clk", &usb_host_hs_utmi_p3_clk, CK_443X),
- CLK(NULL, "usb_host_hs_hsic60m_p1_clk", &usb_host_hs_hsic60m_p1_clk, CK_443X),
- CLK(NULL, "usb_host_hs_hsic60m_p2_clk", &usb_host_hs_hsic60m_p2_clk, CK_443X),
CLK(NULL, "utmi_p1_gfclk", &utmi_p1_gfclk, CK_443X),
CLK(NULL, "usb_host_hs_utmi_p1_clk", &usb_host_hs_utmi_p1_clk, CK_443X),
CLK(NULL, "utmi_p2_gfclk", &utmi_p2_gfclk, CK_443X),
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: linux-next: manual merge of the usb tree with the omap tree
2010-12-23 6:18 ` Stephen Rothwell
(?)
@ 2010-12-23 8:36 ` Felipe Balbi
-1 siblings, 0 replies; 44+ messages in thread
From: Felipe Balbi @ 2010-12-23 8:36 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Greg KH, linux-next, linux-kernel, Anand Gadiyar, Felipe Balbi,
Tony Lindgren, linux-omap
Hi Tony,
On Thu, Dec 23, 2010 at 05:18:59PM +1100, Stephen Rothwell wrote:
>Today's linux-next merge of the usb tree got a conflict in
>arch/arm/mach-omap2/clock3xxx_data.c and
>arch/arm/mach-omap2/clock44xx_data.c between various commits from the omap
>tree and various commits from the usb tree.
>
>I did a quick fix (which may be completely wrong - see below).
could you check if the below fix is good enough. The musb part seems to
be fine.
>diff --cc arch/arm/mach-omap2/clock3xxx_data.c
>index 9ab817e,0579604..0000000
>--- a/arch/arm/mach-omap2/clock3xxx_data.c
>+++ b/arch/arm/mach-omap2/clock3xxx_data.c
>@@@ -3275,17 -3267,18 +3275,18 @@@ static struct omap_clk omap3xxx_clks[]
> CLK(NULL, "gfx_l3_ick", &gfx_l3_ick, CK_3430ES1),
> CLK(NULL, "gfx_cg1_ck", &gfx_cg1_ck, CK_3430ES1),
> CLK(NULL, "gfx_cg2_ck", &gfx_cg2_ck, CK_3430ES1),
> - CLK(NULL, "sgx_fck", &sgx_fck, CK_3430ES2 | CK_3517),
> - CLK(NULL, "sgx_ick", &sgx_ick, CK_3430ES2 | CK_3517),
> + CLK(NULL, "sgx_fck", &sgx_fck, CK_3430ES2PLUS | CK_3517 | CK_36XX),
> + CLK(NULL, "sgx_ick", &sgx_ick, CK_3430ES2PLUS | CK_3517 | CK_36XX),
> CLK(NULL, "d2d_26m_fck", &d2d_26m_fck, CK_3430ES1),
> - CLK(NULL, "modem_fck", &modem_fck, CK_343X),
> - CLK(NULL, "sad2d_ick", &sad2d_ick, CK_343X),
> - CLK(NULL, "mad2d_ick", &mad2d_ick, CK_343X),
> + CLK(NULL, "modem_fck", &modem_fck, CK_34XX | CK_36XX),
> + CLK(NULL, "sad2d_ick", &sad2d_ick, CK_34XX | CK_36XX),
> + CLK(NULL, "mad2d_ick", &mad2d_ick, CK_34XX | CK_36XX),
> CLK(NULL, "gpt10_fck", &gpt10_fck, CK_3XXX),
> CLK(NULL, "gpt11_fck", &gpt11_fck, CK_3XXX),
> - CLK(NULL, "cpefuse_fck", &cpefuse_fck, CK_3430ES2 | CK_AM35XX),
> - CLK(NULL, "ts_fck", &ts_fck, CK_3430ES2 | CK_AM35XX),
> - CLK(NULL, "usbtll_fck", &usbtll_fck, CK_3430ES2 | CK_AM35XX),
> + CLK(NULL, "cpefuse_fck", &cpefuse_fck, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
> + CLK(NULL, "ts_fck", &ts_fck, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
> + CLK(NULL, "usbtll_fck", &usbtll_fck, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
>+ CLK("ehci-omap.0", "usbtll_fck", &usbtll_fck, CK_3430ES2 | CK_AM35XX),
> CLK("omap-mcbsp.1", "prcm_fck", &core_96m_fck, CK_3XXX),
> CLK("omap-mcbsp.5", "prcm_fck", &core_96m_fck, CK_3XXX),
> CLK(NULL, "core_96m_fck", &core_96m_fck, CK_3XXX),
>@@@ -3309,26 -3302,27 +3310,27 @@@
> CLK(NULL, "core_12m_fck", &core_12m_fck, CK_3XXX),
> CLK("omap_hdq.0", "fck", &hdq_fck, CK_3XXX),
> CLK(NULL, "ssi_ssr_fck", &ssi_ssr_fck_3430es1, CK_3430ES1),
> - CLK(NULL, "ssi_ssr_fck", &ssi_ssr_fck_3430es2, CK_3430ES2),
> + CLK(NULL, "ssi_ssr_fck", &ssi_ssr_fck_3430es2, CK_3430ES2PLUS | CK_36XX),
> CLK(NULL, "ssi_sst_fck", &ssi_sst_fck_3430es1, CK_3430ES1),
> - CLK(NULL, "ssi_sst_fck", &ssi_sst_fck_3430es2, CK_3430ES2),
> + CLK(NULL, "ssi_sst_fck", &ssi_sst_fck_3430es2, CK_3430ES2PLUS | CK_36XX),
> CLK(NULL, "core_l3_ick", &core_l3_ick, CK_3XXX),
>- CLK("musb_hdrc", "ick", &hsotgusb_ick_3430es1, CK_3430ES1),
>- CLK("musb_hdrc", "ick", &hsotgusb_ick_3430es2, CK_3430ES2PLUS | CK_36XX),
>+ CLK("musb-omap2430", "ick", &hsotgusb_ick_3430es1, CK_3430ES1),
> - CLK("musb-omap2430", "ick", &hsotgusb_ick_3430es2, CK_3430ES2),
>++ CLK("musb-omap2430", "ick", &hsotgusb_ick_3430es2, CK_3430ES2PLUS | CK_36XX),
> CLK(NULL, "sdrc_ick", &sdrc_ick, CK_3XXX),
> CLK(NULL, "gpmc_fck", &gpmc_fck, CK_3XXX),
> - CLK(NULL, "security_l3_ick", &security_l3_ick, CK_343X),
> - CLK(NULL, "pka_ick", &pka_ick, CK_343X),
> + CLK(NULL, "security_l3_ick", &security_l3_ick, CK_34XX | CK_36XX),
> + CLK(NULL, "pka_ick", &pka_ick, CK_34XX | CK_36XX),
> CLK(NULL, "core_l4_ick", &core_l4_ick, CK_3XXX),
> - CLK(NULL, "usbtll_ick", &usbtll_ick, CK_3430ES2 | CK_AM35XX),
> + CLK(NULL, "usbtll_ick", &usbtll_ick, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
>+ CLK("ehci-omap.0", "usbtll_ick", &usbtll_ick, CK_3430ES2 | CK_AM35XX),
> - CLK("mmci-omap-hs.2", "ick", &mmchs3_ick, CK_3430ES2 | CK_AM35XX),
> - CLK(NULL, "icr_ick", &icr_ick, CK_343X),
> - CLK("omap-aes", "ick", &aes2_ick, CK_343X),
> - CLK("omap-sham", "ick", &sha12_ick, CK_343X),
> - CLK(NULL, "des2_ick", &des2_ick, CK_343X),
> + CLK("mmci-omap-hs.2", "ick", &mmchs3_ick, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
> + CLK(NULL, "icr_ick", &icr_ick, CK_34XX | CK_36XX),
> + CLK("omap-aes", "ick", &aes2_ick, CK_34XX | CK_36XX),
> + CLK("omap-sham", "ick", &sha12_ick, CK_34XX | CK_36XX),
> + CLK(NULL, "des2_ick", &des2_ick, CK_34XX | CK_36XX),
> CLK("mmci-omap-hs.1", "ick", &mmchs2_ick, CK_3XXX),
> CLK("mmci-omap-hs.0", "ick", &mmchs1_ick, CK_3XXX),
> - CLK(NULL, "mspro_ick", &mspro_ick, CK_343X),
> + CLK(NULL, "mspro_ick", &mspro_ick, CK_34XX | CK_36XX),
> CLK("omap_hdq.0", "ick", &hdq_ick, CK_3XXX),
> CLK("omap2_mcspi.4", "ick", &mcspi4_ick, CK_3XXX),
> CLK("omap2_mcspi.3", "ick", &mcspi3_ick, CK_3XXX),
>@@@ -3361,14 -3355,17 +3363,17 @@@
> CLK("omapdss", "video_fck", &dss_96m_fck, CK_3XXX),
> CLK("omapdss", "dss2_fck", &dss2_alwon_fck, CK_3XXX),
> CLK("omapdss", "ick", &dss_ick_3430es1, CK_3430ES1),
> - CLK("omapdss", "ick", &dss_ick_3430es2, CK_3430ES2 | CK_AM35XX),
> - CLK(NULL, "cam_mclk", &cam_mclk, CK_343X),
> - CLK(NULL, "cam_ick", &cam_ick, CK_343X),
> - CLK(NULL, "csi2_96m_fck", &csi2_96m_fck, CK_343X),
> - CLK(NULL, "usbhost_120m_fck", &usbhost_120m_fck, CK_3430ES2 | CK_AM35XX),
> + CLK("omapdss", "ick", &dss_ick_3430es2, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
> + CLK(NULL, "cam_mclk", &cam_mclk, CK_34XX | CK_36XX),
> + CLK(NULL, "cam_ick", &cam_ick, CK_34XX | CK_36XX),
> + CLK(NULL, "csi2_96m_fck", &csi2_96m_fck, CK_34XX | CK_36XX),
> + CLK(NULL, "usbhost_120m_fck", &usbhost_120m_fck, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
>+ CLK("ehci-omap.0", "hs_fck", &usbhost_120m_fck, CK_3430ES2 | CK_AM35XX),
> - CLK(NULL, "usbhost_48m_fck", &usbhost_48m_fck, CK_3430ES2 | CK_AM35XX),
> + CLK(NULL, "usbhost_48m_fck", &usbhost_48m_fck, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
>+ CLK("ehci-omap.0", "fs_fck", &usbhost_48m_fck, CK_3430ES2 | CK_AM35XX),
> - CLK(NULL, "usbhost_ick", &usbhost_ick, CK_3430ES2 | CK_AM35XX),
> + CLK(NULL, "usbhost_ick", &usbhost_ick, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
>+ CLK("ehci-omap.0", "usbhost_ick", &usbhost_ick, CK_3430ES2 | CK_AM35XX),
> - CLK(NULL, "usim_fck", &usim_fck, CK_3430ES2),
> + CLK(NULL, "usim_fck", &usim_fck, CK_3430ES2PLUS | CK_36XX),
> CLK(NULL, "gpt1_fck", &gpt1_fck, CK_3XXX),
> CLK(NULL, "wkup_32k_fck", &wkup_32k_fck, CK_3XXX),
> CLK(NULL, "gpio1_dbck", &gpio1_dbck, CK_3XXX),
>diff --cc arch/arm/mach-omap2/clock44xx_data.c
>index c426adc,bfcd19f..0000000
>--- a/arch/arm/mach-omap2/clock44xx_data.c
>+++ b/arch/arm/mach-omap2/clock44xx_data.c
>@@@ -3198,6 -2937,10 +3198,7 @@@ static struct omap_clk omap44xx_clks[]
> CLK(NULL, "uart3_fck", &uart3_fck, CK_443X),
> CLK(NULL, "uart4_fck", &uart4_fck, CK_443X),
> CLK(NULL, "usb_host_fs_fck", &usb_host_fs_fck, CK_443X),
>+ CLK("ehci-omap.0", "fs_fck", &usb_host_fs_fck, CK_443X),
> - CLK(NULL, "usb_host_hs_utmi_p3_clk", &usb_host_hs_utmi_p3_clk, CK_443X),
> - CLK(NULL, "usb_host_hs_hsic60m_p1_clk", &usb_host_hs_hsic60m_p1_clk, CK_443X),
> - CLK(NULL, "usb_host_hs_hsic60m_p2_clk", &usb_host_hs_hsic60m_p2_clk, CK_443X),
> CLK(NULL, "utmi_p1_gfclk", &utmi_p1_gfclk, CK_443X),
> CLK(NULL, "usb_host_hs_utmi_p1_clk", &usb_host_hs_utmi_p1_clk, CK_443X),
> CLK(NULL, "utmi_p2_gfclk", &utmi_p2_gfclk, CK_443X),
--
balbi
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: linux-next: manual merge of the usb tree with the omap tree
2010-12-23 6:18 ` Stephen Rothwell
(?)
(?)
@ 2010-12-23 18:29 ` Cousson, Benoit
2011-01-06 15:02 ` Ming Lei
-1 siblings, 1 reply; 44+ messages in thread
From: Cousson, Benoit @ 2010-12-23 18:29 UTC (permalink / raw)
To: Stephen Rothwell, Paul Walmsley
Cc: Greg KH, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Gadiyar, Anand, Balbi, Felipe, Tony Lindgren,
linux-omap@vger.kernel.org
+ Paul "the omap clock guru".
At first glance, that seems almost good.
Except for a couple of nodes that seems to lose their 3630 support.
I'm just wondering why the original usb clock node is
kept after the introduction of the "ehci-omap.0" clock
node. But this is anyway harmless.
What commits are generating this conflict?
On 12/23/2010 7:18 AM, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the usb tree got a conflict in
> arch/arm/mach-omap2/clock3xxx_data.c and
> arch/arm/mach-omap2/clock44xx_data.c between various commits from the omap
> tree and various commits from the usb tree.
>
> I did a quick fix (which may be completely wrong - see below).
> diff --cc arch/arm/mach-omap2/clock3xxx_data.c
> index 9ab817e,0579604..0000000
> --- a/arch/arm/mach-omap2/clock3xxx_data.c
> +++ b/arch/arm/mach-omap2/clock3xxx_data.c
> @@@ -3275,17 -3267,18 +3275,18 @@@ static struct omap_clk omap3xxx_clks[]
> CLK(NULL, "gfx_l3_ick", &gfx_l3_ick, CK_3430ES1),
> CLK(NULL, "gfx_cg1_ck", &gfx_cg1_ck, CK_3430ES1),
> CLK(NULL, "gfx_cg2_ck", &gfx_cg2_ck, CK_3430ES1),
> - CLK(NULL, "sgx_fck", &sgx_fck, CK_3430ES2 | CK_3517),
> - CLK(NULL, "sgx_ick", &sgx_ick, CK_3430ES2 | CK_3517),
> + CLK(NULL, "sgx_fck", &sgx_fck, CK_3430ES2PLUS | CK_3517 | CK_36XX),
> + CLK(NULL, "sgx_ick", &sgx_ick, CK_3430ES2PLUS | CK_3517 | CK_36XX),
> CLK(NULL, "d2d_26m_fck", &d2d_26m_fck, CK_3430ES1),
> - CLK(NULL, "modem_fck", &modem_fck, CK_343X),
> - CLK(NULL, "sad2d_ick", &sad2d_ick, CK_343X),
> - CLK(NULL, "mad2d_ick", &mad2d_ick, CK_343X),
> + CLK(NULL, "modem_fck", &modem_fck, CK_34XX | CK_36XX),
> + CLK(NULL, "sad2d_ick", &sad2d_ick, CK_34XX | CK_36XX),
> + CLK(NULL, "mad2d_ick", &mad2d_ick, CK_34XX | CK_36XX),
> CLK(NULL, "gpt10_fck", &gpt10_fck, CK_3XXX),
> CLK(NULL, "gpt11_fck", &gpt11_fck, CK_3XXX),
> - CLK(NULL, "cpefuse_fck", &cpefuse_fck, CK_3430ES2 | CK_AM35XX),
> - CLK(NULL, "ts_fck", &ts_fck, CK_3430ES2 | CK_AM35XX),
> - CLK(NULL, "usbtll_fck", &usbtll_fck, CK_3430ES2 | CK_AM35XX),
> + CLK(NULL, "cpefuse_fck", &cpefuse_fck, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
> + CLK(NULL, "ts_fck", &ts_fck, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
> + CLK(NULL, "usbtll_fck", &usbtll_fck, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
That one could be removed after the introduction of the following one if the
clk_get(dev, "usbtll_fck") API is used.
> + CLK("ehci-omap.0", "usbtll_fck", &usbtll_fck, CK_3430ES2 | CK_AM35XX),
If only that one is kept it should be:
+ CLK("ehci-omap.0", "usbtll_fck", &usbtll_fck, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
Assuming that one of the conflicting commits was trying to add the 3630 support.
> CLK("omap-mcbsp.1", "prcm_fck", &core_96m_fck, CK_3XXX),
> CLK("omap-mcbsp.5", "prcm_fck", &core_96m_fck, CK_3XXX),
> CLK(NULL, "core_96m_fck", &core_96m_fck, CK_3XXX),
> @@@ -3309,26 -3302,27 +3310,27 @@@
> CLK(NULL, "core_12m_fck", &core_12m_fck, CK_3XXX),
> CLK("omap_hdq.0", "fck", &hdq_fck, CK_3XXX),
> CLK(NULL, "ssi_ssr_fck", &ssi_ssr_fck_3430es1, CK_3430ES1),
> - CLK(NULL, "ssi_ssr_fck", &ssi_ssr_fck_3430es2, CK_3430ES2),
> + CLK(NULL, "ssi_ssr_fck", &ssi_ssr_fck_3430es2, CK_3430ES2PLUS | CK_36XX),
> CLK(NULL, "ssi_sst_fck", &ssi_sst_fck_3430es1, CK_3430ES1),
> - CLK(NULL, "ssi_sst_fck", &ssi_sst_fck_3430es2, CK_3430ES2),
> + CLK(NULL, "ssi_sst_fck", &ssi_sst_fck_3430es2, CK_3430ES2PLUS | CK_36XX),
> CLK(NULL, "core_l3_ick", &core_l3_ick, CK_3XXX),
> - CLK("musb_hdrc", "ick", &hsotgusb_ick_3430es1, CK_3430ES1),
> - CLK("musb_hdrc", "ick", &hsotgusb_ick_3430es2, CK_3430ES2PLUS | CK_36XX),
> + CLK("musb-omap2430", "ick", &hsotgusb_ick_3430es1, CK_3430ES1),
> - CLK("musb-omap2430", "ick", &hsotgusb_ick_3430es2, CK_3430ES2),
> ++ CLK("musb-omap2430", "ick", &hsotgusb_ick_3430es2, CK_3430ES2PLUS | CK_36XX),
> CLK(NULL, "sdrc_ick", &sdrc_ick, CK_3XXX),
> CLK(NULL, "gpmc_fck", &gpmc_fck, CK_3XXX),
> - CLK(NULL, "security_l3_ick", &security_l3_ick, CK_343X),
> - CLK(NULL, "pka_ick", &pka_ick, CK_343X),
> + CLK(NULL, "security_l3_ick", &security_l3_ick, CK_34XX | CK_36XX),
> + CLK(NULL, "pka_ick", &pka_ick, CK_34XX | CK_36XX),
> CLK(NULL, "core_l4_ick", &core_l4_ick, CK_3XXX),
> - CLK(NULL, "usbtll_ick", &usbtll_ick, CK_3430ES2 | CK_AM35XX),
> + CLK(NULL, "usbtll_ick", &usbtll_ick, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
> + CLK("ehci-omap.0", "usbtll_ick", &usbtll_ick, CK_3430ES2 | CK_AM35XX),
ditto, should probably be:
+ CLK("ehci-omap.0", "usbtll_ick", &usbtll_ick, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
> - CLK("mmci-omap-hs.2", "ick", &mmchs3_ick, CK_3430ES2 | CK_AM35XX),
> - CLK(NULL, "icr_ick", &icr_ick, CK_343X),
> - CLK("omap-aes", "ick", &aes2_ick, CK_343X),
> - CLK("omap-sham", "ick", &sha12_ick, CK_343X),
> - CLK(NULL, "des2_ick", &des2_ick, CK_343X),
> + CLK("mmci-omap-hs.2", "ick", &mmchs3_ick, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
> + CLK(NULL, "icr_ick", &icr_ick, CK_34XX | CK_36XX),
> + CLK("omap-aes", "ick", &aes2_ick, CK_34XX | CK_36XX),
> + CLK("omap-sham", "ick", &sha12_ick, CK_34XX | CK_36XX),
> + CLK(NULL, "des2_ick", &des2_ick, CK_34XX | CK_36XX),
> CLK("mmci-omap-hs.1", "ick", &mmchs2_ick, CK_3XXX),
> CLK("mmci-omap-hs.0", "ick", &mmchs1_ick, CK_3XXX),
> - CLK(NULL, "mspro_ick", &mspro_ick, CK_343X),
> + CLK(NULL, "mspro_ick", &mspro_ick, CK_34XX | CK_36XX),
> CLK("omap_hdq.0", "ick", &hdq_ick, CK_3XXX),
> CLK("omap2_mcspi.4", "ick", &mcspi4_ick, CK_3XXX),
> CLK("omap2_mcspi.3", "ick", &mcspi3_ick, CK_3XXX),
> @@@ -3361,14 -3355,17 +3363,17 @@@
> CLK("omapdss", "video_fck", &dss_96m_fck, CK_3XXX),
> CLK("omapdss", "dss2_fck", &dss2_alwon_fck, CK_3XXX),
> CLK("omapdss", "ick", &dss_ick_3430es1, CK_3430ES1),
> - CLK("omapdss", "ick", &dss_ick_3430es2, CK_3430ES2 | CK_AM35XX),
> - CLK(NULL, "cam_mclk", &cam_mclk, CK_343X),
> - CLK(NULL, "cam_ick", &cam_ick, CK_343X),
> - CLK(NULL, "csi2_96m_fck", &csi2_96m_fck, CK_343X),
> - CLK(NULL, "usbhost_120m_fck", &usbhost_120m_fck, CK_3430ES2 | CK_AM35XX),
> + CLK("omapdss", "ick", &dss_ick_3430es2, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
> + CLK(NULL, "cam_mclk", &cam_mclk, CK_34XX | CK_36XX),
> + CLK(NULL, "cam_ick", &cam_ick, CK_34XX | CK_36XX),
> + CLK(NULL, "csi2_96m_fck", &csi2_96m_fck, CK_34XX | CK_36XX),
> + CLK(NULL, "usbhost_120m_fck", &usbhost_120m_fck, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
> + CLK("ehci-omap.0", "hs_fck", &usbhost_120m_fck, CK_3430ES2 | CK_AM35XX),
ditto
> - CLK(NULL, "usbhost_48m_fck", &usbhost_48m_fck, CK_3430ES2 | CK_AM35XX),
> + CLK(NULL, "usbhost_48m_fck", &usbhost_48m_fck, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
> + CLK("ehci-omap.0", "fs_fck", &usbhost_48m_fck, CK_3430ES2 | CK_AM35XX),
ditto
> - CLK(NULL, "usbhost_ick", &usbhost_ick, CK_3430ES2 | CK_AM35XX),
> + CLK(NULL, "usbhost_ick", &usbhost_ick, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
> + CLK("ehci-omap.0", "usbhost_ick", &usbhost_ick, CK_3430ES2 | CK_AM35XX),
ditto
> - CLK(NULL, "usim_fck", &usim_fck, CK_3430ES2),
> + CLK(NULL, "usim_fck", &usim_fck, CK_3430ES2PLUS | CK_36XX),
> CLK(NULL, "gpt1_fck", &gpt1_fck, CK_3XXX),
> CLK(NULL, "wkup_32k_fck", &wkup_32k_fck, CK_3XXX),
> CLK(NULL, "gpio1_dbck", &gpio1_dbck, CK_3XXX),
> diff --cc arch/arm/mach-omap2/clock44xx_data.c
> index c426adc,bfcd19f..0000000
> --- a/arch/arm/mach-omap2/clock44xx_data.c
> +++ b/arch/arm/mach-omap2/clock44xx_data.c
> @@@ -3198,6 -2937,10 +3198,7 @@@ static struct omap_clk omap44xx_clks[]
> CLK(NULL, "uart3_fck", &uart3_fck, CK_443X),
> CLK(NULL, "uart4_fck", &uart4_fck, CK_443X),
> CLK(NULL, "usb_host_fs_fck", &usb_host_fs_fck, CK_443X),
> + CLK("ehci-omap.0", "fs_fck", &usb_host_fs_fck, CK_443X),
> - CLK(NULL, "usb_host_hs_utmi_p3_clk", &usb_host_hs_utmi_p3_clk, CK_443X),
> - CLK(NULL, "usb_host_hs_hsic60m_p1_clk", &usb_host_hs_hsic60m_p1_clk, CK_443X),
> - CLK(NULL, "usb_host_hs_hsic60m_p2_clk", &usb_host_hs_hsic60m_p2_clk, CK_443X),
I'm not sure these 3 nodes should be removed. AFAIR, they were just slightly moved in lo branch.
Regards,
Benoit
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: linux-next: manual merge of the usb tree with the omap tree
2010-12-23 18:29 ` Cousson, Benoit
@ 2011-01-06 15:02 ` Ming Lei
2011-01-06 15:07 ` Anand Gadiyar
0 siblings, 1 reply; 44+ messages in thread
From: Ming Lei @ 2011-01-06 15:02 UTC (permalink / raw)
To: Cousson, Benoit
Cc: Stephen Rothwell, Paul Walmsley, Greg KH,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Gadiyar, Anand, Balbi, Felipe, Tony Lindgren,
linux-omap@vger.kernel.org
Hi,
2010/12/24 Cousson, Benoit <b-cousson@ti.com>:
> + Paul "the omap clock guru".
>
> At first glance, that seems almost good.
> Except for a couple of nodes that seems to lose their 3630 support.
>
> I'm just wondering why the original usb clock node is
> kept after the introduction of the "ehci-omap.0" clock
> node. But this is anyway harmless.
>
> What commits are generating this conflict?
>
> On 12/23/2010 7:18 AM, Stephen Rothwell wrote:
>> Hi Greg,
>>
>> Today's linux-next merge of the usb tree got a conflict in
>> arch/arm/mach-omap2/clock3xxx_data.c and
>> arch/arm/mach-omap2/clock44xx_data.c between various commits from the omap
>> tree and various commits from the usb tree.
>>
>> I did a quick fix (which may be completely wrong - see below).
>
>> diff --cc arch/arm/mach-omap2/clock3xxx_data.c
>> index 9ab817e,0579604..0000000
>> --- a/arch/arm/mach-omap2/clock3xxx_data.c
>> +++ b/arch/arm/mach-omap2/clock3xxx_data.c
>> @@@ -3275,17 -3267,18 +3275,18 @@@ static struct omap_clk omap3xxx_clks[]
>> CLK(NULL, "gfx_l3_ick", &gfx_l3_ick, CK_3430ES1),
>> CLK(NULL, "gfx_cg1_ck", &gfx_cg1_ck, CK_3430ES1),
>> CLK(NULL, "gfx_cg2_ck", &gfx_cg2_ck, CK_3430ES1),
>> - CLK(NULL, "sgx_fck", &sgx_fck, CK_3430ES2 | CK_3517),
>> - CLK(NULL, "sgx_ick", &sgx_ick, CK_3430ES2 | CK_3517),
>> + CLK(NULL, "sgx_fck", &sgx_fck, CK_3430ES2PLUS | CK_3517 | CK_36XX),
>> + CLK(NULL, "sgx_ick", &sgx_ick, CK_3430ES2PLUS | CK_3517 | CK_36XX),
>> CLK(NULL, "d2d_26m_fck", &d2d_26m_fck, CK_3430ES1),
>> - CLK(NULL, "modem_fck", &modem_fck, CK_343X),
>> - CLK(NULL, "sad2d_ick", &sad2d_ick, CK_343X),
>> - CLK(NULL, "mad2d_ick", &mad2d_ick, CK_343X),
>> + CLK(NULL, "modem_fck", &modem_fck, CK_34XX | CK_36XX),
>> + CLK(NULL, "sad2d_ick", &sad2d_ick, CK_34XX | CK_36XX),
>> + CLK(NULL, "mad2d_ick", &mad2d_ick, CK_34XX | CK_36XX),
>> CLK(NULL, "gpt10_fck", &gpt10_fck, CK_3XXX),
>> CLK(NULL, "gpt11_fck", &gpt11_fck, CK_3XXX),
>> - CLK(NULL, "cpefuse_fck", &cpefuse_fck, CK_3430ES2 | CK_AM35XX),
>> - CLK(NULL, "ts_fck", &ts_fck, CK_3430ES2 | CK_AM35XX),
>> - CLK(NULL, "usbtll_fck", &usbtll_fck, CK_3430ES2 | CK_AM35XX),
>> + CLK(NULL, "cpefuse_fck", &cpefuse_fck, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
>> + CLK(NULL, "ts_fck", &ts_fck, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
>> + CLK(NULL, "usbtll_fck", &usbtll_fck, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
>
> That one could be removed after the introduction of the following one if the
> clk_get(dev, "usbtll_fck") API is used.
>
>> + CLK("ehci-omap.0", "usbtll_fck", &usbtll_fck, CK_3430ES2 | CK_AM35XX),
>
> If only that one is kept it should be:
> + CLK("ehci-omap.0", "usbtll_fck", &usbtll_fck, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
>
> Assuming that one of the conflicting commits was trying to add the 3630 support.
>
>> CLK("omap-mcbsp.1", "prcm_fck", &core_96m_fck, CK_3XXX),
>> CLK("omap-mcbsp.5", "prcm_fck", &core_96m_fck, CK_3XXX),
>> CLK(NULL, "core_96m_fck", &core_96m_fck, CK_3XXX),
>> @@@ -3309,26 -3302,27 +3310,27 @@@
>> CLK(NULL, "core_12m_fck", &core_12m_fck, CK_3XXX),
>> CLK("omap_hdq.0", "fck", &hdq_fck, CK_3XXX),
>> CLK(NULL, "ssi_ssr_fck", &ssi_ssr_fck_3430es1, CK_3430ES1),
>> - CLK(NULL, "ssi_ssr_fck", &ssi_ssr_fck_3430es2, CK_3430ES2),
>> + CLK(NULL, "ssi_ssr_fck", &ssi_ssr_fck_3430es2, CK_3430ES2PLUS | CK_36XX),
>> CLK(NULL, "ssi_sst_fck", &ssi_sst_fck_3430es1, CK_3430ES1),
>> - CLK(NULL, "ssi_sst_fck", &ssi_sst_fck_3430es2, CK_3430ES2),
>> + CLK(NULL, "ssi_sst_fck", &ssi_sst_fck_3430es2, CK_3430ES2PLUS | CK_36XX),
>> CLK(NULL, "core_l3_ick", &core_l3_ick, CK_3XXX),
>> - CLK("musb_hdrc", "ick", &hsotgusb_ick_3430es1, CK_3430ES1),
>> - CLK("musb_hdrc", "ick", &hsotgusb_ick_3430es2, CK_3430ES2PLUS | CK_36XX),
>> + CLK("musb-omap2430", "ick", &hsotgusb_ick_3430es1, CK_3430ES1),
>> - CLK("musb-omap2430", "ick", &hsotgusb_ick_3430es2, CK_3430ES2),
>> ++ CLK("musb-omap2430", "ick", &hsotgusb_ick_3430es2, CK_3430ES2PLUS | CK_36XX),
>> CLK(NULL, "sdrc_ick", &sdrc_ick, CK_3XXX),
>> CLK(NULL, "gpmc_fck", &gpmc_fck, CK_3XXX),
>> - CLK(NULL, "security_l3_ick", &security_l3_ick, CK_343X),
>> - CLK(NULL, "pka_ick", &pka_ick, CK_343X),
>> + CLK(NULL, "security_l3_ick", &security_l3_ick, CK_34XX | CK_36XX),
>> + CLK(NULL, "pka_ick", &pka_ick, CK_34XX | CK_36XX),
>> CLK(NULL, "core_l4_ick", &core_l4_ick, CK_3XXX),
>> - CLK(NULL, "usbtll_ick", &usbtll_ick, CK_3430ES2 | CK_AM35XX),
>> + CLK(NULL, "usbtll_ick", &usbtll_ick, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
>> + CLK("ehci-omap.0", "usbtll_ick", &usbtll_ick, CK_3430ES2 | CK_AM35XX),
>
> ditto, should probably be:
> + CLK("ehci-omap.0", "usbtll_ick", &usbtll_ick, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
>
>> - CLK("mmci-omap-hs.2", "ick", &mmchs3_ick, CK_3430ES2 | CK_AM35XX),
>> - CLK(NULL, "icr_ick", &icr_ick, CK_343X),
>> - CLK("omap-aes", "ick", &aes2_ick, CK_343X),
>> - CLK("omap-sham", "ick", &sha12_ick, CK_343X),
>> - CLK(NULL, "des2_ick", &des2_ick, CK_343X),
>> + CLK("mmci-omap-hs.2", "ick", &mmchs3_ick, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
>> + CLK(NULL, "icr_ick", &icr_ick, CK_34XX | CK_36XX),
>> + CLK("omap-aes", "ick", &aes2_ick, CK_34XX | CK_36XX),
>> + CLK("omap-sham", "ick", &sha12_ick, CK_34XX | CK_36XX),
>> + CLK(NULL, "des2_ick", &des2_ick, CK_34XX | CK_36XX),
>> CLK("mmci-omap-hs.1", "ick", &mmchs2_ick, CK_3XXX),
>> CLK("mmci-omap-hs.0", "ick", &mmchs1_ick, CK_3XXX),
>> - CLK(NULL, "mspro_ick", &mspro_ick, CK_343X),
>> + CLK(NULL, "mspro_ick", &mspro_ick, CK_34XX | CK_36XX),
>> CLK("omap_hdq.0", "ick", &hdq_ick, CK_3XXX),
>> CLK("omap2_mcspi.4", "ick", &mcspi4_ick, CK_3XXX),
>> CLK("omap2_mcspi.3", "ick", &mcspi3_ick, CK_3XXX),
>> @@@ -3361,14 -3355,17 +3363,17 @@@
>> CLK("omapdss", "video_fck", &dss_96m_fck, CK_3XXX),
>> CLK("omapdss", "dss2_fck", &dss2_alwon_fck, CK_3XXX),
>> CLK("omapdss", "ick", &dss_ick_3430es1, CK_3430ES1),
>> - CLK("omapdss", "ick", &dss_ick_3430es2, CK_3430ES2 | CK_AM35XX),
>> - CLK(NULL, "cam_mclk", &cam_mclk, CK_343X),
>> - CLK(NULL, "cam_ick", &cam_ick, CK_343X),
>> - CLK(NULL, "csi2_96m_fck", &csi2_96m_fck, CK_343X),
>> - CLK(NULL, "usbhost_120m_fck", &usbhost_120m_fck, CK_3430ES2 | CK_AM35XX),
>> + CLK("omapdss", "ick", &dss_ick_3430es2, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
>> + CLK(NULL, "cam_mclk", &cam_mclk, CK_34XX | CK_36XX),
>> + CLK(NULL, "cam_ick", &cam_ick, CK_34XX | CK_36XX),
>> + CLK(NULL, "csi2_96m_fck", &csi2_96m_fck, CK_34XX | CK_36XX),
>> + CLK(NULL, "usbhost_120m_fck", &usbhost_120m_fck, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
>> + CLK("ehci-omap.0", "hs_fck", &usbhost_120m_fck, CK_3430ES2 | CK_AM35XX),
>
> ditto
>
>> - CLK(NULL, "usbhost_48m_fck", &usbhost_48m_fck, CK_3430ES2 | CK_AM35XX),
>> + CLK(NULL, "usbhost_48m_fck", &usbhost_48m_fck, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
>> + CLK("ehci-omap.0", "fs_fck", &usbhost_48m_fck, CK_3430ES2 | CK_AM35XX),
>
> ditto
>
>> - CLK(NULL, "usbhost_ick", &usbhost_ick, CK_3430ES2 | CK_AM35XX),
>> + CLK(NULL, "usbhost_ick", &usbhost_ick, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
>> + CLK("ehci-omap.0", "usbhost_ick", &usbhost_ick, CK_3430ES2 | CK_AM35XX),
>
> ditto
>
>> - CLK(NULL, "usim_fck", &usim_fck, CK_3430ES2),
>> + CLK(NULL, "usim_fck", &usim_fck, CK_3430ES2PLUS | CK_36XX),
>> CLK(NULL, "gpt1_fck", &gpt1_fck, CK_3XXX),
>> CLK(NULL, "wkup_32k_fck", &wkup_32k_fck, CK_3XXX),
>> CLK(NULL, "gpio1_dbck", &gpio1_dbck, CK_3XXX),
>> diff --cc arch/arm/mach-omap2/clock44xx_data.c
>> index c426adc,bfcd19f..0000000
>> --- a/arch/arm/mach-omap2/clock44xx_data.c
>> +++ b/arch/arm/mach-omap2/clock44xx_data.c
>> @@@ -3198,6 -2937,10 +3198,7 @@@ static struct omap_clk omap44xx_clks[]
>> CLK(NULL, "uart3_fck", &uart3_fck, CK_443X),
>> CLK(NULL, "uart4_fck", &uart4_fck, CK_443X),
>> CLK(NULL, "usb_host_fs_fck", &usb_host_fs_fck, CK_443X),
>> + CLK("ehci-omap.0", "fs_fck", &usb_host_fs_fck, CK_443X),
>> - CLK(NULL, "usb_host_hs_utmi_p3_clk", &usb_host_hs_utmi_p3_clk, CK_443X),
>> - CLK(NULL, "usb_host_hs_hsic60m_p1_clk", &usb_host_hs_hsic60m_p1_clk, CK_443X),
>> - CLK(NULL, "usb_host_hs_hsic60m_p2_clk", &usb_host_hs_hsic60m_p2_clk, CK_443X),
>
> I'm not sure these 3 nodes should be removed. AFAIR, they were just slightly moved in lo branch.
Even with the fixes above, ehci on my beagle xM/Panda still doesn't work
with 2.6.37-next-20110106+, follows the failure messages:
[ 57.918182] bus: 'platform': really_probe: probing driver ehci-omap
with device ehci-omap.0
[ 57.918243] ehci-omap ehci-omap.0: failed to get ehci port0 regulator
[ 57.918273] ehci-omap ehci-omap.0: failed to get ehci port1 regulator
[ 57.918304] ehci-omap ehci-omap.0: starting TI EHCI USB Controller
[ 57.918457] ehci-omap ehci-omap.0: OMAP UHH_REVISION 0x10
[ 57.918487] ehci-omap ehci-omap.0: TLL RESET DONE
[ 57.918487] ehci-omap ehci-omap.0: OMAP3 ES version > ES2.1
[ 57.918518] ehci-omap ehci-omap.0: UHH setup done, uhh_hostconfig=31c
[ 58.922302] ehci-omap ehci-omap.0: phy reset operation timed out
[ 59.930114] ehci-omap ehci-omap.0: phy reset operation timed out
[ 59.930145] ehci-omap ehci-omap.0: reset hcs_params 0x1313 dbg=0
cc=1 pcc=3 ordered ports=3
[ 59.930175] ehci-omap ehci-omap.0: reset hcc_params 0016 thresh 1
uframes 256/512/1024 park
[ 59.930206] ehci-omap ehci-omap.0: OMAP-EHCI Host Controller
[ 59.936218] drivers/usb/core/inode.c: creating file 'devices'
[ 59.936279] drivers/usb/core/inode.c: creating file '001'
Any ideas?
thanks,
--
Lei Ming
^ permalink raw reply [flat|nested] 44+ messages in thread* RE: linux-next: manual merge of the usb tree with the omap tree
2011-01-06 15:02 ` Ming Lei
@ 2011-01-06 15:07 ` Anand Gadiyar
2011-01-06 15:25 ` Ming Lei
2011-01-06 15:43 ` Brad Parker
0 siblings, 2 replies; 44+ messages in thread
From: Anand Gadiyar @ 2011-01-06 15:07 UTC (permalink / raw)
To: Ming Lei, Benoit Cousson
Cc: Stephen Rothwell, Paul Walmsley, Greg KH, linux-next,
linux-kernel, Felipe Balbi, Tony Lindgren, linux-omap
Ming Lei wrote:
> Hi,
>
> 2010/12/24 Cousson, Benoit <b-cousson@ti.com>:
> > + Paul "the omap clock guru".
> >
> > At first glance, that seems almost good.
> > Except for a couple of nodes that seems to lose their 3630 support.
> >
> > I'm just wondering why the original usb clock node is
> > kept after the introduction of the "ehci-omap.0" clock
> > node. But this is anyway harmless.
> >
> > What commits are generating this conflict?
> >
> > On 12/23/2010 7:18 AM, Stephen Rothwell wrote:
> >> Hi Greg,
> >>
> >> Today's linux-next merge of the usb tree got a conflict in
> >> arch/arm/mach-omap2/clock3xxx_data.c and
> >> arch/arm/mach-omap2/clock44xx_data.c between various commits from the
omap
> >> tree and various commits from the usb tree.
> >>
> >> I did a quick fix (which may be completely wrong - see below).
> >
<snip>
> > I'm not sure these 3 nodes should be removed. AFAIR, they
> were just slightly moved in lo branch.
>
> Even with the fixes above, ehci on my beagle xM/Panda still
> doesn't work
> with 2.6.37-next-20110106+, follows the failure messages:
>
> [ 57.918182] bus: 'platform': really_probe: probing driver
ehci-omapwith device ehci-omap.0
> [ 57.918243] ehci-omap ehci-omap.0: failed to get ehci port0 regulator
> [ 57.918273] ehci-omap ehci-omap.0: failed to get ehci port1 regulator
> [ 57.918304] ehci-omap ehci-omap.0: starting TI EHCI USB Controller
> [ 57.918457] ehci-omap ehci-omap.0: OMAP UHH_REVISION 0x10
> [ 57.918487] ehci-omap ehci-omap.0: TLL RESET DONE
> [ 57.918487] ehci-omap ehci-omap.0: OMAP3 ES version > ES2.1
> [ 57.918518] ehci-omap ehci-omap.0: UHH setup done, uhh_hostconfig=31c
> [ 58.922302] ehci-omap ehci-omap.0: phy reset operation timed out
> [ 59.930114] ehci-omap ehci-omap.0: phy reset operation timed out
> [ 59.930145] ehci-omap ehci-omap.0: reset hcs_params 0x1313 dbg=0 cc=1
pcc=3 ordered ports=3
> [ 59.930175] ehci-omap ehci-omap.0: reset hcc_params 0016 thresh 1
uframes 256/512/1024 park
> [ 59.930206] ehci-omap ehci-omap.0: OMAP-EHCI Host Controller
> [ 59.936218] drivers/usb/core/inode.c: creating file 'devices'
> [ 59.936279] drivers/usb/core/inode.c: creating file '001'
>
> Any ideas?
>
I'll take a look in a short while. I don't have an XM to
test, so you'll have to help me out here.
- Anand
^ permalink raw reply [flat|nested] 44+ messages in thread
* Re: linux-next: manual merge of the usb tree with the omap tree
2011-01-06 15:07 ` Anand Gadiyar
@ 2011-01-06 15:25 ` Ming Lei
2011-01-06 15:50 ` Ming Lei
2011-01-06 15:43 ` Brad Parker
1 sibling, 1 reply; 44+ messages in thread
From: Ming Lei @ 2011-01-06 15:25 UTC (permalink / raw)
To: Anand Gadiyar
Cc: Benoit Cousson, Stephen Rothwell, Paul Walmsley, Greg KH,
linux-next, linux-kernel, Felipe Balbi, Tony Lindgren, linux-omap
Hi,
2011/1/6 Anand Gadiyar <gadiyar@ti.com>:
> I'll take a look in a short while. I don't have an XM to
> test, so you'll have to help me out here.
No problem for me, :-)
thanks,
--
Lei Ming
^ permalink raw reply [flat|nested] 44+ messages in thread
* Re: linux-next: manual merge of the usb tree with the omap tree
2011-01-06 15:25 ` Ming Lei
@ 2011-01-06 15:50 ` Ming Lei
2011-01-07 14:07 ` Anand Gadiyar
0 siblings, 1 reply; 44+ messages in thread
From: Ming Lei @ 2011-01-06 15:50 UTC (permalink / raw)
To: Anand Gadiyar
Cc: Benoit Cousson, Stephen Rothwell, Paul Walmsley, Greg KH,
linux-next, linux-kernel, Felipe Balbi, Tony Lindgren, linux-omap
[-- Attachment #1: Type: text/plain, Size: 6388 bytes --]
Hi,
2011/1/6 Ming Lei <tom.leiming@gmail.com>:
> Hi,
>
> 2011/1/6 Anand Gadiyar <gadiyar@ti.com>:
>
>> I'll take a look in a short while. I don't have an XM to
>> test, so you'll have to help me out here.
>
> No problem for me, :-)
I see why the beagle xM does not work, the attachment patch is
needed to make it working.
But the ehci on panda(omap4430) still does not work with
2.6.37-next-20110106+, and follows the failure messages:
[ 46.572601] ehci_hcd: USB 2.0 'Enhanced' Host Controller (EHCI) Driver
[ 46.580017] ehci_hcd: block sizes: qh 60 qtd 96 itd 160 sitd 96
[ 46.580078] bus: 'platform': add driver ehci-omap
[ 46.580139] bus: 'platform': driver_probe_device: matched device
ehci-omap.0 with driver ehci-omap
[ 46.580169] bus: 'platform': really_probe: probing driver ehci-omap
with device ehci-omap.0
[ 46.580200] ehci-omap ehci-omap.0: failed to get ehci port0 regulator
[ 46.580200] ehci-omap ehci-omap.0: starting TI EHCI USB Controller
[ 46.580291] ehci-omap ehci-omap.0: OMAP UHH_REVISION 0x50700100
[ 46.580352] ehci-omap ehci-omap.0: TLL RESET DONE
[ 46.580352] ehci-omap ehci-omap.0: UHH setup done, uhh_hostconfig=1c
[ 46.580383] ehci-omap ehci-omap.0: reset hcs_params 0x1313 dbg=0
cc=1 pcc=3 ordered ports=3
[ 46.580383] ehci-omap ehci-omap.0: reset hcc_params 20016 thresh 1
uframes 256/512/1024 park LPM
[ 46.580383] ehci-omap ehci-omap.0: OMAP-EHCI Host Controller
[ 46.588592] drivers/usb/core/inode.c: creating file 'devices'
[ 46.588623] drivers/usb/core/inode.c: creating file '001'
[ 46.588684] device: 'usbmon1': device_add
[ 46.588867] PM: Adding info for No Bus:usbmon1
[ 46.590026] ehci-omap ehci-omap.0: new USB bus registered, assigned
bus number 1
[ 46.645721] ehci-omap ehci-omap.0: park 0
[ 46.645721] ehci-omap ehci-omap.0: support lpm
[ 46.645751] ehci-omap ehci-omap.0: irq 109, io mem 0x4a064c00
[ 46.651763] ehci-omap ehci-omap.0: reset command 0080b02 park=3
ithresh=8 period=1024 Reset HALT
[ 46.651763] ehci-omap ehci-omap.0: init command 0010005 (park)=0
ithresh=1 period=512 RUN
[ 46.661254] ehci-omap ehci-omap.0: USB 2.0 started, EHCI 1.00
[ 46.667297] usb usb1: rpm_resume flags 0x0
[ 46.667297] usb usb1: rpm_resume returns 1
[ 46.667358] usb usb1: default language 0x0409
[ 46.667358] usb usb1: udev 1, busnum 1, minor = 0
[ 46.667388] usb usb1: New USB device found, idVendor=1d6b, idProduct=0002
[ 46.675476] usb usb1: New USB device strings: Mfr=3, Product=2,
SerialNumber=1
[ 46.683288] usb usb1: Product: OMAP-EHCI Host Controller
[ 46.689086] usb usb1: Manufacturer: Linux 2.6.37-next-20110106+ ehci_hcd
[ 46.696350] usb usb1: SerialNumber: ehci-omap.0
[ 46.701354] device: 'usb1': device_add
[ 46.701568] bus: 'usb': add device usb1
[ 46.701629] PM: Adding info for usb:usb1
[ 46.702758] bus: 'usb': driver_probe_device: matched device usb1
with driver usb
[ 46.702758] bus: 'usb': really_probe: probing driver usb with device usb1
[ 46.702819] usb usb1: usb_probe_device
[ 46.702819] usb usb1: configuration #1 chosen from 1 choice
[ 46.702850] usb usb1: rpm_resume flags 0x4
[ 46.702850] usb usb1: rpm_resume returns 1
[ 46.702911] usb usb1: adding 1-0:1.0 (config #1, interface 0)
[ 46.702911] device: '1-0:1.0': device_add
[ 46.702941] bus: 'usb': add device 1-0:1.0
[ 46.703002] PM: Adding info for usb:1-0:1.0
[ 46.703430] bus: 'usb': driver_probe_device: matched device 1-0:1.0
with driver hub
[ 46.703460] bus: 'usb': really_probe: probing driver hub with device 1-0:1.0
[ 46.703460] hub 1-0:1.0: usb_probe_interface
[ 46.703491] hub 1-0:1.0: usb_probe_interface - got id
[ 46.703491] usb usb1: rpm_resume flags 0x4
[ 46.703491] usb usb1: rpm_resume returns 1
[ 46.703521] hub 1-0:1.0: USB hub found
[ 46.707427] hub 1-0:1.0: 3 ports detected
[ 46.715698] hub 1-0:1.0: standalone hub
[ 46.715698] hub 1-0:1.0: individual port power switching
[ 46.715728] hub 1-0:1.0: individual port over-current protection
[ 46.715728] hub 1-0:1.0: power on to power good time: 20ms
[ 46.715759] hub 1-0:1.0: local power source is good
[ 46.715759] hub 1-0:1.0: enabling power on all ports
[ 46.715820] driver: '1-0:1.0': driver_bound: bound to device 'hub'
[ 46.715820] bus: 'usb': really_probe: bound device 1-0:1.0 to driver hub
[ 46.715850] device: 'ep_81': device_add
[ 46.717468] PM: Adding info for No Bus:ep_81
[ 46.717498] device: 'usbdev1.1': device_add
[ 46.717590] PM: Adding info for No Bus:usbdev1.1
[ 46.717773] drivers/usb/core/inode.c: creating file '001'
[ 46.717803] driver: 'usb1': driver_bound: bound to device 'usb'
[ 46.717803] bus: 'usb': really_probe: bound device usb1 to driver usb
[ 46.717834] device: 'ep_00': device_add
[ 46.717895] PM: Adding info for No Bus:ep_00
[ 46.717895] usb usb1: rpm_suspend flags 0xc
[ 46.717926] usb usb1: rpm_suspend returns -16
[ 46.717926] ehci-omap ehci-omap.0: ...powerup ports...
[ 46.747161] driver: 'ehci-omap.0': driver_bound: bound to device 'ehci-omap'
[ 46.747192] bus: 'platform': really_probe: bound device ehci-omap.0
to driver ehci-omap
[ 46.809661] ehci-omap ehci-omap.0: GetStatus port:1 status 001803 0
ACK POWER sig=j CSC CONNECT
[ 46.809692] hub 1-0:1.0: port 1: status 0501 change 0001
[ 46.911193] hub 1-0:1.0: state 7 ports 3 chg 0002 evt 0000
[ 46.911193] hub 1-0:1.0: rpm_resume flags 0x4
[ 46.911193] hub 1-0:1.0: rpm_resume returns 1
[ 46.911224] hub 1-0:1.0: port 1, status 0501, change 0000, 480 Mb/s
[ 46.973907] ehci-omap ehci-omap.0: port 1 high speed
[ 46.973907] ehci-omap ehci-omap.0: GetStatus port:1 status 001005 0
ACK POWER sig=se0 PE CONNECT
[ 47.036102] usb 1-1: new high speed USB device using ehci-omap and address 2
[ 47.044036] ehci-omap ehci-omap.0: detected XactErr len 0/8 retry 1
[ 47.044158] ehci-omap ehci-omap.0: detected XactErr len 0/8 retry 2
[ 47.044281] ehci-omap ehci-omap.0: detected XactErr len 0/8 retry 3
[ 47.044403] ehci-omap ehci-omap.0: detected XactErr len 0/8 retry 4
[ 47.044525] ehci-omap ehci-omap.0: detected XactErr len 0/8 retry 5
[ 47.044647] ehci-omap ehci-omap.0: detected XactErr len 0/8 retry 6
[ 47.044799] ehci-omap ehci-omap.0: detected XactErr len 0/8 retry 7
[ 47.044921] ehci-omap ehci-omap.0: detected XactErr len 0/8 retry 8
......
Anand, could you help to check it?
thanks,
--
Lei Ming
[-- Attachment #2: fix_ehci_gpio_beagle_xm.patch --]
[-- Type: text/x-patch, Size: 777 bytes --]
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
index f1a8ede..3e130ae 100644
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -299,7 +299,10 @@ static int beagle_twl_gpio_setup(struct device *dev,
/* TWL4030_GPIO_MAX + 0 == ledA, EHCI nEN_USB_PWR (out, active low) */
gpio_request(gpio + TWL4030_GPIO_MAX, "nEN_USB_PWR");
- gpio_direction_output(gpio + TWL4030_GPIO_MAX, 0);
+ if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM)
+ gpio_direction_output(gpio + TWL4030_GPIO_MAX, 1);
+ else
+ gpio_direction_output(gpio + TWL4030_GPIO_MAX, 0);
/* TWL4030_GPIO_MAX + 1 == ledB, PMU_STAT (out, active low LED) */
gpio_leds[2].gpio = gpio + TWL4030_GPIO_MAX + 1;
--
1.7.3
^ permalink raw reply related [flat|nested] 44+ messages in thread
* Re: linux-next: manual merge of the usb tree with the omap tree
2011-01-06 15:50 ` Ming Lei
@ 2011-01-07 14:07 ` Anand Gadiyar
2011-01-07 14:15 ` Ming Lei
0 siblings, 1 reply; 44+ messages in thread
From: Anand Gadiyar @ 2011-01-07 14:07 UTC (permalink / raw)
To: Ming Lei
Cc: Benoit Cousson, Stephen Rothwell, Paul Walmsley, Greg KH,
linux-next, linux-kernel, Felipe Balbi, Tony Lindgren, linux-omap
On 1/6/2011 9:20 PM, Ming Lei wrote:
> Hi,
>
> 2011/1/6 Ming Lei <tom.leiming@gmail.com>:
>> Hi,
>>
>> 2011/1/6 Anand Gadiyar <gadiyar@ti.com>:
>>
>>> I'll take a look in a short while. I don't have an XM to
>>> test, so you'll have to help me out here.
>>
>> No problem for me, :-)
>
> I see why the beagle xM does not work, the attachment patch is
> needed to make it working.
>
> But the ehci on panda(omap4430) still does not work with
> 2.6.37-next-20110106+, and follows the failure messages:
>
> [ 46.572601] ehci_hcd: USB 2.0 'Enhanced' Host Controller (EHCI) Driver
> [ 46.580017] ehci_hcd: block sizes: qh 60 qtd 96 itd 160 sitd 96
> [ 46.580078] bus: 'platform': add driver ehci-omap
> [ 46.580139] bus: 'platform': driver_probe_device: matched device ehci-omap.0 with driver ehci-omap
> [ 46.580169] bus: 'platform': really_probe: probing driver ehci-omap with device ehci-omap.0
> [ 46.580200] ehci-omap ehci-omap.0: failed to get ehci port0 regulator
> [ 46.580200] ehci-omap ehci-omap.0: starting TI EHCI USB Controller
> [ 46.580291] ehci-omap ehci-omap.0: OMAP UHH_REVISION 0x50700100
> [ 46.580352] ehci-omap ehci-omap.0: TLL RESET DONE
> [ 46.580352] ehci-omap ehci-omap.0: UHH setup done, uhh_hostconfig=1c
> [ 46.580383] ehci-omap ehci-omap.0: reset hcs_params 0x1313 dbg=0 cc=1 pcc=3 ordered ports=3
> [ 46.580383] ehci-omap ehci-omap.0: reset hcc_params 20016 thresh 1 uframes 256/512/1024 park LPM
> [ 46.580383] ehci-omap ehci-omap.0: OMAP-EHCI Host Controller
> [ 46.588592] drivers/usb/core/inode.c: creating file 'devices'
> [ 46.588623] drivers/usb/core/inode.c: creating file '001'
> [ 46.588684] device: 'usbmon1': device_add
> [ 46.588867] PM: Adding info for No Bus:usbmon1
> [ 46.590026] ehci-omap ehci-omap.0: new USB bus registered, assigned bus number 1
> [ 46.645721] ehci-omap ehci-omap.0: park 0
> [ 46.645721] ehci-omap ehci-omap.0: support lpm
> [ 46.645751] ehci-omap ehci-omap.0: irq 109, io mem 0x4a064c00
> [ 46.651763] ehci-omap ehci-omap.0: reset command 0080b02 park=3 ithresh=8 period=1024 Reset HALT
> [ 46.651763] ehci-omap ehci-omap.0: init command 0010005 (park)=0 ithresh=1 period=512 RUN
> [ 46.661254] ehci-omap ehci-omap.0: USB 2.0 started, EHCI 1.00
> [ 46.667297] usb usb1: rpm_resume flags 0x0
> [ 46.667297] usb usb1: rpm_resume returns 1
> [ 46.667358] usb usb1: default language 0x0409
> [ 46.667358] usb usb1: udev 1, busnum 1, minor = 0
> [ 46.667388] usb usb1: New USB device found, idVendor=1d6b, idProduct=0002
> [ 46.675476] usb usb1: New USB device strings: Mfr=3, Product=2, SerialNumber=1
> [ 46.683288] usb usb1: Product: OMAP-EHCI Host Controller
> [ 46.689086] usb usb1: Manufacturer: Linux 2.6.37-next-20110106+ ehci_hcd
> [ 46.696350] usb usb1: SerialNumber: ehci-omap.0
> [ 46.701354] device: 'usb1': device_add
> [ 46.701568] bus: 'usb': add device usb1
> [ 46.701629] PM: Adding info for usb:usb1
> [ 46.702758] bus: 'usb': driver_probe_device: matched device usb1 with driver usb
> [ 46.702758] bus: 'usb': really_probe: probing driver usb with device usb1
> [ 46.702819] usb usb1: usb_probe_device
> [ 46.702819] usb usb1: configuration #1 chosen from 1 choice
> [ 46.702850] usb usb1: rpm_resume flags 0x4
> [ 46.702850] usb usb1: rpm_resume returns 1
> [ 46.702911] usb usb1: adding 1-0:1.0 (config #1, interface 0)
> [ 46.702911] device: '1-0:1.0': device_add
> [ 46.702941] bus: 'usb': add device 1-0:1.0
> [ 46.703002] PM: Adding info for usb:1-0:1.0
> [ 46.703430] bus: 'usb': driver_probe_device: matched device 1-0:1.0 with driver hub
> [ 46.703460] bus: 'usb': really_probe: probing driver hub with device 1-0:1.0
> [ 46.703460] hub 1-0:1.0: usb_probe_interface
> [ 46.703491] hub 1-0:1.0: usb_probe_interface - got id
> [ 46.703491] usb usb1: rpm_resume flags 0x4
> [ 46.703491] usb usb1: rpm_resume returns 1
> [ 46.703521] hub 1-0:1.0: USB hub found
> [ 46.707427] hub 1-0:1.0: 3 ports detected
> [ 46.715698] hub 1-0:1.0: standalone hub
> [ 46.715698] hub 1-0:1.0: individual port power switching
> [ 46.715728] hub 1-0:1.0: individual port over-current protection
> [ 46.715728] hub 1-0:1.0: power on to power good time: 20ms
> [ 46.715759] hub 1-0:1.0: local power source is good
> [ 46.715759] hub 1-0:1.0: enabling power on all ports
> [ 46.715820] driver: '1-0:1.0': driver_bound: bound to device 'hub'
> [ 46.715820] bus: 'usb': really_probe: bound device 1-0:1.0 to driver hub
> [ 46.715850] device: 'ep_81': device_add
> [ 46.717468] PM: Adding info for No Bus:ep_81
> [ 46.717498] device: 'usbdev1.1': device_add
> [ 46.717590] PM: Adding info for No Bus:usbdev1.1
> [ 46.717773] drivers/usb/core/inode.c: creating file '001'
> [ 46.717803] driver: 'usb1': driver_bound: bound to device 'usb'
> [ 46.717803] bus: 'usb': really_probe: bound device usb1 to driver usb
> [ 46.717834] device: 'ep_00': device_add
> [ 46.717895] PM: Adding info for No Bus:ep_00
> [ 46.717895] usb usb1: rpm_suspend flags 0xc
> [ 46.717926] usb usb1: rpm_suspend returns -16
> [ 46.717926] ehci-omap ehci-omap.0: ...powerup ports...
> [ 46.747161] driver: 'ehci-omap.0': driver_bound: bound to device 'ehci-omap'
> [ 46.747192] bus: 'platform': really_probe: bound device ehci-omap.0 to driver ehci-omap
> [ 46.809661] ehci-omap ehci-omap.0: GetStatus port:1 status 001803 0 ACK POWER sig=j CSC CONNECT
> [ 46.809692] hub 1-0:1.0: port 1: status 0501 change 0001
> [ 46.911193] hub 1-0:1.0: state 7 ports 3 chg 0002 evt 0000
> [ 46.911193] hub 1-0:1.0: rpm_resume flags 0x4
> [ 46.911193] hub 1-0:1.0: rpm_resume returns 1
> [ 46.911224] hub 1-0:1.0: port 1, status 0501, change 0000, 480 Mb/s
> [ 46.973907] ehci-omap ehci-omap.0: port 1 high speed
> [ 46.973907] ehci-omap ehci-omap.0: GetStatus port:1 status 001005 0 ACK POWER sig=se0 PE CONNECT
> [ 47.036102] usb 1-1: new high speed USB device using ehci-omap and address 2
> [ 47.044036] ehci-omap ehci-omap.0: detected XactErr len 0/8 retry 1
> [ 47.044158] ehci-omap ehci-omap.0: detected XactErr len 0/8 retry 2
> [ 47.044281] ehci-omap ehci-omap.0: detected XactErr len 0/8 retry 3
> [ 47.044403] ehci-omap ehci-omap.0: detected XactErr len 0/8 retry 4
> [ 47.044525] ehci-omap ehci-omap.0: detected XactErr len 0/8 retry 5
> [ 47.044647] ehci-omap ehci-omap.0: detected XactErr len 0/8 retry 6
> [ 47.044799] ehci-omap ehci-omap.0: detected XactErr len 0/8 retry 7
> [ 47.044921] ehci-omap ehci-omap.0: detected XactErr len 0/8 retry 8
> ......
>
> Anand, could you help to check it?
>
Hi Ming Lei,
I'm able to reproduce this on my panda, and I have it working as of
linux-next-20101221 (the last version I tested last year) and failing
on linux-next-20101227 (which was the very next linux-next release).
Not sure why, but my Panda manages to get the VID:PID of the hub as
well, while yours does not even get there.
I may need a few more hours to debug this, unless someone beats me
to it. ;)
- Anand
^ permalink raw reply [flat|nested] 44+ messages in thread
* Re: linux-next: manual merge of the usb tree with the omap tree
2011-01-07 14:07 ` Anand Gadiyar
@ 2011-01-07 14:15 ` Ming Lei
2011-01-07 14:39 ` Anand Gadiyar
0 siblings, 1 reply; 44+ messages in thread
From: Ming Lei @ 2011-01-07 14:15 UTC (permalink / raw)
To: Anand Gadiyar
Cc: Benoit Cousson, Stephen Rothwell, Paul Walmsley, Greg KH,
linux-next, linux-kernel, Felipe Balbi, Tony Lindgren, linux-omap
Hi Anand,
2011/1/7 Anand Gadiyar <gadiyar@ti.com>:
> Hi Ming Lei,
>
> I'm able to reproduce this on my panda, and I have it working as of
> linux-next-20101221 (the last version I tested last year) and failing
> on linux-next-20101227 (which was the very next linux-next release).
>
> Not sure why, but my Panda manages to get the VID:PID of the hub as
> well, while yours does not even get there.
>
> I may need a few more hours to debug this, unless someone beats me
> to it. ;)
Is it caused by the below?
[ 46.580200] ehci-omap ehci-omap.0: failed to get ehci port0 regulator
thanks,
--
Lei Ming
^ permalink raw reply [flat|nested] 44+ messages in thread
* RE: linux-next: manual merge of the usb tree with the omap tree
2011-01-07 14:15 ` Ming Lei
@ 2011-01-07 14:39 ` Anand Gadiyar
2011-01-07 15:20 ` Anand Gadiyar
0 siblings, 1 reply; 44+ messages in thread
From: Anand Gadiyar @ 2011-01-07 14:39 UTC (permalink / raw)
To: Ming Lei
Cc: Benoit Cousson, Stephen Rothwell, Paul Walmsley, Greg KH,
linux-next, linux-kernel, Felipe Balbi, Tony Lindgren, linux-omap
Ming Lei wrote:
> 2011/1/7 Anand Gadiyar <gadiyar@ti.com>:
> > Hi Ming Lei,
> >
> > I'm able to reproduce this on my panda, and I have it working as of
> > linux-next-20101221 (the last version I tested last year) and failing
> > on linux-next-20101227 (which was the very next linux-next release).
> >
> > Not sure why, but my Panda manages to get the VID:PID of the hub as
> > well, while yours does not even get there.
> >
> > I may need a few more hours to debug this, unless someone beats me
> > to it. ;)
>
> Is it caused by the below?
>
> [ 46.580200] ehci-omap ehci-omap.0: failed to get ehci port0 regulator
>
Nope. We don't set up any regulators for the PHY on Panda (at least not
yet).
And the working case (next-20101221) has the same log.
I suspect the PHY doesn't get reset for the proper duration; I'm looking
for something in that area. (Another option is to bisect between the two
versions, but I'm not sure if that's any easier).
- Anand
^ permalink raw reply [flat|nested] 44+ messages in thread
* RE: linux-next: manual merge of the usb tree with the omap tree
2011-01-07 14:39 ` Anand Gadiyar
@ 2011-01-07 15:20 ` Anand Gadiyar
2011-01-07 18:54 ` Gadiyar, Anand
2011-01-10 13:53 ` Ming Lei
0 siblings, 2 replies; 44+ messages in thread
From: Anand Gadiyar @ 2011-01-07 15:20 UTC (permalink / raw)
To: Anand Gadiyar, Ming Lei
Cc: Benoit Cousson, Stephen Rothwell, Paul Walmsley, Greg KH,
linux-next, linux-kernel, Felipe Balbi, Tony Lindgren, linux-omap
Ming Lei wrote:
> Ming Lei wrote:
> > 2011/1/7 Anand Gadiyar <gadiyar@ti.com>:
> > > Hi Ming Lei,
> > >
> > > I'm able to reproduce this on my panda, and I have it working as of
> > > linux-next-20101221 (the last version I tested last year) and
failing
> > > on linux-next-20101227 (which was the very next linux-next release).
> > >
> > > Not sure why, but my Panda manages to get the VID:PID of the hub as
> > > well, while yours does not even get there.
> > >
> > > I may need a few more hours to debug this, unless someone beats me
> > > to it. ;)
> >
> > Is it caused by the below?
> >
> > [ 46.580200] ehci-omap ehci-omap.0: failed to get ehci port0
regulator
> >
>
> Nope. We don't set up any regulators for the PHY on Panda (at least not
> yet).
>
> And the working case (next-20101221) has the same log.
>
> I suspect the PHY doesn't get reset for the proper duration; I'm looking
> for something in that area. (Another option is to bisect between the two
> versions, but I'm not sure if that's any easier).
>
Update: I disabled CONFIG_OMAP_RESET_CLOCKS and the PHY and other
connected devices enumerate just fine. Could you try this out on
your board as well?
I'll look deeper and see if there are some required clocks that are
accidentally getting turned off.
- Anand
^ permalink raw reply [flat|nested] 44+ messages in thread
* Re: linux-next: manual merge of the usb tree with the omap tree
2011-01-07 15:20 ` Anand Gadiyar
@ 2011-01-07 18:54 ` Gadiyar, Anand
2011-01-07 19:24 ` Felipe Balbi
2011-01-10 13:53 ` Ming Lei
1 sibling, 1 reply; 44+ messages in thread
From: Gadiyar, Anand @ 2011-01-07 18:54 UTC (permalink / raw)
To: Anand Gadiyar, Ming Lei
Cc: Benoit Cousson, Stephen Rothwell, Paul Walmsley, Greg KH,
linux-next, linux-kernel, Felipe Balbi, Tony Lindgren, linux-omap
On Fri, Jan 7, 2011 at 8:50 PM, Anand Gadiyar <gadiyar@ti.com> wrote:
> Update: I disabled CONFIG_OMAP_RESET_CLOCKS and the PHY and other
> connected devices enumerate just fine. Could you try this out on
> your board as well?
>
> I'll look deeper and see if there are some required clocks that are
> accidentally getting turned off.
>
A final update from today: It appears that disabling auxclk3_ck causes
EHCI to fail. I'm not sure what this clock feeds, and will need to look it
up. Keeping this clock alive is sufficient to get the hub to enumerate.
I would've looked it up, but got booted out by a fire alarm drill. I'll
take a look tomorrow and cook up a fix.
- Anand
^ permalink raw reply [flat|nested] 44+ messages in thread
* Re: linux-next: manual merge of the usb tree with the omap tree
2011-01-07 18:54 ` Gadiyar, Anand
@ 2011-01-07 19:24 ` Felipe Balbi
0 siblings, 0 replies; 44+ messages in thread
From: Felipe Balbi @ 2011-01-07 19:24 UTC (permalink / raw)
To: Gadiyar, Anand
Cc: Ming Lei, Benoit Cousson, Stephen Rothwell, Paul Walmsley,
Greg KH, linux-next, linux-kernel, Felipe Balbi, Tony Lindgren,
linux-omap
On Sat, Jan 08, 2011 at 12:24:24AM +0530, Gadiyar, Anand wrote:
> On Fri, Jan 7, 2011 at 8:50 PM, Anand Gadiyar <gadiyar@ti.com> wrote:
> > Update: I disabled CONFIG_OMAP_RESET_CLOCKS and the PHY and other
> > connected devices enumerate just fine. Could you try this out on
> > your board as well?
> >
> > I'll look deeper and see if there are some required clocks that are
> > accidentally getting turned off.
> >
>
> A final update from today: It appears that disabling auxclk3_ck causes
> EHCI to fail. I'm not sure what this clock feeds, and will need to look it
> up. Keeping this clock alive is sufficient to get the hub to enumerate.
>
> I would've looked it up, but got booted out by a fire alarm drill. I'll
> take a look tomorrow and cook up a fix.
Good finding :-) Thanks a lot :-)
--
balbi
^ permalink raw reply [flat|nested] 44+ messages in thread
* Re: linux-next: manual merge of the usb tree with the omap tree
2011-01-07 15:20 ` Anand Gadiyar
2011-01-07 18:54 ` Gadiyar, Anand
@ 2011-01-10 13:53 ` Ming Lei
2011-01-10 14:09 ` Anand Gadiyar
1 sibling, 1 reply; 44+ messages in thread
From: Ming Lei @ 2011-01-10 13:53 UTC (permalink / raw)
To: Anand Gadiyar
Cc: Benoit Cousson, Stephen Rothwell, Paul Walmsley, Greg KH,
linux-next, linux-kernel, Felipe Balbi, Tony Lindgren, linux-omap
Hi,
2011/1/7 Anand Gadiyar <gadiyar@ti.com>:
> Update: I disabled CONFIG_OMAP_RESET_CLOCKS and the PHY and other
> connected devices enumerate just fine. Could you try this out on
> your board as well?
Yes, it does work for me if CONFIG_OMAP_RESET_CLOCKS is disabled.
thanks,
--
Lei Ming
^ permalink raw reply [flat|nested] 44+ messages in thread
* Re: linux-next: manual merge of the usb tree with the omap tree
2011-01-10 13:53 ` Ming Lei
@ 2011-01-10 14:09 ` Anand Gadiyar
0 siblings, 0 replies; 44+ messages in thread
From: Anand Gadiyar @ 2011-01-10 14:09 UTC (permalink / raw)
To: Ming Lei
Cc: Benoit Cousson, Stephen Rothwell, Paul Walmsley, Greg KH,
linux-next, linux-kernel, Felipe Balbi, Tony Lindgren, linux-omap
On 1/10/2011 7:23 PM, Ming Lei wrote:
> Hi,
>
> 2011/1/7 Anand Gadiyar <gadiyar@ti.com>:
>
>> Update: I disabled CONFIG_OMAP_RESET_CLOCKS and the PHY and other
>> connected devices enumerate just fine. Could you try this out on
>> your board as well?
>
> Yes, it does work for me if CONFIG_OMAP_RESET_CLOCKS is disabled.
>
> thanks,
Great, patch coming up in a few minutes.
I figured out why we need auxclk3 - the PHY's reference clock
is provided by it.
- Anand
^ permalink raw reply [flat|nested] 44+ messages in thread
* Re: linux-next: manual merge of the usb tree with the omap tree
2011-01-06 15:07 ` Anand Gadiyar
2011-01-06 15:25 ` Ming Lei
@ 2011-01-06 15:43 ` Brad Parker
2011-01-06 16:59 ` Koen Kooi
1 sibling, 1 reply; 44+ messages in thread
From: Brad Parker @ 2011-01-06 15:43 UTC (permalink / raw)
To: Anand Gadiyar
Cc: Ming Lei, Benoit Cousson, Stephen Rothwell, Paul Walmsley,
Greg KH, linux-next, linux-kernel, Felipe Balbi, Tony Lindgren,
linux-omap
It's probably expected, but I can't get the EHCI USB port to work
on a beagle board XM (36xx) using the current omap tree.
It this most likely due to these clock issues?
the (very old) angstrom 2.6.32 kernel works fine, as a comparison.
-brad
^ permalink raw reply [flat|nested] 44+ messages in thread
* Re: linux-next: manual merge of the usb tree with the omap tree
2011-01-06 15:43 ` Brad Parker
@ 2011-01-06 16:59 ` Koen Kooi
2011-01-06 17:57 ` Nishanth Menon
2011-01-06 18:15 ` Kevin Hilman
0 siblings, 2 replies; 44+ messages in thread
From: Koen Kooi @ 2011-01-06 16:59 UTC (permalink / raw)
To: Brad Parker
Cc: Anand Gadiyar, Ming Lei, Benoit Cousson, Stephen Rothwell,
Paul Walmsley, Greg KH, linux-next, linux-kernel, Felipe Balbi,
Tony Lindgren, linux-omap
Op 6 jan 2011, om 16:43 heeft Brad Parker het volgende geschreven:
> It's probably expected, but I can't get the EHCI USB port to work
> on a beagle board XM (36xx) using the current omap tree.
>
> It this most likely due to these clock issues?
You need this patch: http://thread.gmane.org/gmane.linux.ports.arm.omap/47807/
I'm currently too lazy to split it up like Nishant wants as I don't see the point splitting for the sake of splitting.
^ permalink raw reply [flat|nested] 44+ messages in thread
* Re: linux-next: manual merge of the usb tree with the omap tree
2011-01-06 16:59 ` Koen Kooi
@ 2011-01-06 17:57 ` Nishanth Menon
2011-01-06 18:15 ` Kevin Hilman
1 sibling, 0 replies; 44+ messages in thread
From: Nishanth Menon @ 2011-01-06 17:57 UTC (permalink / raw)
To: Koen Kooi
Cc: Brad Parker, Anand Gadiyar, Ming Lei, Benoit Cousson,
Stephen Rothwell, Paul Walmsley, Greg KH, linux-next,
linux-kernel, Felipe Balbi, Tony Lindgren, linux-omap
Koen Kooi had written, on 01/06/2011 10:59 AM, the following:
> Op 6 jan 2011, om 16:43 heeft Brad Parker het volgende geschreven:
>
>> It's probably expected, but I can't get the EHCI USB port to work
>> on a beagle board XM (36xx) using the current omap tree.
>>
>> It this most likely due to these clock issues?
>
> You need this patch: http://thread.gmane.org/gmane.linux.ports.arm.omap/47807/
>
> I'm currently too lazy to split it up like Nishant wants as I don't see the point splitting for the sake of splitting.--
Alrite, if it is ok with you and Tony, I will help post the split up -
this will help multiple things:
a) prevents the patch being held off because of multiline comments and
the link
b) git bisect can isolate to a specific change.
c) A patch should do a single logical thing for helping (b).
--
Regards,
Nishanth Menon
^ permalink raw reply [flat|nested] 44+ messages in thread
* Re: linux-next: manual merge of the usb tree with the omap tree
2011-01-06 16:59 ` Koen Kooi
2011-01-06 17:57 ` Nishanth Menon
@ 2011-01-06 18:15 ` Kevin Hilman
2011-01-06 18:21 ` Nishanth Menon
2011-01-06 18:27 ` Paul Walmsley
1 sibling, 2 replies; 44+ messages in thread
From: Kevin Hilman @ 2011-01-06 18:15 UTC (permalink / raw)
To: Koen Kooi
Cc: Brad Parker, Anand Gadiyar, Ming Lei, Benoit Cousson,
Stephen Rothwell, Paul Walmsley, Greg KH, linux-next,
linux-kernel, Felipe Balbi, Tony Lindgren, linux-omap
Koen Kooi <koen@dominion.thruhere.net> writes:
> Op 6 jan 2011, om 16:43 heeft Brad Parker het volgende geschreven:
>
>> It's probably expected, but I can't get the EHCI USB port to work
>> on a beagle board XM (36xx) using the current omap tree.
>>
>> It this most likely due to these clock issues?
>
> You need this patch: http://thread.gmane.org/gmane.linux.ports.arm.omap/47807/
>
> I'm currently too lazy to split it up like Nishant wants as I don't
> see the point splitting for the sake of splitting.--
IMO, it doesn't need to be split up.
But it does have to fix the other comments I made on the same thread[1]
1) add a descriptive changelog, and
2) Cc linux-arm-kernel
Kevin
[1] http://article.gmane.org/gmane.linux.ports.arm.omap/48920
^ permalink raw reply [flat|nested] 44+ messages in thread
* Re: linux-next: manual merge of the usb tree with the omap tree
2011-01-06 18:15 ` Kevin Hilman
@ 2011-01-06 18:21 ` Nishanth Menon
2011-01-06 18:38 ` Kevin Hilman
2011-01-06 18:27 ` Paul Walmsley
1 sibling, 1 reply; 44+ messages in thread
From: Nishanth Menon @ 2011-01-06 18:21 UTC (permalink / raw)
To: Kevin Hilman
Cc: Koen Kooi, Brad Parker, Anand Gadiyar, Ming Lei, Benoit Cousson,
Stephen Rothwell, Paul Walmsley, Greg KH, linux-next,
linux-kernel, Felipe Balbi, Tony Lindgren, linux-omap
[-- Attachment #1: Type: text/plain, Size: 1205 bytes --]
Kevin Hilman had written, on 01/06/2011 12:15 PM, the following:
> Koen Kooi <koen@dominion.thruhere.net> writes:
>
>> Op 6 jan 2011, om 16:43 heeft Brad Parker het volgende geschreven:
>>
>>> It's probably expected, but I can't get the EHCI USB port to work
>>> on a beagle board XM (36xx) using the current omap tree.
>>>
>>> It this most likely due to these clock issues?
>> You need this patch: http://thread.gmane.org/gmane.linux.ports.arm.omap/47807/
>>
>> I'm currently too lazy to split it up like Nishant wants as I don't
>> see the point splitting for the sake of splitting.--
>
> IMO, it doesn't need to be split up.
>
> But it does have to fix the other comments I made on the same thread[1]
>
> 1) add a descriptive changelog, and
> 2) Cc linux-arm-kernel
Kevin,
there are four things being done in the patch:
a) fix GPIO number for EHCI power on
b) fix GPIO number for DVI reset line
c) switch on DVI
d) switch on Camera
I have split the first 2 up. I just splitting the (c) up when I noticed
the code is confusing - I will reply in thread to the original patch.
I apologize, but I disagree - as far as I see it, these are separate
changes being done.
--
Regards,
Nishanth Menon
[-- Attachment #2: 0001-omap3-beaglexm-fix-EHCI-power-up-GPIO-dir.patch --]
[-- Type: text/x-patch, Size: 1541 bytes --]
>From c03fd107da409806ec15d508db6c7c352244a1f4 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@beagleboard.org>
Date: Thu, 6 Jan 2011 12:08:15 -0600
Subject: [PATCH 1/2] omap3: beaglexm: fix EHCI power up GPIO dir
EHCI enable power pin is inverted (active high) in comparison
to vanilla beagle which is active low. Handle this case conditionally.
[nm@ti.com: helped split up]
Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Koen Kooi <koen@beagleboard.org>
---
arch/arm/mach-omap2/board-omap3beagle.c | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
index 6c12760..1b5aa7a 100644
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -297,9 +297,16 @@ static int beagle_twl_gpio_setup(struct device *dev,
gpio_request(gpio + 1, "EHCI_nOC");
gpio_direction_input(gpio + 1);
- /* TWL4030_GPIO_MAX + 0 == ledA, EHCI nEN_USB_PWR (out, active low) */
+ /*
+ * TWL4030_GPIO_MAX + 0 == ledA, EHCI nEN_USB_PWR (out, XM active
+ * high / others active low)
+ */
gpio_request(gpio + TWL4030_GPIO_MAX, "nEN_USB_PWR");
gpio_direction_output(gpio + TWL4030_GPIO_MAX, 0);
+ if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM)
+ gpio_direction_output(gpio + TWL4030_GPIO_MAX, 1);
+ else
+ gpio_direction_output(gpio + TWL4030_GPIO_MAX, 0);
/* TWL4030_GPIO_MAX + 1 == ledB, PMU_STAT (out, active low LED) */
gpio_leds[2].gpio = gpio + TWL4030_GPIO_MAX + 1;
--
1.6.3.3
[-- Attachment #3: 0002-omap3-beaglexm-fix-DVI-reset-GPIO.patch --]
[-- Type: text/x-patch, Size: 1496 bytes --]
>From d34971b71d61f3fc20e724a48dbdfe347aa53802 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@beagleboard.org>
Date: Thu, 6 Jan 2011 12:14:00 -0600
Subject: [PATCH 2/2] omap3: beaglexm: fix DVI reset GPIO
GPIO reset line for Beagle XM is different from vanilla beagle
so we populate it as part of gpio update routine.
Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Koen Kooi <koen@beagleboard.org>
---
arch/arm/mach-omap2/board-omap3beagle.c | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
index 1b5aa7a..d628f5e 100644
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -199,7 +199,7 @@ static struct omap_dss_device beagle_dvi_device = {
.name = "dvi",
.driver_name = "generic_panel",
.phy.dpi.data_lines = 24,
- .reset_gpio = 170,
+ .reset_gpio = -EINVAL,
.platform_enable = beagle_enable_dvi,
.platform_disable = beagle_disable_dvi,
};
@@ -308,6 +308,12 @@ static int beagle_twl_gpio_setup(struct device *dev,
else
gpio_direction_output(gpio + TWL4030_GPIO_MAX, 0);
+ /* DVI reset GPIO is different between beagle revisions */
+ if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM)
+ beagle_dvi_device.reset_gpio = 129;
+ else
+ beagle_dvi_device.reset_gpio = 170;
+
/* TWL4030_GPIO_MAX + 1 == ledB, PMU_STAT (out, active low LED) */
gpio_leds[2].gpio = gpio + TWL4030_GPIO_MAX + 1;
--
1.6.3.3
^ permalink raw reply related [flat|nested] 44+ messages in thread* Re: linux-next: manual merge of the usb tree with the omap tree
2011-01-06 18:21 ` Nishanth Menon
@ 2011-01-06 18:38 ` Kevin Hilman
2011-01-06 20:24 ` Nishanth Menon
0 siblings, 1 reply; 44+ messages in thread
From: Kevin Hilman @ 2011-01-06 18:38 UTC (permalink / raw)
To: Nishanth Menon
Cc: Koen Kooi, Brad Parker, Anand Gadiyar, Ming Lei, Benoit Cousson,
Stephen Rothwell, Paul Walmsley, Greg KH, linux-next,
linux-kernel, Felipe Balbi, Tony Lindgren, linux-omap
Nishanth Menon <nm@ti.com> writes:
> Kevin Hilman had written, on 01/06/2011 12:15 PM, the following:
>> Koen Kooi <koen@dominion.thruhere.net> writes:
>>
>>> Op 6 jan 2011, om 16:43 heeft Brad Parker het volgende geschreven:
>>>
>>>> It's probably expected, but I can't get the EHCI USB port to work
>>>> on a beagle board XM (36xx) using the current omap tree.
>>>>
>>>> It this most likely due to these clock issues?
>>> You need this patch: http://thread.gmane.org/gmane.linux.ports.arm.omap/47807/
>>>
>>> I'm currently too lazy to split it up like Nishant wants as I don't
>>> see the point splitting for the sake of splitting.--
>>
>> IMO, it doesn't need to be split up.
>>
>> But it does have to fix the other comments I made on the same thread[1]
>>
>> 1) add a descriptive changelog, and
>> 2) Cc linux-arm-kernel
>
> Kevin,
> there are four things being done in the patch:
> a) fix GPIO number for EHCI power on
> b) fix GPIO number for DVI reset line
> c) switch on DVI
> d) switch on Camera
>
> I have split the first 2 up. I just splitting the (c) up when I
> noticed the code is confusing - I will reply in thread to the original
> patch.
>
> I apologize, but I disagree - as far as I see it, these are separate
> changes being done.
Sure, but there are all tiny and isolated. For me, what's missing is
just a changlog describing all the changes.
Feel free to break it up if you prefer, but IMO it would be mergable as
a single patch if there was a descriptive changelog actually mentioning
all the changes made (as you just did above.)
Kevin
^ permalink raw reply [flat|nested] 44+ messages in thread
* Re: linux-next: manual merge of the usb tree with the omap tree
2011-01-06 18:38 ` Kevin Hilman
@ 2011-01-06 20:24 ` Nishanth Menon
2011-01-06 21:29 ` Kevin Hilman
0 siblings, 1 reply; 44+ messages in thread
From: Nishanth Menon @ 2011-01-06 20:24 UTC (permalink / raw)
To: Kevin Hilman
Cc: Koen Kooi, Brad Parker, Anand Gadiyar, Ming Lei, Benoit Cousson,
Stephen Rothwell, Paul Walmsley, Greg KH, linux-next,
linux-kernel, Felipe Balbi, Tony Lindgren, linux-omap
Kevin Hilman had written, on 01/06/2011 12:38 PM, the following:
[..]
> Feel free to break it up if you prefer, but IMO it would be mergable as
just for the record, posted the same here:
http://marc.info/?l=linux-omap&m=129434370207879&w=2
[..]
--
Regards,
Nishanth Menon
^ permalink raw reply [flat|nested] 44+ messages in thread
* Re: linux-next: manual merge of the usb tree with the omap tree
2011-01-06 20:24 ` Nishanth Menon
@ 2011-01-06 21:29 ` Kevin Hilman
0 siblings, 0 replies; 44+ messages in thread
From: Kevin Hilman @ 2011-01-06 21:29 UTC (permalink / raw)
To: Nishanth Menon
Cc: Koen Kooi, Brad Parker, Anand Gadiyar, Ming Lei, Benoit Cousson,
Stephen Rothwell, Paul Walmsley, Greg KH, linux-next,
linux-kernel, Felipe Balbi, Tony Lindgren, linux-omap
Nishanth Menon <nm@ti.com> writes:
> Kevin Hilman had written, on 01/06/2011 12:38 PM, the following:
> [..]
>> Feel free to break it up if you prefer, but IMO it would be mergable as
> just for the record, posted the same here:
> http://marc.info/?l=linux-omap&m=129434370207879&w=2
Thanks, and this is even more mergable. :)
Kevin
^ permalink raw reply [flat|nested] 44+ messages in thread
* Re: linux-next: manual merge of the usb tree with the omap tree
2011-01-06 18:15 ` Kevin Hilman
2011-01-06 18:21 ` Nishanth Menon
@ 2011-01-06 18:27 ` Paul Walmsley
1 sibling, 0 replies; 44+ messages in thread
From: Paul Walmsley @ 2011-01-06 18:27 UTC (permalink / raw)
To: Kevin Hilman
Cc: Koen Kooi, Brad Parker, Anand Gadiyar, Ming Lei, Benoit Cousson,
Stephen Rothwell, Greg KH, linux-next, linux-kernel, Felipe Balbi,
Tony Lindgren, linux-omap
On Thu, 6 Jan 2011, Kevin Hilman wrote:
> Koen Kooi <koen@dominion.thruhere.net> writes:
>
> > Op 6 jan 2011, om 16:43 heeft Brad Parker het volgende geschreven:
> >
> >> It's probably expected, but I can't get the EHCI USB port to work
> >> on a beagle board XM (36xx) using the current omap tree.
> >>
> >> It this most likely due to these clock issues?
> >
> > You need this patch: http://thread.gmane.org/gmane.linux.ports.arm.omap/47807/
> >
> > I'm currently too lazy to split it up like Nishant wants as I don't
> > see the point splitting for the sake of splitting.--
>
> IMO, it doesn't need to be split up.
>
> But it does have to fix the other comments I made on the same thread[1]
>
> 1) add a descriptive changelog, and
> 2) Cc linux-arm-kernel
and glancing at the patch
3) Fix the multiline comments to conform to Documentation/CodingStyle
as I think Nishanth mentioned.
- Paul
^ permalink raw reply [flat|nested] 44+ messages in thread