Message ID | b3a6cf12c46b23a501b0d54c6892b969e2a55145.1713874657.git.geert+renesas@glider.be (mailing list archive) |
---|---|
State | Accepted |
Commit | 466c8c46b4ba763435b2a787b7824d9f0fd3e76e |
Headers | show |
Series | ASoC: dt-bindings: renesas: Fix R-Car Gen4 SoC-specific compatibles | expand |
On 23/04/2024 14:19, Geert Uytterhoeven wrote: > make dtbs_check: > > arch/arm64/boot/dts/renesas/r8a779g0-white-hawk.dtb: sound@ec5a0000: compatible: 'oneOf' conditional failed, one must be fixed: > ['renesas,rcar_sound-r8a779g0', 'renesas,rcar_sound-gen4'] is too short > ... > 'renesas,rcar_sound-r8a779h0' was expected > > The list of SoC-specific compatible values for R-Car Gen4 SoCs is > mutually-exclusive, just like for other R-Car SoC generations, so it > should use an enum. > > Fixes: d6e792ed7dd022a1 ("ASoC: dt-bindings: renesas: add R8A779H0 V4M") Offending commit was never tested (testing means dtbs_check and dt_binding_check)... Just like many other patches from Kuninori regarding bindings, it was not sent for automation. I don't understand why. get_maintainers clearly asks for this... Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Best regards, Krzysztof
On Tue, 23 Apr 2024 14:19:26 +0200, Geert Uytterhoeven wrote: > make dtbs_check: > > arch/arm64/boot/dts/renesas/r8a779g0-white-hawk.dtb: sound@ec5a0000: compatible: 'oneOf' conditional failed, one must be fixed: > ['renesas,rcar_sound-r8a779g0', 'renesas,rcar_sound-gen4'] is too short > ... > 'renesas,rcar_sound-r8a779h0' was expected > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: dt-bindings: renesas: Fix R-Car Gen4 SoC-specific compatibles commit: 466c8c46b4ba763435b2a787b7824d9f0fd3e76e 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/sound/renesas,rsnd.yaml b/Documentation/devicetree/bindings/sound/renesas,rsnd.yaml index b3da278cf141c373..07ec6247d9defc41 100644 --- a/Documentation/devicetree/bindings/sound/renesas,rsnd.yaml +++ b/Documentation/devicetree/bindings/sound/renesas,rsnd.yaml @@ -48,8 +48,9 @@ properties: - const: renesas,rcar_sound-gen3 # for Gen4 SoC - items: - - const: renesas,rcar_sound-r8a779g0 # R-Car V4H - - const: renesas,rcar_sound-r8a779h0 # R-Car V4M + - enum: + - renesas,rcar_sound-r8a779g0 # R-Car V4H + - renesas,rcar_sound-r8a779h0 # R-Car V4M - const: renesas,rcar_sound-gen4 # for Generic - enum:
make dtbs_check: arch/arm64/boot/dts/renesas/r8a779g0-white-hawk.dtb: sound@ec5a0000: compatible: 'oneOf' conditional failed, one must be fixed: ['renesas,rcar_sound-r8a779g0', 'renesas,rcar_sound-gen4'] is too short ... 'renesas,rcar_sound-r8a779h0' was expected The list of SoC-specific compatible values for R-Car Gen4 SoCs is mutually-exclusive, just like for other R-Car SoC generations, so it should use an enum. Fixes: d6e792ed7dd022a1 ("ASoC: dt-bindings: renesas: add R8A779H0 V4M") Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- Documentation/devicetree/bindings/sound/renesas,rsnd.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)