Mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2026-06-02 09:46:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'u-boot-at91-2026.04-a' of https://source.denx.de/u-boot/custodians/u-boot-at91

Browse Source 
First set of u-boot-at91 features for the 2026.04 cycle:

This small fixes set includes fixing 64 bit builds and some warnings for
the at91 serial driver, and some cleanup on the nand driver.
This commit is contained in:
Tom Rini
2026-02-08 10:14:45 -06:00
parent c7fbe028ee 1690228bac
commit 42b3ee7fa5
8 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
board/bluewater/gurnard/gurnard.c
View File

@@ -29,7 +29,7 @@
#include <asm/arch/at91_rstc.h>
#include <asm/arch/at91_rtc.h>
#include <asm/arch/at91_sck.h>
#include <asm/arch/atmel_serial.h>
#include <dm/platform_data/atmel_serial.h>
#include <asm/arch/clk.h>
#include <asm/arch/gpio.h>
#include <dm/uclass-internal.h>

2
board/siemens/corvus/board.c
View File

@@ -20,7 +20,7 @@
#include <asm/arch/at91sam9_smc.h>
#include <asm/arch/at91_common.h>
#include <asm/arch/at91_rstc.h>
#include <asm/arch/atmel_serial.h>
#include <dm/platform_data/atmel_serial.h>
#include <asm/arch/gpio.h>
#include <asm/gpio.h>
#include <asm/arch/clk.h>

2
board/siemens/smartweb/smartweb.c
View File

@@ -25,7 +25,7 @@
#include <asm/arch/at91sam9260_matrix.h>
#include <asm/arch/at91sam9_smc.h>
#include <asm/arch/at91_common.h>
#include <asm/arch/atmel_serial.h>
#include <dm/platform_data/atmel_serial.h>
#include <asm/arch/at91_spi.h>
#include <spi.h>
#include <asm/arch/clk.h>

2
board/siemens/taurus/taurus.c
View File

@@ -24,7 +24,7 @@
#include <asm/arch/at91_rstc.h>
#include <asm/arch/gpio.h>
#include <asm/arch/at91sam9_sdramc.h>
#include <asm/arch/atmel_serial.h>
#include <dm/platform_data/atmel_serial.h>
#include <asm/arch/clk.h>
#include <asm/gpio.h>
#include <linux/mtd/rawnand.h>

18
drivers/mtd/nand/raw/atmel/nand-controller.c
View File

@@ -1010,10 +1010,10 @@ static int atmel_nand_pmecc_init(struct nand_chip *chip)
if (nc->caps->legacy_of_bindings) {
u32 val;
if (!ofnode_read_u32(nc->dev->node_, "atmel,pmecc-cap", &val))
if (!ofnode_read_u32(dev_ofnode(nc->dev), "atmel,pmecc-cap", &val))
chip->ecc.strength = val;
if (!ofnode_read_u32(nc->dev->node_,
if (!ofnode_read_u32(dev_ofnode(nc->dev),
"atmel,pmecc-sector-size",
&val))
chip->ecc.size = val;
@@ -1671,7 +1671,7 @@ static int atmel_nand_controller_add_nands(struct atmel_nand_controller *nc)
* Add support for legacy nands
*/
np = nc->dev->node_;
np = dev_ofnode(nc->dev);
ret = ofnode_read_u32(np, "#address-cells", &val);
if (ret) {
@@ -1791,7 +1791,7 @@ static int atmel_nand_attach_chip(struct nand_chip *chip)
if (ret)
return ret;
if (nc->caps->legacy_of_bindings || !ofnode_valid(nc->dev->node_)) {
if (nc->caps->legacy_of_bindings || !ofnode_valid(dev_ofnode(nc->dev))) {
/*
* We keep the MTD name unchanged to avoid breaking platforms
* where the MTD cmdline parser is used and the bootloader
@@ -1855,7 +1855,7 @@ atmel_nand_controller_init(struct atmel_nand_controller *nc,
return PTR_ERR(nc->mck);
}
ret = ofnode_parse_phandle_with_args(dev->parent->node_,
ret = ofnode_parse_phandle_with_args(dev_ofnode(dev->parent),
"atmel,smc", NULL, 0, 0, &args);
if (ret) {
dev_err(dev, "Missing or invalid atmel,smc property\n");
@@ -1887,7 +1887,7 @@ atmel_smc_nand_controller_init(struct atmel_smc_nand_controller *nc)
if (nc->base.caps->legacy_of_bindings)
return 0;
ret = ofnode_parse_phandle_with_args(dev->parent->node_,
ret = ofnode_parse_phandle_with_args(dev_ofnode(dev->parent),
nc->base.caps->ebi_csa_regmap_name,
NULL, 0, 0, &args);
if (ret) {
@@ -1933,7 +1933,7 @@ static int atmel_hsmc_nand_controller_init(struct atmel_hsmc_nand_controller *nc
int ret;
u32 addr;
ret = ofnode_parse_phandle_with_args(dev->parent->node_,
ret = ofnode_parse_phandle_with_args(dev_ofnode(dev->parent),
"atmel,smc", NULL, 0, 0, &args);
if (ret) {
dev_err(dev, "Missing or invalid atmel,smc property\n");
@@ -1957,7 +1957,7 @@ static int atmel_hsmc_nand_controller_init(struct atmel_hsmc_nand_controller *nc
if (ret)
return ret;
ret = ofnode_parse_phandle_with_args(dev->node_,
ret = ofnode_parse_phandle_with_args(dev_ofnode(dev),
"atmel,nfc-io", NULL, 0, 0, &args);
if (ret) {
dev_err(dev, "Missing or invalid atmel,nfc-io property\n");
@@ -1971,7 +1971,7 @@ static int atmel_hsmc_nand_controller_init(struct atmel_hsmc_nand_controller *nc
return ret;
}
ret = ofnode_parse_phandle_with_args(dev->node_,
ret = ofnode_parse_phandle_with_args(dev_ofnode(dev),
"atmel,nfc-sram", NULL, 0, 0, &args);
if (ret) {
dev_err(dev, "Missing or invalid atmel,nfc-sram property\n");

6
drivers/mtd/nand/raw/atmel/pmecc.c
View File

@@ -833,9 +833,9 @@ atmel_pmecc_create(struct udevice *dev,
pmecc->dev = dev;
mutex_init(&pmecc->lock);
ofnode_read_resource(dev->node_, 0, &res);
ofnode_read_resource(dev_ofnode(dev), 0, &res);
pmecc->regs.base = (void *)res.start;
ofnode_read_resource(dev->node_, 1, &res);
ofnode_read_resource(dev_ofnode(dev), 1, &res);
pmecc->regs.errloc = (void *)res.start;
/* pmecc data setup time */
@@ -913,7 +913,7 @@ struct atmel_pmecc *devm_atmel_pmecc_get(struct udevice *userdev)
if (!userdev)
return ERR_PTR(-EINVAL);
ret = ofnode_parse_phandle_with_args(userdev->node_,
ret = ofnode_parse_phandle_with_args(dev_ofnode(userdev),
"ecc-engine",
NULL, 0, 0, &args);
/* Probe pmecc driver */

7
drivers/serial/atmel_usart.c
View File

@@ -18,10 +18,12 @@
#include <asm/io.h>
#if CONFIG_IS_ENABLED(DM_SERIAL)
#include <asm/arch/atmel_serial.h>
#include <dm/platform_data/atmel_serial.h>
#endif
#if IS_ENABLED(CONFIG_ARCH_AT91)
#include <asm/arch/clk.h>
#include <asm/arch/hardware.h>
#endif
#include "atmel_usart.h"
@@ -316,6 +318,9 @@ static inline void _debug_uart_init(void)
{
atmel_usart3_t *usart = (atmel_usart3_t *)CONFIG_VAL(DEBUG_UART_BASE);
if (IS_ENABLED(CONFIG_DEBUG_UART_SKIP_INIT))
return;
_atmel_serial_init(usart, CONFIG_DEBUG_UART_CLOCK, CONFIG_BAUDRATE);
}

2
arch/arm/mach-at91/include/mach/atmel_serial.h → include/dm/platform_data/atmel_serial.h
View File

@@ -8,7 +8,7 @@
/* Information about a serial port */
struct atmel_serial_plat {
uint32_t base_addr;
uintptr_t base_addr;
};
#endif