From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 14 May 2024 21:41:01 +0000 (-0700)
Subject: Merge tag 'spi-v6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi
X-Git-Tag: Ubuntu-6.11.0-9.9~1491
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=e2b4a5bf32ffd0f5964e9949a82232fe5363b123;p=mirror_ubuntu-kernels.git

Merge tag 'spi-v6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi

Pull spi updates from Mark Brown:
 "The diffstat for this release is dominated by the new Airoha driver,
  mainly as a result of this being a generally quite quiet release.
  There were a couple of cleanups in the core but nothing substantial,
  the updates here are almost all driver specific ones.

   - Support for multi-word mode in the OMAP2 McSPI driver

   - Overhaul of the PXA2xx driver, mostly API updates

   - A number of DT binding conversions

   - Support for Airoha NAND controllers, Cirrus Logic CS35L56, Mobileye
     EYEQ5 and Renesas R8A779H0"

* tag 'spi-v6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi: (87 commits)
  spi: dw: Bail out early on unsupported target mode
  spi: Remove unneded check for orig_nents
  MAINTAINERS: repair file entry in AIROHA SPI SNFI DRIVER
  spi: pxa2xx: Drop the stale entry in documentation TOC
  spi: pxa2xx: Don't provide struct chip_data for others
  spi: pxa2xx: Remove timeout field from struct chip_data
  spi: pxa2xx: Remove DMA parameters from struct chip_data
  spi: pxa2xx: Drop struct pxa2xx_spi_chip
  spi: pxa2xx: Don't use "proxy" headers
  spi: pxa2xx: Remove outdated documentation
  spi: pxa2xx: Move contents of linux/spi/pxa2xx_spi.h to a local one
  spi: pxa2xx: Provide num-cs for Sharp PDAs via device properties
  spi: pxa2xx: Allow number of chip select pins to be read from property
  spi: dt-bindings: ti,qspi: convert to dtschema
  spi: bitbang: Add missing MODULE_DESCRIPTION()
  spi: bitbang: Use NSEC_PER_*SEC rather than hard coding
  spi: dw: Drop default number of CS setting
  spi: dw: Convert dw_spi::num_cs to u32
  spi: dw: Add a number of native CS auto-detection
  spi: dw: Convert to using BITS_TO_BYTES() macro
  ...
---

e2b4a5bf32ffd0f5964e9949a82232fe5363b123
diff --cc include/linux/gpio/property.h
index 1a14e239221f,832a60c2e0b9..0d2209308002
--- a/include/linux/gpio/property.h
+++ b/include/linux/gpio/property.h
@@@ -2,8 -2,11 +2,10 @@@
  #ifndef __LINUX_GPIO_PROPERTY_H
  #define __LINUX_GPIO_PROPERTY_H
  
 -#include <dt-bindings/gpio/gpio.h> /* for GPIO_* flags */
  #include <linux/property.h>
  
+ struct software_node;
+ 
  #define PROPERTY_ENTRY_GPIO(_name_, _chip_node_, _idx_, _flags_) \
  	PROPERTY_ENTRY_REF(_name_, _chip_node_, _idx_, _flags_)