From: David Daney <[email protected]> The device tree will *always* have correct ehci/ohci clock configuration, so use it. This allows us to remove a big chunk of platform configuration code from octeon-platform.c.
Tested-by: Alex Smith <[email protected]> Signed-off-by: David Daney <[email protected]> Signed-off-by: Alex Smith <[email protected]> Cc: [email protected] --- arch/mips/cavium-octeon/octeon-platform.c | 102 ------------------------------ drivers/usb/host/ehci-octeon.c | 17 +++-- drivers/usb/host/octeon2-common.c | 47 ++++++++++++-- drivers/usb/host/ohci-octeon.c | 17 +++-- 4 files changed, 69 insertions(+), 114 deletions(-) diff --git a/arch/mips/cavium-octeon/octeon-platform.c b/arch/mips/cavium-octeon/octeon-platform.c index 6df0f4d..f8cced4 100644 --- a/arch/mips/cavium-octeon/octeon-platform.c +++ b/arch/mips/cavium-octeon/octeon-platform.c @@ -66,108 +66,6 @@ out: } device_initcall(octeon_rng_device_init); -#ifdef CONFIG_USB - -static int __init octeon_ehci_device_init(void) -{ - struct platform_device *pd; - int ret = 0; - - struct resource usb_resources[] = { - { - .flags = IORESOURCE_MEM, - }, { - .flags = IORESOURCE_IRQ, - } - }; - - /* Only Octeon2 has ehci/ohci */ - if (!OCTEON_IS_MODEL(OCTEON_CN63XX)) - return 0; - - if (octeon_is_simulation() || usb_disabled()) - return 0; /* No USB in the simulator. */ - - pd = platform_device_alloc("octeon-ehci", 0); - if (!pd) { - ret = -ENOMEM; - goto out; - } - - usb_resources[0].start = 0x00016F0000000000ULL; - usb_resources[0].end = usb_resources[0].start + 0x100; - - usb_resources[1].start = OCTEON_IRQ_USB0; - usb_resources[1].end = OCTEON_IRQ_USB0; - - ret = platform_device_add_resources(pd, usb_resources, - ARRAY_SIZE(usb_resources)); - if (ret) - goto fail; - - ret = platform_device_add(pd); - if (ret) - goto fail; - - return ret; -fail: - platform_device_put(pd); -out: - return ret; -} -device_initcall(octeon_ehci_device_init); - -static int __init octeon_ohci_device_init(void) -{ - struct platform_device *pd; - int ret = 0; - - struct resource usb_resources[] = { - { - .flags = IORESOURCE_MEM, - }, { - .flags = IORESOURCE_IRQ, - } - }; - - /* Only Octeon2 has ehci/ohci */ - if (!OCTEON_IS_MODEL(OCTEON_CN63XX)) - return 0; - - if (octeon_is_simulation() || usb_disabled()) - return 0; /* No USB in the simulator. */ - - pd = platform_device_alloc("octeon-ohci", 0); - if (!pd) { - ret = -ENOMEM; - goto out; - } - - usb_resources[0].start = 0x00016F0000000400ULL; - usb_resources[0].end = usb_resources[0].start + 0x100; - - usb_resources[1].start = OCTEON_IRQ_USB0; - usb_resources[1].end = OCTEON_IRQ_USB0; - - ret = platform_device_add_resources(pd, usb_resources, - ARRAY_SIZE(usb_resources)); - if (ret) - goto fail; - - ret = platform_device_add(pd); - if (ret) - goto fail; - - return ret; -fail: - platform_device_put(pd); -out: - return ret; -} -device_initcall(octeon_ohci_device_init); - -#endif /* CONFIG_USB */ - static struct of_device_id __initdata octeon_ids[] = { { .compatible = "simple-bus", }, { .compatible = "cavium,octeon-6335-uctl", }, diff --git a/drivers/usb/host/ehci-octeon.c b/drivers/usb/host/ehci-octeon.c index 9051439..e1a264f5 100644 --- a/drivers/usb/host/ehci-octeon.c +++ b/drivers/usb/host/ehci-octeon.c @@ -19,14 +19,14 @@ #define OCTEON_EHCI_HCD_NAME "octeon-ehci" /* Common clock init code. */ -void octeon2_usb_clocks_start(void); +void octeon2_usb_clocks_start(struct device *dev); void octeon2_usb_clocks_stop(void); -static void ehci_octeon_start(void) +static void ehci_octeon_start(struct device *dev) { union cvmx_uctlx_ehci_ctl ehci_ctl; - octeon2_usb_clocks_start(); + octeon2_usb_clocks_start(dev); ehci_ctl.u64 = cvmx_read_csr(CVMX_UCTLX_EHCI_CTL(0)); /* Use 64-bit addressing. */ @@ -134,7 +134,7 @@ static int ehci_octeon_drv_probe(struct platform_device *pdev) goto err1; } - ehci_octeon_start(); + ehci_octeon_start(&pdev->dev); ehci = hcd_to_ehci(hcd); @@ -175,6 +175,14 @@ static int ehci_octeon_drv_remove(struct platform_device *pdev) return 0; } +static struct of_device_id ehci_octeon_match[] = { + { + .compatible = "cavium,octeon-6335-ehci", + }, + {}, +}; +MODULE_DEVICE_TABLE(of, ehci_octeon_match); + static struct platform_driver ehci_octeon_driver = { .probe = ehci_octeon_drv_probe, .remove = ehci_octeon_drv_remove, @@ -182,6 +190,7 @@ static struct platform_driver ehci_octeon_driver = { .driver = { .name = OCTEON_EHCI_HCD_NAME, .owner = THIS_MODULE, + .of_match_table = ehci_octeon_match, } }; diff --git a/drivers/usb/host/octeon2-common.c b/drivers/usb/host/octeon2-common.c index d9df423..3c7c13a 100644 --- a/drivers/usb/host/octeon2-common.c +++ b/drivers/usb/host/octeon2-common.c @@ -6,9 +6,11 @@ * Copyright (C) 2010, 2011 Cavium Networks */ +#include <linux/device.h> #include <linux/module.h> #include <linux/mutex.h> #include <linux/delay.h> +#include <linux/of.h> #include <asm/octeon/octeon.h> #include <asm/octeon/cvmx-uctlx-defs.h> @@ -17,13 +19,15 @@ static DEFINE_MUTEX(octeon2_usb_clocks_mutex); static int octeon2_usb_clock_start_cnt; -void octeon2_usb_clocks_start(void) +void octeon2_usb_clocks_start(struct device *dev) { u64 div; union cvmx_uctlx_if_ena if_ena; union cvmx_uctlx_clk_rst_ctl clk_rst_ctl; union cvmx_uctlx_uphy_ctl_status uphy_ctl_status; union cvmx_uctlx_uphy_portx_ctl_status port_ctl_status; + u32 clock_rate = 12000000; + bool is_crystal_clock = false; int i; unsigned long io_clk_64_to_ns; @@ -36,6 +40,28 @@ void octeon2_usb_clocks_start(void) io_clk_64_to_ns = 64000000000ull / octeon_get_io_clock_rate(); + if (dev->of_node) { + struct device_node *uctl_node; + const char *clock_type; + + uctl_node = of_get_parent(dev->of_node); + if (!uctl_node) { + dev_err(dev, "No UCTL device node\n"); + goto exit; + } + i = of_property_read_u32(uctl_node, + "refclk-frequency", &clock_rate); + if (i) { + dev_err(dev, "No UCTL \"refclk-frequency\"\n"); + goto exit; + } + i = of_property_read_string(uctl_node, + "refclk-type", &clock_type); + + if (!i && strcmp("crystal", clock_type) == 0) + is_crystal_clock = true; + } + /* * Step 1: Wait for voltages stable. That surely happened * before starting the kernel. @@ -66,9 +92,22 @@ void octeon2_usb_clocks_start(void) cvmx_write_csr(CVMX_UCTLX_CLK_RST_CTL(0), clk_rst_ctl.u64); /* 3b */ - /* 12MHz crystal. */ - clk_rst_ctl.s.p_refclk_sel = 0; - clk_rst_ctl.s.p_refclk_div = 0; + clk_rst_ctl.s.p_refclk_sel = is_crystal_clock ? 0 : 1; + switch (clock_rate) { + default: + pr_err("Invalid UCTL clock rate of %u, using 12000000 instead\n", + clock_rate); + /* Fall through */ + case 12000000: + clk_rst_ctl.s.p_refclk_div = 0; + break; + case 24000000: + clk_rst_ctl.s.p_refclk_div = 1; + break; + case 48000000: + clk_rst_ctl.s.p_refclk_div = 2; + break; + } cvmx_write_csr(CVMX_UCTLX_CLK_RST_CTL(0), clk_rst_ctl.u64); /* 3c */ diff --git a/drivers/usb/host/ohci-octeon.c b/drivers/usb/host/ohci-octeon.c index 15af895..2127290 100644 --- a/drivers/usb/host/ohci-octeon.c +++ b/drivers/usb/host/ohci-octeon.c @@ -19,14 +19,14 @@ #define OCTEON_OHCI_HCD_NAME "octeon-ohci" /* Common clock init code. */ -void octeon2_usb_clocks_start(void); +void octeon2_usb_clocks_start(struct device *dev); void octeon2_usb_clocks_stop(void); -static void ohci_octeon_hw_start(void) +static void ohci_octeon_hw_start(struct device *dev) { union cvmx_uctlx_ohci_ctl ohci_ctl; - octeon2_usb_clocks_start(); + octeon2_usb_clocks_start(dev); ohci_ctl.u64 = cvmx_read_csr(CVMX_UCTLX_OHCI_CTL(0)); ohci_ctl.s.l2c_addr_msb = 0; @@ -144,7 +144,7 @@ static int ohci_octeon_drv_probe(struct platform_device *pdev) goto err1; } - ohci_octeon_hw_start(); + ohci_octeon_hw_start(&pdev->dev); hcd->regs = reg_base; @@ -189,6 +189,14 @@ static int ohci_octeon_drv_remove(struct platform_device *pdev) return 0; } +static struct of_device_id ohci_octeon_match[] = { + { + .compatible = "cavium,octeon-6335-ohci", + }, + {}, +}; +MODULE_DEVICE_TABLE(of, ohci_octeon_match); + static struct platform_driver ohci_octeon_driver = { .probe = ohci_octeon_drv_probe, .remove = ohci_octeon_drv_remove, @@ -196,6 +204,7 @@ static struct platform_driver ohci_octeon_driver = { .driver = { .name = OCTEON_OHCI_HCD_NAME, .owner = THIS_MODULE, + .of_match_table = ohci_octeon_match, } }; -- 1.9.3 -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
