Merge tag 'usb-serial-5.4-rc1' of... (11c302f2) · Commits · 戴 / test

drivers/usb/serial/ftdi_sio.c

+43 −0

Original line number	Diff line number	Diff line
		@@ -2023,6 +2023,46 @@ static int ftdi_read_eeprom(struct usb_serial serial, void dst, u16 addr,
		return 0;
		}

		static int ftdi_gpio_init_ft232h(struct usb_serial_port *port)
		{
		struct ftdi_private *priv = usb_get_serial_port_data(port);
		u16 cbus_config;
		u8 *buf;
		int ret;
		int i;

		buf = kmalloc(4, GFP_KERNEL);
		if (!buf)
		return -ENOMEM;

		ret = ftdi_read_eeprom(port->serial, buf, 0x1a, 4);
		if (ret < 0)
		goto out_free;

		/*
		* FT232H CBUS Memory Map
		*
		* 0x1a: X- (upper nibble -> AC5)
		* 0x1b: -X (lower nibble -> AC6)
		* 0x1c: XX (upper nibble -> AC9 \| lower nibble -> AC8)
		*/
		cbus_config = buf[2] << 8 \| (buf[1] & 0xf) << 4 \| (buf[0] & 0xf0) >> 4;

		priv->gc.ngpio = 4;
		priv->gpio_altfunc = 0xff;

		for (i = 0; i < priv->gc.ngpio; ++i) {
		if ((cbus_config & 0xf) == FTDI_FTX_CBUS_MUX_GPIO)
		priv->gpio_altfunc &= ~BIT(i);
		cbus_config >>= 4;
		}

		out_free:
		kfree(buf);

		return ret;
		}

		static int ftdi_gpio_init_ft232r(struct usb_serial_port *port)
		{
		struct ftdi_private *priv = usb_get_serial_port_data(port);
		@@ -2098,6 +2138,9 @@ static int ftdi_gpio_init(struct usb_serial_port *port)
		int result;

		switch (priv->chip_type) {
		case FT232H:
		result = ftdi_gpio_init_ft232h(port);
		break;
		case FT232RL:
		result = ftdi_gpio_init_ft232r(port);
		break;