From 0fc58bab9f4adcfb484e8025d25b9ea392817a46 Mon Sep 17 00:00:00 2001 From: Luke Go Date: Mon, 21 Oct 2019 17:58:33 +0900 Subject: [PATCH] ODROID-C4: Add wifi dts configs and remove pci access routine from aml_wifi. Signed-off-by: Luke Go Change-Id: I0111583e1812633be391b7997388c1be1deadd32 --- arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts | 10 +--------- arch/arm64/configs/odroidc4_android_defconfig | 2 +- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts b/arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts index 88396663cd8f..55480c41a2c1 100644 --- a/arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts +++ b/arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts @@ -185,14 +185,6 @@ 0xffff 0x0>; /* ending flag */ }; - bt-dev{ - compatible = "amlogic, bt-dev"; - dev_name = "bt-dev"; - status = "disabled"; - gpio_reset = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>; - gpio_hostwake = <&gpio GPIOX_19 GPIO_ACTIVE_HIGH>; - }; - wifi{ compatible = "amlogic, aml_wifi"; dev_name = "aml_wifi"; @@ -805,7 +797,7 @@ "MMC_PM_KEEP_POWER", "MMC_CAP_SDIO_IRQ"; f_min = <400000>; - f_max = <200000000>; + f_max = <60000000>; }; }; diff --git a/arch/arm64/configs/odroidc4_android_defconfig b/arch/arm64/configs/odroidc4_android_defconfig index da65388c2597..aa57d944a87a 100644 --- a/arch/arm64/configs/odroidc4_android_defconfig +++ b/arch/arm64/configs/odroidc4_android_defconfig @@ -1454,7 +1454,7 @@ CONFIG_AMLOGIC_WDT_MESON_V3=y # CONFIG_AMLOGIC_ESM=y CONFIG_AMLOGIC_WIFI=y -CONFIG_AMLOGIC_BT_DEVICE=y +# CONFIG_AMLOGIC_BT_DEVICE is not set # # DVB COMPAT support