Commit 793bef57 authored by Ladislav Michl's avatar Ladislav Michl Committed by Thomas Bogendoerfer
Browse files

MIPS: OCTEON: octeon-usb: move gpio config to separate function 



Power gpio configuration is using Octeon specific code, so
move it to separate function, that can later be guarded
with ifdefs.

Signed-off-by: default avatarLadislav Michl <ladis@linux-mips.org>
Signed-off-by: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
parent 940692c6

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

+25 −20
Original line number Diff line number Diff line
@@ -197,29 +197,10 @@ static DEFINE_MUTEX(dwc3_octeon_clocks_mutex); 
static uint8_t clk_div[OCTEON_H_CLKDIV_SEL] = {1, 2, 4, 6, 8, 16, 24, 32};





static int dwc3_octeon_config_power(struct device *dev, u64 base)

static void dwc3_octeon_config_gpio(int index, int gpio)

{

	union cvmx_gpio_bit_cfgx gpio_bit;

	uint32_t gpio_pwr[3];

	int gpio, len, power_active_low;

	struct device_node *node = dev->of_node;

	int index = (base >> 24) & 1;

	u64 val;

	u64 uctl_host_cfg_reg = base + USBDRD_UCTL_HOST_CFG;



	if (of_find_property(node, "power", &len) != NULL) {

		if (len == 12) {

			of_property_read_u32_array(node, "power", gpio_pwr, 3);

			power_active_low = gpio_pwr[2] & 0x01;

			gpio = gpio_pwr[1];

		} else if (len == 8) {

			of_property_read_u32_array(node, "power", gpio_pwr, 2);

			power_active_low = 0;

			gpio = gpio_pwr[1];

		} else {

			dev_err(dev, "invalid power configuration\n");

			return -EINVAL;

		}

	if ((OCTEON_IS_MODEL(OCTEON_CN73XX) ||

	    OCTEON_IS_MODEL(OCTEON_CNF75XX))

	    && gpio <= 31) {
@@ -238,6 +219,30 @@ static int dwc3_octeon_config_power(struct device *dev, u64 base) 
		gpio_bit.s.output_sel = (index == 0 ? 0x14 : 0x19);

		cvmx_write_csr(CVMX_GPIO_XBIT_CFGX(gpio), gpio_bit.u64);

	}

}



static int dwc3_octeon_config_power(struct device *dev, u64 base)

{

	uint32_t gpio_pwr[3];

	int gpio, len, power_active_low;

	struct device_node *node = dev->of_node;

	u64 val;

	u64 uctl_host_cfg_reg = base + USBDRD_UCTL_HOST_CFG;



	if (of_find_property(node, "power", &len) != NULL) {

		if (len == 12) {

			of_property_read_u32_array(node, "power", gpio_pwr, 3);

			power_active_low = gpio_pwr[2] & 0x01;

			gpio = gpio_pwr[1];

		} else if (len == 8) {

			of_property_read_u32_array(node, "power", gpio_pwr, 2);

			power_active_low = 0;

			gpio = gpio_pwr[1];

		} else {

			dev_err(dev, "invalid power configuration\n");

			return -EINVAL;

		}

		dwc3_octeon_config_gpio((base >> 24) & 1, gpio);



		/* Enable XHCI power control and set if active high or low. */

		val = cvmx_read_csr(uctl_host_cfg_reg);