Message ID | 20230624082054.37697-1-krzysztof.kozlowski@linaro.org |
---|---|
State | Accepted |
Commit | e884a133340a470070b2c59833c9ff87aa6517ba |
Headers | show |
Series | spi: dt-bindings: atmel,at91rm9200-spi: fix broken sam9x7 compatible | expand |
On Sat, 24 Jun 2023 10:20:54 +0200, Krzysztof Kozlowski wrote: > Commit a3eb95484f27 ("spi: dt-bindings: atmel,at91rm9200-spi: add sam9x7 > compatible") adding sam9x7 compatible did not make any sense as it added > new compatible into middle of existing compatible list. The intention > was probably to add new set of compatibles with sam9x7 as first one. > > Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next Thanks! [1/1] spi: dt-bindings: atmel,at91rm9200-spi: fix broken sam9x7 compatible commit: e884a133340a470070b2c59833c9ff87aa6517ba All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
diff --git a/Documentation/devicetree/bindings/spi/atmel,at91rm9200-spi.yaml b/Documentation/devicetree/bindings/spi/atmel,at91rm9200-spi.yaml index bdc42eeacba4..58367587bfbc 100644 --- a/Documentation/devicetree/bindings/spi/atmel,at91rm9200-spi.yaml +++ b/Documentation/devicetree/bindings/spi/atmel,at91rm9200-spi.yaml @@ -19,7 +19,10 @@ properties: - const: atmel,at91rm9200-spi - items: - const: microchip,sam9x60-spi + - const: atmel,at91rm9200-spi + - items: - const: microchip,sam9x7-spi + - const: microchip,sam9x60-spi - const: atmel,at91rm9200-spi reg:
Commit a3eb95484f27 ("spi: dt-bindings: atmel,at91rm9200-spi: add sam9x7 compatible") adding sam9x7 compatible did not make any sense as it added new compatible into middle of existing compatible list. The intention was probably to add new set of compatibles with sam9x7 as first one. Fixes: a3eb95484f27 ("spi: dt-bindings: atmel,at91rm9200-spi: add sam9x7 compatible") Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> --- .../devicetree/bindings/spi/atmel,at91rm9200-spi.yaml | 3 +++ 1 file changed, 3 insertions(+)