From 767090963886f65cdab2095dae85c52ab6b30800 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Mon, 26 Sep 2016 14:26:51 +0200 Subject: [PATCH] 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 Reviewed-by: Simon Glass --- arch/arm/Kconfig | 1 + board/raspberrypi/rpi/rpi.c | 37 ------------------------------------- configs/rpi_2_defconfig | 2 ++ configs/rpi_3_32b_defconfig | 2 ++ configs/rpi_3_defconfig | 2 ++ configs/rpi_defconfig | 2 ++ 6 files changed, 9 insertions(+), 37 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 220022bcd9..fcbf1d81f4 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -321,6 +321,7 @@ config ARCH_BCM283X select DM select DM_SERIAL select DM_GPIO + select OF_CONTROL config TARGET_VEXPRESS_CA15_TC2 bool "Support vexpress_ca15_tc2" 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 #include #include -#include #include #ifdef CONFIG_ARM64 #include @@ -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; diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig index bddee4300a..d573efe80d 100644 --- a/configs/rpi_2_defconfig +++ b/configs/rpi_2_defconfig @@ -1,6 +1,8 @@ CONFIG_ARM=y CONFIG_ARCH_BCM283X=y CONFIG_TARGET_RPI_2=y +CONFIG_DEFAULT_DEVICE_TREE="bcm2836-rpi-2-b" +CONFIG_OF_EMBED=y CONFIG_OF_BOARD_SETUP=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig index 00b6ff4eb8..954d5ffc38 100644 --- a/configs/rpi_3_32b_defconfig +++ b/configs/rpi_3_32b_defconfig @@ -2,6 +2,8 @@ CONFIG_ARM=y CONFIG_ARCH_BCM283X=y CONFIG_TARGET_RPI_3_32B=y CONFIG_SYS_MALLOC_F_LEN=0x2000 +CONFIG_DEFAULT_DEVICE_TREE="bcm2837-rpi-3-b" +CONFIG_OF_EMBED=y CONFIG_OF_BOARD_SETUP=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig index 9b6a72f04d..22199eb030 100644 --- a/configs/rpi_3_defconfig +++ b/configs/rpi_3_defconfig @@ -2,6 +2,8 @@ CONFIG_ARM=y CONFIG_ARCH_BCM283X=y CONFIG_TARGET_RPI_3=y CONFIG_SYS_MALLOC_F_LEN=0x2000 +CONFIG_DEFAULT_DEVICE_TREE="bcm2837-rpi-3-b" +CONFIG_OF_EMBED=y CONFIG_OF_BOARD_SETUP=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig index 861a9796a7..b55de4fefb 100644 --- a/configs/rpi_defconfig +++ b/configs/rpi_defconfig @@ -1,6 +1,8 @@ CONFIG_ARM=y CONFIG_ARCH_BCM283X=y CONFIG_TARGET_RPI=y +CONFIG_DEFAULT_DEVICE_TREE="bcm2835-rpi-b" +CONFIG_OF_EMBED=y CONFIG_OF_BOARD_SETUP=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set -- 2.39.5