diff options
| author | Tom Rini <[email protected]> | 2025-11-28 08:26:44 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-11-28 08:26:44 -0600 |
| commit | 31bf4a1c308773895a8e7ea047b3cea037e4c922 (patch) | |
| tree | 1685bf672adb1d83de6c3b54e77e332433bdb61a /arch | |
| parent | 781e6e35a066101e8cc56095376d0d7640e1877b (diff) | |
| parent | 5b702cf4d09f84f6cfe2989038b67feafe9945ed (diff) | |
Merge tag 'rpi-2026.01-rc3' of https://source.denx.de/u-boot/custodians/u-boot-raspberrypi
Updates for RPi for 2026.01-rc4:
- rpi: Fix DRAM size reporting to show total RAM
- rpi: Use the U-Boot control FDT for fdt_addr
- pinctrl: bcm283x: Add GPIO pull-up/down control for BCM2835 and BCM2711
- rpi: Fix compilation with larger configs
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-bcm283x/include/mach/gpio.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/mach-bcm283x/include/mach/gpio.h b/arch/arm/mach-bcm283x/include/mach/gpio.h index 4aeb48eeb20..c54414a012c 100644 --- a/arch/arm/mach-bcm283x/include/mach/gpio.h +++ b/arch/arm/mach-bcm283x/include/mach/gpio.h @@ -26,6 +26,16 @@ #define BCM2835_GPIO_FSEL_BANK(gpio) (gpio / 10) #define BCM2835_GPIO_FSEL_SHIFT(gpio) ((gpio % 10) * 3) +/* BCM2835 GPIO Pull-up/down register offsets */ +#define BCM2835_GPPUD 37 +#define BCM2835_GPPUDCLK0 38 + +/* BCM2711 GPIO Pull-up/down control */ +#define BCM2711_GPPUD_CNTRL_REG0 57 +#define BCM2711_PUD_REG_OFFSET(gpio) ((gpio) / 16) +#define BCM2711_PUD_REG_SHIFT(gpio) (((gpio) % 16) * 2) +#define BCM2711_PUD_2711_MASK 0x3 + struct bcm2835_gpio_regs { u32 gpfsel[6]; u32 reserved1; |