shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-10 21:07:02 +09:00
Code Issues Packages Projects Releases Wiki Activity

ODROID-N2: Add wifi dts configs and remove pci access routine from

Browse Source 
aml_wifi.

Signed-off-by: Luke Go <sangch.go@gmail.com>
Change-Id: I0111583e1812633be391b7997388c1be1deadd32
This commit is contained in:
Luke Go
2019-10-21 17:58:33 +09:00
committed by Chris KIM
parent c166e93753
commit 1160f845d6
3 changed files with 35 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
arch/arm64/boot/dts/amlogic/meson64_odroidn2.dts
View File

@@ -194,6 +194,16 @@
vdac_config = <0xa000>;
};
wifi {
compatible = "amlogic,aml_wifi";
dev_name = "aml_wifi";
status = "disabled";
interrupt_pin = <&gpio GPIOX_7 GPIO_ACTIVE_LOW>;
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
};
deinterlace {
compatible = "amlogic, deinterlace";
status = "okay";
@@ -530,6 +540,24 @@
};
};
&sd_emmc_a {
status = "okay";
sdio {
caps = "MMC_CAP_4_BIT_DATA",
"MMC_CAP_MMC_HIGHSPEED",
"MMC_CAP_SD_HIGHSPEED",
"MMC_CAP_NONREMOVABLE",
"MMC_CAP_UHS_SDR12",
"MMC_CAP_UHS_SDR25",
"MMC_CAP_UHS_SDR50",
"MMC_CAP_UHS_SDR104",
"MMC_PM_KEEP_POWER",
"MMC_CAP_SDIO_IRQ";
f_min = <400000>;
f_max = <60000000>;
};
};
&saradc {
status = "okay";
};

2
arch/arm64/configs/odroidn2_android_defconfig
View File

@@ -1465,7 +1465,7 @@ CONFIG_AMLOGIC_WDT_MESON_V3=y
# ESM Support
#
CONFIG_AMLOGIC_ESM=y
# CONFIG_AMLOGIC_WIFI is not set
CONFIG_AMLOGIC_WIFI=y
# CONFIG_AMLOGIC_BT_DEVICE is not set
#

7
drivers/amlogic/wifi/wifi_dt.c
View File

@@ -37,7 +37,9 @@
#include <linux/io.h>
#include <linux/uaccess.h>
#include <linux/pwm.h>
#if !defined(CONFIG_ARCH_MESON64_ODROID_COMMON)
#include <linux/pci.h>
#endif
#include <linux/amlogic/pwm_meson.h>
#include "../../gpio/gpiolib.h"
#define OWNER_NAME "sdio_wifi"
@@ -250,7 +252,7 @@ static int wifi_power_release(struct inode *inode, struct file *file)
return 0;
}
#if !defined(CONFIG_ARCH_MESON64_ODROID_COMMON)
void pci_reinit(void)
{
struct pci_bus *bus = NULL;
@@ -310,6 +312,7 @@ void pci_remove_reinit(unsigned int vid, unsigned int pid, unsigned int delBus)
}
EXPORT_SYMBOL(pci_remove_reinit);
#endif
static long wifi_power_ioctl(struct file *filp,
unsigned int cmd, unsigned long arg)
@@ -332,7 +335,9 @@ static long wifi_power_ioctl(struct file *filp,
mdelay(200);
set_usb_wifi_power(1);
mdelay(200);
#if !defined(CONFIG_ARCH_MESON64_ODROID_COMMON)
pci_reinit();
#endif
WIFI_INFO("Set sdio wifi power up!\n");
break;
case WIFI_POWER_DOWN: