USB Host support for OMAP5 uEVM (for 3.14)
Subsystems (5)
v6 cover USB Host support for OMAP5 uEVM (for 3.14)
Hi Benoit & Tony,
This patchset brings up USB Host ports and Ethernet port on the OMAP5 uEVM board.
It depends on the TI Clock DT conversion patches [1] and is based on 3.13
[1] - http://article.gmane.org/gmane.linux.ports.arm.kernel/293147
Tested on:
- OMAP5 uEVM
- Pandaboard ES Rev. B1
- Beagleboard-XM Rev C2
- Beagleboard Rev C4.
cheers,
-roger
Changelog:
v6:
- Initialized clocks to -ENODEV and split patch 3.
v5:
- Expose all clocks in the DT binding document for mfd:omap-usb-host and mfd:omap-usb-tll
v4:
- Updated DT binding document for clock binding
v3:
- Rebased on top of 3.13-rc7
cheers,
-roger
Roger Quadros (10):
mfd: omap-usb-host: Use resource managed clk_get()
mfd: omap-usb-host: Get clocks based on hardware revision
mfd: omap-usb-host: Use clock names as per function for reference
clocks
mfd: omap-usb-host: Update DT clock binding information
mfd: omap-usb-tll: Update DT clock binding information
ARM: dts: omap4: Update omap-usb-host node
ARM: dts: omap5: Update omap-usb-host node
ARM: dts: omap4-panda: Provide USB PHY clock
ARM: dts: omap5-uevm: Provide USB PHY clock
ARM: OMAP2+: Remove legacy_init_ehci_clk()
.../devicetree/bindings/mfd/omap-usb-host.txt | 23 +++ .../devicetree/bindings/mfd/omap-usb-tll.txt | 10 ++ arch/arm/boot/dts/omap4-panda-common.dtsi | 8 +- arch/arm/boot/dts/omap4.dtsi | 6 + arch/arm/boot/dts/omap5-uevm.dts | 8 +- arch/arm/boot/dts/omap5.dtsi | 6 + arch/arm/mach-omap2/pdata-quirks.c | 16 -- drivers/mfd/omap-usb-host.c | 171 ++++++++++----------- 8 files changed, 128 insertions(+), 120 deletions(-)
Signature · 1 line
1.8.3.2
PATCH v6 1/10 mfd: omap-usb-host: Use resource managed clk_get()
Use devm_clk_get() instead of clk_get().
--- drivers/mfd/omap-usb-host.c | 81 +++++++++------------------------------------ 1 file changed, 16 insertions(+), 65 deletions(-)
drivers/mfd/omap-usb-host.c +16 -65
@@ -674,46 +674,46 @@ static int usbhs_omap_probe(struct platform_device *pdev) omap->ehci_logic_fck =ERR_PTR (-EINVAL );if (need_logic_fck) { - omap->ehci_logic_fck =clk_get (dev,"ehci_logic_fck" ); + omap->ehci_logic_fck =devm_clk_get (dev,"ehci_logic_fck" );if (IS_ERR (omap->ehci_logic_fck)) { ret =PTR_ERR (omap->ehci_logic_fck);dev_dbg (dev,"ehci_logic_fck failed:%d\n" , ret); } } - omap->utmi_p1_gfclk =clk_get (dev,"utmi_p1_gfclk" ); + omap->utmi_p1_gfclk =devm_clk_get (dev,"utmi_p1_gfclk" );if (IS_ERR (omap->utmi_p1_gfclk)) { ret =PTR_ERR (omap->utmi_p1_gfclk);dev_err (dev,"utmi_p1_gfclk failed error:%d\n" , ret); - goto err_p1_gfclk; + goto err_mem; } - omap->utmi_p2_gfclk =clk_get (dev,"utmi_p2_gfclk" ); + omap->utmi_p2_gfclk =devm_clk_get (dev,"utmi_p2_gfclk" );if (IS_ERR (omap->utmi_p2_gfclk)) { ret =PTR_ERR (omap->utmi_p2_gfclk);dev_err (dev,"utmi_p2_gfclk failed error:%d\n" , ret); - goto err_p2_gfclk; + goto err_mem; } - omap->xclk60mhsp1_ck =clk_get (dev,"xclk60mhsp1_ck" ); + omap->xclk60mhsp1_ck =devm_clk_get (dev,"xclk60mhsp1_ck" );if (IS_ERR (omap->xclk60mhsp1_ck)) { ret =PTR_ERR (omap->xclk60mhsp1_ck);dev_err (dev,"xclk60mhsp1_ck failed error:%d\n" , ret); - goto err_xclk60mhsp1; + goto err_mem; } - omap->xclk60mhsp2_ck =clk_get (dev,"xclk60mhsp2_ck" ); + omap->xclk60mhsp2_ck =devm_clk_get (dev,"xclk60mhsp2_ck" );if (IS_ERR (omap->xclk60mhsp2_ck)) { ret =PTR_ERR (omap->xclk60mhsp2_ck);dev_err (dev,"xclk60mhsp2_ck failed error:%d\n" , ret); - goto err_xclk60mhsp2; + goto err_mem; } - omap->init_60m_fclk =clk_get (dev,"init_60m_fclk" ); + omap->init_60m_fclk =devm_clk_get (dev,"init_60m_fclk" );if (IS_ERR (omap->init_60m_fclk)) { ret =PTR_ERR (omap->init_60m_fclk);dev_err (dev,"init_60m_fclk failed error:%d\n" , ret); - goto err_init60m; + goto err_mem; }for (i =0 ; i < omap->nports; i++) {
@@ -727,21 +727,21 @@ static int usbhs_omap_probe(struct platform_device *pdev)* platforms have all clocks and we can function without * them */ - omap->utmi_clk[i] =clk_get (dev, clkname); + omap->utmi_clk[i] =devm_clk_get (dev, clkname);if (IS_ERR (omap->utmi_clk[i]))dev_dbg (dev,"Failed to get clock : %s : %ld\n" , clkname,PTR_ERR (omap->utmi_clk[i]));snprintf (clkname,sizeof (clkname),"usb_host_hs_hsic480m_p%d_clk" , i +1 ); - omap->hsic480m_clk[i] =clk_get (dev, clkname); + omap->hsic480m_clk[i] =devm_clk_get (dev, clkname);if (IS_ERR (omap->hsic480m_clk[i]))dev_dbg (dev,"Failed to get clock : %s : %ld\n" , clkname,PTR_ERR (omap->hsic480m_clk[i]));snprintf (clkname,sizeof (clkname),"usb_host_hs_hsic60m_p%d_clk" , i +1 ); - omap->hsic60m_clk[i] =clk_get (dev, clkname); + omap->hsic60m_clk[i] =devm_clk_get (dev, clkname);if (IS_ERR (omap->hsic60m_clk[i]))dev_dbg (dev,"Failed to get clock : %s : %ld\n" , clkname,PTR_ERR (omap->hsic60m_clk[i]));
@@ -784,7 +784,7 @@ static int usbhs_omap_probe(struct platform_device *pdev)if (ret) {dev_err (dev,"Failed to create DT children: %d\n" , ret); - goto err_alloc; + goto err_mem; } }else {
@@ -792,40 +792,12 @@ static int usbhs_omap_probe(struct platform_device *pdev)if (ret) {dev_err (dev,"omap_usbhs_alloc_children failed: %d\n" , ret); - goto err_alloc; + goto err_mem; } }return 0 ; -err_alloc: -for (i =0 ; i < omap->nports; i++) { -if (!IS_ERR (omap->utmi_clk[i])) -clk_put (omap->utmi_clk[i]); -if (!IS_ERR (omap->hsic60m_clk[i])) -clk_put (omap->hsic60m_clk[i]); -if (!IS_ERR (omap->hsic480m_clk[i])) -clk_put (omap->hsic480m_clk[i]); - } - -clk_put (omap->init_60m_fclk); - -err_init60m: -clk_put (omap->xclk60mhsp2_ck); - -err_xclk60mhsp2: -clk_put (omap->xclk60mhsp1_ck); - -err_xclk60mhsp1: -clk_put (omap->utmi_p2_gfclk); - -err_p2_gfclk: -clk_put (omap->utmi_p1_gfclk); - -err_p1_gfclk: -if (!IS_ERR (omap->ehci_logic_fck)) -clk_put (omap->ehci_logic_fck); - err_mem:pm_runtime_disable (dev);
@@ -847,27 +819,6 @@ static int usbhs_omap_remove_child(struct device *dev, void *data)*/ static int usbhs_omap_remove (struct platform_device *pdev) { -struct usbhs_hcd_omap *omap =platform_get_drvdata (pdev); -int i; - -for (i =0 ; i < omap->nports; i++) { -if (!IS_ERR (omap->utmi_clk[i])) -clk_put (omap->utmi_clk[i]); -if (!IS_ERR (omap->hsic60m_clk[i])) -clk_put (omap->hsic60m_clk[i]); -if (!IS_ERR (omap->hsic480m_clk[i])) -clk_put (omap->hsic480m_clk[i]); - } - -clk_put (omap->init_60m_fclk); -clk_put (omap->utmi_p1_gfclk); -clk_put (omap->utmi_p2_gfclk); -clk_put (omap->xclk60mhsp2_ck); -clk_put (omap->xclk60mhsp1_ck); - -if (!IS_ERR (omap->ehci_logic_fck)) -clk_put (omap->ehci_logic_fck); -pm_runtime_disable (&pdev->dev);/* remove children */
Signature · 1 line
1.8.3.2
PATCH v6 2/10 mfd: omap-usb-host: Get clocks based on hardware revision
In reply to Roger QuadrosNot all revisions have all the clocks so get the necessary clocks based on hardware revision.
This should avoid un-necessary clk_get failure messages that were observed earlier.
Be more strict and always fail on clk_get() error.
--- drivers/mfd/omap-usb-host.c | 92 +++++++++++++++++++++++++++++++-------------- 1 file changed, 64 insertions(+), 28 deletions(-)
drivers/mfd/omap-usb-host.c +64 -28
@@ -665,22 +665,41 @@ static int usbhs_omap_probe(struct platform_device *pdev) goto err_mem; } - need_logic_fck = false; +/* Set all clocks as invalid to begin with */ + omap->ehci_logic_fck = omap->init_60m_fclk =ERR_PTR (-ENODEV ); + omap->utmi_p1_gfclk = omap->utmi_p2_gfclk =ERR_PTR (-ENODEV ); + omap->xclk60mhsp1_ck = omap->xclk60mhsp2_ck =ERR_PTR (-ENODEV ); +for (i =0 ; i < omap->nports; i++) { -if (is_ehci_phy_mode (i) ||is_ehci_tll_mode (i) || -is_ehci_hsic_mode (i)) - need_logic_fck |= true; + omap->utmi_clk[i] =ERR_PTR (-ENODEV ); + omap->hsic480m_clk[i] =ERR_PTR (-ENODEV ); + omap->hsic60m_clk[i] =ERR_PTR (-ENODEV ); } - omap->ehci_logic_fck =ERR_PTR (-EINVAL ); -if (need_logic_fck) { - omap->ehci_logic_fck =devm_clk_get (dev,"ehci_logic_fck" ); -if (IS_ERR (omap->ehci_logic_fck)) { - ret =PTR_ERR (omap->ehci_logic_fck); -dev_dbg (dev,"ehci_logic_fck failed:%d\n" , ret); +/* for OMAP3 i.e. USBHS REV1 */ +if (omap->usbhs_rev ==OMAP_USBHS_REV1 ) { + need_logic_fck = false; +for (i =0 ; i < omap->nports; i++) { +if (is_ehci_phy_mode (pdata->port_mode[i]) || +is_ehci_tll_mode (pdata->port_mode[i]) || +is_ehci_hsic_mode (pdata->port_mode[i])) + + need_logic_fck |= true; + } + +if (need_logic_fck) { + omap->ehci_logic_fck =clk_get (dev,"usbhost_120m_fck" ); +if (IS_ERR (omap->ehci_logic_fck)) { + ret =PTR_ERR (omap->ehci_logic_fck); +dev_err (dev,"usbhost_120m_fck failed:%d\n" , + ret); + goto err_mem; + } } + goto initialize; } +/* for OMAP4+ i.e. USBHS REV2+ */ omap->utmi_p1_gfclk =devm_clk_get (dev,"utmi_p1_gfclk" );if (IS_ERR (omap->utmi_p1_gfclk)) { ret =PTR_ERR (omap->utmi_p1_gfclk);
@@ -728,54 +747,71 @@ static int usbhs_omap_probe(struct platform_device *pdev)* them */ omap->utmi_clk[i] =devm_clk_get (dev, clkname); -if (IS_ERR (omap->utmi_clk[i])) -dev_dbg (dev,"Failed to get clock : %s : %ld\n" , - clkname,PTR_ERR (omap->utmi_clk[i])); +if (IS_ERR (omap->utmi_clk[i])) { + ret =PTR_ERR (omap->utmi_clk[i]); +dev_err (dev,"Failed to get clock : %s : %d\n" , + clkname, ret); + goto err_mem; + }snprintf (clkname,sizeof (clkname),"usb_host_hs_hsic480m_p%d_clk" , i +1 ); omap->hsic480m_clk[i] =devm_clk_get (dev, clkname); -if (IS_ERR (omap->hsic480m_clk[i])) -dev_dbg (dev,"Failed to get clock : %s : %ld\n" , - clkname,PTR_ERR (omap->hsic480m_clk[i])); +if (IS_ERR (omap->hsic480m_clk[i])) { + ret =PTR_ERR (omap->hsic480m_clk[i]); +dev_err (dev,"Failed to get clock : %s : %d\n" , + clkname, ret); + goto err_mem; + }snprintf (clkname,sizeof (clkname),"usb_host_hs_hsic60m_p%d_clk" , i +1 ); omap->hsic60m_clk[i] =devm_clk_get (dev, clkname); -if (IS_ERR (omap->hsic60m_clk[i])) -dev_dbg (dev,"Failed to get clock : %s : %ld\n" , - clkname,PTR_ERR (omap->hsic60m_clk[i])); +if (IS_ERR (omap->hsic60m_clk[i])) { + ret =PTR_ERR (omap->hsic60m_clk[i]); +dev_err (dev,"Failed to get clock : %s : %d\n" , + clkname, ret); + goto err_mem; + } }if (is_ehci_phy_mode (pdata->port_mode[0 ])) { -/* for OMAP3, clk_set_parent fails */ ret =clk_set_parent (omap->utmi_p1_gfclk, omap->xclk60mhsp1_ck); -if (ret !=0 ) -dev_dbg (dev,"xclk60mhsp1_ck set parent failed: %d\n" , +if (ret !=0 ) { +dev_err (dev,"xclk60mhsp1_ck set parent failed: %d\n" , ret); + goto err_mem; + } }else if (is_ehci_tll_mode (pdata->port_mode[0 ])) { ret =clk_set_parent (omap->utmi_p1_gfclk, omap->init_60m_fclk); -if (ret !=0 ) -dev_dbg (dev,"P0 init_60m_fclk set parent failed: %d\n" , +if (ret !=0 ) { +dev_err (dev,"P0 init_60m_fclk set parent failed: %d\n" , ret); + goto err_mem; + } }if (is_ehci_phy_mode (pdata->port_mode[1 ])) { ret =clk_set_parent (omap->utmi_p2_gfclk, omap->xclk60mhsp2_ck); -if (ret !=0 ) -dev_dbg (dev,"xclk60mhsp2_ck set parent failed: %d\n" , +if (ret !=0 ) { +dev_err (dev,"xclk60mhsp2_ck set parent failed: %d\n" , ret); + goto err_mem; + } }else if (is_ehci_tll_mode (pdata->port_mode[1 ])) { ret =clk_set_parent (omap->utmi_p2_gfclk, omap->init_60m_fclk); -if (ret !=0 ) -dev_dbg (dev,"P1 init_60m_fclk set parent failed: %d\n" , +if (ret !=0 ) { +dev_err (dev,"P1 init_60m_fclk set parent failed: %d\n" , ret); + goto err_mem; + } } +initialize:omap_usbhs_init (dev);if (dev->of_node) {
Signature · 1 line
1.8.3.2
PATCH v6 3/10 mfd: omap-usb-host: Use clock names as per function for reference clocks
In reply to Roger QuadrosUse a meaningful name for the reference clocks so that it indicates the function.
--- drivers/mfd/omap-usb-host.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/mfd/omap-usb-host.c +3 -3
@@ -714,21 +714,21 @@ static int usbhs_omap_probe(struct platform_device *pdev) goto err_mem; } - omap->xclk60mhsp1_ck =devm_clk_get (dev,"xclk60mhsp1_ck" ); + omap->xclk60mhsp1_ck =devm_clk_get (dev,"refclk_60m_ext_p1" );if (IS_ERR (omap->xclk60mhsp1_ck)) { ret =PTR_ERR (omap->xclk60mhsp1_ck);dev_err (dev,"xclk60mhsp1_ck failed error:%d\n" , ret); goto err_mem; } - omap->xclk60mhsp2_ck =devm_clk_get (dev,"xclk60mhsp2_ck" ); + omap->xclk60mhsp2_ck =devm_clk_get (dev,"refclk_60m_ext_p2" );if (IS_ERR (omap->xclk60mhsp2_ck)) { ret =PTR_ERR (omap->xclk60mhsp2_ck);dev_err (dev,"xclk60mhsp2_ck failed error:%d\n" , ret); goto err_mem; } - omap->init_60m_fclk =devm_clk_get (dev,"init_60m_fclk" ); + omap->init_60m_fclk =devm_clk_get (dev,"refclk_60m_int" );if (IS_ERR (omap->init_60m_fclk)) { ret =PTR_ERR (omap->init_60m_fclk);dev_err (dev,"init_60m_fclk failed error:%d\n" , ret);
Signature · 1 line
1.8.3.2
PATCH v6 4/10 mfd: omap-usb-host: Update DT clock binding information
In reply to Roger QuadrosThe omap-usb-host driver expects certained named clocks. Add this information to the DT binding document.
--- .../devicetree/bindings/mfd/omap-usb-host.txt | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+)
Documentation/devicetree/bindings/mfd/omap-usb-host.txt +23 -0
@@ -32,6 +32,29 @@ Optional properties: - single-ulpi-bypass: Must be present if the controller contains a single ULPI bypass control bit. e.g. OMAP3 silicon <= ES2.1 +- clocks: a list of phandles and clock-specifier pairs, one for each entry in + clock-names. + +- clock-names: should include: + For OMAP3 + * "usbhost_120m_fck" - 120MHz Functional clock. + + For OMAP4+ + * "refclk_60m_int" - 60MHz internal reference clock for UTMI clock mux + * "refclk_60m_ext_p1" - 60MHz external ref. clock for Port 1's UTMI clock mux. + * "refclk_60m_ext_p2" - 60MHz external ref. clock for Port 2's UTMI clock mux + * "utmi_p1_gfclk" - Port 1 UTMI clock mux. + * "utmi_p2_gfclk" - Port 2 UTMI clock mux. + * "usb_host_hs_utmi_p1_clk" - Port 1 UTMI clock gate. + * "usb_host_hs_utmi_p2_clk" - Port 2 UTMI clock gate. + * "usb_host_hs_utmi_p3_clk" - Port 3 UTMI clock gate. + * "usb_host_hs_hsic480m_p1_clk" - Port 1 480MHz HSIC clock gate. + * "usb_host_hs_hsic480m_p2_clk" - Port 2 480MHz HSIC clock gate. + * "usb_host_hs_hsic480m_p3_clk" - Port 3 480MHz HSIC clock gate. + * "usb_host_hs_hsic60m_p1_clk" - Port 1 60MHz HSIC clock gate. + * "usb_host_hs_hsic60m_p2_clk" - Port 2 60MHz HSIC clock gate. + * "usb_host_hs_hsic60m_p3_clk" - Port 3 60MHz HSIC clock gate. + Required properties if child node exists: - #address-cells: Must be 1
Signature · 1 line
1.8.3.2
PATCH v6 5/10 mfd: omap-usb-tll: Update DT clock binding information
In reply to Roger QuadrosThe omap-usb-tll driver needs one clock for each TLL channel. Add this information to the DT binding document.
--- Documentation/devicetree/bindings/mfd/omap-usb-tll.txt | 10 ++++++++++ 1 file changed, 10 insertions(+)
Documentation/devicetree/bindings/mfd/omap-usb-tll.txt +10 -0
@@ -7,6 +7,16 @@ Required properties: - interrupts : should contain the TLL module's interrupt - ti,hwmod : must contain "usb_tll_hs" +Optional properties: + +- clocks: a list of phandles and clock-specifier pairs, one for each entry in + clock-names. + +- clock-names: should include: + * "usb_tll_hs_usb_ch0_clk" - USB TLL channel 0 clock + * "usb_tll_hs_usb_ch1_clk" - USB TLL channel 1 clock + * "usb_tll_hs_usb_ch2_clk" - USB TLL channel 2 clock + Example: usbhstll: usbhstll at 4a062000 {
Signature · 1 line
1.8.3.2
PATCH v6 6/10 ARM: dts: omap4: Update omap-usb-host node
In reply to Roger QuadrosThe omap-usb-host driver expects a certain name for internal and external reference clocks. Provide these clocks.
--- arch/arm/boot/dts/omap4.dtsi | 6 ++++++ 1 file changed, 6 insertions(+)
arch/arm/boot/dts/omap4.dtsi +6 -0
@@ -697,6 +697,12 @@ #address-cells = <1>; #size-cells = <1>; ranges; + clocks = <&init_60m_fclk>, + <&xclk60mhsp1_ck>, + <&xclk60mhsp2_ck>; + clock-names = "refclk_60m_int", + "refclk_60m_ext_p1", + "refclk_60m_ext_p2"; usbhsohci: ohci at 4a064800 { compatible = "ti,ohci-omap3", "usb-ohci";
Signature · 1 line
1.8.3.2
PATCH v6 7/10 ARM: dts: omap5: Update omap-usb-host node
In reply to Roger QuadrosThe omap-usb-host driver expects a certain name for internal and external reference clocks. Provide these clocks.
--- arch/arm/boot/dts/omap5.dtsi | 6 ++++++ 1 file changed, 6 insertions(+)
arch/arm/boot/dts/omap5.dtsi +6 -0
@@ -765,6 +765,12 @@ #address-cells = <1>; #size-cells = <1>; ranges; + clocks = <&l3init_60m_fclk>, + <&xclk60mhsp1_ck>, + <&xclk60mhsp2_ck>; + clock-names = "refclk_60m_int", + "refclk_60m_ext_p1", + "refclk_60m_ext_p2"; usbhsohci: ohci at 4a064800 { compatible = "ti,ohci-omap3", "usb-ohci";
Signature · 1 line
1.8.3.2
PATCH v6 8/10 ARM: dts: omap4-panda: Provide USB PHY clock
In reply to Roger QuadrosThe USB PHY gets its clock from AUXCLK3. Provide this information.
--- arch/arm/boot/dts/omap4-panda-common.dtsi | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
arch/arm/boot/dts/omap4-panda-common.dtsi +2 -6
@@ -83,12 +83,8 @@ compatible = "usb-nop-xceiv"; reset-gpios = <&gpio2 30 GPIO_ACTIVE_LOW>; /* gpio_62 */ vcc-supply = <&hsusb1_power>; - /** - * FIXME: - * put the right clock phandle here when available - * clocks = <&auxclk3>; - * clock-names = "main_clk"; - */ + clocks = <&auxclk3_ck>; + clock-names = "main_clk"; clock-frequency = <19200000>; };
Signature · 1 line
1.8.3.2
PATCH v6 9/10 ARM: dts: omap5-uevm: Provide USB PHY clock
In reply to Roger QuadrosThe HS USB 2 PHY gets its clock from AUXCLK1. Provide this information.
--- arch/arm/boot/dts/omap5-uevm.dts | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
arch/arm/boot/dts/omap5-uevm.dts +2 -6
@@ -31,12 +31,8 @@ hsusb2_phy: hsusb2_phy { compatible = "usb-nop-xceiv"; reset-gpios = <&gpio3 16 GPIO_ACTIVE_LOW>; /* gpio3_80 HUB_NRESET */ - /** - * FIXME - * Put the right clock phandle here when available - * clocks = <&auxclk1>; - * clock-names = "main_clk"; - */ + clocks = <&auxclk1_ck>; + clock-names = "main_clk"; clock-frequency = <19200000>; };
Signature · 1 line
1.8.3.2
PATCH v6 10/10 ARM: OMAP2+: Remove legacy_init_ehci_clk()
In reply to Roger QuadrosThe necessary clock phandle for the EHCI clock is now provided via device tree so we no longer need this legacy method.
--- arch/arm/mach-omap2/pdata-quirks.c | 16 ---------------- 1 file changed, 16 deletions(-)
arch/arm/mach-omap2/pdata-quirks.c +0 -16
@@ -26,20 +26,6 @@ struct pdata_init {void (*fn)(void ); }; -/* -* Create alias for USB host PHY clock. -* Remove this when clock phandle can be provided via DT -*/ -static void __init __used legacy_init_ehci_clk (char *clkname) -{ -int ret; - - ret =clk_add_alias ("main_clk" ,NULL , clkname,NULL ); -if (ret) -pr_err ("%s:Failed to add main_clk alias to %s :%d\n" , - __func__, clkname, ret); -} -#if IS_ENABLED (CONFIG_WL12XX )static struct wl12xx_platform_data wl12xx__initdata ;
@@ -105,7 +91,6 @@ static void __init omap4_sdp_legacy_init(void)static void __init omap4_panda_legacy_init (void ) {omap4_panda_display_init_of (); -legacy_init_ehci_clk ("auxclk3_ck" );legacy_init_wl12xx (WL12XX_REFCLOCK_38 ,0 ,53 ); }#endif
@@ -113,7 +98,6 @@ static void __init omap4_panda_legacy_init(void)#ifdef CONFIG_SOC_OMAP5 static void __init omap5_uevm_legacy_init (void ) { -legacy_init_ehci_clk ("auxclk1_ck" ); }#endif
Signature · 1 line
1.8.3.2
Quoted 2 lines
This patchset brings up USB Host ports and Ethernet port on the OMAP5 uEVM board.
I'd keep hold of this and send it out again when the merge-window is closed.
Signature · 4 lines
Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org ? Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog