diff options
| author | Fabian Vogt <fvogt@suse.com> | 2016-09-26 14:26:51 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-11-28 20:15:18 -0500 |
| commit | 767090963886f65cdab2095dae85c52ab6b30800 (patch) | |
| tree | 0f459a95a3e563ca8f9b40c895aa868ebe7bfcb0 /board/raspberrypi | |
| parent | d8396a3272edc4b8154d0c93ea9b40473b300739 (diff) | |
| download | u-boot-midas-767090963886f65cdab2095dae85c52ab6b30800.tar.gz u-boot-midas-767090963886f65cdab2095dae85c52ab6b30800.tar.bz2 u-boot-midas-767090963886f65cdab2095dae85c52ab6b30800.zip | |
ARM: bcm283x: use OF_CONTROL for bcm283x
This patch removes use of U_BOOT_DEVICE in board/raspberrypi/rpi/rpi.c,
enables OF_CONTROL in the config and adjusts the rpi_*defconfig configs.
Signed-off-by: Fabian Vogt <fvogt@suse.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'board/raspberrypi')
| -rw-r--r-- | board/raspberrypi/rpi/rpi.c | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c index e82022ef12..04f27b4b8f 100644 --- a/board/raspberrypi/rpi/rpi.c +++ b/board/raspberrypi/rpi/rpi.c @@ -17,7 +17,6 @@ #include <asm/arch/mbox.h> #include <asm/arch/sdhci.h> #include <asm/global_data.h> -#include <dm/platform_data/serial_pl01x.h> #include <dm/platform_data/serial_bcm283x_mu.h> #ifdef CONFIG_ARM64 #include <asm/armv8/mmu.h> @@ -28,42 +27,6 @@ DECLARE_GLOBAL_DATA_PTR; /* From lowlevel_init.S */ extern unsigned long fw_dtb_pointer; -static const struct bcm2835_gpio_platdata gpio_platdata = { - .base = BCM2835_GPIO_BASE, -}; - -U_BOOT_DEVICE(bcm2835_gpios) = { - .name = "gpio_bcm2835", - .platdata = &gpio_platdata, -}; - -#ifdef CONFIG_PL01X_SERIAL -static const struct pl01x_serial_platdata serial_platdata = { -#ifndef CONFIG_BCM2835 - .base = 0x3f201000, -#else - .base = 0x20201000, -#endif - .type = TYPE_PL011, - .skip_init = true, -}; - -U_BOOT_DEVICE(bcm2835_serials) = { - .name = "serial_pl01x", - .platdata = &serial_platdata, -}; -#else -static struct bcm283x_mu_serial_platdata serial_platdata = { - .base = 0x3f215040, - .clock = 250000000, - .skip_init = true, -}; - -U_BOOT_DEVICE(bcm2837_serials) = { - .name = "serial_bcm283x_mu", - .platdata = &serial_platdata, -}; -#endif struct msg_get_arm_mem { struct bcm2835_mbox_hdr hdr; |