Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7fd57ab9 authored by Steven J. Hill's avatar Steven J. Hill Committed by Ralf Baechle
Browse files

MIPS: Octeon: Fix compile error when USB is not enabled. 



Move all USB platform code to one place within the file.

Signed-off-by: default avatarSteven J. Hill <Steven.Hill@cavium.com>
Acked-by: default avatarDavid Daney <david.daney@cavium.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/15406/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 930cbb73

arch/mips/cavium-octeon/octeon-platform.c

+49 −48
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
 * License.  See the file "COPYING" in the main directory of this archive

 * for more details.

 *

 * Copyright (C) 2004-2016 Cavium Networks

 * Copyright (C) 2004-2017 Cavium, Inc.

 * Copyright (C) 2008 Wind River Systems

 */
@@ -13,61 +13,19 @@ 
#include <linux/of_platform.h>

#include <linux/of_fdt.h>

#include <linux/libfdt.h>

#include <linux/usb/ehci_def.h>

#include <linux/usb/ehci_pdriver.h>

#include <linux/usb/ohci_pdriver.h>



#include <asm/octeon/octeon.h>

#include <asm/octeon/cvmx-helper-board.h>



#ifdef CONFIG_USB

#include <linux/usb/ehci_def.h>

#include <linux/usb/ehci_pdriver.h>

#include <linux/usb/ohci_pdriver.h>

#include <asm/octeon/cvmx-uctlx-defs.h>



#define CVMX_UAHCX_EHCI_USBCMD	(CVMX_ADD_IO_SEG(0x00016F0000000010ull))

#define CVMX_UAHCX_OHCI_USBCMD	(CVMX_ADD_IO_SEG(0x00016F0000000408ull))



/* Octeon Random Number Generator.  */

static int __init octeon_rng_device_init(void)

{

	struct platform_device *pd;

	int ret = 0;



	struct resource rng_resources[] = {

		{

			.flags	= IORESOURCE_MEM,

			.start	= XKPHYS_TO_PHYS(CVMX_RNM_CTL_STATUS),

			.end	= XKPHYS_TO_PHYS(CVMX_RNM_CTL_STATUS) + 0xf

		}, {

			.flags	= IORESOURCE_MEM,

			.start	= cvmx_build_io_address(8, 0),

			.end	= cvmx_build_io_address(8, 0) + 0x7

		}

	};



	pd = platform_device_alloc("octeon_rng", -1);

	if (!pd) {

		ret = -ENOMEM;

		goto out;

	}



	ret = platform_device_add_resources(pd, rng_resources,

					    ARRAY_SIZE(rng_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_rng_device_init);



#ifdef CONFIG_USB



static DEFINE_MUTEX(octeon2_usb_clocks_mutex);



static int octeon2_usb_clock_start_cnt;
@@ -440,6 +398,47 @@ device_initcall(octeon_ohci_device_init); 


#endif /* CONFIG_USB */



/* Octeon Random Number Generator.  */

static int __init octeon_rng_device_init(void)

{

	struct platform_device *pd;

	int ret = 0;



	struct resource rng_resources[] = {

		{

			.flags	= IORESOURCE_MEM,

			.start	= XKPHYS_TO_PHYS(CVMX_RNM_CTL_STATUS),

			.end	= XKPHYS_TO_PHYS(CVMX_RNM_CTL_STATUS) + 0xf

		}, {

			.flags	= IORESOURCE_MEM,

			.start	= cvmx_build_io_address(8, 0),

			.end	= cvmx_build_io_address(8, 0) + 0x7

		}

	};



	pd = platform_device_alloc("octeon_rng", -1);

	if (!pd) {

		ret = -ENOMEM;

		goto out;

	}



	ret = platform_device_add_resources(pd, rng_resources,

					    ARRAY_SIZE(rng_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_rng_device_init);



static struct of_device_id __initdata octeon_ids[] = {

	{ .compatible = "simple-bus", },
@@ -1004,6 +1003,7 @@ int __init octeon_prune_device_tree(void) 
		;

	}



#ifdef CONFIG_USB

	/* OHCI/UHCI USB */

	alias_prop = fdt_getprop(initial_boot_params, aliases,

				 "uctl", NULL);
@@ -1052,6 +1052,7 @@ int __init octeon_prune_device_tree(void) 
			}

		}

	}

#endif



	return 0;

}