ARM: davinci: omapl138-hawk: remove legacy usb helpers (2435854e) · Commits · 戴 / test

arch/arm/mach-davinci/board-omapl138-hawk.c

+1 −74

Original line number	Diff line number	Diff line
		@@ -294,9 +294,6 @@ static int omapl138_hawk_register_aemif(void)
		return platform_device_register(&omapl138_hawk_aemif_device);
		}

		static irqreturn_t omapl138_hawk_usb_ocic_irq(int irq, void *dev_id);
		static da8xx_ocic_handler_t hawk_usb_ocic_handler;

		static const short da850_hawk_usb11_pins[] = {
		DA850_GPIO2_4, DA850_GPIO6_13,
		-1
		@@ -310,58 +307,11 @@ static struct gpiod_lookup_table hawk_usb_gpio_lookup = {
		},
		};

		static int hawk_usb_set_power(unsigned port, int on)
		{
		gpio_set_value(DA850_USB1_VBUS_PIN, on);
		return 0;
		}

		static int hawk_usb_get_power(unsigned port)
		{
		return gpio_get_value(DA850_USB1_VBUS_PIN);
		}

		static int hawk_usb_get_oci(unsigned port)
		{
		return !gpio_get_value(DA850_USB1_OC_PIN);
		}

		static int hawk_usb_ocic_notify(da8xx_ocic_handler_t handler)
		{
		int irq = gpio_to_irq(DA850_USB1_OC_PIN);
		int error = 0;

		if (handler != NULL) {
		hawk_usb_ocic_handler = handler;

		error = request_irq(irq, omapl138_hawk_usb_ocic_irq,
		IRQF_TRIGGER_RISING \|
		IRQF_TRIGGER_FALLING,
		"OHCI over-current indicator", NULL);
		if (error)
		pr_err("%s: could not request IRQ to watch "
		"over-current indicator changes\n", __func__);
		} else {
		free_irq(irq, NULL);
		}
		return error;
		}

		static struct da8xx_ohci_root_hub omapl138_hawk_usb11_pdata = {
		.set_power = hawk_usb_set_power,
		.get_power = hawk_usb_get_power,
		.get_oci = hawk_usb_get_oci,
		.ocic_notify = hawk_usb_ocic_notify,
		/* TPS2087 switch @ 5V */
		.potpgt = (3 + 1) / 2, /* 3 ms max */
		};

		static irqreturn_t omapl138_hawk_usb_ocic_irq(int irq, void *dev_id)
		{
		hawk_usb_ocic_handler(&omapl138_hawk_usb11_pdata, 1);
		return IRQ_HANDLED;
		}

		static __init void omapl138_hawk_usb_init(void)
		{
		int ret;
		@@ -382,36 +332,13 @@ static __init void omapl138_hawk_usb_init(void)
		pr_warn("%s: USB PHY registration failed: %d\n",
		__func__, ret);

		ret = gpio_request_one(DA850_USB1_VBUS_PIN,
		GPIOF_DIR_OUT, "USB1 VBUS");
		if (ret < 0) {
		pr_err("%s: failed to request GPIO for USB 1.1 port "
		"power control: %d\n", __func__, ret);
		return;
		}

		ret = gpio_request_one(DA850_USB1_OC_PIN,
		GPIOF_DIR_IN, "USB1 OC");
		if (ret < 0) {
		pr_err("%s: failed to request GPIO for USB 1.1 port "
		"over-current indicator: %d\n", __func__, ret);
		goto usb11_setup_oc_fail;
		}

		gpiod_add_lookup_table(&hawk_usb_gpio_lookup);

		ret = da8xx_register_usb11(&omapl138_hawk_usb11_pdata);
		if (ret) {
		if (ret)
		pr_warn("%s: USB 1.1 registration failed: %d\n", __func__, ret);
		goto usb11_setup_fail;
		}

		return;

		usb11_setup_fail:
		gpio_free(DA850_USB1_OC_PIN);
		usb11_setup_oc_fail:
		gpio_free(DA850_USB1_VBUS_PIN);
		}

		static __init void omapl138_hawk_init(void)

Admin message