ARM: imx: Factor common code out of Data Modul i.MX8M Mini eDM SBC
authorMarek Vasut <marex@denx.de>
Sun, 11 Dec 2022 20:17:14 +0000 (21:17 +0100)
committerStefano Babic <sbabic@denx.de>
Mon, 30 Jan 2023 22:23:02 +0000 (23:23 +0100)
Pull common.c into common subdirectory of the board file,
since this code can be reused by other Data Modul SBCs.
Drop the include of lpddr4_timing.h, which is unneeded.

Signed-off-by: Marek Vasut <marex@denx.de>
board/data_modul/common/common.c [new file with mode: 0644]
board/data_modul/common/common.h [new file with mode: 0644]
board/data_modul/imx8mm_edm_sbc/Makefile
board/data_modul/imx8mm_edm_sbc/common.c [deleted file]
board/data_modul/imx8mm_edm_sbc/imx8mm_data_modul_edm_sbc.c
board/data_modul/imx8mm_edm_sbc/lpddr4_timing.h
board/data_modul/imx8mm_edm_sbc/spl.c

diff --git a/board/data_modul/common/common.c b/board/data_modul/common/common.c
new file mode 100644 (file)
index 0000000..bf9a114
--- /dev/null
@@ -0,0 +1,194 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright 2022 Marek Vasut <marex@denx.de>
+ */
+
+#include <common.h>
+#include <asm-generic/gpio.h>
+#include <asm-generic/sections.h>
+#include <asm/arch/clock.h>
+#include <asm/arch/ddr.h>
+#include <asm/arch/sys_proto.h>
+#include <asm/io.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <common.h>
+#include <dm/uclass.h>
+#include <hang.h>
+#include <i2c_eeprom.h>
+#include <image.h>
+#include <init.h>
+#include <net.h>
+#include <spl.h>
+
+#include <dm/uclass.h>
+#include <dm/device.h>
+#include <dm/uclass-internal.h>
+#include <dm/device-internal.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+#define WDOG_PAD_CTRL  (PAD_CTL_DSE6 | PAD_CTL_ODE | PAD_CTL_PUE | PAD_CTL_PE)
+
+u8 dmo_get_memcfg(void)
+{
+       struct gpio_desc gpio[4];
+       u8 memcfg = 0;
+       ofnode node;
+       int i, ret;
+
+       node = ofnode_path("/config");
+       if (!ofnode_valid(node)) {
+               printf("%s: no /config node?\n", __func__);
+               return BIT(2) | BIT(0);
+       }
+
+       ret = gpio_request_list_by_name_nodev(node,
+                                             "dmo,ram-coding-gpios",
+                                             gpio, ARRAY_SIZE(gpio),
+                                             GPIOD_IS_IN);
+       for (i = 0; i < ret; i++)
+               memcfg |= !!dm_gpio_get_value(&(gpio[i])) << i;
+
+       gpio_free_list_nodev(gpio, ret);
+
+       return memcfg;
+}
+
+int board_phys_sdram_size(phys_size_t *size)
+{
+       u8 memcfg = dmo_get_memcfg();
+
+       *size = (4ULL >> ((memcfg >> 1) & 0x3)) * SZ_1G;
+
+       return 0;
+}
+
+#ifdef CONFIG_SPL_BUILD
+static void data_modul_imx_edm_sbc_early_init_f(const iomux_v3_cfg_t wdog_pad)
+{
+       struct wdog_regs *wdog = (struct wdog_regs *)WDOG1_BASE_ADDR;
+
+       imx_iomux_v3_setup_pad(wdog_pad | MUX_PAD_CTRL(WDOG_PAD_CTRL));
+
+       set_wdog_reset(wdog);
+}
+
+__weak int data_modul_imx_edm_sbc_board_power_init(void)
+{
+       return 0;
+}
+
+static void spl_dram_init(struct dram_timing_info *dram_timing_info[8])
+{
+       u8 memcfg = dmo_get_memcfg();
+       int i;
+
+       printf("DDR:   %d GiB x%d [0x%x]\n",
+              /* 0..4 GiB, 1..2 GiB, 0..1 GiB */
+              4 >> ((memcfg >> 1) & 0x3),
+              /* 0..x32, 1..x16 */
+              32 >> (memcfg & BIT(0)),
+              memcfg);
+
+       if (!dram_timing_info[memcfg]) {
+               printf("Unsupported DRAM strapping, trying lowest supported. MEMCFG=0x%x\n",
+                      memcfg);
+               for (i = 7; i >= 0; i--)
+                       if (dram_timing_info[i])        /* Configuration found */
+                               break;
+       }
+
+       ddr_init(dram_timing_info[memcfg]);
+}
+
+void dmo_board_init_f(const iomux_v3_cfg_t wdog_pad,
+                     struct dram_timing_info *dram_timing_info[8])
+{
+       struct udevice *dev;
+       int ret;
+
+       icache_enable();
+
+       arch_cpu_init();
+
+       init_uart_clk(2);
+
+       data_modul_imx_edm_sbc_early_init_f(wdog_pad);
+
+       /* Clear the BSS. */
+       memset(__bss_start, 0, __bss_end - __bss_start);
+
+       ret = spl_early_init();
+       if (ret) {
+               debug("spl_early_init() failed: %d\n", ret);
+               hang();
+       }
+
+       preloader_console_init();
+
+       ret = uclass_get_device_by_name(UCLASS_CLK,
+                                       "clock-controller@30380000",
+                                       &dev);
+       if (ret < 0) {
+               printf("Failed to find clock node. Check device tree\n");
+               hang();
+       }
+
+       enable_tzc380();
+
+       data_modul_imx_edm_sbc_board_power_init();
+
+       /* DDR initialization */
+       spl_dram_init(dram_timing_info);
+
+       board_init_r(NULL, 0);
+}
+#else
+void dmo_setup_boot_device(void)
+{
+       int boot_device = get_boot_device();
+       char *devnum;
+
+       devnum = env_get("devnum");
+       if (devnum)     /* devnum is already set */
+               return;
+
+       if (boot_device == MMC3_BOOT)   /* eMMC */
+               env_set_ulong("devnum", 0);
+       else
+               env_set_ulong("devnum", 1);
+}
+
+void dmo_setup_mac_address(void)
+{
+       unsigned char enetaddr[6];
+       struct udevice *dev;
+       int off, ret;
+
+       ret = eth_env_get_enetaddr("ethaddr", enetaddr);
+       if (ret)        /* ethaddr is already set */
+               return;
+
+       off = fdt_path_offset(gd->fdt_blob, "eeprom0");
+       if (off < 0) {
+               printf("%s: No eeprom0 path offset\n", __func__);
+               return;
+       }
+
+       ret = uclass_get_device_by_of_offset(UCLASS_I2C_EEPROM, off, &dev);
+       if (ret) {
+               printf("Cannot find EEPROM!\n");
+               return;
+       }
+
+       ret = i2c_eeprom_read(dev, 0xb0, enetaddr, 0x6);
+       if (ret) {
+               printf("Error reading configuration EEPROM!\n");
+               return;
+       }
+
+       if (is_valid_ethaddr(enetaddr))
+               eth_env_set_enetaddr("ethaddr", enetaddr);
+}
+#endif
diff --git a/board/data_modul/common/common.h b/board/data_modul/common/common.h
new file mode 100644 (file)
index 0000000..4f6b2bc
--- /dev/null
@@ -0,0 +1,18 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright 2022 Marek Vasut <marex@denx.de>
+ */
+
+#ifndef __EDM_SBC_COMMON_H__
+#define __EDM_SBC_COMMON_H__
+
+#include <asm/arch/ddr.h>
+#include <asm/mach-imx/iomux-v3.h>
+
+u8 dmo_get_memcfg(void);
+void dmo_board_init_f(const iomux_v3_cfg_t wdog_pad,
+                     struct dram_timing_info *dram_timing_info[8]);
+void dmo_setup_boot_device(void);
+void dmo_setup_mac_address(void);
+
+#endif /* __EDM_SBC_COMMON_H__ */
index eaba85d65b806b0868cb7b117159b556016cad26..6d72e930fca0ecaaf7353f721f643c3b0aa59ee5 100644 (file)
@@ -10,4 +10,4 @@ else
 obj-y += imx8mm_data_modul_edm_sbc.o
 endif
 
-obj-y += common.o
+obj-y += ../common/common.o
diff --git a/board/data_modul/imx8mm_edm_sbc/common.c b/board/data_modul/imx8mm_edm_sbc/common.c
deleted file mode 100644 (file)
index 713f789..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright 2022 Marek Vasut <marex@denx.de>
- */
-
-#include <common.h>
-#include <asm/io.h>
-#include <asm-generic/gpio.h>
-
-#include "lpddr4_timing.h"
-
-DECLARE_GLOBAL_DATA_PTR;
-
-u8 dmo_get_memcfg(void)
-{
-       struct gpio_desc gpio[4];
-       u8 memcfg = 0;
-       ofnode node;
-       int i, ret;
-
-       node = ofnode_path("/config");
-       if (!ofnode_valid(node)) {
-               printf("%s: no /config node?\n", __func__);
-               return BIT(2) | BIT(0);
-       }
-
-       ret = gpio_request_list_by_name_nodev(node,
-                                             "dmo,ram-coding-gpios",
-                                             gpio, ARRAY_SIZE(gpio),
-                                             GPIOD_IS_IN);
-       for (i = 0; i < ret; i++)
-               memcfg |= !!dm_gpio_get_value(&(gpio[i])) << i;
-
-       gpio_free_list_nodev(gpio, ret);
-
-       return memcfg;
-}
index 82856f7a08c1e6aa3e234a6d95e089a229448b4e..ff89333b73288239a60d623efd5f49d0912b2e3c 100644 (file)
@@ -5,76 +5,16 @@
 
 #include <common.h>
 #include <asm/arch/clock.h>
-#include <asm/arch/sys_proto.h>
 #include <asm/io.h>
-#include <asm/mach-imx/boot_mode.h>
 #include <dm.h>
 #include <dm/device-internal.h>
-#include <i2c_eeprom.h>
 #include <malloc.h>
-#include <net.h>
 #include <spl.h>
 
-#include "lpddr4_timing.h"
+#include "../common/common.h"
 
 DECLARE_GLOBAL_DATA_PTR;
 
-int board_phys_sdram_size(phys_size_t *size)
-{
-       u8 memcfg = dmo_get_memcfg();
-
-       *size = (4ULL >> ((memcfg >> 1) & 0x3)) * SZ_1G;
-
-       return 0;
-}
-
-static void setup_mac_address(void)
-{
-       unsigned char enetaddr[6];
-       struct udevice *dev;
-       int off, ret;
-
-       ret = eth_env_get_enetaddr("ethaddr", enetaddr);
-       if (ret)        /* ethaddr is already set */
-               return;
-
-       off = fdt_path_offset(gd->fdt_blob, "eeprom0");
-       if (off < 0) {
-               printf("%s: No eeprom0 path offset\n", __func__);
-               return;
-       }
-
-       ret = uclass_get_device_by_of_offset(UCLASS_I2C_EEPROM, off, &dev);
-       if (ret) {
-               printf("Cannot find EEPROM!\n");
-               return;
-       }
-
-       ret = i2c_eeprom_read(dev, 0xb0, enetaddr, 0x6);
-       if (ret) {
-               printf("Error reading configuration EEPROM!\n");
-               return;
-       }
-
-       if (is_valid_ethaddr(enetaddr))
-               eth_env_set_enetaddr("ethaddr", enetaddr);
-}
-
-static void setup_boot_device(void)
-{
-       int boot_device = get_boot_device();
-       char *devnum;
-
-       devnum = env_get("devnum");
-       if (devnum)     /* devnum is already set */
-               return;
-
-       if (boot_device == MMC3_BOOT)   /* eMMC */
-               env_set_ulong("devnum", 0);
-       else
-               env_set_ulong("devnum", 1);
-}
-
 int board_init(void)
 {
        return 0;
@@ -85,8 +25,8 @@ int board_late_init(void)
        struct udevice *dev;
        int ret;
 
-       setup_boot_device();
-       setup_mac_address();
+       dmo_setup_boot_device();
+       dmo_setup_mac_address();
 
        ret = uclass_get_device_by_name(UCLASS_MISC, "usb-hub@2c", &dev);
        if (ret)
index 1fab9b14051dbaab8dac5d8cce86250b0061fb64..8b5368a104dd4774e15e46f2e389f7e7f5a351a3 100644 (file)
@@ -9,6 +9,4 @@
 extern struct dram_timing_info dmo_imx8mm_sbc_dram_timing_16_32;
 extern struct dram_timing_info dmo_imx8mm_sbc_dram_timing_32_32;
 
-u8 dmo_get_memcfg(void);
-
 #endif /* __LPDDR4_TIMING_H__ */
index f5063eb8c1917f38ab39a41e9f2ea554f31a2afc..4a9c62fb86fc3fa5d41e5273e802438b35a39fb0 100644 (file)
 
 #include "lpddr4_timing.h"
 
-DECLARE_GLOBAL_DATA_PTR;
-
-#define WDOG_PAD_CTRL  (PAD_CTL_DSE6 | PAD_CTL_ODE | PAD_CTL_PUE | PAD_CTL_PE)
-
-static const iomux_v3_cfg_t wdog_pads[] = {
-       IMX8MM_PAD_GPIO1_IO02_WDOG1_WDOG_B  | MUX_PAD_CTRL(WDOG_PAD_CTRL),
-};
+#include "../common/common.h"
 
-static void data_modul_imx8mm_edm_sbc_early_init_f(void)
-{
-       struct wdog_regs *wdog = (struct wdog_regs *)WDOG1_BASE_ADDR;
-
-       imx_iomux_v3_setup_multiple_pads(wdog_pads, ARRAY_SIZE(wdog_pads));
-
-       set_wdog_reset(wdog);
-}
+DECLARE_GLOBAL_DATA_PTR;
 
-static int data_modul_imx8mm_edm_sbc_board_power_init(void)
+int data_modul_imx_edm_sbc_board_power_init(void)
 {
        struct udevice *dev;
        int ret;
@@ -105,67 +92,7 @@ static struct dram_timing_info *dram_timing_info[8] = {
        NULL,                                   /* INVALID */
 };
 
-static void spl_dram_init(void)
-{
-       u8 memcfg = dmo_get_memcfg();
-       int i;
-
-       printf("DDR:   %d GiB x%d [0x%x]\n",
-              /* 0..4 GiB, 1..2 GiB, 0..1 GiB */
-              4 >> ((memcfg >> 1) & 0x3),
-              /* 0..x32, 1..x16 */
-              32 >> (memcfg & BIT(0)),
-              memcfg);
-
-       if (!dram_timing_info[memcfg]) {
-               printf("Unsupported DRAM strapping, trying lowest supported. MEMCFG=0x%x\n",
-                      memcfg);
-               for (i = ARRAY_SIZE(dram_timing_info) - 1; i >= 0; i--)
-                       if (dram_timing_info[i])        /* Configuration found */
-                               break;
-       }
-
-       ddr_init(dram_timing_info[memcfg]);
-}
-
 void board_init_f(ulong dummy)
 {
-       struct udevice *dev;
-       int ret;
-
-       icache_enable();
-
-       arch_cpu_init();
-
-       init_uart_clk(2);
-
-       data_modul_imx8mm_edm_sbc_early_init_f();
-
-       /* Clear the BSS. */
-       memset(__bss_start, 0, __bss_end - __bss_start);
-
-       ret = spl_early_init();
-       if (ret) {
-               debug("spl_early_init() failed: %d\n", ret);
-               hang();
-       }
-
-       preloader_console_init();
-
-       ret = uclass_get_device_by_name(UCLASS_CLK,
-                                       "clock-controller@30380000",
-                                       &dev);
-       if (ret < 0) {
-               printf("Failed to find clock node. Check device tree\n");
-               hang();
-       }
-
-       enable_tzc380();
-
-       data_modul_imx8mm_edm_sbc_board_power_init();
-
-       /* DDR initialization */
-       spl_dram_init();
-
-       board_init_r(NULL, 0);
+       dmo_board_init_f(IMX8MM_PAD_GPIO1_IO02_WDOG1_WDOG_B, dram_timing_info);
 }