From af8b1f119b9f53a6ec04be6c92f8e284048a998f Mon Sep 17 00:00:00 2001 From: Luke Go Date: Fri, 14 Feb 2020 16:28:16 +0900 Subject: [PATCH 1/2] ODROID: WIFI/BT: Support the WIFI/BT Combo Shiled. Change-Id: I37b02ef1638592aaf3f611de59b89cbe86c8ca85 Signed-off-by: Luke Go --- arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts | 6 +++++- drivers/amlogic/wifi/wifi_dt.c | 7 ++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts b/arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts index 08e5bc0048dd..5bb5e5f1c6af 100644 --- a/arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts +++ b/arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts @@ -203,6 +203,10 @@ irq_trigger_type = "GPIO_IRQ_HIGH"; power_on_pin = <&gpio GPIOX_6 GPIO_ACTIVE_HIGH>; dhd_static_buf; //if use bcm wifi, config dhd_static_buf + pinctrl-names = "default"; + pinctrl-0 = <&pwm_e_pins>; + pwms= <&pwm_ef MESON_PWM_0 30541 0>; + duty_cycle = <15270>; }; deinterlace { @@ -792,7 +796,7 @@ "MMC_PM_KEEP_POWER", "MMC_CAP_SDIO_IRQ"; f_min = <400000>; - f_max = <60000000>; + f_max = <208000000>; }; }; diff --git a/drivers/amlogic/wifi/wifi_dt.c b/drivers/amlogic/wifi/wifi_dt.c index 656b5ae19a4b..66c695bd2d86 100644 --- a/drivers/amlogic/wifi/wifi_dt.c +++ b/drivers/amlogic/wifi/wifi_dt.c @@ -669,7 +669,12 @@ static int wifi_dev_probe(struct platform_device *pdev) plat->power_on_pin2 = desc_to_gpio(desc); } - if (get_cpu_type() >= MESON_CPU_MAJOR_ID_GXTVBB) { + if (get_cpu_type() == MESON_CPU_MAJOR_ID_SM1) { + WIFI_INFO("set pwm as 32k output"); + ret = pwm_single_channel_conf(plat); + if (ret) + pr_err("pwm config err\n"); + } else if (get_cpu_type() >= MESON_CPU_MAJOR_ID_GXTVBB) { ret = pwm_double_channel_conf_dt(plat); if (ret != 0) { WIFI_INFO("pwm_double_channel_conf_dt error\n"); From 4f616906dc1c2255afade44b30648f3bd75b1868 Mon Sep 17 00:00:00 2001 From: Luke Go Date: Mon, 24 Feb 2020 17:35:17 +0900 Subject: [PATCH 2/2] ODROID: mem; Removed memory size limitation. Change-Id: I166f9f8a69d3c46d275ae282321599d21cd146fd Signed-off-by: Luke Go --- arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts | 5 ----- 1 file changed, 5 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts b/arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts index 5bb5e5f1c6af..6c0c36c3f665 100644 --- a/arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts +++ b/arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts @@ -29,11 +29,6 @@ chosen { }; - memory@00000000 { - device_type = "memory"; - linux,usable-memory = <0x0 0x000000 0x0 0x80000000>; - }; - reserved-memory { #address-cells = <2>; #size-cells = <2>;