Unverified Commit 7eabedfb authored Feb 07, 2022 by Arnd Bergmann

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

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

* 'v5.17/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux:
  arm64: dts: meson-sm1-odroid: fix boot loop after reboot
  arm64: dts: meson-g12: drop BL32 region from SEI510/SEI610
  arm64: dts: meson-g12: add ATF BL32 reserved-memory region
  arm64: dts: meson-gx: add ATF BL32 reserved-memory region
  arm64: dts: meson-sm1-bananapi-m5: fix wrong GPIO domain for GPIOE_2
  arm64: dts: meson-sm1-odroid: use correct enable-gpio pin for tf-io regulator
  arm64: dts: meson-g12b-odroid-n2: fix typo 'dio2133'

Link: https://lore.kernel.org/r/67888f6a-f4ff-9569-131a-0c7baba6ddaf@baylibre.com


Signed-off-by: Arnd Bergmann <arnd@arndb.de>

parents 486343d3 e6b03375

arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi

+6 −0

Original line number	Diff line number	Diff line
		@@ -107,6 +107,12 @@
		no-map;
		};

		/* 32 MiB reserved for ARM Trusted Firmware (BL32) */
		secmon_reserved_bl32: secmon@5300000 {
		reg = <0x0 0x05300000 0x0 0x2000000>;
		no-map;
		};

		linux,cma {
		compatible = "shared-dma-pool";
		reusable;

arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts

+0 −8

Original line number	Diff line number	Diff line
		@@ -157,14 +157,6 @@
		regulator-always-on;
		};

		reserved-memory {
		/* TEE Reserved Memory */
		bl32_reserved: bl32@5000000 {
		reg = <0x0 0x05300000 0x0 0x2000000>;
		no-map;
		};
		};

		sdio_pwrseq: sdio-pwrseq {
		compatible = "mmc-pwrseq-simple";
		reset-gpios = <&gpio GPIOX_6 GPIO_ACTIVE_LOW>;

arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi

+2 −2

Original line number	Diff line number	Diff line
		@@ -17,7 +17,7 @@
		rtc1 = &vrtc;
		};

		dioo2133: audio-amplifier-0 {
		dio2133: audio-amplifier-0 {
		compatible = "simple-audio-amplifier";
		enable-gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_HIGH>;
		VCC-supply = <&vcc_5v>;
		@@ -219,7 +219,7 @@
		audio-widgets = "Line", "Lineout";
		audio-aux-devs = <&tdmout_b>, <&tdmout_c>, <&tdmin_a>,
		<&tdmin_b>, <&tdmin_c>, <&tdmin_lb>,
		<&dioo2133>;
		<&dio2133>;
		audio-routing = "TDMOUT_B IN 0", "FRDDR_A OUT 1",
		"TDMOUT_B IN 1", "FRDDR_B OUT 1",
		"TDMOUT_B IN 2", "FRDDR_C OUT 1",

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -49,6 +49,12 @@
		no-map;
		};

		/* 32 MiB reserved for ARM Trusted Firmware (BL32) */
		secmon_reserved_bl32: secmon@5300000 {
		reg = <0x0 0x05300000 0x0 0x2000000>;
		no-map;
		};

		linux,cma {
		compatible = "shared-dma-pool";
		reusable;

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -123,7 +123,7 @@
		regulator-min-microvolt = <1800000>;
		regulator-max-microvolt = <3300000>;

		enable-gpio = <&gpio GPIOE_2 GPIO_ACTIVE_HIGH>;
		enable-gpio = <&gpio_ao GPIOE_2 GPIO_ACTIVE_HIGH>;
		enable-active-high;
		regulator-always-on;