Unverified Commit 1808b184 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'v5.18/fixes' of... 

Merge branch 'v5.18/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux into arm/fixes

* 'v5.18/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux:
  arm64: dts: meson-sm1-bananapi-m5: fix wrong GPIO pin labeling for CON1
  arm64: dts: remove cpu compatible "arm,armv8" for s4
  arm64: dts: meson: remove CPU opps below 1GHz for SM1 boards
  arm64: dts: meson: remove CPU opps below 1GHz for G12B boards

Link: https://lore.kernel.org/r/1132bd6e-cd29-6e58-1fae-38e074545b25@baylibre.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 803fa58d 962dd65e

arch/arm64/boot/dts/amlogic/meson-g12b-a311d.dtsi

+0 −40
Original line number Diff line number Diff line
@@ -11,26 +11,6 @@ 
		compatible = "operating-points-v2";

		opp-shared;



		opp-100000000 {

			opp-hz = /bits/ 64 <100000000>;

			opp-microvolt = <731000>;

		};



		opp-250000000 {

			opp-hz = /bits/ 64 <250000000>;

			opp-microvolt = <731000>;

		};



		opp-500000000 {

			opp-hz = /bits/ 64 <500000000>;

			opp-microvolt = <731000>;

		};



		opp-667000000 {

			opp-hz = /bits/ 64 <667000000>;

			opp-microvolt = <731000>;

		};



		opp-1000000000 {

			opp-hz = /bits/ 64 <1000000000>;

			opp-microvolt = <761000>;
@@ -71,26 +51,6 @@ 
		compatible = "operating-points-v2";

		opp-shared;



		opp-100000000 {

			opp-hz = /bits/ 64 <100000000>;

			opp-microvolt = <731000>;

		};



		opp-250000000 {

			opp-hz = /bits/ 64 <250000000>;

			opp-microvolt = <731000>;

		};



		opp-500000000 {

			opp-hz = /bits/ 64 <500000000>;

			opp-microvolt = <731000>;

		};



		opp-667000000 {

			opp-hz = /bits/ 64 <667000000>;

			opp-microvolt = <731000>;

		};



		opp-1000000000 {

			opp-hz = /bits/ 64 <1000000000>;

			opp-microvolt = <731000>;

arch/arm64/boot/dts/amlogic/meson-g12b-s922x.dtsi

+0 −40
Original line number Diff line number Diff line
@@ -11,26 +11,6 @@ 
		compatible = "operating-points-v2";

		opp-shared;



		opp-100000000 {

			opp-hz = /bits/ 64 <100000000>;

			opp-microvolt = <731000>;

		};



		opp-250000000 {

			opp-hz = /bits/ 64 <250000000>;

			opp-microvolt = <731000>;

		};



		opp-500000000 {

			opp-hz = /bits/ 64 <500000000>;

			opp-microvolt = <731000>;

		};



		opp-667000000 {

			opp-hz = /bits/ 64 <667000000>;

			opp-microvolt = <731000>;

		};



		opp-1000000000 {

			opp-hz = /bits/ 64 <1000000000>;

			opp-microvolt = <731000>;
@@ -76,26 +56,6 @@ 
		compatible = "operating-points-v2";

		opp-shared;



		opp-100000000 {

			opp-hz = /bits/ 64 <100000000>;

			opp-microvolt = <751000>;

		};



		opp-250000000 {

			opp-hz = /bits/ 64 <250000000>;

			opp-microvolt = <751000>;

		};



		opp-500000000 {

			opp-hz = /bits/ 64 <500000000>;

			opp-microvolt = <751000>;

		};



		opp-667000000 {

			opp-hz = /bits/ 64 <667000000>;

			opp-microvolt = <751000>;

		};



		opp-1000000000 {

			opp-hz = /bits/ 64 <1000000000>;

			opp-microvolt = <771000>;

arch/arm64/boot/dts/amlogic/meson-s4.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -13,28 +13,28 @@ 


		cpu0: cpu@0 {

			device_type = "cpu";

			compatible = "arm,cortex-a35","arm,armv8";

			compatible = "arm,cortex-a35";

			reg = <0x0 0x0>;

			enable-method = "psci";

		};



		cpu1: cpu@1 {

			device_type = "cpu";

			compatible = "arm,cortex-a35","arm,armv8";

			compatible = "arm,cortex-a35";

			reg = <0x0 0x1>;

			enable-method = "psci";

		};



		cpu2: cpu@2 {

			device_type = "cpu";

			compatible = "arm,cortex-a35","arm,armv8";

			compatible = "arm,cortex-a35";

			reg = <0x0 0x2>;

			enable-method = "psci";

		};



		cpu3: cpu@3 {

			device_type = "cpu";

			compatible = "arm,cortex-a35","arm,armv8";

			compatible = "arm,cortex-a35";

			reg = <0x0 0x3>;

			enable-method = "psci";

		};

arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts

+1 −0
Original line number Diff line number Diff line
@@ -437,6 +437,7 @@ 
		"",

		"eMMC_RST#", /* BOOT_12 */

		"eMMC_DS", /* BOOT_13 */

		"", "",

		/* GPIOC */

		"SD_D0_B", /* GPIOC_0 */

		"SD_D1_B", /* GPIOC_1 */

arch/arm64/boot/dts/amlogic/meson-sm1.dtsi

+0 −20
Original line number Diff line number Diff line
@@ -95,26 +95,6 @@ 
		compatible = "operating-points-v2";

		opp-shared;



		opp-100000000 {

			opp-hz = /bits/ 64 <100000000>;

			opp-microvolt = <730000>;

		};



		opp-250000000 {

			opp-hz = /bits/ 64 <250000000>;

			opp-microvolt = <730000>;

		};



		opp-500000000 {

			opp-hz = /bits/ 64 <500000000>;

			opp-microvolt = <730000>;

		};



		opp-667000000 {

			opp-hz = /bits/ 64 <666666666>;

			opp-microvolt = <750000>;

		};



		opp-1000000000 {

			opp-hz = /bits/ 64 <1000000000>;

			opp-microvolt = <770000>;