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

S6: wifi/bt bringup to pcie [1/1]

Browse Source 
PD#SWPL-173979

Problem:
S6 wifi/bt bringup

Solution:
S6 wifi/bt bringup

Verify:
BL201

Change-Id: I965eac759859eff5ec216024c9ed68facb16d976
Signed-off-by: lei.chen <lei.chen@amlogic.com>
This commit is contained in:
lei.chen
2024-06-17 16:21:43 +08:00
committed by pengzhao.liu
parent 7e841dde16
commit 02f424bef5
8 changed files with 83 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm64/boot/dts/amlogic/meson-s6.dtsi
+3 -4
View File
@@ -1806,7 +1806,7 @@
compatible = "amlogic, aml-wifi";
status = "disabled";
irq_trigger_type = "IRQF_TRIGGER_LOW";
wifi_static_buf = <2>;
wifi_static_buf = <0>;
//pinctrl-0 = <&pwm_e_pins>;
//pinctrl-names = "default";
pwm_config = <&wifi_pwm_conf>;
@@ -1814,12 +1814,12 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
// pwms = <&pwm_ef 0 30541 0>;
pwms = <&pwm_e 0 30541 0>;
duty-cycle = <15270>;
times = <7>;
};
pwm_channel2_conf {
// pwms = <&pwm_ef 2 30500 0>;
pwms = <&pwm_e 2 30500 0>;
duty-cycle = <15250>;
times = <10>;
};
@@ -2746,7 +2746,6 @@
mux {
groups = "pwm_e";
function = "pwm_e";
drive-strength-microamp = <500>;
};
};
arch/arm64/boot/dts/amlogic/s6_s905d5_bq201.dts
+13 -6
View File
@@ -951,8 +951,9 @@
};
&pcie {
reset-gpio = <&gpio GPIOX_7 GPIO_ACTIVE_HIGH>;
status = "disable"
reset-gpio = <&gpio GPIOX_0 GPIO_ACTIVE_HIGH>;
max-link-speed=<1>;
status = "okay";
};
/* SDIO */
@@ -966,8 +967,8 @@
bus-width = <4>;
cap-sd-highspeed;
//sd-uhs-sdr50;
//sd-uhs-sdr104;
sd-uhs-sdr50;
sd-uhs-sdr104;
max-frequency = <200000000>;
non-removable;
@@ -1240,18 +1241,24 @@
};
&aml_wifi{
status = "disabled";
status = "okay";
interrupt-gpios = <&gpio GPIOX_7 GPIO_ACTIVE_HIGH>;
power_on-gpios = <&gpio GPIOX_6 GPIO_ACTIVE_HIGH>;
};
&aml_bt {
status = "disabled";
status = "okay";
reset-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>;
btwakeup-gpios = <&gpio GPIOX_18 GPIO_ACTIVE_HIGH>;
hostwake-gpios = <&gpio GPIOX_19 GPIO_ACTIVE_HIGH>;
};
&pwm_e {
pinctrl-0 = <&pwm_e_pins1>;
pinctrl-names = "default";
status = "okay";
};
&uart_A {
status = "okay";
uart-has-rtscts;
arch/arm64/boot/dts/amlogic/s6_s905d5_bq208.dts
+13 -6
View File
@@ -885,8 +885,9 @@
};
&pcie {
reset-gpio = <&gpio GPIOX_7 GPIO_ACTIVE_HIGH>;
status = "disable"
reset-gpio = <&gpio GPIOX_0 GPIO_ACTIVE_HIGH>;
max-link-speed=<1>;
status = "okay";
};
/* SDIO */
@@ -900,8 +901,8 @@
bus-width = <4>;
cap-sd-highspeed;
//sd-uhs-sdr50;
//sd-uhs-sdr104;
sd-uhs-sdr50;
sd-uhs-sdr104;
max-frequency = <200000000>;
non-removable;
@@ -1174,18 +1175,24 @@
};
&aml_wifi{
status = "disabled";
status = "okay";
interrupt-gpios = <&gpio GPIOX_7 GPIO_ACTIVE_HIGH>;
power_on-gpios = <&gpio GPIOX_6 GPIO_ACTIVE_HIGH>;
};
&aml_bt {
status = "disabled";
status = "okay";
reset-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>;
btwakeup-gpios = <&gpio GPIOX_18 GPIO_ACTIVE_HIGH>;
hostwake-gpios = <&gpio GPIOX_19 GPIO_ACTIVE_HIGH>;
};
&pwm_e {
pinctrl-0 = <&pwm_e_pins1>;
pinctrl-names = "default";
status = "okay";
};
&uart_A {
status = "okay";
uart-has-rtscts;
arch/arm64/boot/dts/amlogic/s6_s905d5_bq209.dts
+13 -6
View File
@@ -885,8 +885,9 @@
};
&pcie {
reset-gpio = <&gpio GPIOX_7 GPIO_ACTIVE_HIGH>;
status = "disable"
reset-gpio = <&gpio GPIOX_0 GPIO_ACTIVE_HIGH>;
max-link-speed=<1>;
status = "okay";
};
/* SDIO */
@@ -900,8 +901,8 @@
bus-width = <4>;
cap-sd-highspeed;
//sd-uhs-sdr50;
//sd-uhs-sdr104;
sd-uhs-sdr50;
sd-uhs-sdr104;
max-frequency = <200000000>;
non-removable;
@@ -1174,18 +1175,24 @@
};
&aml_wifi{
status = "disabled";
status = "okay";
interrupt-gpios = <&gpio GPIOX_7 GPIO_ACTIVE_HIGH>;
power_on-gpios = <&gpio GPIOX_6 GPIO_ACTIVE_HIGH>;
};
&aml_bt {
status = "disabled";
status = "okay";
reset-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>;
btwakeup-gpios = <&gpio GPIOX_18 GPIO_ACTIVE_HIGH>;
hostwake-gpios = <&gpio GPIOX_19 GPIO_ACTIVE_HIGH>;
};
&pwm_e {
pinctrl-0 = <&pwm_e_pins1>;
pinctrl-names = "default";
status = "okay";
};
&uart_A {
status = "okay";
uart-has-rtscts;
arch/arm64/boot/dts/amlogic/s6_s905x5_bl201.dts
+13 -6
View File
@@ -1063,8 +1063,9 @@
};
&pcie {
reset-gpio = <&gpio GPIOX_7 GPIO_ACTIVE_HIGH>;
status = "disable"
reset-gpio = <&gpio GPIOX_0 GPIO_ACTIVE_HIGH>;
max-link-speed=<1>;
status = "okay";
};
/* SDIO */
@@ -1078,8 +1079,8 @@
bus-width = <4>;
cap-sd-highspeed;
//sd-uhs-sdr50;
//sd-uhs-sdr104;
sd-uhs-sdr50;
sd-uhs-sdr104;
max-frequency = <200000000>;
non-removable;
@@ -1352,18 +1353,24 @@
};
&aml_wifi{
status = "disabled";
status = "okay";
interrupt-gpios = <&gpio GPIOX_7 GPIO_ACTIVE_HIGH>;
power_on-gpios = <&gpio GPIOX_6 GPIO_ACTIVE_HIGH>;
};
&aml_bt {
status = "disabled";
status = "okay";
reset-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>;
btwakeup-gpios = <&gpio GPIOX_18 GPIO_ACTIVE_HIGH>;
hostwake-gpios = <&gpio GPIOX_19 GPIO_ACTIVE_HIGH>;
};
&pwm_e {
pinctrl-0 = <&pwm_e_pins1>;
pinctrl-names = "default";
status = "okay";
};
&uart_A {
status = "okay";
uart-has-rtscts;
arch/arm64/boot/dts/amlogic/s6_s905x5_bl208.dts
+13 -6
View File
@@ -1027,8 +1027,9 @@
};
&pcie {
reset-gpio = <&gpio GPIOX_7 GPIO_ACTIVE_HIGH>;
status = "disable"
reset-gpio = <&gpio GPIOX_0 GPIO_ACTIVE_HIGH>;
max-link-speed=<1>;
status = "okay";
};
/* SDIO */
@@ -1042,8 +1043,8 @@
bus-width = <4>;
cap-sd-highspeed;
//sd-uhs-sdr50;
//sd-uhs-sdr104;
sd-uhs-sdr50;
sd-uhs-sdr104;
max-frequency = <200000000>;
non-removable;
@@ -1316,18 +1317,24 @@
};
&aml_wifi{
status = "disabled";
status = "okay";
interrupt-gpios = <&gpio GPIOX_7 GPIO_ACTIVE_HIGH>;
power_on-gpios = <&gpio GPIOX_6 GPIO_ACTIVE_HIGH>;
};
&aml_bt {
status = "disabled";
status = "okay";
reset-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>;
btwakeup-gpios = <&gpio GPIOX_18 GPIO_ACTIVE_HIGH>;
hostwake-gpios = <&gpio GPIOX_19 GPIO_ACTIVE_HIGH>;
};
&pwm_e {
pinctrl-0 = <&pwm_e_pins1>;
pinctrl-names = "default";
status = "okay";
};
&uart_A {
status = "okay";
uart-has-rtscts;
arch/arm64/boot/dts/amlogic/s6_s905x5_bl209.dts
+13 -6
View File
@@ -1037,8 +1037,9 @@
};
&pcie {
reset-gpio = <&gpio GPIOX_7 GPIO_ACTIVE_HIGH>;
status = "disable"
reset-gpio = <&gpio GPIOX_0 GPIO_ACTIVE_HIGH>;
max-link-speed=<1>;
status = "okay";
};
/* SDIO */
@@ -1052,8 +1053,8 @@
bus-width = <4>;
cap-sd-highspeed;
//sd-uhs-sdr50;
//sd-uhs-sdr104;
sd-uhs-sdr50;
sd-uhs-sdr104;
max-frequency = <200000000>;
non-removable;
@@ -1326,18 +1327,24 @@
};
&aml_wifi{
status = "disabled";
status = "okay";
interrupt-gpios = <&gpio GPIOX_7 GPIO_ACTIVE_HIGH>;
power_on-gpios = <&gpio GPIOX_6 GPIO_ACTIVE_HIGH>;
};
&aml_bt {
status = "disabled";
status = "okay";
reset-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>;
btwakeup-gpios = <&gpio GPIOX_18 GPIO_ACTIVE_HIGH>;
hostwake-gpios = <&gpio GPIOX_19 GPIO_ACTIVE_HIGH>;
};
&pwm_e {
pinctrl-0 = <&pwm_e_pins1>;
pinctrl-names = "default";
status = "okay";
};
&uart_A {
status = "okay";
uart-has-rtscts;
drivers/wireless/wifi/wifi_dt.c
+2 -1
View File
@@ -42,7 +42,8 @@ struct pcie_wifi_chip {
};
static const struct pcie_wifi_chip pcie_wifi[] = {
{0x16c3, 0xabcd}
{0x16c3, 0xabcd},
{0x1556, 0x1111}
};
int wifi_power_gpio;