diff --git a/board/reMarkable/zero-sugar/Makefile b/board/reMarkable/zero-sugar/Makefile index faac8e1e4c..fd702bd1a4 100644 --- a/board/reMarkable/zero-sugar/Makefile +++ b/board/reMarkable/zero-sugar/Makefile @@ -3,4 +3,10 @@ # SPDX-License-Identifier: GPL-2.0+ # -obj-y := zero-sugar.o ../../freescale/common/pfuze.o ../../freescale/common/mmc.o +obj-y := zero-sugar.o \ + uart_init.o \ + wifi_init.o \ + epd_init.o \ + lcd_init.o \ + digitizer_init.o \ + ../../freescale/common/mmc.o diff --git a/board/reMarkable/zero-sugar/digitizer_init.c b/board/reMarkable/zero-sugar/digitizer_init.c new file mode 100644 index 0000000000..c26ed04be6 --- /dev/null +++ b/board/reMarkable/zero-sugar/digitizer_init.c @@ -0,0 +1,13 @@ +#include "digitizer_init.h" + +#include +#include + +void zs_do_config_digitizer_powerctrl_pins(void) +{ + gpio_request(IMX_GPIO_NR(1, 1), "DIGITIZER_INT"); + gpio_direction_input(IMX_GPIO_NR(1, 1)); + + gpio_request(IMX_GPIO_NR(1, 6), "DIGITIZER_PWR_EN"); + gpio_direction_output(IMX_GPIO_NR(1, 6), 1); +} diff --git a/board/reMarkable/zero-sugar/digitizer_init.h b/board/reMarkable/zero-sugar/digitizer_init.h new file mode 100644 index 0000000000..4ba9e0f3c2 --- /dev/null +++ b/board/reMarkable/zero-sugar/digitizer_init.h @@ -0,0 +1,6 @@ +#ifndef DIGITIZER_INIT_H +#define DIGITIZER_INIT_H + +extern void zs_do_config_digitizer_powerctrl_pins(void); + +#endif diff --git a/board/reMarkable/zero-sugar/epd_init.c b/board/reMarkable/zero-sugar/epd_init.c new file mode 100644 index 0000000000..32ac051013 --- /dev/null +++ b/board/reMarkable/zero-sugar/epd_init.c @@ -0,0 +1,155 @@ +#include "epd_init.h" + +#include +#include +#include + +#include + +#define SY7636A_I2C_BUS 3 +#define SY7636A_I2C_ADDR 0x62 + +#define SY7636A_REG_OPERATIONMODE 0x00 +#define SY7636A_OPERATIONMODE_ONOFF 0x80 +#define SY7636A_OPERATIONMODE_VCOMCTRL 0x40 + +#define SY7636A_REG_VCOMADJUST_L 0x01 +#define SY7636A_REG_VCOMADJUST_H 0x02 + +#define SY7636A_VCOMADJUST_LMASK 0xff +#define SY7636A_VCOMADJUST_HMASK 0x80 + +static int sy7636a_i2c_reg_write(struct udevice *dev, uint addr, uint mask, uint data) +{ + u8 valb; + int ret; + + if (mask != 0xff) { + ret = dm_i2c_read(dev, addr, &valb, 1); + if (ret) + return ret; + + valb &= ~mask; + valb |= data; + } else { + valb = data; + } + + ret = dm_i2c_write(dev, addr, &valb, 1); + return ret; +} + +static int sy7636a_i2c_reg_read(struct udevice *dev, u8 addr, u8 *data) +{ + u8 valb; + int ret; + + ret = dm_i2c_read(dev, addr, &valb, 1); + if (ret) + return ret; + + *data = (int)valb; + return 0; +} + +static int sy7636a_vcom_get(struct udevice *dev, int *vcom) +{ + u8 low, high; + int ret; + + ret = sy7636a_i2c_reg_read(dev, SY7636A_REG_VCOMADJUST_L, &low); + if (ret) + return ret; + + ret = sy7636a_i2c_reg_read(dev, SY7636A_REG_VCOMADJUST_H, &high); + if (ret) + return ret; + + low &= SY7636A_VCOMADJUST_LMASK; + high &= SY7636A_VCOMADJUST_HMASK; + + *vcom = -10 * (low | ((u16)high << 1)); + *vcom = (*vcom < -5000) ? -5000 : *vcom; + return 0; +} + +static int sy7636a_vcom_set(struct udevice *dev, int vcom) +{ + u8 high, low; + int ret; + + if (vcom < 0) + vcom = -vcom; + + vcom /= 10; + + if (vcom > 0x01FF) + return -EINVAL; + + low = vcom & SY7636A_VCOMADJUST_LMASK; + high = ((u16)vcom >> 1) & SY7636A_VCOMADJUST_HMASK; + + ret = sy7636a_i2c_reg_write(dev, SY7636A_REG_VCOMADJUST_L, SY7636A_VCOMADJUST_LMASK, low); + if (ret) + return ret; + + return sy7636a_i2c_reg_write(dev, SY7636A_REG_VCOMADJUST_H, SY7636A_VCOMADJUST_HMASK, high); +} + +int zs_do_config_epd_powerctrl_pins(void) +{ + gpio_request(IMX_GPIO_NR(4, 22), "EPD_PMIC_I2C_PULLUP"); + gpio_direction_output(IMX_GPIO_NR(4, 22), 1); + + gpio_request(IMX_GPIO_NR(7, 10), "PMIC_LDO4VEN"); + gpio_direction_output(IMX_GPIO_NR(7, 10), 1); + + gpio_request(IMX_GPIO_NR(7, 11), "EPD_PMIC_POWERUP"); + gpio_direction_output(IMX_GPIO_NR(7, 11), 1); +} + +int zs_do_epd_power_on(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +{ + struct udevice *bus, *dev; + u8 mask, val; + ulong vcom; + int ivcom; + + int ret; + + ret = uclass_get_device_by_seq(UCLASS_I2C, SY7636A_I2C_BUS, &bus); + if (ret) { + printf("%s: No bus %d\n", __func__, SY7636A_I2C_BUS); + return -1; + } + + ret = dm_i2c_probe(bus, SY7636A_I2C_ADDR, 0, &dev); + if (ret) { + printf("%s: Can't find device id=0x%x, on bus %d\n", + __func__, SY7636A_I2C_ADDR, SY7636A_I2C_BUS); + return -1; + } + + ret = sy7636a_vcom_get(dev, &ivcom); + if (ret) + return ret; + + vcom = env_get_ulong("vcom", 10, 1250); + printf("vcom was %dmV, setting to -%lumV\n", ivcom, vcom); + + ret = sy7636a_vcom_set(dev, vcom); + if (ret) + return ret; + + /* Power on, include VCOM in power sequence */ + mask = (SY7636A_OPERATIONMODE_ONOFF | SY7636A_OPERATIONMODE_VCOMCTRL); + val = SY7636A_OPERATIONMODE_ONOFF; + + return sy7636a_i2c_reg_write(dev, SY7636A_REG_OPERATIONMODE, mask, val); +} + +U_BOOT_CMD( + epd_power_on, 1, 1, zs_do_epd_power_on, + "Turn on power for eInk Display", + "" +); diff --git a/board/reMarkable/zero-sugar/epd_init.h b/board/reMarkable/zero-sugar/epd_init.h new file mode 100644 index 0000000000..a6a4e4f9fd --- /dev/null +++ b/board/reMarkable/zero-sugar/epd_init.h @@ -0,0 +1,9 @@ +#ifndef EPD_INIT_H +#define EPD_INIT_H + +#include + +extern int zs_do_config_epd_powerctrl_pins(void); +extern int zs_do_epd_power_on(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); + +#endif diff --git a/board/reMarkable/zero-sugar/lcd_init.c b/board/reMarkable/zero-sugar/lcd_init.c new file mode 100644 index 0000000000..eed0a90104 --- /dev/null +++ b/board/reMarkable/zero-sugar/lcd_init.c @@ -0,0 +1,68 @@ +#include "lcd_init.h" + +#include +#include +#include +#include + +#define LCD_PAD_CTRL (PAD_CTL_HYS | PAD_CTL_PUS_PU100KOHM | PAD_CTL_DSE_3P3V_49OHM) + +static iomux_v3_cfg_t const lcd_pads[] = { + MX7D_PAD_LCD_CLK__LCD_CLK | MUX_PAD_CTRL(LCD_PAD_CTRL), + MX7D_PAD_LCD_ENABLE__LCD_ENABLE | MUX_PAD_CTRL(LCD_PAD_CTRL), + MX7D_PAD_LCD_HSYNC__LCD_HSYNC | MUX_PAD_CTRL(LCD_PAD_CTRL), + MX7D_PAD_LCD_VSYNC__LCD_VSYNC | MUX_PAD_CTRL(LCD_PAD_CTRL), + MX7D_PAD_LCD_DATA00__LCD_DATA0 | MUX_PAD_CTRL(LCD_PAD_CTRL), + MX7D_PAD_LCD_DATA01__LCD_DATA1 | MUX_PAD_CTRL(LCD_PAD_CTRL), + MX7D_PAD_LCD_DATA02__LCD_DATA2 | MUX_PAD_CTRL(LCD_PAD_CTRL), + MX7D_PAD_LCD_DATA03__LCD_DATA3 | MUX_PAD_CTRL(LCD_PAD_CTRL), + MX7D_PAD_LCD_DATA04__LCD_DATA4 | MUX_PAD_CTRL(LCD_PAD_CTRL), + MX7D_PAD_LCD_DATA05__LCD_DATA5 | MUX_PAD_CTRL(LCD_PAD_CTRL), + MX7D_PAD_LCD_DATA06__LCD_DATA6 | MUX_PAD_CTRL(LCD_PAD_CTRL), + MX7D_PAD_LCD_DATA07__LCD_DATA7 | MUX_PAD_CTRL(LCD_PAD_CTRL), + MX7D_PAD_LCD_DATA08__LCD_DATA8 | MUX_PAD_CTRL(LCD_PAD_CTRL), + MX7D_PAD_LCD_DATA09__LCD_DATA9 | MUX_PAD_CTRL(LCD_PAD_CTRL), + MX7D_PAD_LCD_DATA10__LCD_DATA10 | MUX_PAD_CTRL(LCD_PAD_CTRL), + MX7D_PAD_LCD_DATA11__LCD_DATA11 | MUX_PAD_CTRL(LCD_PAD_CTRL), + MX7D_PAD_LCD_DATA12__LCD_DATA12 | MUX_PAD_CTRL(LCD_PAD_CTRL), + MX7D_PAD_LCD_DATA13__LCD_DATA13 | MUX_PAD_CTRL(LCD_PAD_CTRL), + MX7D_PAD_LCD_DATA14__LCD_DATA14 | MUX_PAD_CTRL(LCD_PAD_CTRL), + MX7D_PAD_LCD_DATA15__LCD_DATA15 | MUX_PAD_CTRL(LCD_PAD_CTRL), + MX7D_PAD_LCD_DATA16__LCD_DATA16 | MUX_PAD_CTRL(LCD_PAD_CTRL), + MX7D_PAD_LCD_DATA17__LCD_DATA17 | MUX_PAD_CTRL(LCD_PAD_CTRL), + MX7D_PAD_LCD_DATA18__LCD_DATA18 | MUX_PAD_CTRL(LCD_PAD_CTRL), + MX7D_PAD_LCD_DATA19__LCD_DATA19 | MUX_PAD_CTRL(LCD_PAD_CTRL), + MX7D_PAD_LCD_DATA20__LCD_DATA20 | MUX_PAD_CTRL(LCD_PAD_CTRL), + MX7D_PAD_LCD_DATA21__LCD_DATA21 | MUX_PAD_CTRL(LCD_PAD_CTRL), + MX7D_PAD_LCD_DATA22__LCD_DATA22 | MUX_PAD_CTRL(LCD_PAD_CTRL), + MX7D_PAD_LCD_DATA23__LCD_DATA23 | MUX_PAD_CTRL(LCD_PAD_CTRL), + + MX7D_PAD_LCD_RESET__GPIO3_IO4 | MUX_PAD_CTRL(LCD_PAD_CTRL), +}; + +void do_enable_parallel_lcd(struct display_info_t const *dev) +{ + imx_iomux_v3_setup_multiple_pads(lcd_pads, ARRAY_SIZE(lcd_pads)); +} + +struct display_info_t const displays[] = {{ + .bus = ELCDIF1_IPS_BASE_ADDR, + .addr = 0, + .pixfmt = 24, + .detect = NULL, + .enable = do_enable_parallel_lcd, + .mode = { + .name = "TFT43AB", + .xres = 480, + .yres = 272, + .pixclock = 108695, + .left_margin = 8, + .right_margin = 4, + .upper_margin = 2, + .lower_margin = 4, + .hsync_len = 41, + .vsync_len = 10, + .sync = 0, + .vmode = FB_VMODE_NONINTERLACED +} } }; +size_t display_count = ARRAY_SIZE(displays); diff --git a/board/reMarkable/zero-sugar/lcd_init.h b/board/reMarkable/zero-sugar/lcd_init.h new file mode 100644 index 0000000000..c989a11519 --- /dev/null +++ b/board/reMarkable/zero-sugar/lcd_init.h @@ -0,0 +1,4 @@ +#ifndef LCD_INIT_H +#define LCD_INIT_H + +#endif diff --git a/board/reMarkable/zero-sugar/uart_init.c b/board/reMarkable/zero-sugar/uart_init.c new file mode 100644 index 0000000000..0602d0b934 --- /dev/null +++ b/board/reMarkable/zero-sugar/uart_init.c @@ -0,0 +1,16 @@ +#include "uart_init.h" + +#include +#include + +#define UART_PAD_CTRL (PAD_CTL_DSE_3P3V_49OHM | PAD_CTL_PUS_PU100KOHM | PAD_CTL_HYS) + +static iomux_v3_cfg_t const uart1_pads[] = { + MX7D_PAD_UART1_TX_DATA__UART1_DCE_TX | MUX_PAD_CTRL(UART_PAD_CTRL), + MX7D_PAD_UART1_RX_DATA__UART1_DCE_RX | MUX_PAD_CTRL(UART_PAD_CTRL), +}; + +void setup_iomux_uart(void) +{ + imx_iomux_v3_setup_multiple_pads(uart1_pads, ARRAY_SIZE(uart1_pads)); +} diff --git a/board/reMarkable/zero-sugar/uart_init.h b/board/reMarkable/zero-sugar/uart_init.h new file mode 100644 index 0000000000..1cbebe05fc --- /dev/null +++ b/board/reMarkable/zero-sugar/uart_init.h @@ -0,0 +1,6 @@ +#ifndef UART_INIT_H +#define UART_INIT_H + +extern void setup_iomux_uart(void); + +#endif diff --git a/board/reMarkable/zero-sugar/wifi_init.c b/board/reMarkable/zero-sugar/wifi_init.c new file mode 100644 index 0000000000..b32b6bcbca --- /dev/null +++ b/board/reMarkable/zero-sugar/wifi_init.c @@ -0,0 +1,23 @@ +#include "wifi_init.h" + +#include +#include +#include + +void zs_do_config_wifi_powerctrl_pins(void) +{ + gpio_request(IMX_GPIO_NR(6, 13), "WIFI_PWR_EN"); + gpio_direction_output(IMX_GPIO_NR(6, 13) , 1); +} + +void zs_do_setup_32K_wifi_clk(void) +{ + /* Set 32K clock source for the CLKO2 clock */ + printf("Setting IPP_D0_CLKO2 to get input from OSC_32K_CLK..\n"); + clock_set_src(IPP_DO_CLKO2, OSC_32K_CLK); +} +U_BOOT_CMD( + 32K_wifi_clk_on, 1, 1, zs_do_setup_32K_wifi_clk, + "Turn on 32K clock for external wifi module", + "Turn on the 32K clock which is required for the external wifi module to run" +); diff --git a/board/reMarkable/zero-sugar/wifi_init.h b/board/reMarkable/zero-sugar/wifi_init.h new file mode 100644 index 0000000000..dd6f46eaa0 --- /dev/null +++ b/board/reMarkable/zero-sugar/wifi_init.h @@ -0,0 +1,7 @@ +#ifndef WIFI_INIT_H +#define WIFI_INIT_H + +extern void zs_do_config_wifi_powerctrl_pins(void); +extern void zs_do_setup_32K_wifi_clk(void); + +#endif diff --git a/board/reMarkable/zero-sugar/zero-sugar.c b/board/reMarkable/zero-sugar/zero-sugar.c index c1701d798e..ffda7b2b07 100644 --- a/board/reMarkable/zero-sugar/zero-sugar.c +++ b/board/reMarkable/zero-sugar/zero-sugar.c @@ -8,6 +8,12 @@ * */ +#include "wifi_init.h" +#include "uart_init.h" +#include "lcd_init.h" +#include "epd_init.h" +#include "digitizer_init.h" + #include #include #include @@ -23,8 +29,6 @@ #include #include #include -#include -#include "../../freescale/common/pfuze.h" #include #include #include @@ -33,28 +37,8 @@ #include -#ifdef CONFIG_FSL_FASTBOOT -#include -#ifdef CONFIG_ANDROID_RECOVERY -#include -#endif -#endif /*CONFIG_FSL_FASTBOOT*/ - DECLARE_GLOBAL_DATA_PTR; -#define UART_PAD_CTRL (PAD_CTL_DSE_3P3V_49OHM | \ - PAD_CTL_PUS_PU100KOHM | PAD_CTL_HYS) - -#define ENET_PAD_CTRL (PAD_CTL_PUS_PU100KOHM | PAD_CTL_DSE_3P3V_49OHM) -#define ENET_PAD_CTRL_MII (PAD_CTL_DSE_3P3V_32OHM) - -#define ENET_RX_PAD_CTRL (PAD_CTL_PUS_PU100KOHM | PAD_CTL_DSE_3P3V_49OHM) - -#define LCD_PAD_CTRL (PAD_CTL_HYS | PAD_CTL_PUS_PU100KOHM | \ - PAD_CTL_DSE_3P3V_49OHM) - -#define BUTTON_PAD_CTRL (PAD_CTL_PUS_PU5KOHM | PAD_CTL_DSE_3P3V_98OHM) - int dram_init(void) { gd->ram_size = PHYS_SDRAM_SIZE; @@ -66,349 +50,25 @@ static iomux_v3_cfg_t const wdog_pads[] = { MX7D_PAD_GPIO1_IO00__WDOG1_WDOG_B | MUX_PAD_CTRL(NO_PAD_CTRL), }; -static iomux_v3_cfg_t const uart1_pads[] = { - MX7D_PAD_UART1_TX_DATA__UART1_DCE_TX | MUX_PAD_CTRL(UART_PAD_CTRL), - MX7D_PAD_UART1_RX_DATA__UART1_DCE_RX | MUX_PAD_CTRL(UART_PAD_CTRL), -}; - -#define BOARD_REV_C 0x300 -#define BOARD_REV_B 0x200 -#define BOARD_REV_A 0x100 - -static int mx7sabre_rev(void) +static void power_perfs(void) { - /* - * Get Board ID information from OCOTP_GP1[15:8] - * i.MX7D SDB RevA: 0x41 - * i.MX7D SDB RevB: 0x42 - */ - struct ocotp_regs *ocotp = (struct ocotp_regs *)OCOTP_BASE_ADDR; - struct fuse_bank *bank = &ocotp->bank[14]; - int reg = readl(&bank->fuse_regs[0]); - int ret; + printk("Powering up peripherals\n"); - if (reg != 0) { - switch (reg >> 8 & 0x0F) { - case 0x3: - ret = BOARD_REV_C; - break; - case 0x02: - ret = BOARD_REV_B; - break; - case 0x01: - default: - ret = BOARD_REV_A; - break; - } - } else { - /* If the gp1 fuse is not burn, we have to use TO rev for the board rev */ - if (is_soc_rev(CHIP_REV_1_0)) - ret = BOARD_REV_A; - else if (is_soc_rev(CHIP_REV_1_1)) - ret = BOARD_REV_B; - else - ret = BOARD_REV_C; - } - - return ret; -} - -u32 get_board_rev(void) -{ - int rev = mx7sabre_rev(); - - return (get_cpu_rev() & ~(0xF << 8)) | rev; -} - -#ifdef CONFIG_VIDEO_MXS -static iomux_v3_cfg_t const lcd_pads[] = { - MX7D_PAD_LCD_CLK__LCD_CLK | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_ENABLE__LCD_ENABLE | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_HSYNC__LCD_HSYNC | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_VSYNC__LCD_VSYNC | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA00__LCD_DATA0 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA01__LCD_DATA1 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA02__LCD_DATA2 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA03__LCD_DATA3 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA04__LCD_DATA4 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA05__LCD_DATA5 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA06__LCD_DATA6 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA07__LCD_DATA7 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA08__LCD_DATA8 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA09__LCD_DATA9 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA10__LCD_DATA10 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA11__LCD_DATA11 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA12__LCD_DATA12 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA13__LCD_DATA13 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA14__LCD_DATA14 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA15__LCD_DATA15 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA16__LCD_DATA16 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA17__LCD_DATA17 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA18__LCD_DATA18 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA19__LCD_DATA19 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA20__LCD_DATA20 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA21__LCD_DATA21 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA22__LCD_DATA22 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA23__LCD_DATA23 | MUX_PAD_CTRL(LCD_PAD_CTRL), - - MX7D_PAD_LCD_RESET__GPIO3_IO4 | MUX_PAD_CTRL(LCD_PAD_CTRL), -}; - -static iomux_v3_cfg_t const pwm_pads[] = { - /* Use GPIO for Brightness adjustment, duty cycle = period */ - MX7D_PAD_GPIO1_IO01__GPIO1_IO1 | MUX_PAD_CTRL(NO_PAD_CTRL), -}; - -void do_enable_parallel_lcd(struct display_info_t const *dev) -{ - imx_iomux_v3_setup_multiple_pads(lcd_pads, ARRAY_SIZE(lcd_pads)); - - imx_iomux_v3_setup_multiple_pads(pwm_pads, ARRAY_SIZE(pwm_pads)); -} - -struct display_info_t const displays[] = {{ - .bus = ELCDIF1_IPS_BASE_ADDR, - .addr = 0, - .pixfmt = 24, - .detect = NULL, - .enable = do_enable_parallel_lcd, - .mode = { - .name = "TFT43AB", - .xres = 480, - .yres = 272, - .pixclock = 108695, - .left_margin = 8, - .right_margin = 4, - .upper_margin = 2, - .lower_margin = 4, - .hsync_len = 41, - .vsync_len = 10, - .sync = 0, - .vmode = FB_VMODE_NONINTERLACED -} } }; -size_t display_count = ARRAY_SIZE(displays); -#endif - - -static void setup_iomux_uart(void) -{ - imx_iomux_v3_setup_multiple_pads(uart1_pads, ARRAY_SIZE(uart1_pads)); -} - -int board_mmc_get_env_dev(int devno) -{ - if (devno == 2) - devno--; - - return devno; -} - -int mmc_map_to_kernel_blk(int dev_no) -{ - if (dev_no == 1) - dev_no++; - - return dev_no; -} - -#ifdef CONFIG_FEC_MXC -static int setup_fec(int fec_id) -{ - struct iomuxc_gpr_base_regs *const iomuxc_gpr_regs - = (struct iomuxc_gpr_base_regs *) IOMUXC_GPR_BASE_ADDR; - - int ret; - unsigned int gpio; - - ret = gpio_lookup_name("gpio_spi@0_5", NULL, NULL, &gpio); - if (ret) { - printf("GPIO: 'gpio_spi@0_5' not found\n"); - return -ENODEV; - } - - ret = gpio_request(gpio, "enet_phy_rst"); - if (ret && ret != -EBUSY) { - printf("gpio: requesting pin %u failed\n", gpio); - return ret; - } - - gpio_direction_output(gpio, 0); + /* WIFI */ + zs_do_setup_32K_wifi_clk(); + zs_do_config_wifi_powerctrl_pins(); udelay(500); - gpio_direction_output(gpio, 1); - if (0 == fec_id) { - /* Use 125M anatop REF_CLK1 for ENET1, clear gpr1[13], gpr1[17]*/ - clrsetbits_le32(&iomuxc_gpr_regs->gpr[1], - (IOMUXC_GPR_GPR1_GPR_ENET1_TX_CLK_SEL_MASK | - IOMUXC_GPR_GPR1_GPR_ENET1_CLK_DIR_MASK), 0); - } else { - /* Use 125M anatop REF_CLK2 for ENET2, clear gpr1[14], gpr1[18]*/ - clrsetbits_le32(&iomuxc_gpr_regs->gpr[1], - (IOMUXC_GPR_GPR1_GPR_ENET2_TX_CLK_SEL_MASK | - IOMUXC_GPR_GPR1_GPR_ENET2_CLK_DIR_MASK), 0); + /* DIGITIZER */ + zs_do_config_digitizer_powerctrl_pins(); + udelay(500); - if (mx7sabre_rev() >= BOARD_REV_B) { - /* On RevB, GPIO1_IO04 is used for ENET2 EN, - * so set its output to low to enable ENET2 signals - */ - gpio_request(IMX_GPIO_NR(1, 4), "fec2_en"); - gpio_direction_output(IMX_GPIO_NR(1, 4), 0); - } - } - - return set_clk_enet(ENET_125MHZ); + /* EPD */ + zs_do_config_epd_powerctrl_pins(); + zs_do_epd_power_on(NULL, 0, 0, NULL); + udelay(500); } -int board_phy_config(struct phy_device *phydev) -{ - /* enable rgmii rxc skew and phy mode select to RGMII copper */ - phy_write(phydev, MDIO_DEVAD_NONE, 0x1e, 0x21); - phy_write(phydev, MDIO_DEVAD_NONE, 0x1f, 0x7ea8); - phy_write(phydev, MDIO_DEVAD_NONE, 0x1e, 0x2f); - phy_write(phydev, MDIO_DEVAD_NONE, 0x1f, 0x71b7); - - if (phydev->drv->config) - phydev->drv->config(phydev); - return 0; -} -#endif - -#define SY7636A_I2C_BUS 3 -#define SY7636A_I2C_ADDR 0x62 - -#define SY7636A_REG_OPERATIONMODE 0x00 -#define SY7636A_OPERATIONMODE_ONOFF 0x80 -#define SY7636A_OPERATIONMODE_VCOMCTRL 0x40 - -#define SY7636A_REG_VCOMADJUST_L 0x01 -#define SY7636A_REG_VCOMADJUST_H 0x02 - -#define SY7636A_VCOMADJUST_LMASK 0xff -#define SY7636A_VCOMADJUST_HMASK 0x80 - -static int sy7636a_i2c_reg_write(struct udevice *dev, uint addr, uint mask, uint data) -{ - u8 valb; - int ret; - - if (mask != 0xff) { - ret = dm_i2c_read(dev, addr, &valb, 1); - if (ret) - return ret; - - valb &= ~mask; - valb |= data; - } else { - valb = data; - } - - ret = dm_i2c_write(dev, addr, &valb, 1); - return ret; -} - -static int sy7636a_i2c_reg_read(struct udevice *dev, u8 addr, u8 *data) -{ - u8 valb; - int ret; - - ret = dm_i2c_read(dev, addr, &valb, 1); - if (ret) - return ret; - - *data = (int)valb; - return 0; -} - -static int sy7636a_vcom_get(struct udevice *dev, int *vcom) -{ - u8 low, high; - int ret; - - ret = sy7636a_i2c_reg_read(dev, SY7636A_REG_VCOMADJUST_L, &low); - if (ret) - return ret; - - ret = sy7636a_i2c_reg_read(dev, SY7636A_REG_VCOMADJUST_H, &high); - if (ret) - return ret; - - low &= SY7636A_VCOMADJUST_LMASK; - high &= SY7636A_VCOMADJUST_HMASK; - - *vcom = -10 * (low | ((u16)high << 1)); - *vcom = (*vcom < -5000) ? -5000 : *vcom; - return 0; -} - -static int sy7636a_vcom_set(struct udevice *dev, int vcom) -{ - u8 high, low; - int ret; - - if (vcom < 0) - vcom = -vcom; - - vcom /= 10; - - if (vcom > 0x01FF) - return -EINVAL; - - low = vcom & SY7636A_VCOMADJUST_LMASK; - high = ((u16)vcom >> 1) & SY7636A_VCOMADJUST_HMASK; - - ret = sy7636a_i2c_reg_write(dev, SY7636A_REG_VCOMADJUST_L, SY7636A_VCOMADJUST_LMASK, low); - if (ret) - return ret; - - return sy7636a_i2c_reg_write(dev, SY7636A_REG_VCOMADJUST_H, SY7636A_VCOMADJUST_HMASK, high); -} - -static int do_epd_power_on(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) -{ - struct udevice *bus, *dev; - u8 mask, val; - ulong vcom; - int ivcom; - - int ret; - - ret = uclass_get_device_by_seq(UCLASS_I2C, SY7636A_I2C_BUS, &bus); - if (ret) { - printf("%s: No bus %d\n", __func__, SY7636A_I2C_BUS); - return -1; - } - - ret = dm_i2c_probe(bus, SY7636A_I2C_ADDR, 0, &dev); - if (ret) { - printf("%s: Can't find device id=0x%x, on bus %d\n", - __func__, SY7636A_I2C_ADDR, SY7636A_I2C_BUS); - return -1; - } - - ret = sy7636a_vcom_get(dev, &ivcom); - if (ret) - return ret; - - vcom = env_get_ulong("vcom", 10, 1250); - printf("vcom was %dmV, setting to -%lumV\n", ivcom, vcom); - - ret = sy7636a_vcom_set(dev, vcom); - if (ret) - return ret; - - /* Power on, include VCOM in power sequence */ - mask = (SY7636A_OPERATIONMODE_ONOFF | SY7636A_OPERATIONMODE_VCOMCTRL); - val = SY7636A_OPERATIONMODE_ONOFF; - - return sy7636a_i2c_reg_write(dev, SY7636A_REG_OPERATIONMODE, mask, val); -} - -U_BOOT_CMD( - epd_power_on, 1, 1, do_epd_power_on, - "Turn on power for eInk Display", - "" -); - int board_early_init_f(void) { setup_iomux_uart(); @@ -421,146 +81,17 @@ int board_init(void) /* address of boot parameters */ gd->bd->bi_boot_params = PHYS_SDRAM + 0x100; -#ifdef CONFIG_FEC_MXC - setup_fec(CONFIG_FEC_ENET_DEV); -#endif - return 0; } -#ifdef CONFIG_CMD_BMODE -static const struct boot_mode board_boot_modes[] = { - /* 4 bit bus width */ - {"sd1", MAKE_CFGVAL(0x10, 0x10, 0x00, 0x00)}, - {"emmc", MAKE_CFGVAL(0x10, 0x2a, 0x00, 0x00)}, - /* TODO: Nand */ - {"qspi", MAKE_CFGVAL(0x00, 0x40, 0x00, 0x00)}, - {NULL, 0}, -}; -#endif - -static void power_perfs(void) -{ - printk("Powering up peripherals\n"); - - /* WIFI */ - gpio_request(IMX_GPIO_NR(6, 13), "WIFI_PWR_EN"); - gpio_direction_output(IMX_GPIO_NR(6, 13) , 1); - udelay(500); - - /* DIGITIZER */ - gpio_request(IMX_GPIO_NR(1, 1), "DIGITIZER_INT"); - gpio_direction_input(IMX_GPIO_NR(1, 1)); - gpio_request(IMX_GPIO_NR(1, 6), "DIGITIZER_PWR_EN"); - gpio_direction_output(IMX_GPIO_NR(1, 6), 1); - udelay(500); - - /* EPD */ - gpio_request(IMX_GPIO_NR(4, 22), "EPD_PMIC_I2C_PULLUP"); - gpio_direction_output(IMX_GPIO_NR(4, 22), 1); - gpio_request(IMX_GPIO_NR(7, 10), "PMIC_LDO4VEN"); - gpio_direction_output(IMX_GPIO_NR(7, 10), 1); - gpio_request(IMX_GPIO_NR(7, 11), "EPD_PMIC_POWERUP"); - gpio_direction_output(IMX_GPIO_NR(7, 11), 1); - do_epd_power_on(NULL, 0, 0, NULL); - udelay(500); -} - -static void config_32K_wifi_clk(void) -{ - /* Set 32K clock source for the CLKO2 clock */ - printf("Setting IPP_D0_CLKO2 to get input from OSC_32K_CLK..\n"); - clock_set_src(IPP_DO_CLKO2, OSC_32K_CLK); -} -U_BOOT_CMD( - 32K_wifi_clk_on, 1, 1, config_32K_wifi_clk, - "Turn on 32K clock for external wifi module", - "Turn on the 32K clock which is required for the external wifi module to run" -); - int board_late_init(void) { struct wdog_regs *wdog = (struct wdog_regs *)WDOG1_BASE_ADDR; -#ifdef CONFIG_CMD_BMODE - add_board_boot_modes(board_boot_modes); -#endif - - env_set("tee", "no"); -#ifdef CONFIG_IMX_OPTEE - env_set("tee", "yes"); -#endif - -#ifdef CONFIG_ENV_IS_IN_MMC - board_late_mmc_env_init(); -#endif - - imx_iomux_v3_setup_multiple_pads(wdog_pads, ARRAY_SIZE(wdog_pads)); + imx_iomux_v3_setup_multiple_pads(wdog_pads, ARRAY_SIZE(wdog_pads)); set_wdog_reset(wdog); power_perfs(); - config_32K_wifi_clk(); - return 0; } - -int checkboard(void) -{ - int rev = mx7sabre_rev(); - char *mode; - char *revname; - - if (IS_ENABLED(CONFIG_ARMV7_BOOT_SEC_DEFAULT)) - mode = "secure"; - else - mode = "non-secure"; - - switch (rev) { - case BOARD_REV_C: - revname = "C"; - break; - case BOARD_REV_B: - revname = "B"; - break; - case BOARD_REV_A: - default: - revname = "A"; - break; - } - - printf("Board: i.MX7D SABRESD Rev%s in %s mode\n", revname, mode); - - return 0; -} - -#ifdef CONFIG_FSL_FASTBOOT -#ifdef CONFIG_ANDROID_RECOVERY - -/* Use S3 button for recovery key */ -#define GPIO_VOL_DN_KEY IMX_GPIO_NR(5, 10) -iomux_v3_cfg_t const recovery_key_pads[] = { - (MX7D_PAD_SD2_WP__GPIO5_IO10 | MUX_PAD_CTRL(BUTTON_PAD_CTRL)), -}; - -int is_recovery_key_pressing(void) -{ - int button_pressed = 0; - - /* Check Recovery Combo Button press or not. */ - imx_iomux_v3_setup_multiple_pads(recovery_key_pads, - ARRAY_SIZE(recovery_key_pads)); - - gpio_request(GPIO_VOL_DN_KEY, "volume_dn_key"); - gpio_direction_input(GPIO_VOL_DN_KEY); - - if (gpio_get_value(GPIO_VOL_DN_KEY) == 0) { /* VOL_DN key is low assert */ - button_pressed = 1; - printf("Recovery key pressed\n"); - } - - return button_pressed; -} - -#endif /*CONFIG_ANDROID_RECOVERY*/ -#endif /*CONFIG_FSL_FASTBOOT*/ diff --git a/configs/zero-sugar_defconfig b/configs/zero-sugar_defconfig index f92ae0476d..354702a327 100644 --- a/configs/zero-sugar_defconfig +++ b/configs/zero-sugar_defconfig @@ -1,20 +1,26 @@ CONFIG_ARM=y CONFIG_ARCH_MX7=y CONFIG_TARGET_ZERO_SUGAR=y -CONFIG_LOCALVERSION="-zero-sugar" -CONFIG_SYS_PROMPT="rM> " CONFIG_ARMV7_BOOT_SEC_DEFAULT=y # CONFIG_ARMV7_VIRT is not set CONFIG_IMX_RDC=y CONFIG_IMX_BOOTAUX=y +# CONFIG_CMD_BMODE is not set CONFIG_DEFAULT_DEVICE_TREE="zero-sugar" +CONFIG_LOCALVERSION="-zero-sugar" CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/reMarkable/zero-sugar/imximage.cfg" CONFIG_BOOTDELAY=3 # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="rM> " +CONFIG_FASTBOOT=y +CONFIG_FSL_FASTBOOT=y +CONFIG_FASTBOOT_BUF_ADDR=0x83800000 +CONFIG_FASTBOOT_BUF_SIZE=0x40000000 +CONFIG_FASTBOOT_FLASH=y +CONFIG_FASTBOOT_FLASH_MMC_DEV=1 CONFIG_CMD_BOOTZ=y -# CONFIG_CMD_IMLS is not set # CONFIG_CMD_XIMG is not set # CONFIG_CMD_EXPORTENV is not set # CONFIG_CMD_IMPORTENV is not set @@ -37,7 +43,12 @@ CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y +CONFIG_EFI_PARTITION=y CONFIG_OF_CONTROL=y +CONFIG_ENV_IS_IN_FAT=y +# CONFIG_ENV_IS_IN_MMC is not set +CONFIG_ENV_FAT_INTERFACE="mmc" +CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_DM_GPIO=y @@ -50,6 +61,7 @@ CONFIG_MMC_HS200_SUPPORT=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_EON=y CONFIG_PHYLIB=y +CONFIG_DM_ETH=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX7=y CONFIG_DM_PMIC=y @@ -70,20 +82,7 @@ CONFIG_USB_GADGET_MANUFACTURER="FSL" CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y -CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_VIDEO=y CONFIG_ERRNO_STR=y -CONFIG_DM_ETH=y - -CONFIG_CMD_FASTBOOT=y -CONFIG_USB_FUNCTION_FASTBOOT=y -CONFIG_FSL_FASTBOOT=y -CONFIG_FASTBOOT=y -CONFIG_FASTBOOT_BUF_ADDR=0x83800000 -CONFIG_FASTBOOT_BUF_SIZE=0x40000000 -CONFIG_FASTBOOT_FLASH=y -CONFIG_FASTBOOT_FLASH_MMC_DEV=1 -CONFIG_EFI_PARTITION=y - diff --git a/include/configs/zero-sugar.h b/include/configs/zero-sugar.h index 837a4da60e..12c43f2b82 100644 --- a/include/configs/zero-sugar.h +++ b/include/configs/zero-sugar.h @@ -260,16 +260,10 @@ /* Environment organization */ #define CONFIG_ENV_SIZE SZ_8K -#define CONFIG_ENV_IS_IN_FAT #ifdef CONFIG_ENV_IS_IN_FAT #define CONFIG_BOOTCOUNT_LIMIT #define CONFIG_BOOTCOUNT_ENV - -#define FAT_ENV_INTERFACE "mmc" -#define FAT_ENV_DEVICE_AND_PART "0:1" -#define CONFIG_FAT_WRITE -#define FAT_ENV_FILE "uboot.env" #endif #ifdef CONFIG_FSL_QSPI