From patchwork Tue May 11 18:18:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Akman X-Patchwork-Id: 1477276 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=mail.com header.i=@mail.com header.a=rsa-sha256 header.s=dbd5af2cbaf7 header.b=jQlx0K1L; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FfmQT1vs6z9sWD for ; Wed, 12 May 2021 04:18:54 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E1B1682F49; Tue, 11 May 2021 20:18:47 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=writeme.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; secure) header.d=mail.com header.i=@mail.com header.b="jQlx0K1L"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id CD9A382F5D; Tue, 11 May 2021 20:18:46 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mout.gmx.com (mout.gmx.com [74.208.4.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 79EBE82F47 for ; Tue, 11 May 2021 20:18:43 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=writeme.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sinan@writeme.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=mail.com; s=dbd5af2cbaf7; t=1620757121; bh=+buI8MB8k+DXhY/4SNCD8BRq+kbakzPPHgVDMhmdU6I=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=jQlx0K1LUFROt0muNGe6gZp0LknU1NU2wmjeqETcDUyCUb32mpkO4fseid5Cuex0d xwiYVZAB9x3Rikp/XbR5oDbcH36uIEWhDegu5k+kkGVMQwQ4KUTgrxMlAZGtbSCm7I BmmThh5uuLXwBhEC0blbQmByXWBIwaYqq3kE25ig= X-UI-Sender-Class: 214d933f-fd2f-45c7-a636-f5d79ae31a79 Received: from localhost.localdomain ([208.111.77.233]) by smtp.mail.com (mrgmxus005 [74.208.5.15]) with ESMTPA (Nemesis) id 0LZxjn-1lFCVZ3Jxl-00lof5; Tue, 11 May 2021 20:18:40 +0200 From: sinan@writeme.com To: u-boot@lists.denx.de Cc: mario.six@gdsys.cc, sinan@writeme.com, trini@konsulko.com Subject: [PATCH] mpc8379erdb: enable DM_USB DM_PCI DM_ETH Date: Tue, 11 May 2021 14:18:02 -0400 Message-Id: <20210511181802.24606-1-sinan@writeme.com> X-Mailer: git-send-email 2.26.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:Yz7XDcOYzgL0qS+/VEqqIMLR/ZmaxqzpfDrdzFQMJ0T3xDj7GJH 5a/Y+xT4WhEsex03mOHzILYWEmC4rcAOBOoMnC/hF398CV/z0tGV5+cVn+C3Xd7jtqY9zkR GnLZ7wTyFYdLsDrTwXAO/0VJBBnV3P8zjIV3RHfAtfu2KtBX6i+aHoRQji5nwEculSrssv4 TOSKkVGUmrzLGGRzMHPzQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:62Q5c6butME=:FpnX8JbWYXhUTiq0VlcqoT ir0YyhdXa+dhCEal+CId+LtEloGD1GBjzZQRfHSCqYFlm/0uyEWGdz2HIHuA+4BZOw8N07Mqg V1FmHzh5SPd7dTUW0RX6ibk/lzuhBWhYgHAiWq21fkwvQQaDbqpP9nAdc2bkf5ntIEWgdka7s 60ZS9hpVZzIkjEtF30iL3EVZTMsX3VapxvFiEfuTTsPhNPcT+8AMy/4IW05R3ljNKlqRRI8+0 yYuFRq+I3j9+9h5JBpSE0e6htRTjNeYxEUjNAO7QIwzdvJzc2vN8jKot2T3RVSYz0O6FwyOcQ SM5IgdSeJhlhKAsB4Nxgm9btE77X0WAR28hL+49nHdIPSyohZJJuS7Cl858w6rcG2WzboQvgZ DPjOfjCWknWTbJfYdVvUICnlpw+WBjKGyiuuXCUpiTjFZikesnxbPKICbYdNeyOTgNNspPVdc Q0HnKHHOtqa+T53Ob+HB1IFHHWRYZ2alofWyTwUG1laXoO7a9HpjxzXCa/QNX3Y+GODZBQQ9A OzvZZgOh5xxgdWvNXZ1bYfRxWYd4qVloEty9shqDbbLcFg1qf0dGE0wGHirYX6QilSt6SH6q0 JIucYH7pbm5gFKDasgLMWaqW89y6Bi1HorGD1Ya2UPTOUpfHOIxD7GFgRD9w5Xi2BdoL6jVPR NqhrRilkTrz86ngq3ealS3XI+Uvj24Y6c7xxRctH7MND3iGA+bfXX3JGzuKtpU3uSp8Zo3Oig Q8IsoR3lALdaVqwRtVjszCcRTpWWCbQZst0W7xHvDQtE3OpQx6mn/qvf+T3zZC1j5e/RDwI5F TCX5vBZD26hi5Pb0H+ixh0oDAa65O7X3KhU817dkhHgwD++EyuaeX6UH+RLF8N+MFoHy5xhpk nIekE/L00Vf8z+oZXBq1EkhZW37zXwm13Jurc+urCWayJhbe94P9QQ6OkDC+sAPe5aeVnxJr4 MyQmEuMvxKv0/d2xGLsqIhlojMlizN80eAd2E9Q6pGvWpuMbkAJhWSAtiNslfgBmUfPzNLqYd mQFoPpM2nz2y51rePWqdORGMVU/61QldlaArpQgvrlgkYojLB7BLRpao9DUrtqbK335it5Lf3 zqdMCto8PNFQGEiQ50N7NZCAkD66W0dRj0WibI6Etq/ntmOfQPNvBMoQEH8lLtnQXMAzKunAi HunTx46tM/OPZSRozh3nfbGc0gHWlTGQ5EyLYczZvN4oYMNJSZn4p0QgEKSpohjLO0vZg= X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.4 at phobos.denx.de X-Virus-Status: Clean From: Sinan Akman Signed-off-by: Sinan Akman --- 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(-) -- 2.14.5 diff --git a/arch/powerpc/cpu/mpc83xx/pci.c b/arch/powerpc/cpu/mpc83xx/pci.c index 5c289d0022..507ab3417b 100644 --- a/arch/powerpc/cpu/mpc83xx/pci.c +++ b/arch/powerpc/cpu/mpc83xx/pci.c @@ -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) diff --git a/arch/powerpc/dts/mpc8379erdb.dts b/arch/powerpc/dts/mpc8379erdb.dts index b1881b161c..2e7c8f103c 100644 --- a/arch/powerpc/dts/mpc8379erdb.dts +++ b/arch/powerpc/dts/mpc8379erdb.dts @@ -69,6 +69,58 @@ device_type = "ipic"; }; + usb@23000 { + compatible = "fsl-usb2-dr"; + reg = <0x23000 0x1000>; + #address-cells = <1>; + #size-cells = <0>; + interrupt-parent = <&ipic>; + interrupts = <38 0x8>; + phy_type = "ulpi"; + }; + + enet0: ethernet@24000 { + #address-cells = <1>; + #size-cells = <1>; + cell-index = <0>; + device_type = "network"; + model = "eTSEC"; + compatible = "fsl,etsec2"; + reg = <0x24000 0x1000>; + ranges = <0x0 0x24000 0x1000>; + local-mac-address = [ 00 00 00 00 00 00 ]; + interrupts = <32 0x8 33 0x8 34 0x8>; + phy-connection-type = "mii"; + interrupt-parent = <&ipic>; + fixed-link = <1 0 1000 0 0>; + phy-handle = <&phy>; + fsl,magic-packet; + + mdio@520 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "fsl,etsec2-mdio"; + reg = <0x520 0x20>; + + phy: ethernet-phy@2 { + interrupt-parent = <&ipic>; + interrupts = <17 0x8>; + reg = <0x2>; + device_type = "ethernet-phy"; + }; + }; + }; + + pci0: pci@e0008300 { + #address-cells = <3>; + #size-cells = <2>; + #interrupt-cells = <1>; + device_type = "pci"; + reg = <0x0 0xe0008300 0x0 0x00000fff>; + compatible = "fsl,mpc837x-pci"; + clock-frequency = <0>; + }; + }; }; diff --git a/board/freescale/mpc837xerdb/mpc837xerdb.c b/board/freescale/mpc837xerdb/mpc837xerdb.c index 624e92ef9c..66b3d9a465 100644 --- a/board/freescale/mpc837xerdb/mpc837xerdb.c +++ b/board/freescale/mpc837xerdb/mpc837xerdb.c @@ -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) diff --git a/configs/MPC837XERDB_defconfig b/configs/MPC837XERDB_defconfig index 63ce36d533..b6161ca072 100644 --- a/configs/MPC837XERDB_defconfig +++ b/configs/MPC837XERDB_defconfig @@ -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