From 8108616f2086606a2c2e1fd2da49c44bbba10af2 Mon Sep 17 00:00:00 2001 From: Shawn Guo Date: Thu, 29 Aug 2019 12:30:46 +0200 Subject: [PATCH] zero-sugar: remove wifi init code We have kernel handle all aspects of wifi initialization now, so the code can be removed from U-Boot. Signed-off-by: Shawn Guo --- board/reMarkable/zero-sugar/Makefile | 1 - board/reMarkable/zero-sugar/wifi_init.c | 34 ------------------------ board/reMarkable/zero-sugar/wifi_init.h | 6 ----- board/reMarkable/zero-sugar/zero-sugar.c | 5 ---- 4 files changed, 46 deletions(-) delete mode 100644 board/reMarkable/zero-sugar/wifi_init.c delete mode 100644 board/reMarkable/zero-sugar/wifi_init.h diff --git a/board/reMarkable/zero-sugar/Makefile b/board/reMarkable/zero-sugar/Makefile index 0f2d4469ad..a5de1f48eb 100644 --- a/board/reMarkable/zero-sugar/Makefile +++ b/board/reMarkable/zero-sugar/Makefile @@ -5,7 +5,6 @@ obj-y := zero-sugar.o \ uart_init.o \ - wifi_init.o \ epd_pmic_init.o \ epd_display_init.o \ touch_init.o \ diff --git a/board/reMarkable/zero-sugar/wifi_init.c b/board/reMarkable/zero-sugar/wifi_init.c deleted file mode 100644 index 94534e1f6e..0000000000 --- a/board/reMarkable/zero-sugar/wifi_init.c +++ /dev/null @@ -1,34 +0,0 @@ -#include "wifi_init.h" - -#include -#include -#include -#include -#include - -static iomux_v3_cfg_t const wifi_32K_clk_pad[] = { - MX7D_PAD_SD1_WP__CCM_CLKO2 | MUX_PAD_CTRL(NO_PAD_CTRL), - MX7D_PAD_ECSPI2_SS0__GPIO4_IO23 | MUX_PAD_CTRL (NO_PAD_CTRL) -}; - -void zs_do_wifi_poweron_cycle(void) -{ - printf("Turning off WIFI/BT power before configuring 32K clock..\n"); - gpio_request(IMX_GPIO_NR(6, 13), "WIFI_PWR_EN"); - gpio_direction_output(IMX_GPIO_NR(6, 13) , 0); - - gpio_request(IMX_GPIO_NR(4, 23), "BT_REG_EN"); - gpio_direction_output(IMX_GPIO_NR(4, 23), 0); - - printf("Setting IPP_D0_CLKO2 to get input from OSC_32K_CLK..\n"); - clock_set_src(IPP_DO_CLKO2, OSC_32K_CLK); - - printf("Configuring SD1_WP pad to output CLKO2..\n"); - imx_iomux_v3_setup_multiple_pads(wifi_32K_clk_pad, ARRAY_SIZE(wifi_32K_clk_pad)); - - printf("Waiting 200us before turning on WIFI power..\n"); - udelay(200); - - printf("Turning on WIFI power..\n"); - gpio_set_value(IMX_GPIO_NR(6, 13), 1); -} diff --git a/board/reMarkable/zero-sugar/wifi_init.h b/board/reMarkable/zero-sugar/wifi_init.h deleted file mode 100644 index de9f9421b0..0000000000 --- a/board/reMarkable/zero-sugar/wifi_init.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef WIFI_INIT_H -#define WIFI_INIT_H - -extern void zs_do_wifi_poweron_cycle(void); - -#endif diff --git a/board/reMarkable/zero-sugar/zero-sugar.c b/board/reMarkable/zero-sugar/zero-sugar.c index 8a99121ae5..1c28f5a835 100644 --- a/board/reMarkable/zero-sugar/zero-sugar.c +++ b/board/reMarkable/zero-sugar/zero-sugar.c @@ -8,7 +8,6 @@ * */ -#include "wifi_init.h" #include "uart_init.h" #include "epd_display_init.h" #include "epd_pmic_init.h" @@ -81,10 +80,6 @@ static void power_perfs(void) /* DIGITIZER */ zs_do_config_digitizer_powerctrl_pins(); udelay(1000000); - - /* WIFI */ - zs_do_wifi_poweron_cycle(); - udelay(500000); } static int init_charger(void)