Unverified Commit b257c5f0 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

* 'v5.16/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux:
  arm64: meson: remove COMMON_CLK
  arm64: meson: fix dts for JetHub D1

Link: https://lore.kernel.org/r/ab9f066f-480b-84b2-248e-953f2f2b5f59@baylibre.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents df0a9b52 5ad77b12

arch/arm64/Kconfig.platforms

+0 −1
Original line number Diff line number Diff line
@@ -161,7 +161,6 @@ config ARCH_MEDIATEK 


config ARCH_MESON

	bool "Amlogic Platforms"

	select COMMON_CLK

	help

	  This enables support for the arm64 based Amlogic SoCs

	  such as the s905, S905X/D, S912, A113X/D or S905X/D2

arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j100.dts

+15 −15
Original line number Diff line number Diff line
@@ -134,7 +134,6 @@ 
					type = "critical";

				};

			};

		};



			cpu_cooling_maps: cooling-maps {

				map0 {
@@ -154,6 +153,7 @@ 
				};

			};

		};

	};



	onewire {

		compatible = "w1-gpio";