diff options
| author | Tom Rini <trini@konsulko.com> | 2020-12-03 09:43:47 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-12-03 09:43:47 -0500 |
| commit | ee1e04558ff8c8ed812b986939447f129bb0b0bb (patch) | |
| tree | 3a8e867ec03a87263834725b5815c43465a81f88 /drivers | |
| parent | ab31883ae7e54ded8396b13a9057f861bf916ea4 (diff) | |
| parent | a6cd384b9c37596ca9035f26922dd65991ddcb85 (diff) | |
Merge branch '2020-12-02-master-imports'
- Assorted minor fixes
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mtd/spi/spi-nor-ids.c | 5 | ||||
| -rw-r--r-- | drivers/watchdog/sbsa_gwdt.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/drivers/mtd/spi/spi-nor-ids.c b/drivers/mtd/spi/spi-nor-ids.c index bc9d4f7e9f8..09e81960488 100644 --- a/drivers/mtd/spi/spi-nor-ids.c +++ b/drivers/mtd/spi/spi-nor-ids.c @@ -278,6 +278,11 @@ const struct flash_info spi_nor_ids[] = { SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) }, + { + INFO("w25q32jwm", 0xef8016, 0, 64 * 1024, 64, + SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | + SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) + }, { INFO("w25x64", 0xef3017, 0, 64 * 1024, 128, SECT_4K) }, { INFO("w25q64dw", 0xef6017, 0, 64 * 1024, 128, diff --git a/drivers/watchdog/sbsa_gwdt.c b/drivers/watchdog/sbsa_gwdt.c index 2eae431ba6c..96285c1a9b4 100644 --- a/drivers/watchdog/sbsa_gwdt.c +++ b/drivers/watchdog/sbsa_gwdt.c @@ -61,7 +61,7 @@ static int sbsa_gwdt_start(struct udevice *dev, u64 timeout, ulong flags) * to half value of timeout. */ clk = get_tbclk(); - writel(clk / 2 * timeout, + writel(clk / (2 * 1000) * timeout, priv->reg_control + SBSA_GWDT_WOR); /* writing WCS will cause an explicit watchdog refresh */ |