Skip to content

Commit 14022b1

Browse files
committed
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/[email protected] Signed-off-by: Olof Johansson <[email protected]>
2 parents b6a79b4 + 1460335 commit 14022b1

File tree

3 files changed

+2
-2
lines changed

3 files changed

+2
-2
lines changed

arch/arm/mach-meson/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ menuconfig ARCH_MESON
99
select CACHE_L2X0
1010
select PINCTRL
1111
select PINCTRL_MESON
12-
select COMMON_CLK
1312
select HAVE_ARM_SCU if SMP
1413
select HAVE_ARM_TWD if SMP
1514

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@
327327
#size-cells = <0>;
328328

329329
bus-width = <4>;
330-
max-frequency = <50000000>;
330+
max-frequency = <60000000>;
331331

332332
non-removable;
333333
disable-wp;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -593,6 +593,7 @@
593593
compatible = "brcm,bcm43438-bt";
594594
interrupt-parent = <&gpio_intc>;
595595
interrupts = <95 IRQ_TYPE_LEVEL_HIGH>;
596+
interrupt-names = "host-wakeup";
596597
shutdown-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>;
597598
max-speed = <2000000>;
598599
clocks = <&wifi32k>;

0 commit comments

Comments
 (0)