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 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC fixes from Arnd Bergmann:
"This should be the last set of bugfixes for arm-soc in v4.9. None of
these are critical regressions, but it would be nice to still get them
merged.

- On the Juno platform, the idle latency was described wrong, leading
to suboptimal cpuidle tuning.

- Also on the same platform, PCI I/O space was set up incorrectly and
could not work.

- On the sti platform, a syntactically incorrect DT entry caused
warnings.

- The newly added 'gr8' platform has somewhat confusing file names,
which we rename for consistency"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
arm64: dts: juno: fix cluster sleep state entry latency on all SoC versions
arm64: dts: juno: Correct PCI IO window
ARM: dts: STiH407-family: fix i2c nodes
ARM: gr8: Rename the DTSI and relevant DTS

Linus Torvalds 8dc0f265 8bca927f

options
unified split
Changed files
+22 -6
arch
arm
boot
dts
Makefile
stih407-family.dtsi
sun5i-gr8-evb.dts
sun5i-gr8.dtsi
arm64
boot
dts
arm
juno-base.dtsi
juno-r1.dts
juno-r2.dts
juno.dts
+1 -1
arch/arm/boot/dts/Makefile
··· 745 745 sun4i-a10-pcduino2.dtb \ 746 746 sun4i-a10-pov-protab2-ips9.dtb 747 747 dtb-$(CONFIG_MACH_SUN5I) += \ 748 - ntc-gr8-evb.dtb \ 749 748 sun5i-a10s-auxtek-t003.dtb \ 750 749 sun5i-a10s-auxtek-t004.dtb \ 751 750 sun5i-a10s-mk802.dtb \ ··· 760 761 sun5i-a13-olinuxino-micro.dtb \ 761 762 sun5i-a13-q8-tablet.dtb \ 762 763 sun5i-a13-utoo-p66.dtb \ 764 + sun5i-gr8-evb.dtb \ 763 765 sun5i-r8-chip.dtb 764 766 dtb-$(CONFIG_MACH_SUN6I) += \ 765 767 sun6i-a31-app4-evb1.dtb \
+1 -1
arch/arm/boot/dts/ntc-gr8-evb.dts arch/arm/boot/dts/sun5i-gr8-evb.dts
··· 44 44 */ 45 45 46 46 /dts-v1/; 47 - #include "ntc-gr8.dtsi" 47 + #include "sun5i-gr8.dtsi" 48 48 #include "sunxi-common-regulators.dtsi" 49 49 50 50 #include <dt-bindings/gpio/gpio.h>
arch/arm/boot/dts/ntc-gr8.dtsi arch/arm/boot/dts/sun5i-gr8.dtsi
+16
arch/arm/boot/dts/stih407-family.dtsi
··· 283 283 clock-frequency = <400000>; 284 284 pinctrl-names = "default"; 285 285 pinctrl-0 = <&pinctrl_i2c0_default>; 286 + #address-cells = <1>; 287 + #size-cells = <0>; 286 288 287 289 status = "disabled"; 288 290 }; ··· 298 296 clock-frequency = <400000>; 299 297 pinctrl-names = "default"; 300 298 pinctrl-0 = <&pinctrl_i2c1_default>; 299 + #address-cells = <1>; 300 + #size-cells = <0>; 301 301 302 302 status = "disabled"; 303 303 }; ··· 313 309 clock-frequency = <400000>; 314 310 pinctrl-names = "default"; 315 311 pinctrl-0 = <&pinctrl_i2c2_default>; 312 + #address-cells = <1>; 313 + #size-cells = <0>; 316 314 317 315 status = "disabled"; 318 316 }; ··· 328 322 clock-frequency = <400000>; 329 323 pinctrl-names = "default"; 330 324 pinctrl-0 = <&pinctrl_i2c3_default>; 325 + #address-cells = <1>; 326 + #size-cells = <0>; 331 327 332 328 status = "disabled"; 333 329 }; ··· 343 335 clock-frequency = <400000>; 344 336 pinctrl-names = "default"; 345 337 pinctrl-0 = <&pinctrl_i2c4_default>; 338 + #address-cells = <1>; 339 + #size-cells = <0>; 346 340 347 341 status = "disabled"; 348 342 }; ··· 358 348 clock-frequency = <400000>; 359 349 pinctrl-names = "default"; 360 350 pinctrl-0 = <&pinctrl_i2c5_default>; 351 + #address-cells = <1>; 352 + #size-cells = <0>; 361 353 362 354 status = "disabled"; 363 355 }; ··· 375 363 clock-frequency = <400000>; 376 364 pinctrl-names = "default"; 377 365 pinctrl-0 = <&pinctrl_i2c10_default>; 366 + #address-cells = <1>; 367 + #size-cells = <0>; 378 368 379 369 status = "disabled"; 380 370 }; ··· 390 376 clock-frequency = <400000>; 391 377 pinctrl-names = "default"; 392 378 pinctrl-0 = <&pinctrl_i2c11_default>; 379 + #address-cells = <1>; 380 + #size-cells = <0>; 393 381 394 382 status = "disabled"; 395 383 };
+1 -1
arch/arm64/boot/dts/arm/juno-base.dtsi
··· 393 393 #address-cells = <3>; 394 394 #size-cells = <2>; 395 395 dma-coherent; 396 - ranges = <0x01000000 0x00 0x5f800000 0x00 0x5f800000 0x0 0x00800000>, 396 + ranges = <0x01000000 0x00 0x00000000 0x00 0x5f800000 0x0 0x00800000>, 397 397 <0x02000000 0x00 0x50000000 0x00 0x50000000 0x0 0x08000000>, 398 398 <0x42000000 0x40 0x00000000 0x40 0x00000000 0x1 0x00000000>; 399 399 #interrupt-cells = <1>;
+1 -1
arch/arm64/boot/dts/arm/juno-r1.dts
··· 76 76 compatible = "arm,idle-state"; 77 77 arm,psci-suspend-param = <0x1010000>; 78 78 local-timer-stop; 79 - entry-latency-us = <300>; 79 + entry-latency-us = <400>; 80 80 exit-latency-us = <1200>; 81 81 min-residency-us = <2500>; 82 82 };
+1 -1
arch/arm64/boot/dts/arm/juno-r2.dts
··· 76 76 compatible = "arm,idle-state"; 77 77 arm,psci-suspend-param = <0x1010000>; 78 78 local-timer-stop; 79 - entry-latency-us = <300>; 79 + entry-latency-us = <400>; 80 80 exit-latency-us = <1200>; 81 81 min-residency-us = <2500>; 82 82 };
+1 -1
arch/arm64/boot/dts/arm/juno.dts
··· 76 76 compatible = "arm,idle-state"; 77 77 arm,psci-suspend-param = <0x1010000>; 78 78 local-timer-stop; 79 - entry-latency-us = <300>; 79 + entry-latency-us = <400>; 80 80 exit-latency-us = <1200>; 81 81 min-residency-us = <2500>; 82 82 };