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

Merge changes I166f9f8a,I37b02ef1 into odroidg12-4.9.y-android

Browse Source 
* changes:
  ODROID: mem; Removed memory size limitation.
  ODROID: WIFI/BT: Support the WIFI/BT Combo Shiled.
This commit is contained in:
Luke go
2020-03-25 13:49:12 +09:00
committed by Gerrit Code Review
parent e95437df7f 4f616906dc
commit e7c77121f7
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts
View File

@@ -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>;
@@ -203,6 +198,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 +791,7 @@
"MMC_PM_KEEP_POWER",
"MMC_CAP_SDIO_IRQ";
f_min = <400000>;
f_max = <60000000>;
f_max = <208000000>;
};
};

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

@@ -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");