From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 13 Jan 2025 05:17:49 +0000 (+0100)
Subject: Merge 6.13-rc4 into char-misc-next
X-Git-Tag: v6.14-rc1~67^2~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be887fcad3f18031232eabcb398d009a3fc3ef61;p=thirdparty%2Flinux.git

Merge 6.13-rc4 into char-misc-next

We need the IIO fixes in here as well, and it resolves a merge conflict
in:
	drivers/iio/adc/ti-ads1119.c

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

be887fcad3f18031232eabcb398d009a3fc3ef61
diff --cc drivers/iio/adc/ti-ads1119.c
index 0a68ecdea4e6f,c268e27eec123..de019b3faa481
--- a/drivers/iio/adc/ti-ads1119.c
+++ b/drivers/iio/adc/ti-ads1119.c
@@@ -500,8 -500,8 +500,8 @@@ static irqreturn_t ads1119_trigger_hand
  	struct iio_dev *indio_dev = pf->indio_dev;
  	struct ads1119_state *st = iio_priv(indio_dev);
  	struct {
- 		unsigned int sample;
+ 		s16 sample;
 -		s64 timestamp __aligned(8);
 +		aligned_s64 timestamp;
  	} scan;
  	unsigned int index;
  	int ret;
diff --cc drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gpio.c
index 97c7dbe43377b,3c1359d8d4e69..04756302b8780
--- a/drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gpio.c
+++ b/drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gpio.c
@@@ -147,11 -147,8 +147,11 @@@ static int pci1xxxx_gpio_set_config(str
  	case PIN_CONFIG_DRIVE_OPEN_DRAIN:
  		pci1xxx_assign_bit(priv->reg_base, OPENDRAIN_OFFSET(offset), (offset % 32), true);
  		break;
 +	case PIN_CONFIG_DRIVE_PUSH_PULL:
 +		pci1xxx_assign_bit(priv->reg_base, OPENDRAIN_OFFSET(offset), (offset % 32), false);
 +		break;
  	default:
- 		ret = -EOPNOTSUPP;
+ 		ret = -ENOTSUPP;
  		break;
  	}
  	spin_unlock_irqrestore(&priv->lock, flags);