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

Merge tag 'amlogic-arm-dt-for-v6.3' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux into arm/dt

Amlogic ARM mach-meson changes for v6.3:
- align OPP table names with DT schema
- meson8/8b: Add more L2 (PL310) cache properties
- align LED node names with dtschema

* tag 'amlogic-arm-dt-for-v6.3' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux:
ARM: dts: meson8: align OPP table names with DT schema
ARM: dts: meson8b: Add more L2 (PL310) cache properties
ARM: dts: meson8: Add more L2 (PL310) cache properties
ARM: dts: meson: align LED node names with dtschema

Link: https://lore.kernel.org/r/61700737-c226-1c07-fba7-6dca896fdab4@linaro.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

+11 -5
+1 -1
arch/arm/boot/dts/meson8-minix-neo-x8.dts
··· 27 27 gpio-leds { 28 28 compatible = "gpio-leds"; 29 29 30 - blue { 30 + led-blue { 31 31 label = "x8:blue:power"; 32 32 gpios = <&gpio_ao GPIO_TEST_N GPIO_ACTIVE_HIGH>; 33 33 };
+4 -1
arch/arm/boot/dts/meson8.dtsi
··· 133 133 }; 134 134 }; 135 135 136 - gpu_opp_table: gpu-opp-table { 136 + gpu_opp_table: opp-table-gpu { 137 137 compatible = "operating-points-v2"; 138 138 139 139 opp-182142857 { ··· 651 651 arm,filter-ranges = <0x100000 0xc0000000>; 652 652 prefetch-data = <1>; 653 653 prefetch-instr = <1>; 654 + arm,prefetch-offset = <7>; 655 + arm,double-linefill = <1>; 656 + arm,prefetch-drop = <1>; 654 657 arm,shared-override; 655 658 }; 656 659
+1 -1
arch/arm/boot/dts/meson8b-ec100.dts
··· 73 73 leds { 74 74 compatible = "gpio-leds"; 75 75 76 - power { 76 + led-power { 77 77 label = "ec100:red:power"; 78 78 /* 79 79 * Needs to go LOW (together with the poweroff GPIO)
+1 -1
arch/arm/boot/dts/meson8b-odroidc1.dts
··· 34 34 35 35 leds { 36 36 compatible = "gpio-leds"; 37 - blue { 37 + led-blue { 38 38 label = "c1:blue:alive"; 39 39 gpios = <&gpio_ao GPIOAO_13 GPIO_ACTIVE_LOW>; 40 40 linux,default-trigger = "heartbeat";
+4 -1
arch/arm/boot/dts/meson8b.dtsi
··· 125 125 }; 126 126 }; 127 127 128 - gpu_opp_table: gpu-opp-table { 128 + gpu_opp_table: opp-table-gpu { 129 129 compatible = "operating-points-v2"; 130 130 131 131 opp-255000000 { ··· 643 643 arm,filter-ranges = <0x100000 0xc0000000>; 644 644 prefetch-data = <1>; 645 645 prefetch-instr = <1>; 646 + arm,prefetch-offset = <7>; 647 + arm,double-linefill = <1>; 648 + arm,prefetch-drop = <1>; 646 649 arm,shared-override; 647 650 }; 648 651