Unverified Commit 551413fe authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'amlogic-arm-dt-for-v6.3' of... 

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: default avatarArnd Bergmann <arnd@arndb.de>
parents d70eec52 5f441684

arch/arm/boot/dts/meson8-minix-neo-x8.dts

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ memory { 
	gpio-leds {

		compatible = "gpio-leds";



		blue {

		led-blue {

			label = "x8:blue:power";

			gpios = <&gpio_ao GPIO_TEST_N GPIO_ACTIVE_HIGH>;

		};

arch/arm/boot/dts/meson8.dtsi

+4 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ opp-1992000000 { 
		};

	};



	gpu_opp_table: gpu-opp-table {

	gpu_opp_table: opp-table-gpu {

		compatible = "operating-points-v2";



		opp-182142857 {
@@ -651,6 +651,9 @@ &L2 { 
	arm,filter-ranges = <0x100000 0xc0000000>;

	prefetch-data = <1>;

	prefetch-instr = <1>;

	arm,prefetch-offset = <7>;

	arm,double-linefill = <1>;

	arm,prefetch-drop = <1>;

	arm,shared-override;

};

arch/arm/boot/dts/meson8b-ec100.dts

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ gpio-poweroff { 
	leds {

		compatible = "gpio-leds";



		power {

		led-power {

			label = "ec100:red:power";

			/*

			 * Needs to go LOW (together with the poweroff GPIO)

arch/arm/boot/dts/meson8b-odroidc1.dts

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ emmc_pwrseq: emmc-pwrseq { 


	leds {

		compatible = "gpio-leds";

		blue {

		led-blue {

			label = "c1:blue:alive";

			gpios = <&gpio_ao GPIOAO_13 GPIO_ACTIVE_LOW>;

			linux,default-trigger = "heartbeat";

arch/arm/boot/dts/meson8b.dtsi

+4 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ opp-1536000000 { 
		};

	};



	gpu_opp_table: gpu-opp-table {

	gpu_opp_table: opp-table-gpu {

		compatible = "operating-points-v2";



		opp-255000000 {
@@ -643,6 +643,9 @@ &L2 { 
	arm,filter-ranges = <0x100000 0xc0000000>;

	prefetch-data = <1>;

	prefetch-instr = <1>;

	arm,prefetch-offset = <7>;

	arm,double-linefill = <1>;

	arm,prefetch-drop = <1>;

	arm,shared-override;

};