Commit 14022b11 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'amlogic-fixes' of... 

Merge tag 'amlogic-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into arm/fixes

Amlogic fixes for v5.6-rc

* tag 'amlogic-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
  arm64: dts: meson: fix gxm-khadas-vim2 wifi
  arm64: dts: meson-sm1-sei610: add missing interrupt-names
  ARM: meson: Drop unneeded select of COMMON_CLK

Link: https://lore.kernel.org/r/7hr1yc9cc1.fsf@baylibre.com


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents b6a79b41 14603356

arch/arm/mach-meson/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ menuconfig ARCH_MESON 
	select CACHE_L2X0

	select PINCTRL

	select PINCTRL_MESON

	select COMMON_CLK

	select HAVE_ARM_SCU if SMP

	select HAVE_ARM_TWD if SMP

arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts

+1 −1
Original line number Diff line number Diff line
@@ -327,7 +327,7 @@ 
	#size-cells = <0>;



	bus-width = <4>;

	max-frequency = <50000000>;

	max-frequency = <60000000>;



	non-removable;

	disable-wp;

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

+1 −0
Original line number Diff line number Diff line
@@ -593,6 +593,7 @@ 
		compatible = "brcm,bcm43438-bt";

		interrupt-parent = <&gpio_intc>;

		interrupts = <95 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "host-wakeup";

		shutdown-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>;

		max-speed = <2000000>;

		clocks = <&wifi32k>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE