Commit b257c5f0 authored by Arnd Bergmann's avatar Arnd Bergmann

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.comSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents df0a9b52 5ad77b12
...@@ -161,7 +161,6 @@ config ARCH_MEDIATEK ...@@ -161,7 +161,6 @@ config ARCH_MEDIATEK
config ARCH_MESON config ARCH_MESON
bool "Amlogic Platforms" bool "Amlogic Platforms"
select COMMON_CLK
help help
This enables support for the arm64 based Amlogic SoCs This enables support for the arm64 based Amlogic SoCs
such as the s905, S905X/D, S912, A113X/D or S905X/D2 such as the s905, S905X/D, S912, A113X/D or S905X/D2
......
...@@ -134,7 +134,6 @@ cpu_critical: cpu-critical { ...@@ -134,7 +134,6 @@ cpu_critical: cpu-critical {
type = "critical"; type = "critical";
}; };
}; };
};
cpu_cooling_maps: cooling-maps { cpu_cooling_maps: cooling-maps {
map0 { map0 {
...@@ -154,6 +153,7 @@ map1 { ...@@ -154,6 +153,7 @@ map1 {
}; };
}; };
}; };
};
onewire { onewire {
compatible = "w1-gpio"; compatible = "w1-gpio";
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment