diff options
| author | Mark Brown <broonie@kernel.org> | 2021-10-07 23:35:27 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-10-07 23:35:27 +0200 |
| commit | 5fe7bd5a37ff0d77936f8e38313db5da2dd53f70 (patch) | |
| tree | 5012e70d0993aa23466e06012d2bfb98ba04aa29 /Documentation | |
| parent | spi: fsi: Print status on error (diff) | |
| parent | spi: spi-nxp-fspi: don't depend on a specific node name erratum workaround (diff) | |
| download | linux-5fe7bd5a37ff0d77936f8e38313db5da2dd53f70.tar.xz linux-5fe7bd5a37ff0d77936f8e38313db5da2dd53f70.zip | |
Merge branch 'spi-5.15' into spi-5.16
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/core-api/irq/irq-domain.rst | 5 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.yaml | 2 | ||||
| -rw-r--r-- | Documentation/networking/device_drivers/ethernet/intel/ice.rst | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/Documentation/core-api/irq/irq-domain.rst b/Documentation/core-api/irq/irq-domain.rst index 6979b4af2c1f..9c0e8758037a 100644 --- a/Documentation/core-api/irq/irq-domain.rst +++ b/Documentation/core-api/irq/irq-domain.rst @@ -175,9 +175,10 @@ for IRQ numbers that are passed to struct device registrations. In that case the Linux IRQ numbers cannot be dynamically assigned and the legacy mapping should be used. -As the name implies, the *_legacy() functions are deprecated and only +As the name implies, the \*_legacy() functions are deprecated and only exist to ease the support of ancient platforms. No new users should be -added. +added. Same goes for the \*_simple() functions when their use results +in the legacy behaviour. The legacy map assumes a contiguous range of IRQ numbers has already been allocated for the controller and that the IRQ number can be diff --git a/Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.yaml b/Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.yaml index ca91201a9926..d7e08b03e204 100644 --- a/Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.yaml +++ b/Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.yaml @@ -171,7 +171,7 @@ examples: cs-gpios = <&gpio0 13 0>, <&gpio0 14 0>; rx-sample-delay-ns = <3>; - spi-flash@1 { + flash@1 { compatible = "spi-nand"; reg = <1>; rx-sample-delay-ns = <7>; diff --git a/Documentation/networking/device_drivers/ethernet/intel/ice.rst b/Documentation/networking/device_drivers/ethernet/intel/ice.rst index e7d9cbff771b..67b7a701ce9e 100644 --- a/Documentation/networking/device_drivers/ethernet/intel/ice.rst +++ b/Documentation/networking/device_drivers/ethernet/intel/ice.rst @@ -851,7 +851,7 @@ NOTES: - 0x88A8 traffic will not be received unless VLAN stripping is disabled with the following command:: - # ethool -K <ethX> rxvlan off + # ethtool -K <ethX> rxvlan off - 0x88A8/0x8100 double VLANs cannot be used with 0x8100 or 0x8100/0x8100 VLANS configured on the same port. 0x88a8/0x8100 traffic will not be received if |