From: Patrice CHOTARD Date: Fri, 27 Mar 2020 08:55:34 +0000 Subject: [PATCH V3] ARM: dts: stm32: Add KS8851-16MLL ethernet on FMC2 In-Reply-To: <20200326155815.69193-1-marex@denx.de> References: <20200326155815.69193-1-marex@denx.de> Message-ID: <45a730af-61bd-663b-87f0-cc38cd994b8b@st.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hi Marek You have forgotten to take into account some of my previous remarks on V2 On 3/26/20 4:58 PM, Marek Vasut wrote: > Add DT entries, Kconfig entries and board-specific entries to configure > FMC2 bus and make KS8851-16MLL on that bus accessible to U-Boot. > > Signed-off-by: Marek Vasut > Cc: Patrick Delaunay > Cc: Patrice Chotard > --- > V2: Configure FMC2 nCS4 for SRAM as well > V3: Adjust the register macros > --- > arch/arm/dts/stm32mp15xx-dhcom-u-boot.dtsi | 68 ++++++++++++++++++++++ > board/dhelectronics/dh_stm32mp1/board.c | 28 +++++++++ > configs/stm32mp15_dhcom_basic_defconfig | 1 + > 3 files changed, 97 insertions(+) > > diff --git a/arch/arm/dts/stm32mp15xx-dhcom-u-boot.dtsi b/arch/arm/dts/stm32mp15xx-dhcom-u-boot.dtsi > index 6c952a57ee..eba3588540 100644 > --- a/arch/arm/dts/stm32mp15xx-dhcom-u-boot.dtsi > +++ b/arch/arm/dts/stm32mp15xx-dhcom-u-boot.dtsi > @@ -37,6 +37,12 @@ > default-state = "on"; > }; > }; > + > + /* This is actually on FMC2, but we do not have bus driver for that */ > + ksz8851: ks8851mll at 64000000 { > + compatible = "micrel,ks8851-mll"; > + reg = <0x64000000 0x20000>; > + }; > }; > > &i2c4 { > @@ -50,6 +56,68 @@ > }; > }; > > +&pinctrl { > + /* These should bound to FMC2 bus driver, but we do not have one */ > + pinctrl-0 = <&fmc_pins_b>; > + pinctrl-1 = <&fmc_sleep_pins_b>; > + pinctrl-names = "default", "sleep"; > + > + fmc_pins_b: fmc-0 { > + pins1 { > + pinmux = , /* FMC_NOE */ > + , /* FMC_NWE */ > + , /* FMC_NL */ > + , /* FMC_D0 */ > + , /* FMC_D1 */ > + , /* FMC_D2 */ > + , /* FMC_D3 */ > + , /* FMC_D4 */ > + , /* FMC_D5 */ > + , /* FMC_D6 */ > + , /* FMC_D7 */ > + , /* FMC_D8 */ > + , /* FMC_D9 */ > + , /* FMC_D10 */ > + , /* FMC_D11 */ > + , /* FMC_D12 */ > + , /* FMC_D13 */ > + , /* FMC_D14 */ > + , /* FMC_D15 */ > + , /* FMC_NE2_FMC_NCE */ > + ; /* FMC_NE4 */ > + bias-disable; > + drive-push-pull; > + slew-rate = <3>; > + }; > + }; > + > + fmc_sleep_pins_b: fmc-sleep-0 { > + pins { > + pinmux = , /* FMC_NOE */ > + , /* FMC_NWE */ > + , /* FMC_NL */ > + , /* FMC_D0 */ > + , /* FMC_D1 */ > + , /* FMC_D2 */ > + , /* FMC_D3 */ > + , /* FMC_D4 */ > + , /* FMC_D5 */ > + , /* FMC_D6 */ > + , /* FMC_D7 */ > + , /* FMC_D8 */ > + , /* FMC_D9 */ > + , /* FMC_D10 */ > + , /* FMC_D11 */ > + , /* FMC_D12 */ > + , /* FMC_D13 */ > + , /* FMC_D14 */ > + , /* FMC_D15 */ > + , /* FMC_NE2_FMC_NCE */ > + ; /* FMC_NE4 */ > + }; > + }; > +}; > + > &pmic { > u-boot,dm-pre-reloc; > }; > diff --git a/board/dhelectronics/dh_stm32mp1/board.c b/board/dhelectronics/dh_stm32mp1/board.c > index b663696983..be55242799 100644 > --- a/board/dhelectronics/dh_stm32mp1/board.c > +++ b/board/dhelectronics/dh_stm32mp1/board.c > @@ -376,6 +376,32 @@ static void sysconf_init(void) > #endif > } > > +static void board_init_fmc2(void) > +{ > +#define STM32_FMC2_BCR1 0x0 > +#define STM32_FMC2_BTR1 0x4 > +#define STM32_FMC2_BWTR1 0x104 > +#define STM32_FMC2_BCR(x) ((x) * 0x8 + STM32_FMC2_BCR1) > +#define STM32_FMC2_BTR(x) ((x) * 0x8 + STM32_FMC2_BTR1) > +#define STM32_FMC2_BWTR(x) ((x) * 0x8 + STM32_FMC2_BWTR1) All these defines can be put in ./arch/arm/mach-stm32mp/include/mach/stm32.h > + > +#define RCC_MP_AHB6RSTCLRR 0x218 > +#define RCC_MP_AHB6ENSETR 0x19c > + > + /* Set up FMC2 bus for KS8851-16MLL and X11 SRAM */ > + writel(BIT(12), STM32_RCC_BASE + RCC_MP_AHB6RSTCLRR); > + writel(BIT(12), STM32_RCC_BASE + RCC_MP_AHB6ENSETR); > + Add a define for AHB6RSTCLRR and AHB6ENSETR BIT(12) > + /* KS8851-16MLL */ > + writel(0x000010db, STM32_FMC2_BASE + STM32_FMC2_BCR(1)); > + writel(0xc0022222, STM32_FMC2_BASE + STM32_FMC2_BTR(1)); > + /* AS7C34098 SRAM on X11 */ > + writel(0x000010db, STM32_FMC2_BASE + STM32_FMC2_BCR(3)); > + writel(0xc0022222, STM32_FMC2_BASE + STM32_FMC2_BTR(3)); > + Avoid to put hardcoded value, it difficult to see what is done, add defines. > + setbits_le32(STM32_FMC2_BASE + STM32_FMC2_BCR1, BIT(31)); Add a define for FMC2_BCR1 BIT(31) , it will be easier to understand what is done thanks Patrice > +} > + > /* board dependent setup after realloc */ > int board_init(void) > { > @@ -399,6 +425,8 @@ int board_init(void) > > sysconf_init(); > > + board_init_fmc2(); > + > if (CONFIG_IS_ENABLED(CONFIG_LED)) > led_default_state(); > > diff --git a/configs/stm32mp15_dhcom_basic_defconfig b/configs/stm32mp15_dhcom_basic_defconfig > index 921dea242a..683f15e7d5 100644 > --- a/configs/stm32mp15_dhcom_basic_defconfig > +++ b/configs/stm32mp15_dhcom_basic_defconfig > @@ -93,6 +93,7 @@ CONFIG_SPI_FLASH_MTD=y > CONFIG_SPL_SPI_FLASH_MTD=y > CONFIG_DM_ETH=y > CONFIG_DWC_ETH_QOS=y > +CONFIG_KS8851_MLL=y > CONFIG_PHY=y > CONFIG_PHY_STM32_USBPHYC=y > CONFIG_PINCONF=y