tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge tag 'renesas-fixes-for-v5.7-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel into arm/fixes

Renesas fixes for v5.7 (take two)

- Fix a wrong clock configuration on R-Mobile A1,
- Minor fixes that are fast-tracked to avoid introducing regressions
during conversion of DT bindings to json-schema.

* tag 'renesas-fixes-for-v5.7-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel:
ARM: dts: iwg20d-q7-dbcm-ca: Remove unneeded properties in hdmi@39
ARM: dts: renesas: Make hdmi encoder nodes compliant with DT bindings
arm64: dts: renesas: Make hdmi encoder nodes compliant with DT bindings
ARM: dts: r8a7740: Add missing extal2 to CPG node

Link: https://lore.kernel.org/r/20200515125043.22811-1-geert+renesas@glider.be
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Arnd Bergmann d5fef88c 495e1356

+7 -41
-2
arch/arm/boot/dts/iwg20d-q7-dbcm-ca.dtsi
··· 72 72 adi,input-depth = <8>; 73 73 adi,input-colorspace = "rgb"; 74 74 adi,input-clock = "1x"; 75 - adi,input-style = <1>; 76 - adi,input-justification = "evenly"; 77 75 78 76 ports { 79 77 #address-cells = <1>;
+1 -1
arch/arm/boot/dts/r8a7740.dtsi
··· 479 479 cpg_clocks: cpg_clocks@e6150000 { 480 480 compatible = "renesas,r8a7740-cpg-clocks"; 481 481 reg = <0xe6150000 0x10000>; 482 - clocks = <&extal1_clk>, <&extalr_clk>; 482 + clocks = <&extal1_clk>, <&extal2_clk>, <&extalr_clk>; 483 483 #clock-cells = <1>; 484 484 clock-output-names = "system", "pllc0", "pllc1", 485 485 "pllc2", "r",
-2
arch/arm/boot/dts/r8a7745-iwg22d-sodimm-dbhd-ca.dts
··· 84 84 adi,input-depth = <8>; 85 85 adi,input-colorspace = "rgb"; 86 86 adi,input-clock = "1x"; 87 - adi,input-style = <1>; 88 - adi,input-justification = "evenly"; 89 87 90 88 ports { 91 89 #address-cells = <1>;
-2
arch/arm/boot/dts/r8a7790-lager.dts
··· 364 364 adi,input-depth = <8>; 365 365 adi,input-colorspace = "rgb"; 366 366 adi,input-clock = "1x"; 367 - adi,input-style = <1>; 368 - adi,input-justification = "evenly"; 369 367 370 368 ports { 371 369 #address-cells = <1>;
-2
arch/arm/boot/dts/r8a7790-stout.dts
··· 297 297 adi,input-depth = <8>; 298 298 adi,input-colorspace = "rgb"; 299 299 adi,input-clock = "1x"; 300 - adi,input-style = <1>; 301 - adi,input-justification = "evenly"; 302 300 303 301 ports { 304 302 #address-cells = <1>;
-2
arch/arm/boot/dts/r8a7791-koelsch.dts
··· 387 387 adi,input-depth = <8>; 388 388 adi,input-colorspace = "rgb"; 389 389 adi,input-clock = "1x"; 390 - adi,input-style = <1>; 391 - adi,input-justification = "evenly"; 392 390 393 391 ports { 394 392 #address-cells = <1>;
-2
arch/arm/boot/dts/r8a7791-porter.dts
··· 181 181 adi,input-depth = <8>; 182 182 adi,input-colorspace = "rgb"; 183 183 adi,input-clock = "1x"; 184 - adi,input-style = <1>; 185 - adi,input-justification = "evenly"; 186 184 187 185 ports { 188 186 #address-cells = <1>;
-2
arch/arm/boot/dts/r8a7792-blanche.dts
··· 289 289 adi,input-depth = <8>; 290 290 adi,input-colorspace = "rgb"; 291 291 adi,input-clock = "1x"; 292 - adi,input-style = <1>; 293 - adi,input-justification = "evenly"; 294 292 295 293 ports { 296 294 #address-cells = <1>;
+4 -8
arch/arm/boot/dts/r8a7792-wheat.dts
··· 249 249 */ 250 250 hdmi@3d { 251 251 compatible = "adi,adv7513"; 252 - reg = <0x3d>, <0x2d>, <0x4d>, <0x5d>; 253 - reg-names = "main", "cec", "edid", "packet"; 252 + reg = <0x3d>, <0x4d>, <0x2d>, <0x5d>; 253 + reg-names = "main", "edid", "cec", "packet"; 254 254 255 255 adi,input-depth = <8>; 256 256 adi,input-colorspace = "rgb"; 257 257 adi,input-clock = "1x"; 258 - adi,input-style = <1>; 259 - adi,input-justification = "evenly"; 260 258 261 259 ports { 262 260 #address-cells = <1>; ··· 278 280 279 281 hdmi@39 { 280 282 compatible = "adi,adv7513"; 281 - reg = <0x39>, <0x29>, <0x49>, <0x59>; 282 - reg-names = "main", "cec", "edid", "packet"; 283 + reg = <0x39>, <0x49>, <0x29>, <0x59>; 284 + reg-names = "main", "edid", "cec", "packet"; 283 285 284 286 adi,input-depth = <8>; 285 287 adi,input-colorspace = "rgb"; 286 288 adi,input-clock = "1x"; 287 - adi,input-style = <1>; 288 - adi,input-justification = "evenly"; 289 289 290 290 ports { 291 291 #address-cells = <1>;
-2
arch/arm/boot/dts/r8a7793-gose.dts
··· 366 366 adi,input-depth = <8>; 367 367 adi,input-colorspace = "rgb"; 368 368 adi,input-clock = "1x"; 369 - adi,input-style = <1>; 370 - adi,input-justification = "evenly"; 371 369 372 370 ports { 373 371 #address-cells = <1>;
-2
arch/arm/boot/dts/r8a7794-silk.dts
··· 255 255 adi,input-depth = <8>; 256 256 adi,input-colorspace = "rgb"; 257 257 adi,input-clock = "1x"; 258 - adi,input-style = <1>; 259 - adi,input-justification = "evenly"; 260 258 261 259 ports { 262 260 #address-cells = <1>;
-2
arch/arm64/boot/dts/renesas/r8a77970-eagle.dts
··· 137 137 adi,input-depth = <8>; 138 138 adi,input-colorspace = "rgb"; 139 139 adi,input-clock = "1x"; 140 - adi,input-style = <1>; 141 - adi,input-justification = "evenly"; 142 140 143 141 ports { 144 142 #address-cells = <1>;
-2
arch/arm64/boot/dts/renesas/r8a77970-v3msk.dts
··· 150 150 adi,input-depth = <8>; 151 151 adi,input-colorspace = "rgb"; 152 152 adi,input-clock = "1x"; 153 - adi,input-style = <1>; 154 - adi,input-justification = "evenly"; 155 153 156 154 ports { 157 155 #address-cells = <1>;
-2
arch/arm64/boot/dts/renesas/r8a77980-condor.dts
··· 174 174 adi,input-depth = <8>; 175 175 adi,input-colorspace = "rgb"; 176 176 adi,input-clock = "1x"; 177 - adi,input-style = <1>; 178 - adi,input-justification = "evenly"; 179 177 180 178 ports { 181 179 #address-cells = <1>;
-2
arch/arm64/boot/dts/renesas/r8a77980-v3hsk.dts
··· 141 141 adi,input-depth = <8>; 142 142 adi,input-colorspace = "rgb"; 143 143 adi,input-clock = "1x"; 144 - adi,input-style = <1>; 145 - adi,input-justification = "evenly"; 146 144 147 145 ports { 148 146 #address-cells = <1>;
-2
arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts
··· 360 360 adi,input-depth = <8>; 361 361 adi,input-colorspace = "rgb"; 362 362 adi,input-clock = "1x"; 363 - adi,input-style = <1>; 364 - adi,input-justification = "evenly"; 365 363 366 364 ports { 367 365 #address-cells = <1>;
+2 -4
arch/arm64/boot/dts/renesas/r8a77995-draak.dts
··· 272 272 273 273 hdmi-encoder@39 { 274 274 compatible = "adi,adv7511w"; 275 - reg = <0x39>, <0x3f>, <0x38>, <0x3c>; 276 - reg-names = "main", "edid", "packet", "cec"; 275 + reg = <0x39>, <0x3f>, <0x3c>, <0x38>; 276 + reg-names = "main", "edid", "cec", "packet"; 277 277 interrupt-parent = <&gpio1>; 278 278 interrupts = <28 IRQ_TYPE_LEVEL_LOW>; 279 279 ··· 284 284 adi,input-depth = <8>; 285 285 adi,input-colorspace = "rgb"; 286 286 adi,input-clock = "1x"; 287 - adi,input-style = <1>; 288 - adi,input-justification = "evenly"; 289 287 290 288 ports { 291 289 #address-cells = <1>;