Skip to contentSkip to conversation

mpc8379erdb: enable DM_USB DM_PCI DM_ETH

PATCH In review sinan at writeme.com 2 participants 2 messages May 11, 2021 – Jul 6, 2021 PowerPC

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mpc8379erdb: enable DM_USB DM_PCI DM_ETH

From: Sinan Akman <[email protected]>

---
 arch/powerpc/cpu/mpc83xx/pci.c            |  2 ++
 arch/powerpc/dts/mpc8379erdb.dts          | 52 +++++++++++++++++++++++++++++++
 board/freescale/mpc837xerdb/mpc837xerdb.c | 11 ++++++-
 configs/MPC837XERDB_defconfig             | 18 +++++------
 4 files changed, 73 insertions(+), 10 deletions(-)
arch/powerpc/cpu/mpc83xx/pci.c +2 -0
index 5c289d0022..507ab3417b 100644
@@ -27,6 +27,7 @@ DECLARE_GLOBAL_DATA_PTR;
 static struct pci_controller pci_hose[MAX_BUSES];
 static int pci_num_buses;
 
+#if !defined(CONFIG_DM_PCI)
 static void pci_init_bus(int bus, struct pci_region *reg)
 {
 	volatile immap_t *immr = (volatile immap_t *)CONFIG_SYS_IMMR;
@@ -184,6 +185,7 @@ void mpc83xx_pcislave_unlock(int bus)
 	hose->last_busno = pci_hose_scan(hose);
 }
 #endif
+#endif /* CONFIG_DM_PCI */
 
 #if defined(CONFIG_OF_LIBFDT)
 void ft_pci_setup(void *blob, struct bd_info *bd)
arch/powerpc/dts/mpc8379erdb.dts +52 -0

58 lines not on this page · raw message

board/freescale/mpc837xerdb/mpc837xerdb.c +10 -1
index 624e92ef9c..66b3d9a465 100644
@@ -176,7 +176,7 @@ int board_early_init_f(void)
 }
 
 #ifdef CONFIG_FSL_ESDHC
-#if !(CONFIG_IS_ENABLED(DM_MMC))
+#if !(CONFIG_IS_ENABLED(DM_MMC) || CONFIG_IS_ENABLED(DM_USB))
 int board_mmc_init(struct bd_info *bd)
 {
 	struct immap __iomem *im = (struct immap __iomem *)CONFIG_SYS_IMMR;
@@ -217,6 +217,15 @@ int misc_init_r(void)
 	return rc;
 }
 
+int board_late_init(void)
+{
+	volatile immap_t *immap = (immap_t *) CONFIG_SYS_IMMR;
+#ifdef CONFIG_USB
+	clrsetbits_be32(&immap->sysconf.sicrl, SICRL_USB_A, 0x40000000);
+#endif
+	return 0;
+}
+
 #if defined(CONFIG_OF_BOARD_SETUP)
 
 int ft_board_setup(void *blob, struct bd_info *bd)
configs/MPC837XERDB_defconfig +9 -9
index 63ce36d533..b6161ca072 100644
@@ -147,7 +147,9 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="PCIE"
 CONFIG_BOOTDELAY=6
+CONFIG_BOARD_LATE_INIT=y
 CONFIG_MISC_INIT_R=y
+CONFIG_PCI_INIT_R=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_IMLS=y
 CONFIG_CMD_I2C=y
@@ -173,16 +175,14 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_PHY_ATHEROS=y
-CONFIG_PHY_BROADCOM=y
-CONFIG_PHY_DAVICOM=y
-CONFIG_PHY_LXT=y
-CONFIG_PHY_MARVELL=y
-CONFIG_PHY_NATSEMI=y
-CONFIG_PHY_REALTEK=y
-CONFIG_PHY_SMSC=y
-CONFIG_PHY_VITESSE=y
+CONFIG_DM_ETH=y
+CONFIG_DM_MDIO=y
+CONFIG_DM_ETH_PHY=y
+CONFIG_RGMII=y
+CONFIG_MII=y
 CONFIG_TSEC_ENET=y
+CONFIG_DM_PCI=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
+CONFIG_DM_USB=y
 CONFIG_USB_EHCI_HCD=y

--
2.14.5