m68k: add basic set of devicetrees
Subsystems (3)
PATCH v3 1/11 m68k: add basic set of devicetrees
This patch adds a basic group of devicetrees, one for each cpu family, including actually just uart and dspi devices, since these are the drivers supporting devicetree (support added in this patch-set).
---
Changes for v2:
- add mcf54xx.dtsi and mcf537x.dtsi
Changes for v3:
- none
--- arch/m68k/dts/mcf5208.dtsi | 36 ++++++++ arch/m68k/dts/mcf5227x.dtsi | 48 ++++++++++ arch/m68k/dts/mcf523x.dtsi | 44 ++++++++++ arch/m68k/dts/mcf5249.dtsi | 38 ++++++++ arch/m68k/dts/mcf5253.dtsi | 44 ++++++++++ arch/m68k/dts/mcf5271.dtsi | 44 ++++++++++ arch/m68k/dts/mcf5272.dtsi | 38 ++++++++ arch/m68k/dts/mcf5275.dtsi | 44 ++++++++++ arch/m68k/dts/mcf5282.dtsi | 44 ++++++++++ arch/m68k/dts/mcf5301x.dtsi | 48 ++++++++++ arch/m68k/dts/mcf5307.dtsi | 39 +++++++++ arch/m68k/dts/mcf5329.dtsi | 36 ++++++++ arch/m68k/dts/mcf537x.dtsi | 36 ++++++++ arch/m68k/dts/mcf5441x.dtsi | 87 +++++++++++++++++++ arch/m68k/dts/mcf5445x.dtsi | 48 ++++++++++ arch/m68k/dts/mcf54xx.dtsi | 40 +++++++++ doc/device-tree-bindings/serial/mcf-uart.txt | 19 ++++ doc/device-tree-bindings/spi/spi-mcf-dspi.txt | 30 +++++++ 18 files changed, 763 insertions(+) create mode 100644 arch/m68k/dts/mcf5208.dtsi create mode 100644 arch/m68k/dts/mcf5227x.dtsi create mode 100644 arch/m68k/dts/mcf523x.dtsi create mode 100644 arch/m68k/dts/mcf5249.dtsi create mode 100644 arch/m68k/dts/mcf5253.dtsi create mode 100644 arch/m68k/dts/mcf5271.dtsi create mode 100644 arch/m68k/dts/mcf5272.dtsi create mode 100644 arch/m68k/dts/mcf5275.dtsi create mode 100644 arch/m68k/dts/mcf5282.dtsi create mode 100644 arch/m68k/dts/mcf5301x.dtsi create mode 100644 arch/m68k/dts/mcf5307.dtsi create mode 100644 arch/m68k/dts/mcf5329.dtsi create mode 100644 arch/m68k/dts/mcf537x.dtsi create mode 100644 arch/m68k/dts/mcf5441x.dtsi create mode 100644 arch/m68k/dts/mcf5445x.dtsi create mode 100644 arch/m68k/dts/mcf54xx.dtsi create mode 100644 doc/device-tree-bindings/serial/mcf-uart.txt create mode 100644 doc/device-tree-bindings/spi/spi-mcf-dspi.txt
arch/m68k/dts/mcf5208.dtsi new file +36 -0
@@ -0,0 +1,36 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Angelo Dureghello <[email protected]> + */ + +/ { + compatible = "fsl,mcf5208"; + + aliases { + serial0 = &uart0; + }; + + soc { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; + + uart0: uart at fc060000 { + compatible = "fsl,mcf-uart"; + reg = <0xfc060000 0x40>; + status = "disabled"; + }; + + uart1: uart at fc064000 { + compatible = "fsl,mcf-uart"; + reg = <0xfc064000 0x40>; + status = "disabled"; + }; + + uart2: uart at fc068000 { + compatible = "fsl,mcf-uart"; + reg = <0xfc068000 0x40>; + status = "disabled"; + }; + }; +};
arch/m68k/dts/mcf5227x.dtsi new file +48 -0
48 lines not on this page · raw message
arch/m68k/dts/mcf523x.dtsi new file +44 -0
44 lines not on this page · raw message
arch/m68k/dts/mcf5249.dtsi new file +38 -0
@@ -0,0 +1,38 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Angelo Dureghello <[email protected]> + */ + +/ { + compatible = "fsl,mcf5249"; + + aliases { + serial0 = &uart0; + }; + + soc { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; + + mbar: mbar at 10000000 { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x00000000 0x10000000 0x10000>; + reg = <0x10000000 0x10000>; + + uart0: uart at 1c0 { + compatible = "fsl,mcf-uart"; + reg = <0x1c0 0x40>; + status = "disabled"; + }; + + uart1: uart at 200 { + compatible = "fsl,mcf-uart"; + reg = <0x200 0x40>; + status = "disabled"; + }; + }; + }; +};
arch/m68k/dts/mcf5253.dtsi new file +44 -0
44 lines not on this page · raw message
arch/m68k/dts/mcf5271.dtsi new file +44 -0
44 lines not on this page · raw message
arch/m68k/dts/mcf5272.dtsi new file +38 -0
@@ -0,0 +1,38 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Angelo Dureghello <[email protected]> + */ + +/ { + compatible = "fsl,mcf5272"; + + aliases { + serial0 = &uart0; + }; + + soc { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; + + mbar: mbar at 10000000 { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x00000000 0x10000000 0x10000>; + reg = <0x10000000 0x10000>; + + uart0: uart at 100 { + compatible = "fsl,mcf-uart"; + reg = <0x100 0x40>; + status = "disabled"; + }; + + uart1: uart at 140 { + compatible = "fsl,mcf-uart"; + reg = <0x140 0x40>; + status = "disabled"; + }; + }; + }; +};
arch/m68k/dts/mcf5275.dtsi new file +44 -0
44 lines not on this page · raw message
arch/m68k/dts/mcf5282.dtsi new file +44 -0
44 lines not on this page · raw message
arch/m68k/dts/mcf5301x.dtsi new file +48 -0
48 lines not on this page · raw message
arch/m68k/dts/mcf5307.dtsi new file +39 -0
@@ -0,0 +1,39 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Angelo Dureghello <[email protected]> + */ + +/ { + compatible = "fsl,mcf5307"; + + aliases { + serial0 = &uart0; + }; + + soc { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; + + /* MBAR */ + mbar: mbar at 10000000 { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x00000000 0x10000000 0x10000>; + reg = <0x10000000 0x10000>; + + uart0: uart at 1c0 { + compatible = "fsl,mcf-uart"; + reg = <0x1c0 0x40>; + status = "disabled"; + }; + + uart1: uart at 200 { + compatible = "fsl,mcf-uart"; + reg = <0x200 0x40>; + status = "disabled"; + }; + }; + }; +};
arch/m68k/dts/mcf5329.dtsi new file +36 -0
@@ -0,0 +1,36 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Angelo Dureghello <[email protected]> + */ + +/ { + compatible = "fsl,mcf5329"; + + aliases { + serial0 = &uart0; + }; + + soc { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; + + uart0: uart at fc060000 { + compatible = "fsl,mcf-uart"; + reg = <0xfc060000 0x40>; + status = "disabled"; + }; + + uart1: uart at fc064000 { + compatible = "fsl,mcf-uart"; + reg = <0xfc064000 0x40>; + status = "disabled"; + }; + + uart2: uart at fc068000 { + compatible = "fsl,mcf-uart"; + reg = <0xfc068000 0x40>; + status = "disabled"; + }; + }; +};
arch/m68k/dts/mcf537x.dtsi new file +36 -0
@@ -0,0 +1,36 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Angelo Dureghello <[email protected]> + */ + +/ { + compatible = "fsl,mcf5329"; + + aliases { + serial0 = &uart0; + }; + + soc { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; + + uart0: uart at fc060000 { + compatible = "fsl,mcf-uart"; + reg = <0xfc060000 0x40>; + status = "disabled"; + }; + + uart1: uart at fc064000 { + compatible = "fsl,mcf-uart"; + reg = <0xfc064000 0x40>; + status = "disabled"; + }; + + uart2: uart at fc068000 { + compatible = "fsl,mcf-uart"; + reg = <0xfc068000 0x40>; + status = "disabled"; + }; + }; +};
arch/m68k/dts/mcf5441x.dtsi new file +87 -0
87 lines not on this page · raw message
arch/m68k/dts/mcf5445x.dtsi new file +48 -0
48 lines not on this page · raw message
arch/m68k/dts/mcf54xx.dtsi new file +40 -0
@@ -0,0 +1,40 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Angelo Dureghello <[email protected]> + */ + +/ { + compatible = "fsl,mcf54x5"; + + aliases { + /* TO DO, clarify on serial, this SoC seems to have SPC and + * no UARTS. + */ + spi0 = &dspi0; + }; + + soc { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; + + mbar: mbar at 80000000 { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x00000000 0x80000000 0x10000>; + reg = <0x80000000 0x10000>; + + dspi0: dspi at 8a00 { + compatible = "fsl,mcf-dspi"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0x8a00 0x100>; + spi-max-frequency = <50000000>; + num-cs = <4>; + spi-mode = <0>; + status = "disabled"; + }; + }; + }; +};
doc/device-tree-bindings/serial/mcf-uart.txt new file +19 -0
@@ -0,0 +1,19 @@ +Freescale ColdFire UART + +Required properties: +- compatible : should be "fsl,mcf-uart" +- reg: start address and size of the registers + +Example: + +soc { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; + + uart0: uart at fc060000 { + compatible = "fsl,mcf-uart"; + reg = <0xfc060000 0x40>; + status = "disabled"; + }; +};
doc/device-tree-bindings/spi/spi-mcf-dspi.txt new file +30 -0
@@ -0,0 +1,30 @@ +Freescale ColdFire DSPI controller + +Required properties: +- compatible : "fsl,mcf-dspi" +- #address-cells: <1>, as required by generic SPI binding +- #size-cells: <0>, also as required by generic SPI binding +- reg : offset and length of the register set for the device + +Optional properties: +- spi-max-frequency : max supported spi frequency +- num-cs : the number of the chipselect signals +- spi-mode: spi motorola mode, 0 to 3 +- ctar-params: CTAR0 to 7 register configuration, as an array + of 8 integer fields for each register, where each register + is defined as: <fmsz, pcssck, pasc, pdt, cssck, asc, dt, br>. + +Example: + +dspi0: dspi at fc05c000 { + compatible = "fsl,mcf-dspi"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0xfc05c000 0x100>; + spi-max-frequency = <50000000>; + num-cs = <4>; + spi-mode = <0>; + ctar-fields = <7, 0, 0, 0, 0, 0, 1, 6>, + <7, 0, 0, 0, 0, 0, 1, 6>, + <7, 0, 0, 0, 0, 0, 1, 6>; +};
Signature · 1 line
2.19.1
PATCH v3 2/11 drivers: spi: cf_spi: add Kconfig option
This patch adds cf_spi DM Kconfig option.
---
Changes for v2:
- new patch
Changes for v3:
- re-put SOFT_SPI in place, options are out of alphabetical order
--- drivers/spi/Kconfig | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/spi/Kconfig +6 -0
@@ -87,6 +87,12 @@ config CADENCE_QSPI used to access the SPI NOR flash on platforms embedding this Cadence IP core. +config CF_SPI + bool "ColdFire SPI driver" + help + Enable the ColdFire SPI driver. This driver can be used on + some m68k SoCs. + config DESIGNWARE_SPI bool "Designware SPI driver" help
Signature · 1 line
2.19.1
PATCH v3 2/11 drivers: spi: cf_spi: add Kconfig option
Quoted 11 lines · Angelo Dureghello
This patch adds
cf_spiDMKconfigoption.Signed-off-by Angelo Dureghello <[email protected]>---
Changes for v2:
- new patch
Changes for v3:
- re-putSOFT_SPIin place, options are out of alphabetical order--- drivers/spi/Kconfig | 6 ++++++ 1 file changed, 6 insertions(+)
PATCH v3 3/11 drivers: spi: cf_spi: convert to driver model
In reply to Angelo DureghelloConverting to driver model and removes non-dm code.
---
Changes for v2:
- removed non DM code part
- add default setup of CTAR registers
- add DT CTAR register setup support
Changes for v3:
- changed commit head
- removed spi_slave reference
- add #ifdefs for the case OF_PLATDATA is used
--- drivers/spi/cf_spi.c | 517 +++++++++++++++--------- include/dm/platform_data/spi_coldfire.h | 29 ++ 2 files changed, 352 insertions(+), 194 deletions(-) create mode 100644 include/dm/platform_data/spi_coldfire.h
drivers/spi/cf_spi.c +323 -194
@@ -6,16 +6,25 @@* * Copyright (C) 2004-2009 Freescale Semiconductor, Inc. * TsiChung Liew (Tsi-Chung.Liew at freescale.com) +* +* Support for DM and DT, non-DM code removed. +* Copyright (C) 2018 Angelo Dureghello <[email protected]> +* +* TODO: fsl_dspi.c should work as a driver for the DSPI module. */ #include <common.h> +#include <dm.h> +#include <dm/platform_data/spi_coldfire.h> #include <spi.h> #include <malloc.h> #include <asm/immap.h> +#include <asm/io.h> -struct cf_spi_slave { -struct spi_slave slave; +struct coldfire_spi_priv { +struct dspi *regs;uint baudrate; +int mode;int charbit; };
@@ -38,14 +47,30 @@ DECLARE_GLOBAL_DATA_PTR;#define SPI_MODE_MOD 0x00200000#define SPI_DBLRATE 0x00100000 -static inline struct cf_spi_slave *to_cf_spi_slave (struct spi_slave *slave) -{ - return container_of(slave, struct cf_spi_slave, slave); -} +#define MCF_DSPI_MAX_CTAR_REGS 8 -static void cfspi_init (void ) +/* Default values */ +#define MCF_DSPI_DEFAULT_SCK_FREQ 10000000 +#define MCF_DSPI_DEFAULT_MAX_CS 4 +#define MCF_DSPI_DEFAULT_MODE 0 + +#define MCF_DSPI_DEFAULT_CTAR (DSPI_CTAR_TRSZ(7) | \ + DSPI_CTAR_PCSSCK_1CLK | \ + DSPI_CTAR_PASC(0) | \ + DSPI_CTAR_PDT(0) | \ + DSPI_CTAR_CSSCK(0) | \ + DSPI_CTAR_ASC(0) | \ + DSPI_CTAR_DT(1) | \ + DSPI_CTAR_BR(6)) + +static void __spi_init (struct coldfire_spi_priv *cfspi) { -volatile dspi_t *dspi = (dspi_t *)MMAP_DSPI ; +struct dspi *dspi = cfspi->regs; +int i; + +/* Default CTARs */ +for (i =0 ; i <MCF_DSPI_MAX_CTAR_REGS ; i++) +writel (MCF_DSPI_DEFAULT_CTAR , &dspi->ctar[i]);cfspi_port_conf ();/* port configuration */
@@ -53,128 +78,9 @@ static void cfspi_init(void)DSPI_MCR_CSIS5 |DSPI_MCR_CSIS4 |DSPI_MCR_CSIS3 |DSPI_MCR_CSIS2 |DSPI_MCR_CSIS1 |DSPI_MCR_CSIS0 |DSPI_MCR_CRXF |DSPI_MCR_CTXF ; - -/* Default setting in platform configuration */ -#ifdef CONFIG_SYS_DSPI_CTAR0 - dspi->ctar[0 ] =CONFIG_SYS_DSPI_CTAR0 ; -#endif -#ifdef CONFIG_SYS_DSPI_CTAR1 - dspi->ctar[1 ] =CONFIG_SYS_DSPI_CTAR1 ; -#endif -#ifdef CONFIG_SYS_DSPI_CTAR2 - dspi->ctar[2 ] =CONFIG_SYS_DSPI_CTAR2 ; -#endif -#ifdef CONFIG_SYS_DSPI_CTAR3 - dspi->ctar[3 ] =CONFIG_SYS_DSPI_CTAR3 ; -#endif -#ifdef CONFIG_SYS_DSPI_CTAR4 - dspi->ctar[4 ] =CONFIG_SYS_DSPI_CTAR4 ; -#endif -#ifdef CONFIG_SYS_DSPI_CTAR5 - dspi->ctar[5 ] =CONFIG_SYS_DSPI_CTAR5 ; -#endif -#ifdef CONFIG_SYS_DSPI_CTAR6 - dspi->ctar[6 ] =CONFIG_SYS_DSPI_CTAR6 ; -#endif -#ifdef CONFIG_SYS_DSPI_CTAR7 - dspi->ctar[7 ] =CONFIG_SYS_DSPI_CTAR7 ; -#endif -} - -static void cfspi_tx (u32 ctrl,u16 data) -{ -volatile dspi_t *dspi = (dspi_t *)MMAP_DSPI ; - -while ((dspi->sr &0x0000F000 ) >=4 ) ; - - dspi->tfr = (ctrl | data); } -static u16 cfspi_rx (void ) -{ -volatile dspi_t *dspi = (dspi_t *)MMAP_DSPI ; - -while ((dspi->sr &0x000000F0 ) ==0 ) ; - -return (dspi->rfr &0xFFFF ); -} - -static int cfspi_xfer (struct spi_slave *slave,uint bitlen,const void *dout, -void *din,ulong flags) -{ -struct cf_spi_slave *cfslave =to_cf_spi_slave (slave); -u16 *spi_rd16 =NULL , *spi_wr16 =NULL ; -u8 *spi_rd =NULL , *spi_wr =NULL ; -static u32 ctrl =0 ; -uint len = bitlen >>3 ; - -if (cfslave->charbit ==16 ) { - bitlen >>=1 ; - spi_wr16 = (u16 *) dout; - spi_rd16 = (u16 *) din; - }else { - spi_wr = (u8 *) dout; - spi_rd = (u8 *) din; - } - -if ((flags &SPI_XFER_BEGIN ) ==SPI_XFER_BEGIN ) - ctrl |=DSPI_TFR_CONT ; - - ctrl = (ctrl &0xFF000000 ) | ((1 << slave->cs) <<16 ); - -if (len >1 ) { -int tmp_len = len -1 ; -while (tmp_len--) { -if (dout !=NULL ) { -if (cfslave->charbit ==16 ) -cfspi_tx (ctrl, *spi_wr16++); -else -cfspi_tx (ctrl, *spi_wr++); -cfspi_rx (); - } - -if (din !=NULL ) { -cfspi_tx (ctrl,CONFIG_SPI_IDLE_VAL ); -if (cfslave->charbit ==16 ) - *spi_rd16++ =cfspi_rx (); -else - *spi_rd++ =cfspi_rx (); - } - } - - len =1 ;/* remaining byte */ - } - -if ((flags &SPI_XFER_END ) ==SPI_XFER_END ) - ctrl &= ~DSPI_TFR_CONT ; - -if (len) { -if (dout !=NULL ) { -if (cfslave->charbit ==16 ) -cfspi_tx (ctrl, *spi_wr16); -else -cfspi_tx (ctrl, *spi_wr); -cfspi_rx (); - } - -if (din !=NULL ) { -cfspi_tx (ctrl,CONFIG_SPI_IDLE_VAL ); -if (cfslave->charbit ==16 ) - *spi_rd16 =cfspi_rx (); -else - *spi_rd =cfspi_rx (); - } - }else { -/* dummy read */ -cfspi_tx (ctrl,CONFIG_SPI_IDLE_VAL ); -cfspi_rx (); - } - -return 0 ; -} - -static struct spi_slave *cfspi_setup_slave (struct cf_spi_slave *cfslave, -uint mode) +int __spi_set_speed (struct coldfire_spi_priv *cfspi,uint bus) {/* * bit definition for mode:
@@ -189,7 +95,7 @@ static struct spi_slave *cfspi_setup_slave(struct cf_spi_slave *cfslave,* 11 - 8: Delay after transfer scaler * 7 - 0: SPI_CPHA, SPI_CPOL, SPI_LSB_FIRST */ -volatile dspi_t *dspi = (dspi_t *)MMAP_DSPI ; +struct dspi *dspi = cfspi->regs;int prescaler[] = {2 ,3 ,5 ,7 };int scaler[] = {2 ,4 ,6 ,8 ,
@@ -199,56 +105,38 @@ static struct spi_slave *cfspi_setup_slave(struct cf_spi_slave *cfslave, };int i, j, pbrcnt, brcnt, diff, tmp, dbr =0 ;int best_i, best_j, bestmatch =0x7FFFFFFF , baud_speed; -u32 bus_setup =0 ; +u32 bus_setup; + +/* Read current setup */ + bus_setup =readl (&dspi->ctar[bus]); tmp = (prescaler[3 ] * scaler[15 ]);/* Maximum and minimum baudrate it can handle */ -if ((cfslave->baudrate > (gd->bus_clk >>1 )) || - (cfslave->baudrate < (gd->bus_clk / tmp))) { +if ((cfspi->baudrate > (gd->bus_clk >>1 )) || + (cfspi->baudrate < (gd->bus_clk / tmp))) {printf ("Exceed baudrate limitation: Max %d - Min %d\n" , (int )(gd->bus_clk >>1 ), (int )(gd->bus_clk / tmp)); -return NULL ; +return -1 ; }/* Activate Double Baud when it exceed 1/4 the bus clk */ -if ((CONFIG_SYS_DSPI_CTAR0 &DSPI_CTAR_DBR ) || - (cfslave->baudrate > (gd->bus_clk / (prescaler[0 ] * scaler[0 ])))) { +if ((bus_setup &DSPI_CTAR_DBR ) || + (cfspi->baudrate > (gd->bus_clk / (prescaler[0 ] * scaler[0 ])))) { bus_setup |=DSPI_CTAR_DBR ; dbr =1 ; } -if (mode &SPI_CPOL ) - bus_setup |=DSPI_CTAR_CPOL ; -if (mode &SPI_CPHA ) - bus_setup |=DSPI_CTAR_CPHA ; -if (mode &SPI_LSB_FIRST ) - bus_setup |=DSPI_CTAR_LSBFE ; -/* Overwrite default value set in platform configuration file */ -if (mode &SPI_MODE_MOD ) { - -if ((mode &0xF0000000 ) ==0 ) - bus_setup |= - dspi->ctar[cfslave->slave.bus] &0x78000000 ; -else - bus_setup |= ((mode &0xF0000000 ) >>1 ); - +if (cfspi->mode &SPI_MODE_MOD ) {/* * Check to see if it is enabled by default in platform * config, or manual setting passed by mode parameter */ -if (mode &SPI_DBLRATE ) { +if (cfspi->mode &SPI_DBLRATE ) { bus_setup |=DSPI_CTAR_DBR ; dbr =1 ; } - bus_setup |= (mode &0x0FC00000 ) >>4 ;/* PSCSCK, PASC, PDT */ - bus_setup |= (mode &0x000FFF00 ) >>4 ;/* CSSCK, ASC, DT */ - }else - bus_setup |= (dspi->ctar[cfslave->slave.bus] &0x78FCFFF0 ); - - cfslave->charbit = - ((dspi->ctar[cfslave->slave.bus] &0x78000000 ) == -0x78000000 ) ?16 :8 ; + } pbrcnt =sizeof (prescaler) /sizeof (int ); brcnt =sizeof (scaler) /sizeof (int );
@@ -259,10 +147,10 @@ static struct spi_slave *cfspi_setup_slave(struct cf_spi_slave *cfslave,for (j =0 ; j < brcnt; j++) { tmp = (baud_speed / scaler[j]) * (1 + dbr); -if (tmp > cfslave->baudrate) - diff = tmp - cfslave->baudrate; +if (tmp > cfspi->baudrate) + diff = tmp - cfspi->baudrate;else - diff = cfslave->baudrate - tmp; + diff = cfspi->baudrate - tmp;if (diff < bestmatch) { bestmatch = diff;
@@ -271,65 +159,306 @@ static struct spi_slave *cfspi_setup_slave(struct cf_spi_slave *cfslave, } } } + + bus_setup &= ~(DSPI_CTAR_PBR (0x03 ) |DSPI_CTAR_BR (0x0f )); bus_setup |= (DSPI_CTAR_PBR (best_i) |DSPI_CTAR_BR (best_j)); - dspi->ctar[cfslave->slave.bus] = bus_setup; +writel (bus_setup, &dspi->ctar[bus]); + +return 0 ; +} + +static int __spi_set_mode (struct coldfire_spi_priv *cfspi,uint bus) +{ +struct dspi *dspi = cfspi->regs; +u32 bus_setup =0 ; + +if (cfspi->mode &SPI_CPOL ) + bus_setup |=DSPI_CTAR_CPOL ; +if (cfspi->mode &SPI_CPHA ) + bus_setup |=DSPI_CTAR_CPHA ; +if (cfspi->mode &SPI_LSB_FIRST ) + bus_setup |=DSPI_CTAR_LSBFE ; + +/* Overwrite default value set in platform configuration file */ +if (cfspi->mode &SPI_MODE_MOD ) { +if ((cfspi->mode &0xF0000000 ) ==0 ) + bus_setup |= +readl (&dspi->ctar[bus]) &0x78000000 ; +else + bus_setup |= ((cfspi->mode &0xF0000000 ) >>1 ); + +/* PSCSCK, PASC, PDT */ + bus_setup |= (cfspi->mode &0x0FC00000 ) >>4 ; +/* CSSCK, ASC, DT */ + bus_setup |= (cfspi->mode &0x000FFF00 ) >>4 ; + }else { + bus_setup |= (readl (&dspi->ctar[bus]) &0x78FCFFF0 ); + } + + cfspi->charbit = + ((readl (&dspi->ctar[bus]) &0x78000000 ) ==0x78000000 ) ?16 :8 ; -return &cfslave->slave; +setbits_be32 (&dspi->ctar[bus], bus_setup); + +return 0 ; } -#endif /* CONFIG_CF_DSPI */ -#ifdef CONFIG_CMD_SPI -int spi_cs_is_valid (unsigned int bus,unsigned int cs) +static inline void __cfspi_tx (struct coldfire_spi_priv *cfspi, +u32 ctrl,u16 data) { -if (((cs >=0 ) && (cs <8 )) && ((bus >=0 ) && (bus <8 ))) -return 1 ; -else -return 0 ; +while ((readl (&cfspi->regs->sr) &0x0000F000 ) >=4 ) + ; + +writel (ctrl | data, &cfspi->regs->tfr); +} + +static inline u16 __cfspi_rx (struct coldfire_spi_priv *cfspi) +{ +while ((readl (&cfspi->regs->sr) &0x000000F0 ) ==0 ) + ; + +return readw (&cfspi->regs->rfr); +} + +static int __spi_xfer (struct coldfire_spi_priv *cfspi,uint cs,uint bitlen, +const void *dout,void *din,ulong flags) +{ +u16 *spi_rd16 =NULL , *spi_wr16 =NULL ; +u8 *spi_rd =NULL , *spi_wr =NULL ; +static u32 ctrl; +uint len = bitlen >>3 ; + +if (cfspi->charbit ==16 ) { + bitlen >>=1 ; + spi_wr16 = (u16 *)dout; + spi_rd16 = (u16 *)din; + }else { + spi_wr = (u8 *)dout; + spi_rd = (u8 *)din; + } + +if ((flags &SPI_XFER_BEGIN ) ==SPI_XFER_BEGIN ) + ctrl |=DSPI_TFR_CONT ; + + ctrl = (ctrl &0xFF000000 ) | ((1 << cs) <<16 ); + +if (len >1 ) { +int tmp_len = len -1 ; + +while (tmp_len--) { +if (dout) { +if (cfspi->charbit ==16 ) +__cfspi_tx (cfspi, ctrl, *spi_wr16++); +else +__cfspi_tx (cfspi, ctrl, *spi_wr++); +__cfspi_rx (cfspi); + } + +if (din) { +__cfspi_tx (cfspi, ctrl,CONFIG_SPI_IDLE_VAL ); +if (cfspi->charbit ==16 ) + *spi_rd16++ =__cfspi_rx (cfspi); +else + *spi_rd++ =__cfspi_rx (cfspi); + } + } + + len =1 ;/* remaining byte */ + } + +if ((flags &SPI_XFER_END ) ==SPI_XFER_END ) + ctrl &= ~DSPI_TFR_CONT ; + +if (len) { +if (dout) { +if (cfspi->charbit ==16 ) +__cfspi_tx (cfspi, ctrl, *spi_wr16); +else +__cfspi_tx (cfspi, ctrl, *spi_wr); +__cfspi_rx (cfspi); + } + +if (din) { +__cfspi_tx (cfspi, ctrl,CONFIG_SPI_IDLE_VAL ); +if (cfspi->charbit ==16 ) + *spi_rd16 =__cfspi_rx (cfspi); +else + *spi_rd =__cfspi_rx (cfspi); + } + }else { +/* dummy read */ +__cfspi_tx (cfspi, ctrl,CONFIG_SPI_IDLE_VAL ); +__cfspi_rx (cfspi); + } + +return 0 ; }void spi_init (void ) { -cfspi_init (); } -struct spi_slave *spi_setup_slave (unsigned int bus,unsigned int cs, -unsigned int max_hz,unsigned int mode) +static int coldfire_spi_claim_bus (struct udevice *dev) +{ +struct udevice *bus = dev->parent; +struct dm_spi_slave_platdata *slave_plat = +dev_get_parent_platdata (dev); + +return cfspi_claim_bus (bus->seq, slave_plat->cs); +} + +static int coldfire_spi_release_bus (struct udevice *dev) { -struct cf_spi_slave *cfslave; +struct udevice *bus = dev->parent; +struct dm_spi_slave_platdata *slave_plat = +dev_get_parent_platdata (dev); -if (!spi_cs_is_valid (bus, cs)) -return NULL ; +cfspi_release_bus (bus->seq, slave_plat->cs); - cfslave = spi_alloc_slave(struct cf_spi_slave, bus, cs); -if (!cfslave) -return NULL ; +return 0 ; +} - cfslave->baudrate = max_hz; +static int coldfire_spi_xfer (struct udevice *dev,unsigned int bitlen, +const void *dout,void *din, +unsigned long flags) +{ +struct udevice *bus =dev_get_parent (dev); +struct coldfire_spi_priv *cfspi =dev_get_priv (bus); +struct dm_spi_slave_platdata *slave_plat =dev_get_parent_platdata (dev); -/* specific setup */ -return cfspi_setup_slave (cfslave, mode); +return __spi_xfer (cfspi, slave_plat->cs, bitlen, dout, din, flags); } -void spi_free_slave (struct spi_slave *slave) +static int coldfire_spi_set_speed (struct udevice *bus,uint max_hz) { -struct cf_spi_slave *cfslave =to_cf_spi_slave (slave); +struct coldfire_spi_priv *cfspi =dev_get_priv (bus); + + cfspi->baudrate = max_hz; -free (cfslave); +return __spi_set_speed (cfspi, bus->seq); } -int spi_claim_bus (struct spi_slave *slave) +static int coldfire_spi_set_mode (struct udevice *bus,uint mode) { -return cfspi_claim_bus (slave->bus, slave->cs); +struct coldfire_spi_priv *cfspi =dev_get_priv (bus); + + cfspi->mode = mode; + +return __spi_set_mode (cfspi, bus->seq); } -void spi_release_bus (struct spi_slave *slave) +static int coldfire_spi_probe (struct udevice *bus) { -cfspi_release_bus (slave->bus, slave->cs); +struct coldfire_spi_platdata *plat =dev_get_platdata (bus); +struct coldfire_spi_priv *cfspi =dev_get_priv (bus); +int i; + + cfspi->regs = (struct dspi *)plat->regs_addr; + + cfspi->baudrate = plat->speed_hz; + cfspi->mode = plat->mode; + +for (i =0 ; i <MCF_DSPI_MAX_CTAR_REGS ; i++) { +unsigned int ctar =0 ; + +if (plat->ctar[i][0 ] ==0 ) +break ; + + ctar =DSPI_CTAR_TRSZ (plat->ctar[i][0 ]) | +DSPI_CTAR_PCSSCK (plat->ctar[i][1 ]) | +DSPI_CTAR_PASC (plat->ctar[i][2 ]) | +DSPI_CTAR_PDT (plat->ctar[i][3 ]) | +DSPI_CTAR_CSSCK (plat->ctar[i][4 ]) | +DSPI_CTAR_ASC (plat->ctar[i][5 ]) | +DSPI_CTAR_DT (plat->ctar[i][6 ]) | +DSPI_CTAR_BR (plat->ctar[i][7 ]); + +writel (ctar, &cfspi->regs->ctar[i]); + } + +__spi_init (cfspi); + +return 0 ; } -int spi_xfer (struct spi_slave *slave,unsigned int bitlen,const void *dout, -void *din,unsigned long flags) +#if !CONFIG_IS_ENABLED (OF_PLATDATA ) +static int coldfire_dspi_ofdata_to_platdata (struct udevice *bus) { -return cfspi_xfer (slave, bitlen, dout, din, flags); +fdt_addr_t addr; +struct coldfire_spi_platdata *plat = bus->platdata; +const void *blob = gd->fdt_blob; +int node =dev_of_offset (bus); +int *ctar, len; + + addr =devfdt_get_addr (bus); +if (addr ==FDT_ADDR_T_NONE ) { +debug ("DSPI: Can't get base address or size\n" ); +return -ENOMEM ; + } + plat->regs_addr = addr; + + plat->num_cs =fdtdec_get_int (blob, node,"num-cs" , +MCF_DSPI_DEFAULT_MAX_CS ); + + plat->speed_hz =fdtdec_get_int (blob, node,"spi-max-frequency" , +MCF_DSPI_DEFAULT_SCK_FREQ ); + + plat->mode =fdtdec_get_int (blob, node,"spi-mode" , +MCF_DSPI_DEFAULT_MODE ); + +memset (plat->ctar,0 ,sizeof (plat->ctar)); + + ctar = (int *)fdt_getprop (blob, node,"ctar-params" , &len); + +if (ctar && len) { +int i, q, ctar_regs; + + ctar_regs = len /sizeof (unsigned int ) /MAX_CTAR_FIELDS ; + +if (ctar_regs >MAX_CTAR_REGS ) + ctar_regs =MAX_CTAR_REGS ; + +for (i =0 ; i < ctar_regs; i++) { +for (q =0 ; q <MAX_CTAR_FIELDS ; q++) + plat->ctar[i][q] = *ctar++; + } + } + +debug ("DSPI: regs=%pa, max-frequency=%d, num-cs=%d, mode=%d\n" , + (void *)plat->regs_addr, + plat->speed_hz, plat->num_cs, plat->mode); + +return 0 ; } -#endif /* CONFIG_CMD_SPI */ +#endif + +static const struct dm_spi_ops coldfire_spi_ops = { + .claim_bus = coldfire_spi_claim_bus, + .release_bus = coldfire_spi_release_bus, + .xfer = coldfire_spi_xfer, + .set_speed = coldfire_spi_set_speed, + .set_mode = coldfire_spi_set_mode, +}; + +#if !CONFIG_IS_ENABLED (OF_PLATDATA ) +static const struct udevice_id coldfire_spi_ids[] = { + { .compatible ="fsl,mcf-dspi" }, + { } +}; +#endif + +U_BOOT_DRIVER (coldfire_spi) = { + .name ="spi_coldfire" , + .id =UCLASS_SPI , +#if !CONFIG_IS_ENABLED(OF_PLATDATA) + .of_match = coldfire_spi_ids, +#endif + .probe = coldfire_spi_probe, + .ops = &coldfire_spi_ops, + .platdata_auto_alloc_size =sizeof (struct coldfire_spi_platdata ), +#if !CONFIG_IS_ENABLED(OF_PLATDATA) + .ofdata_to_platdata = coldfire_dspi_ofdata_to_platdata, +#endif + .priv_auto_alloc_size =sizeof (struct coldfire_spi_priv ), +}; +#endif /* CONFIG_CF_DSPI */
include/dm/platform_data/spi_coldfire.h new file +29 -0
@@ -0,0 +1,29 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* Copyright (c) 2018 Angelo Dureghello <[email protected]> +*/ + +#ifndef __spi_coldfire_h +#define __spi_coldfire_h + +#define MAX_CTAR_REGS 8 +#define MAX_CTAR_FIELDS 8 + +/* +* struct coldfire_spi_platdata - information about a coldfire spi module +* +* @regs_addr: base address for module registers +* @speed_hz: default SCK frequency +* @mode: default SPI mode +* @num_cs: number of DSPI chipselect signals +*/ +struct coldfire_spi_platdata { +fdt_addr_t regs_addr; +uint speed_hz; +uint mode; +uint num_cs; +uint ctar[MAX_CTAR_REGS ][MAX_CTAR_FIELDS ]; +}; + +#endif /* __spi_coldfire_h */ +
Signature · 1 line
2.19.1
PATCH v3 3/11 drivers: spi: cf_spi: convert to driver model
Quoted 12 lines · Angelo Dureghello
Converting to driver model and removes non-dm code.
Signed-off-by Angelo Dureghello <[email protected]>---
Changes for v2:
- removed non DM code part
- add default setup of CTAR registers
- add DT CTAR register setup support
Changes for v3:
- changed commit head
- removedspi_slavereference
- add #ifdefs for the caseOF_PLATDATAis used
Quoted 5 lines
--- drivers/spi/cf_spi.c | 517 +++++++++++++++--------- include/dm/platform_data/spi_coldfire.h | 29 ++ 2 files changed, 352 insertions(+), 194 deletions(-) create mode 100644 include/dm/platform_data/spi_coldfire.h
This is a big tricky to review, but it looks right to me.
PATCH v3 3/11 drivers: spi: cf_spi: convert to driver model
In reply to Angelo DureghelloQuoted 373 lines · Angelo Dureghello
Converting to driver model and removes non-dm code.
Signed-off-by Angelo Dureghello <[email protected]>---
Changes for v2:
- removed non DM code part
- add default setup of CTAR registers
- add DT CTAR register setup support
Changes for v3:
- changed commit head
- removedspi_slavereference
- add #ifdefs for the caseOF_PLATDATAis used--- drivers/spi/cf_spi.c | 517 +++++++++++++++--------- include/dm/platform_data/spi_coldfire.h | 29 ++ 2 files changed, 352 insertions(+), 194 deletions(-) create mode 100644 include/dm/platform_data/spi_coldfire.hdrivers/spi/cf_spi.c +95
-171@@ -6,16 +6,25 @@* * Copyright (C) 2004-2009 Freescale Semiconductor, Inc. * TsiChung Liew (Tsi-Chung.Liew at freescale.com) +* +* Support for DM and DT, non-DM code removed. +* Copyright (C) 2018 Angelo Dureghello <[email protected]> +* +* TODO: fsl_dspi.c should work as a driver for the DSPI module. */ #include <common.h> +#include <dm.h> +#include <dm/platform_data/spi_coldfire.h> #include <spi.h> #include <malloc.h> #include <asm/immap.h> +#include <asm/io.h> -struct cf_spi_slave { -struct spi_slave slave; +struct coldfire_spi_priv { +struct dspi *regs;uint baudrate; +int mode;int charbit; };@@ -38,14 +47,30 @@ DECLARE_GLOBAL_DATA_PTR;#define SPI_MODE_MOD 0x00200000#define SPI_DBLRATE 0x00100000 -static inline struct cf_spi_slave *to_cf_spi_slave (struct spi_slave *slave) -{ - return container_of(slave, struct cf_spi_slave, slave); -} +#define MCF_DSPI_MAX_CTAR_REGS 8 -static void cfspi_init (void ) +/* Default values */ +#define MCF_DSPI_DEFAULT_SCK_FREQ 10000000 +#define MCF_DSPI_DEFAULT_MAX_CS 4 +#define MCF_DSPI_DEFAULT_MODE 0 + +#define MCF_DSPI_DEFAULT_CTAR (DSPI_CTAR_TRSZ(7) | \ + DSPI_CTAR_PCSSCK_1CLK | \ + DSPI_CTAR_PASC(0) | \ + DSPI_CTAR_PDT(0) | \ + DSPI_CTAR_CSSCK(0) | \ + DSPI_CTAR_ASC(0) | \ + DSPI_CTAR_DT(1) | \ + DSPI_CTAR_BR(6)) + +static void __spi_init (struct coldfire_spi_priv *cfspi) { -volatile dspi_t *dspi = (dspi_t *)MMAP_DSPI ; +struct dspi *dspi = cfspi->regs; +int i; + +/* Default CTARs */ +for (i =0 ; i <MCF_DSPI_MAX_CTAR_REGS ; i++) +writel (MCF_DSPI_DEFAULT_CTAR , &dspi->ctar[i]);cfspi_port_conf ();/* port configuration */ @@ -53,128 +78,9 @@ static void cfspi_init(void)DSPI_MCR_CSIS5 |DSPI_MCR_CSIS4 |DSPI_MCR_CSIS3 |DSPI_MCR_CSIS2 |DSPI_MCR_CSIS1 |DSPI_MCR_CSIS0 |DSPI_MCR_CRXF |DSPI_MCR_CTXF ; - -/* Default setting in platform configuration */ -#ifdef CONFIG_SYS_DSPI_CTAR0 - dspi->ctar[0 ] =CONFIG_SYS_DSPI_CTAR0 ; -#endif -#ifdef CONFIG_SYS_DSPI_CTAR1 - dspi->ctar[1 ] =CONFIG_SYS_DSPI_CTAR1 ; -#endif -#ifdef CONFIG_SYS_DSPI_CTAR2 - dspi->ctar[2 ] =CONFIG_SYS_DSPI_CTAR2 ; -#endif -#ifdef CONFIG_SYS_DSPI_CTAR3 - dspi->ctar[3 ] =CONFIG_SYS_DSPI_CTAR3 ; -#endif -#ifdef CONFIG_SYS_DSPI_CTAR4 - dspi->ctar[4 ] =CONFIG_SYS_DSPI_CTAR4 ; -#endif -#ifdef CONFIG_SYS_DSPI_CTAR5 - dspi->ctar[5 ] =CONFIG_SYS_DSPI_CTAR5 ; -#endif -#ifdef CONFIG_SYS_DSPI_CTAR6 - dspi->ctar[6 ] =CONFIG_SYS_DSPI_CTAR6 ; -#endif -#ifdef CONFIG_SYS_DSPI_CTAR7 - dspi->ctar[7 ] =CONFIG_SYS_DSPI_CTAR7 ; -#endif -} - -static void cfspi_tx (u32 ctrl,u16 data) -{ -volatile dspi_t *dspi = (dspi_t *)MMAP_DSPI ; - -while ((dspi->sr &0x0000F000 ) >=4 ) ; - - dspi->tfr = (ctrl | data); } -static u16 cfspi_rx (void ) -{ -volatile dspi_t *dspi = (dspi_t *)MMAP_DSPI ; - -while ((dspi->sr &0x000000F0 ) ==0 ) ; - -return (dspi->rfr &0xFFFF ); -} - -static int cfspi_xfer (struct spi_slave *slave,uint bitlen,const void *dout, -void *din,ulong flags) -{ -struct cf_spi_slave *cfslave =to_cf_spi_slave (slave); -u16 *spi_rd16 =NULL , *spi_wr16 =NULL ; -u8 *spi_rd =NULL , *spi_wr =NULL ; -static u32 ctrl =0 ; -uint len = bitlen >>3 ; - -if (cfslave->charbit ==16 ) { - bitlen >>=1 ; - spi_wr16 = (u16 *) dout; - spi_rd16 = (u16 *) din; - }else { - spi_wr = (u8 *) dout; - spi_rd = (u8 *) din; - } - -if ((flags &SPI_XFER_BEGIN ) ==SPI_XFER_BEGIN ) - ctrl |=DSPI_TFR_CONT ; - - ctrl = (ctrl &0xFF000000 ) | ((1 << slave->cs) <<16 ); - -if (len >1 ) { -int tmp_len = len -1 ; -while (tmp_len--) { -if (dout !=NULL ) { -if (cfslave->charbit ==16 ) -cfspi_tx (ctrl, *spi_wr16++); -else -cfspi_tx (ctrl, *spi_wr++); -cfspi_rx (); - } - -if (din !=NULL ) { -cfspi_tx (ctrl,CONFIG_SPI_IDLE_VAL ); -if (cfslave->charbit ==16 ) - *spi_rd16++ =cfspi_rx (); -else - *spi_rd++ =cfspi_rx (); - } - } - - len =1 ;/* remaining byte */ - } - -if ((flags &SPI_XFER_END ) ==SPI_XFER_END ) - ctrl &= ~DSPI_TFR_CONT ; - -if (len) { -if (dout !=NULL ) { -if (cfslave->charbit ==16 ) -cfspi_tx (ctrl, *spi_wr16); -else -cfspi_tx (ctrl, *spi_wr); -cfspi_rx (); - } - -if (din !=NULL ) { -cfspi_tx (ctrl,CONFIG_SPI_IDLE_VAL ); -if (cfslave->charbit ==16 ) - *spi_rd16 =cfspi_rx (); -else - *spi_rd =cfspi_rx (); - } - }else { -/* dummy read */ -cfspi_tx (ctrl,CONFIG_SPI_IDLE_VAL ); -cfspi_rx (); - } - -return 0 ; -} - -static struct spi_slave *cfspi_setup_slave (struct cf_spi_slave *cfslave, -uint mode) +int __spi_set_speed (struct coldfire_spi_priv *cfspi,uint bus) {/* * bit definition for mode: @@ -189,7 +95,7 @@ static struct spi_slave *cfspi_setup_slave(struct cf_spi_slave *cfslave,* 11 - 8: Delay after transfer scaler * 7 - 0: SPI_CPHA, SPI_CPOL, SPI_LSB_FIRST */ -volatile dspi_t *dspi = (dspi_t *)MMAP_DSPI ; +struct dspi *dspi = cfspi->regs;int prescaler[] = {2 ,3 ,5 ,7 };int scaler[] = {2 ,4 ,6 ,8 ,@@ -199,56 +105,38 @@ static struct spi_slave *cfspi_setup_slave(struct cf_spi_slave *cfslave, };int i, j, pbrcnt, brcnt, diff, tmp, dbr =0 ;int best_i, best_j, bestmatch =0x7FFFFFFF , baud_speed; -u32 bus_setup =0 ; +u32 bus_setup; + +/* Read current setup */ + bus_setup =readl (&dspi->ctar[bus]); tmp = (prescaler[3 ] * scaler[15 ]);/* Maximum and minimum baudrate it can handle */ -if ((cfslave->baudrate > (gd->bus_clk >>1 )) || - (cfslave->baudrate < (gd->bus_clk / tmp))) { +if ((cfspi->baudrate > (gd->bus_clk >>1 )) || + (cfspi->baudrate < (gd->bus_clk / tmp))) {printf ("Exceed baudrate limitation: Max %d - Min %d\n" , (int )(gd->bus_clk >>1 ), (int )(gd->bus_clk / tmp)); -return NULL ; +return -1 ; }/* Activate Double Baud when it exceed 1/4 the bus clk */ -if ((CONFIG_SYS_DSPI_CTAR0 &DSPI_CTAR_DBR ) || - (cfslave->baudrate > (gd->bus_clk / (prescaler[0 ] * scaler[0 ])))) { +if ((bus_setup &DSPI_CTAR_DBR ) || + (cfspi->baudrate > (gd->bus_clk / (prescaler[0 ] * scaler[0 ])))) { bus_setup |=DSPI_CTAR_DBR ; dbr =1 ; } -if (mode &SPI_CPOL ) - bus_setup |=DSPI_CTAR_CPOL ; -if (mode &SPI_CPHA ) - bus_setup |=DSPI_CTAR_CPHA ; -if (mode &SPI_LSB_FIRST ) - bus_setup |=DSPI_CTAR_LSBFE ; -/* Overwrite default value set in platform configuration file */ -if (mode &SPI_MODE_MOD ) { - -if ((mode &0xF0000000 ) ==0 ) - bus_setup |= - dspi->ctar[cfslave->slave.bus] &0x78000000 ; -else - bus_setup |= ((mode &0xF0000000 ) >>1 ); - +if (cfspi->mode &SPI_MODE_MOD ) {/* * Check to see if it is enabled by default in platform * config, or manual setting passed by mode parameter */ -if (mode &SPI_DBLRATE ) { +if (cfspi->mode &SPI_DBLRATE ) { bus_setup |=DSPI_CTAR_DBR ; dbr =1 ; } - bus_setup |= (mode &0x0FC00000 ) >>4 ;/* PSCSCK, PASC, PDT */ - bus_setup |= (mode &0x000FFF00 ) >>4 ;/* CSSCK, ASC, DT */ - }else - bus_setup |= (dspi->ctar[cfslave->slave.bus] &0x78FCFFF0 ); - - cfslave->charbit = - ((dspi->ctar[cfslave->slave.bus] &0x78000000 ) == -0x78000000 ) ?16 :8 ; + } pbrcnt =sizeof (prescaler) /sizeof (int ); brcnt =sizeof (scaler) /sizeof (int );@@ -259,10 +147,10 @@ static struct spi_slave *cfspi_setup_slave(struct cf_spi_slave *cfslave,for (j =0 ; j < brcnt; j++) { tmp = (baud_speed / scaler[j]) * (1 + dbr); -if (tmp > cfslave->baudrate) - diff = tmp - cfslave->baudrate; +if (tmp > cfspi->baudrate) + diff = tmp - cfspi->baudrate;else - diff = cfslave->baudrate - tmp; + diff = cfspi->baudrate - tmp;if (diff < bestmatch) { bestmatch = diff;@@ -271,65 +159,306 @@ static struct spi_slave *cfspi_setup_slave(struct cf_spi_slave *cfslave, } } } + + bus_setup &= ~(DSPI_CTAR_PBR (0x03 ) |DSPI_CTAR_BR (0x0f )); bus_setup |= (DSPI_CTAR_PBR (best_i) |DSPI_CTAR_BR (best_j)); - dspi->ctar[cfslave->slave.bus] = bus_setup; +writel (bus_setup, &dspi->ctar[bus]); + +return 0 ; +} + +static int __spi_set_mode (struct coldfire_spi_priv *cfspi,uint bus) +{ +struct dspi *dspi = cfspi->regs; +u32 bus_setup =0 ; + +if (cfspi->mode &SPI_CPOL ) + bus_setup |=DSPI_CTAR_CPOL ; +if (cfspi->mode &SPI_CPHA ) + bus_setup |=DSPI_CTAR_CPHA ; +if (cfspi->mode &SPI_LSB_FIRST ) + bus_setup |=DSPI_CTAR_LSBFE ; + +/* Overwrite default value set in platform configuration file */ +if (cfspi->mode &SPI_MODE_MOD ) { +if ((cfspi->mode &0xF0000000 ) ==0 ) + bus_setup |= +readl (&dspi->ctar[bus]) &0x78000000 ; +else + bus_setup |= ((cfspi->mode &0xF0000000 ) >>1 ); + +/* PSCSCK, PASC, PDT */ + bus_setup |= (cfspi->mode &0x0FC00000 ) >>4 ; +/* CSSCK, ASC, DT */ + bus_setup |= (cfspi->mode &0x000FFF00 ) >>4 ; + }else { + bus_setup |= (readl (&dspi->ctar[bus]) &0x78FCFFF0 ); + } + + cfspi->charbit = + ((readl (&dspi->ctar[bus]) &0x78000000 ) ==0x78000000 ) ?16 :8 ; -return &cfslave->slave; +setbits_be32 (&dspi->ctar[bus], bus_setup); + +return 0 ; } -#endif /* CONFIG_CF_DSPI */ -#ifdef CONFIG_CMD_SPI -int spi_cs_is_valid (unsigned int bus,unsigned int cs) +static inline void __cfspi_tx (struct coldfire_spi_priv *cfspi, +u32 ctrl,u16 data) { -if (((cs >=0 ) && (cs <8 )) && ((bus >=0 ) && (bus <8 ))) -return 1 ; -else -return 0 ; +while ((readl (&cfspi->regs->sr) &0x0000F000 ) >=4 ) + ; +
drivers/spi/cf_spi.c static struct spi_slave *cfspi_setup_slave(struct cf_spi_slave *cfslave, · line 221
Quoted 10 lines
drivers/spi/cf_spi.c +10
-0+writel (ctrl | data, &cfspi->regs->tfr); +} + +static inline u16 __cfspi_rx (struct coldfire_spi_priv *cfspi) +{ +while ((readl (&cfspi->regs->sr) &0x000000F0 ) ==0 ) + ; + +return readw (&cfspi->regs->rfr); +}
Use wait_for bit calls instead of infine loops.
drivers/spi/cf_spi.c static struct spi_slave *cfspi_setup_slave(struct cf_spi_slave *cfslave, · line 223
Quoted 2 lines
drivers/spi/cf_spi.c +2
-0+ +static int __spi_xfer(struct coldfire_spi_priv *cfspi, uint cs, uint bitlen,
no need for __ we don't have non-dm code
Quoted 10 lines
drivers/spi/cf_spi.c +10
-0+ const void *dout, void *din, ulong flags) +{ + u16 *spi_rd16 = NULL, *spi_wr16 = NULL; +u8 *spi_rd =NULL , *spi_wr =NULL ; +static u32 ctrl; +uint len = bitlen >>3 ; + +if (cfspi->charbit ==16 ) { + bitlen >>=1 ; + spi_wr16 = (u16 *)dout;
drivers/spi/cf_spi.c static struct spi_slave *cfspi_setup_slave(struct cf_spi_slave *cfslave, · line 243
Quoted 10 lines
drivers/spi/cf_spi.c +10
-0+ spi_rd16 = (u16 *)din; + }else { + spi_wr = (u8 *)dout; + spi_rd = (u8 *)din; + } + +if ((flags &SPI_XFER_BEGIN ) ==SPI_XFER_BEGIN ) + ctrl |=DSPI_TFR_CONT ; + + ctrl = (ctrl &0xFF000000 ) | ((1 << cs) <<16 );
macros?
Quoted 5 lines
drivers/spi/cf_spi.c +5
-0+ +if (len >1 ) { +int tmp_len = len -1 ; + +while (tmp_len--) {
drivers/spi/cf_spi.c static struct spi_slave *cfspi_setup_slave(struct cf_spi_slave *cfslave, · line 258
Quoted 10 lines
drivers/spi/cf_spi.c +10
-0+if (dout) { +if (cfspi->charbit ==16 ) +__cfspi_tx (cfspi, ctrl, *spi_wr16++); +else +__cfspi_tx (cfspi, ctrl, *spi_wr++); +__cfspi_rx (cfspi); + } + +if (din) { +__cfspi_tx (cfspi, ctrl,CONFIG_SPI_IDLE_VAL );
same here?
drivers/spi/cf_spi.c static struct spi_slave *cfspi_setup_slave(struct cf_spi_slave *cfslave, · line 269
Quoted 11 lines
drivers/spi/cf_spi.c +11
-0+if (cfspi->charbit ==16 ) + *spi_rd16++ =__cfspi_rx (cfspi); +else + *spi_rd++ =__cfspi_rx (cfspi); + } + } + + len =1 ;/* remaining byte */ + } + +if ((flags &SPI_XFER_END ) ==SPI_XFER_END )
Why we need to check the macro again flags & SPI_XFER_END enogh?
Quoted 12 lines
drivers/spi/cf_spi.c +12
-0+ ctrl &= ~DSPI_TFR_CONT ; + +if (len) { +if (dout) { +if (cfspi->charbit ==16 ) +__cfspi_tx (cfspi, ctrl, *spi_wr16); +else +__cfspi_tx (cfspi, ctrl, *spi_wr); +__cfspi_rx (cfspi); + } + +if (din) {
drivers/spi/cf_spi.c static struct spi_slave *cfspi_setup_slave(struct cf_spi_slave *cfslave, · line 291
Quoted 10 lines
drivers/spi/cf_spi.c +10
-0+__cfspi_tx (cfspi, ctrl,CONFIG_SPI_IDLE_VAL ); +if (cfspi->charbit ==16 ) + *spi_rd16 =__cfspi_rx (cfspi); +else + *spi_rd =__cfspi_rx (cfspi); + } + }else { +/* dummy read */ +__cfspi_tx (cfspi, ctrl,CONFIG_SPI_IDLE_VAL ); +__cfspi_rx (cfspi);
same here, no __
drivers/spi/cf_spi.c static struct spi_slave *cfspi_setup_slave(struct cf_spi_slave *cfslave, · line 299
Quoted 9 lines
drivers/spi/cf_spi.c +3
-1+ } + +return 0 ; }void spi_init (void ) { -cfspi_init (); }
remove spi_init if not used, can be another patch.
Quoted 43 lines
drivers/spi/cf_spi.c +24
-11-struct spi_slave *spi_setup_slave (unsigned int bus,unsigned int cs, -unsigned int max_hz,unsigned int mode) +static int coldfire_spi_claim_bus (struct udevice *dev) +{ +struct udevice *bus = dev->parent; +struct dm_spi_slave_platdata *slave_plat = +dev_get_parent_platdata (dev); + +return cfspi_claim_bus (bus->seq, slave_plat->cs); +} + +static int coldfire_spi_release_bus (struct udevice *dev) { -struct cf_spi_slave *cfslave; +struct udevice *bus = dev->parent; +struct dm_spi_slave_platdata *slave_plat = +dev_get_parent_platdata (dev); -if (!spi_cs_is_valid (bus, cs)) -return NULL ; +cfspi_release_bus (bus->seq, slave_plat->cs); - cfslave = spi_alloc_slave(struct cf_spi_slave, bus, cs); -if (!cfslave) -return NULL ; +return 0 ; +} - cfslave->baudrate = max_hz; +static int coldfire_spi_xfer (struct udevice *dev,unsigned int bitlen, +const void *dout,void *din, +unsigned long flags) +{ +struct udevice *bus =dev_get_parent (dev); +struct coldfire_spi_priv *cfspi =dev_get_priv (bus); +struct dm_spi_slave_platdata *slave_plat =dev_get_parent_platdata (dev); -/* specific setup */ -return cfspi_setup_slave (cfslave, mode); +return __spi_xfer (cfspi, slave_plat->cs, bitlen, dout, din, flags); }
drivers/spi/cf_spi.c static struct spi_slave *cfspi_setup_slave(struct cf_spi_slave *cfslave, · line 338
Quoted 10 lines
drivers/spi/cf_spi.c +5
-3-void spi_free_slave (struct spi_slave *slave) +static int coldfire_spi_set_speed (struct udevice *bus,uint max_hz) { -struct cf_spi_slave *cfslave =to_cf_spi_slave (slave); +struct coldfire_spi_priv *cfspi =dev_get_priv (bus); + + cfspi->baudrate = max_hz; -free (cfslave); +return __spi_set_speed (cfspi, bus->seq);
no __ and do it withough function.
drivers/spi/cf_spi.c static struct spi_slave *cfspi_setup_slave(struct cf_spi_slave *cfslave, · line 347
Quoted 11 lines
drivers/spi/cf_spi.c +6
-2} -int spi_claim_bus (struct spi_slave *slave) +static int coldfire_spi_set_mode (struct udevice *bus,uint mode) { -return cfspi_claim_bus (slave->bus, slave->cs); +struct coldfire_spi_priv *cfspi =dev_get_priv (bus); + + cfspi->mode = mode; + +return __spi_set_mode (cfspi, bus->seq);
same here.
Quoted 24 lines
drivers/spi/cf_spi.c +19
-2} -void spi_release_bus (struct spi_slave *slave) +static int coldfire_spi_probe (struct udevice *bus) { -cfspi_release_bus (slave->bus, slave->cs); +struct coldfire_spi_platdata *plat =dev_get_platdata (bus); +struct coldfire_spi_priv *cfspi =dev_get_priv (bus); +int i; + + cfspi->regs = (struct dspi *)plat->regs_addr; + + cfspi->baudrate = plat->speed_hz; + cfspi->mode = plat->mode; + +for (i =0 ; i <MCF_DSPI_MAX_CTAR_REGS ; i++) { +unsigned int ctar =0 ; + +if (plat->ctar[i][0 ] ==0 ) +break ; + + ctar =DSPI_CTAR_TRSZ (plat->ctar[i][0 ]) | +DSPI_CTAR_PCSSCK (plat->ctar[i][1 ]) | + DSPI_CTAR_PASC(plat->ctar[i][2]) |
drivers/spi/cf_spi.c static struct spi_slave *cfspi_setup_slave(struct cf_spi_slave *cfslave, · line 379
Quoted 10 lines
drivers/spi/cf_spi.c +10
-0+DSPI_CTAR_PDT (plat->ctar[i][3 ]) | +DSPI_CTAR_CSSCK (plat->ctar[i][4 ]) | +DSPI_CTAR_ASC (plat->ctar[i][5 ]) | +DSPI_CTAR_DT (plat->ctar[i][6 ]) | +DSPI_CTAR_BR (plat->ctar[i][7 ]); + +writel (ctar, &cfspi->regs->ctar[i]); + } + +__spi_init (cfspi);
no __
drivers/spi/cf_spi.c static struct spi_slave *cfspi_setup_slave(struct cf_spi_slave *cfslave, · line 384
Quoted 7 lines
drivers/spi/cf_spi.c +3
-2+ +return 0 ; } -int spi_xfer (struct spi_slave *slave,unsigned int bitlen,const void *dout, -void *din,unsigned long flags) +#if !CONFIG_IS_ENABLED (OF_PLATDATA )
valid check is
#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
drivers/spi/cf_spi.c static struct spi_slave *cfspi_setup_slave(struct cf_spi_slave *cfslave, · line 395
Quoted 12 lines
drivers/spi/cf_spi.c +10
-1+static int coldfire_dspi_ofdata_to_platdata (struct udevice *bus) { -return cfspi_xfer (slave, bitlen, dout, din, flags); +fdt_addr_t addr; +struct coldfire_spi_platdata *plat = bus->platdata; +const void *blob = gd->fdt_blob; +int node =dev_of_offset (bus); +int *ctar, len; + + addr =devfdt_get_addr (bus); +if (addr ==FDT_ADDR_T_NONE ) { +debug ("DSPI: Can't get base address or size\n" );
no need this debug.
Quoted 39 lines
drivers/spi/cf_spi.c +37
-1+return -ENOMEM ; + } + plat->regs_addr = addr; + + plat->num_cs =fdtdec_get_int (blob, node,"num-cs" , +MCF_DSPI_DEFAULT_MAX_CS ); + + plat->speed_hz =fdtdec_get_int (blob, node,"spi-max-frequency" , +MCF_DSPI_DEFAULT_SCK_FREQ ); + + plat->mode =fdtdec_get_int (blob, node,"spi-mode" , +MCF_DSPI_DEFAULT_MODE ); + +memset (plat->ctar,0 ,sizeof (plat->ctar)); + + ctar = (int *)fdt_getprop (blob, node,"ctar-params" , &len); + +if (ctar && len) { +int i, q, ctar_regs; + + ctar_regs = len /sizeof (unsigned int ) /MAX_CTAR_FIELDS ; + +if (ctar_regs >MAX_CTAR_REGS ) + ctar_regs =MAX_CTAR_REGS ; + +for (i =0 ; i < ctar_regs; i++) { +for (q =0 ; q <MAX_CTAR_FIELDS ; q++) + plat->ctar[i][q] = *ctar++; + } + } + +debug ("DSPI: regs=%pa, max-frequency=%d, num-cs=%d, mode=%d\n" , + (void *)plat->regs_addr, + plat->speed_hz, plat->num_cs, plat->mode); + +return 0 ; } -#endif /* CONFIG_CMD_SPI */ +#endif
drivers/spi/cf_spi.c static struct spi_slave *cfspi_setup_slave(struct cf_spi_slave *cfslave, · line 443
Quoted 10 lines
drivers/spi/cf_spi.c +10
-0+ +static const struct dm_spi_ops coldfire_spi_ops = { + .claim_bus = coldfire_spi_claim_bus, + .release_bus = coldfire_spi_release_bus, + .xfer = coldfire_spi_xfer, + .set_speed = coldfire_spi_set_speed, + .set_mode = coldfire_spi_set_mode, +}; + +#if !CONFIG_IS_ENABLED (OF_PLATDATA )
group this check related code at once.
Quoted 8 lines
drivers/spi/cf_spi.c +8
-0+static const struct udevice_id coldfire_spi_ids[] = { + { .compatible ="fsl,mcf-dspi" }, + { } +}; +#endif + +U_BOOT_DRIVER (coldfire_spi) = { + .name ="spi_coldfire" ,
drivers/spi/cf_spi.c static struct spi_slave *cfspi_setup_slave(struct cf_spi_slave *cfslave, · line 461
Quoted 10 lines
drivers/spi/cf_spi.c +10
-0+ .id = UCLASS_SPI, +#if !CONFIG_IS_ENABLED (OF_PLATDATA ) + .of_match = coldfire_spi_ids, +#endif + .probe = coldfire_spi_probe, + .ops = &coldfire_spi_ops, + .platdata_auto_alloc_size = sizeof(struct coldfire_spi_platdata), +#if !CONFIG_IS_ENABLED(OF_PLATDATA) + .ofdata_to_platdata = coldfire_dspi_ofdata_to_platdata, +#endif
group it above ifdef and move in once place.
drivers/spi/cf_spi.c static struct spi_slave *cfspi_setup_slave(struct cf_spi_slave *cfslave, · line 464
Quoted 3 lines
drivers/spi/cf_spi.c +3
-0+ .priv_auto_alloc_size = sizeof(struct coldfire_spi_priv), +}; +#endif /* CONFIG_CF_DSPI */
I think we don't need this.
Apart from above, there are extern functions in this driver which are using spi code in arch area so better to move here or handle via respective drivers.
PATCH v3 3/11 drivers: spi: cf_spi: convert to driver model
Hi Jagan,
was in the middle of a job switch recently, now i am looking back into the list. Seen your reminder, will fix the points in short.
Regards,
Angelo
Quoted 700 lines · Jagan Teki
Quoted 373 lines · Angelo Dureghello
Converting to driver model and removes non-dm code.
Signed-off-by Angelo Dureghello <[email protected]>---
Changes for v2:
- removed non DM code part
- add default setup of CTAR registers
- add DT CTAR register setup support
Changes for v3:
- changed commit head
- removedspi_slavereference
- add #ifdefs for the caseOF_PLATDATAis used--- drivers/spi/cf_spi.c | 517 +++++++++++++++--------- include/dm/platform_data/spi_coldfire.h | 29 ++ 2 files changed, 352 insertions(+), 194 deletions(-) create mode 100644 include/dm/platform_data/spi_coldfire.hdrivers/spi/cf_spi.c +95
-171@@ -6,16 +6,25 @@* * Copyright (C) 2004-2009 Freescale Semiconductor, Inc. * TsiChung Liew (Tsi-Chung.Liew at freescale.com) +* +* Support for DM and DT, non-DM code removed. +* Copyright (C) 2018 Angelo Dureghello <[email protected]> +* +* TODO: fsl_dspi.c should work as a driver for the DSPI module. */ #include <common.h> +#include <dm.h> +#include <dm/platform_data/spi_coldfire.h> #include <spi.h> #include <malloc.h> #include <asm/immap.h> +#include <asm/io.h> -struct cf_spi_slave { -struct spi_slave slave; +struct coldfire_spi_priv { +struct dspi *regs;uint baudrate; +int mode;int charbit; };@@ -38,14 +47,30 @@ DECLARE_GLOBAL_DATA_PTR;#define SPI_MODE_MOD 0x00200000#define SPI_DBLRATE 0x00100000 -static inline struct cf_spi_slave *to_cf_spi_slave (struct spi_slave *slave) -{ - return container_of(slave, struct cf_spi_slave, slave); -} +#define MCF_DSPI_MAX_CTAR_REGS 8 -static void cfspi_init (void ) +/* Default values */ +#define MCF_DSPI_DEFAULT_SCK_FREQ 10000000 +#define MCF_DSPI_DEFAULT_MAX_CS 4 +#define MCF_DSPI_DEFAULT_MODE 0 + +#define MCF_DSPI_DEFAULT_CTAR (DSPI_CTAR_TRSZ(7) | \ + DSPI_CTAR_PCSSCK_1CLK | \ + DSPI_CTAR_PASC(0) | \ + DSPI_CTAR_PDT(0) | \ + DSPI_CTAR_CSSCK(0) | \ + DSPI_CTAR_ASC(0) | \ + DSPI_CTAR_DT(1) | \ + DSPI_CTAR_BR(6)) + +static void __spi_init (struct coldfire_spi_priv *cfspi) { -volatile dspi_t *dspi = (dspi_t *)MMAP_DSPI ; +struct dspi *dspi = cfspi->regs; +int i; + +/* Default CTARs */ +for (i =0 ; i <MCF_DSPI_MAX_CTAR_REGS ; i++) +writel (MCF_DSPI_DEFAULT_CTAR , &dspi->ctar[i]);cfspi_port_conf ();/* port configuration */ @@ -53,128 +78,9 @@ static void cfspi_init(void)DSPI_MCR_CSIS5 |DSPI_MCR_CSIS4 |DSPI_MCR_CSIS3 |DSPI_MCR_CSIS2 |DSPI_MCR_CSIS1 |DSPI_MCR_CSIS0 |DSPI_MCR_CRXF |DSPI_MCR_CTXF ; - -/* Default setting in platform configuration */ -#ifdef CONFIG_SYS_DSPI_CTAR0 - dspi->ctar[0 ] =CONFIG_SYS_DSPI_CTAR0 ; -#endif -#ifdef CONFIG_SYS_DSPI_CTAR1 - dspi->ctar[1 ] =CONFIG_SYS_DSPI_CTAR1 ; -#endif -#ifdef CONFIG_SYS_DSPI_CTAR2 - dspi->ctar[2 ] =CONFIG_SYS_DSPI_CTAR2 ; -#endif -#ifdef CONFIG_SYS_DSPI_CTAR3 - dspi->ctar[3 ] =CONFIG_SYS_DSPI_CTAR3 ; -#endif -#ifdef CONFIG_SYS_DSPI_CTAR4 - dspi->ctar[4 ] =CONFIG_SYS_DSPI_CTAR4 ; -#endif -#ifdef CONFIG_SYS_DSPI_CTAR5 - dspi->ctar[5 ] =CONFIG_SYS_DSPI_CTAR5 ; -#endif -#ifdef CONFIG_SYS_DSPI_CTAR6 - dspi->ctar[6 ] =CONFIG_SYS_DSPI_CTAR6 ; -#endif -#ifdef CONFIG_SYS_DSPI_CTAR7 - dspi->ctar[7 ] =CONFIG_SYS_DSPI_CTAR7 ; -#endif -} - -static void cfspi_tx (u32 ctrl,u16 data) -{ -volatile dspi_t *dspi = (dspi_t *)MMAP_DSPI ; - -while ((dspi->sr &0x0000F000 ) >=4 ) ; - - dspi->tfr = (ctrl | data); } -static u16 cfspi_rx (void ) -{ -volatile dspi_t *dspi = (dspi_t *)MMAP_DSPI ; - -while ((dspi->sr &0x000000F0 ) ==0 ) ; - -return (dspi->rfr &0xFFFF ); -} - -static int cfspi_xfer (struct spi_slave *slave,uint bitlen,const void *dout, -void *din,ulong flags) -{ -struct cf_spi_slave *cfslave =to_cf_spi_slave (slave); -u16 *spi_rd16 =NULL , *spi_wr16 =NULL ; -u8 *spi_rd =NULL , *spi_wr =NULL ; -static u32 ctrl =0 ; -uint len = bitlen >>3 ; - -if (cfslave->charbit ==16 ) { - bitlen >>=1 ; - spi_wr16 = (u16 *) dout; - spi_rd16 = (u16 *) din; - }else { - spi_wr = (u8 *) dout; - spi_rd = (u8 *) din; - } - -if ((flags &SPI_XFER_BEGIN ) ==SPI_XFER_BEGIN ) - ctrl |=DSPI_TFR_CONT ; - - ctrl = (ctrl &0xFF000000 ) | ((1 << slave->cs) <<16 ); - -if (len >1 ) { -int tmp_len = len -1 ; -while (tmp_len--) { -if (dout !=NULL ) { -if (cfslave->charbit ==16 ) -cfspi_tx (ctrl, *spi_wr16++); -else -cfspi_tx (ctrl, *spi_wr++); -cfspi_rx (); - } - -if (din !=NULL ) { -cfspi_tx (ctrl,CONFIG_SPI_IDLE_VAL ); -if (cfslave->charbit ==16 ) - *spi_rd16++ =cfspi_rx (); -else - *spi_rd++ =cfspi_rx (); - } - } - - len =1 ;/* remaining byte */ - } - -if ((flags &SPI_XFER_END ) ==SPI_XFER_END ) - ctrl &= ~DSPI_TFR_CONT ; - -if (len) { -if (dout !=NULL ) { -if (cfslave->charbit ==16 ) -cfspi_tx (ctrl, *spi_wr16); -else -cfspi_tx (ctrl, *spi_wr); -cfspi_rx (); - } - -if (din !=NULL ) { -cfspi_tx (ctrl,CONFIG_SPI_IDLE_VAL ); -if (cfslave->charbit ==16 ) - *spi_rd16 =cfspi_rx (); -else - *spi_rd =cfspi_rx (); - } - }else { -/* dummy read */ -cfspi_tx (ctrl,CONFIG_SPI_IDLE_VAL ); -cfspi_rx (); - } - -return 0 ; -} - -static struct spi_slave *cfspi_setup_slave (struct cf_spi_slave *cfslave, -uint mode) +int __spi_set_speed (struct coldfire_spi_priv *cfspi,uint bus) {/* * bit definition for mode: @@ -189,7 +95,7 @@ static struct spi_slave *cfspi_setup_slave(struct cf_spi_slave *cfslave,* 11 - 8: Delay after transfer scaler * 7 - 0: SPI_CPHA, SPI_CPOL, SPI_LSB_FIRST */ -volatile dspi_t *dspi = (dspi_t *)MMAP_DSPI ; +struct dspi *dspi = cfspi->regs;int prescaler[] = {2 ,3 ,5 ,7 };int scaler[] = {2 ,4 ,6 ,8 ,@@ -199,56 +105,38 @@ static struct spi_slave *cfspi_setup_slave(struct cf_spi_slave *cfslave, };int i, j, pbrcnt, brcnt, diff, tmp, dbr =0 ;int best_i, best_j, bestmatch =0x7FFFFFFF , baud_speed; -u32 bus_setup =0 ; +u32 bus_setup; + +/* Read current setup */ + bus_setup =readl (&dspi->ctar[bus]); tmp = (prescaler[3 ] * scaler[15 ]);/* Maximum and minimum baudrate it can handle */ -if ((cfslave->baudrate > (gd->bus_clk >>1 )) || - (cfslave->baudrate < (gd->bus_clk / tmp))) { +if ((cfspi->baudrate > (gd->bus_clk >>1 )) || + (cfspi->baudrate < (gd->bus_clk / tmp))) {printf ("Exceed baudrate limitation: Max %d - Min %d\n" , (int )(gd->bus_clk >>1 ), (int )(gd->bus_clk / tmp)); -return NULL ; +return -1 ; }/* Activate Double Baud when it exceed 1/4 the bus clk */ -if ((CONFIG_SYS_DSPI_CTAR0 &DSPI_CTAR_DBR ) || - (cfslave->baudrate > (gd->bus_clk / (prescaler[0 ] * scaler[0 ])))) { +if ((bus_setup &DSPI_CTAR_DBR ) || + (cfspi->baudrate > (gd->bus_clk / (prescaler[0 ] * scaler[0 ])))) { bus_setup |=DSPI_CTAR_DBR ; dbr =1 ; } -if (mode &SPI_CPOL ) - bus_setup |=DSPI_CTAR_CPOL ; -if (mode &SPI_CPHA ) - bus_setup |=DSPI_CTAR_CPHA ; -if (mode &SPI_LSB_FIRST ) - bus_setup |=DSPI_CTAR_LSBFE ; -/* Overwrite default value set in platform configuration file */ -if (mode &SPI_MODE_MOD ) { - -if ((mode &0xF0000000 ) ==0 ) - bus_setup |= - dspi->ctar[cfslave->slave.bus] &0x78000000 ; -else - bus_setup |= ((mode &0xF0000000 ) >>1 ); - +if (cfspi->mode &SPI_MODE_MOD ) {/* * Check to see if it is enabled by default in platform * config, or manual setting passed by mode parameter */ -if (mode &SPI_DBLRATE ) { +if (cfspi->mode &SPI_DBLRATE ) { bus_setup |=DSPI_CTAR_DBR ; dbr =1 ; } - bus_setup |= (mode &0x0FC00000 ) >>4 ;/* PSCSCK, PASC, PDT */ - bus_setup |= (mode &0x000FFF00 ) >>4 ;/* CSSCK, ASC, DT */ - }else - bus_setup |= (dspi->ctar[cfslave->slave.bus] &0x78FCFFF0 ); - - cfslave->charbit = - ((dspi->ctar[cfslave->slave.bus] &0x78000000 ) == -0x78000000 ) ?16 :8 ; + } pbrcnt =sizeof (prescaler) /sizeof (int ); brcnt =sizeof (scaler) /sizeof (int );@@ -259,10 +147,10 @@ static struct spi_slave *cfspi_setup_slave(struct cf_spi_slave *cfslave,for (j =0 ; j < brcnt; j++) { tmp = (baud_speed / scaler[j]) * (1 + dbr); -if (tmp > cfslave->baudrate) - diff = tmp - cfslave->baudrate; +if (tmp > cfspi->baudrate) + diff = tmp - cfspi->baudrate;else - diff = cfslave->baudrate - tmp; + diff = cfspi->baudrate - tmp;if (diff < bestmatch) { bestmatch = diff;@@ -271,65 +159,306 @@ static struct spi_slave *cfspi_setup_slave(struct cf_spi_slave *cfslave, } } } + + bus_setup &= ~(DSPI_CTAR_PBR (0x03 ) |DSPI_CTAR_BR (0x0f )); bus_setup |= (DSPI_CTAR_PBR (best_i) |DSPI_CTAR_BR (best_j)); - dspi->ctar[cfslave->slave.bus] = bus_setup; +writel (bus_setup, &dspi->ctar[bus]); + +return 0 ; +} + +static int __spi_set_mode (struct coldfire_spi_priv *cfspi,uint bus) +{ +struct dspi *dspi = cfspi->regs; +u32 bus_setup =0 ; + +if (cfspi->mode &SPI_CPOL ) + bus_setup |=DSPI_CTAR_CPOL ; +if (cfspi->mode &SPI_CPHA ) + bus_setup |=DSPI_CTAR_CPHA ; +if (cfspi->mode &SPI_LSB_FIRST ) + bus_setup |=DSPI_CTAR_LSBFE ; + +/* Overwrite default value set in platform configuration file */ +if (cfspi->mode &SPI_MODE_MOD ) { +if ((cfspi->mode &0xF0000000 ) ==0 ) + bus_setup |= +readl (&dspi->ctar[bus]) &0x78000000 ; +else + bus_setup |= ((cfspi->mode &0xF0000000 ) >>1 ); + +/* PSCSCK, PASC, PDT */ + bus_setup |= (cfspi->mode &0x0FC00000 ) >>4 ; +/* CSSCK, ASC, DT */ + bus_setup |= (cfspi->mode &0x000FFF00 ) >>4 ; + }else { + bus_setup |= (readl (&dspi->ctar[bus]) &0x78FCFFF0 ); + } + + cfspi->charbit = + ((readl (&dspi->ctar[bus]) &0x78000000 ) ==0x78000000 ) ?16 :8 ; -return &cfslave->slave; +setbits_be32 (&dspi->ctar[bus], bus_setup); + +return 0 ; } -#endif /* CONFIG_CF_DSPI */ -#ifdef CONFIG_CMD_SPI -int spi_cs_is_valid (unsigned int bus,unsigned int cs) +static inline void __cfspi_tx (struct coldfire_spi_priv *cfspi, +u32 ctrl,u16 data) { -if (((cs >=0 ) && (cs <8 )) && ((bus >=0 ) && (bus <8 ))) -return 1 ; -else -return 0 ; +while ((readl (&cfspi->regs->sr) &0x0000F000 ) >=4 ) + ; +drivers/spi/cf_spi.c static struct spi_slave *cfspi_setup_slave(struct cf_spi_slave *cfslave, · line 221
Quoted 10 lines
drivers/spi/cf_spi.c +10
-0+writel (ctrl | data, &cfspi->regs->tfr); +} + +static inline u16 __cfspi_rx (struct coldfire_spi_priv *cfspi) +{ +while ((readl (&cfspi->regs->sr) &0x000000F0 ) ==0 ) + ; + +return readw (&cfspi->regs->rfr); +}Use
wait_forbit calls instead of infine loops.drivers/spi/cf_spi.c static struct spi_slave *cfspi_setup_slave(struct cf_spi_slave *cfslave, · line 223
Quoted 2 lines
drivers/spi/cf_spi.c +2
-0+ +static int __spi_xfer(struct coldfire_spi_priv *cfspi, uint cs, uint bitlen,no need for __ we don't have non-dm code
Quoted 10 lines
drivers/spi/cf_spi.c +10
-0+ const void *dout, void *din, ulong flags) +{ + u16 *spi_rd16 = NULL, *spi_wr16 = NULL; +u8 *spi_rd =NULL , *spi_wr =NULL ; +static u32 ctrl; +uint len = bitlen >>3 ; + +if (cfspi->charbit ==16 ) { + bitlen >>=1 ; + spi_wr16 = (u16 *)dout;drivers/spi/cf_spi.c static struct spi_slave *cfspi_setup_slave(struct cf_spi_slave *cfslave, · line 243
Quoted 10 lines
drivers/spi/cf_spi.c +10
-0+ spi_rd16 = (u16 *)din; + }else { + spi_wr = (u8 *)dout; + spi_rd = (u8 *)din; + } + +if ((flags &SPI_XFER_BEGIN ) ==SPI_XFER_BEGIN ) + ctrl |=DSPI_TFR_CONT ; + + ctrl = (ctrl &0xFF000000 ) | ((1 << cs) <<16 );macros?
Quoted 5 lines
drivers/spi/cf_spi.c +5
-0+ +if (len >1 ) { +int tmp_len = len -1 ; + +while (tmp_len--) {drivers/spi/cf_spi.c static struct spi_slave *cfspi_setup_slave(struct cf_spi_slave *cfslave, · line 258
Quoted 10 lines
drivers/spi/cf_spi.c +10
-0+if (dout) { +if (cfspi->charbit ==16 ) +__cfspi_tx (cfspi, ctrl, *spi_wr16++); +else +__cfspi_tx (cfspi, ctrl, *spi_wr++); +__cfspi_rx (cfspi); + } + +if (din) { +__cfspi_tx (cfspi, ctrl,CONFIG_SPI_IDLE_VAL );same here?
drivers/spi/cf_spi.c static struct spi_slave *cfspi_setup_slave(struct cf_spi_slave *cfslave, · line 269
Quoted 11 lines
drivers/spi/cf_spi.c +11
-0+if (cfspi->charbit ==16 ) + *spi_rd16++ =__cfspi_rx (cfspi); +else + *spi_rd++ =__cfspi_rx (cfspi); + } + } + + len =1 ;/* remaining byte */ + } + +if ((flags &SPI_XFER_END ) ==SPI_XFER_END )Why we need to check the macro again flags &
SPI_XFER_ENDenogh?Quoted 12 lines
drivers/spi/cf_spi.c +12
-0+ ctrl &= ~DSPI_TFR_CONT ; + +if (len) { +if (dout) { +if (cfspi->charbit ==16 ) +__cfspi_tx (cfspi, ctrl, *spi_wr16); +else +__cfspi_tx (cfspi, ctrl, *spi_wr); +__cfspi_rx (cfspi); + } + +if (din) {drivers/spi/cf_spi.c static struct spi_slave *cfspi_setup_slave(struct cf_spi_slave *cfslave, · line 291
Quoted 10 lines
drivers/spi/cf_spi.c +10
-0+__cfspi_tx (cfspi, ctrl,CONFIG_SPI_IDLE_VAL ); +if (cfspi->charbit ==16 ) + *spi_rd16 =__cfspi_rx (cfspi); +else + *spi_rd =__cfspi_rx (cfspi); + } + }else { +/* dummy read */ +__cfspi_tx (cfspi, ctrl,CONFIG_SPI_IDLE_VAL ); +__cfspi_rx (cfspi);same here, no __
drivers/spi/cf_spi.c static struct spi_slave *cfspi_setup_slave(struct cf_spi_slave *cfslave, · line 299
Quoted 9 lines
drivers/spi/cf_spi.c +3
-1+ } + +return 0 ; }void spi_init (void ) { -cfspi_init (); }remove
spi_initif not used, can be another patch.Quoted 43 lines
drivers/spi/cf_spi.c +24
-11-struct spi_slave *spi_setup_slave (unsigned int bus,unsigned int cs, -unsigned int max_hz,unsigned int mode) +static int coldfire_spi_claim_bus (struct udevice *dev) +{ +struct udevice *bus = dev->parent; +struct dm_spi_slave_platdata *slave_plat = +dev_get_parent_platdata (dev); + +return cfspi_claim_bus (bus->seq, slave_plat->cs); +} + +static int coldfire_spi_release_bus (struct udevice *dev) { -struct cf_spi_slave *cfslave; +struct udevice *bus = dev->parent; +struct dm_spi_slave_platdata *slave_plat = +dev_get_parent_platdata (dev); -if (!spi_cs_is_valid (bus, cs)) -return NULL ; +cfspi_release_bus (bus->seq, slave_plat->cs); - cfslave = spi_alloc_slave(struct cf_spi_slave, bus, cs); -if (!cfslave) -return NULL ; +return 0 ; +} - cfslave->baudrate = max_hz; +static int coldfire_spi_xfer (struct udevice *dev,unsigned int bitlen, +const void *dout,void *din, +unsigned long flags) +{ +struct udevice *bus =dev_get_parent (dev); +struct coldfire_spi_priv *cfspi =dev_get_priv (bus); +struct dm_spi_slave_platdata *slave_plat =dev_get_parent_platdata (dev); -/* specific setup */ -return cfspi_setup_slave (cfslave, mode); +return __spi_xfer (cfspi, slave_plat->cs, bitlen, dout, din, flags); }drivers/spi/cf_spi.c static struct spi_slave *cfspi_setup_slave(struct cf_spi_slave *cfslave, · line 338
Quoted 10 lines
drivers/spi/cf_spi.c +5
-3-void spi_free_slave (struct spi_slave *slave) +static int coldfire_spi_set_speed (struct udevice *bus,uint max_hz) { -struct cf_spi_slave *cfslave =to_cf_spi_slave (slave); +struct coldfire_spi_priv *cfspi =dev_get_priv (bus); + + cfspi->baudrate = max_hz; -free (cfslave); +return __spi_set_speed (cfspi, bus->seq);no __ and do it withough function.
drivers/spi/cf_spi.c static struct spi_slave *cfspi_setup_slave(struct cf_spi_slave *cfslave, · line 347
Quoted 11 lines
drivers/spi/cf_spi.c +6
-2} -int spi_claim_bus (struct spi_slave *slave) +static int coldfire_spi_set_mode (struct udevice *bus,uint mode) { -return cfspi_claim_bus (slave->bus, slave->cs); +struct coldfire_spi_priv *cfspi =dev_get_priv (bus); + + cfspi->mode = mode; + +return __spi_set_mode (cfspi, bus->seq);same here.
Quoted 24 lines
drivers/spi/cf_spi.c +19
-2} -void spi_release_bus (struct spi_slave *slave) +static int coldfire_spi_probe (struct udevice *bus) { -cfspi_release_bus (slave->bus, slave->cs); +struct coldfire_spi_platdata *plat =dev_get_platdata (bus); +struct coldfire_spi_priv *cfspi =dev_get_priv (bus); +int i; + + cfspi->regs = (struct dspi *)plat->regs_addr; + + cfspi->baudrate = plat->speed_hz; + cfspi->mode = plat->mode; + +for (i =0 ; i <MCF_DSPI_MAX_CTAR_REGS ; i++) { +unsigned int ctar =0 ; + +if (plat->ctar[i][0 ] ==0 ) +break ; + + ctar =DSPI_CTAR_TRSZ (plat->ctar[i][0 ]) | +DSPI_CTAR_PCSSCK (plat->ctar[i][1 ]) | + DSPI_CTAR_PASC(plat->ctar[i][2]) |drivers/spi/cf_spi.c static struct spi_slave *cfspi_setup_slave(struct cf_spi_slave *cfslave, · line 379
Quoted 10 lines
drivers/spi/cf_spi.c +10
-0+DSPI_CTAR_PDT (plat->ctar[i][3 ]) | +DSPI_CTAR_CSSCK (plat->ctar[i][4 ]) | +DSPI_CTAR_ASC (plat->ctar[i][5 ]) | +DSPI_CTAR_DT (plat->ctar[i][6 ]) | +DSPI_CTAR_BR (plat->ctar[i][7 ]); + +writel (ctar, &cfspi->regs->ctar[i]); + } + +__spi_init (cfspi);no __
drivers/spi/cf_spi.c static struct spi_slave *cfspi_setup_slave(struct cf_spi_slave *cfslave, · line 384
Quoted 7 lines
drivers/spi/cf_spi.c +3
-2+ +return 0 ; } -int spi_xfer (struct spi_slave *slave,unsigned int bitlen,const void *dout, -void *din,unsigned long flags) +#if !CONFIG_IS_ENABLED (OF_PLATDATA )valid check is
#ifCONFIG_IS_ENABLED(OF_CONTROL)&& !CONFIG_IS_ENABLED(OF_PLATDATA)drivers/spi/cf_spi.c static struct spi_slave *cfspi_setup_slave(struct cf_spi_slave *cfslave, · line 395
Quoted 12 lines
drivers/spi/cf_spi.c +10
-1+static int coldfire_dspi_ofdata_to_platdata (struct udevice *bus) { -return cfspi_xfer (slave, bitlen, dout, din, flags); +fdt_addr_t addr; +struct coldfire_spi_platdata *plat = bus->platdata; +const void *blob = gd->fdt_blob; +int node =dev_of_offset (bus); +int *ctar, len; + + addr =devfdt_get_addr (bus); +if (addr ==FDT_ADDR_T_NONE ) { +debug ("DSPI: Can't get base address or size\n" );no need this debug.
Quoted 39 lines
drivers/spi/cf_spi.c +37
-1+return -ENOMEM ; + } + plat->regs_addr = addr; + + plat->num_cs =fdtdec_get_int (blob, node,"num-cs" , +MCF_DSPI_DEFAULT_MAX_CS ); + + plat->speed_hz =fdtdec_get_int (blob, node,"spi-max-frequency" , +MCF_DSPI_DEFAULT_SCK_FREQ ); + + plat->mode =fdtdec_get_int (blob, node,"spi-mode" , +MCF_DSPI_DEFAULT_MODE ); + +memset (plat->ctar,0 ,sizeof (plat->ctar)); + + ctar = (int *)fdt_getprop (blob, node,"ctar-params" , &len); + +if (ctar && len) { +int i, q, ctar_regs; + + ctar_regs = len /sizeof (unsigned int ) /MAX_CTAR_FIELDS ; + +if (ctar_regs >MAX_CTAR_REGS ) + ctar_regs =MAX_CTAR_REGS ; + +for (i =0 ; i < ctar_regs; i++) { +for (q =0 ; q <MAX_CTAR_FIELDS ; q++) + plat->ctar[i][q] = *ctar++; + } + } + +debug ("DSPI: regs=%pa, max-frequency=%d, num-cs=%d, mode=%d\n" , + (void *)plat->regs_addr, + plat->speed_hz, plat->num_cs, plat->mode); + +return 0 ; } -#endif /* CONFIG_CMD_SPI */ +#endif drivers/spi/cf_spi.c static struct spi_slave *cfspi_setup_slave(struct cf_spi_slave *cfslave, · line 443
Quoted 10 lines
drivers/spi/cf_spi.c +10
-0+ +static const struct dm_spi_ops coldfire_spi_ops = { + .claim_bus = coldfire_spi_claim_bus, + .release_bus = coldfire_spi_release_bus, + .xfer = coldfire_spi_xfer, + .set_speed = coldfire_spi_set_speed, + .set_mode = coldfire_spi_set_mode, +}; + +#if !CONFIG_IS_ENABLED (OF_PLATDATA )group this check related code at once.
Quoted 8 lines
drivers/spi/cf_spi.c +8
-0+static const struct udevice_id coldfire_spi_ids[] = { + { .compatible ="fsl,mcf-dspi" }, + { } +}; +#endif + +U_BOOT_DRIVER (coldfire_spi) = { + .name ="spi_coldfire" ,drivers/spi/cf_spi.c static struct spi_slave *cfspi_setup_slave(struct cf_spi_slave *cfslave, · line 461
Quoted 10 lines
drivers/spi/cf_spi.c +10
-0+ .id = UCLASS_SPI, +#if !CONFIG_IS_ENABLED (OF_PLATDATA ) + .of_match = coldfire_spi_ids, +#endif + .probe = coldfire_spi_probe, + .ops = &coldfire_spi_ops, + .platdata_auto_alloc_size = sizeof(struct coldfire_spi_platdata), +#if !CONFIG_IS_ENABLED(OF_PLATDATA) + .ofdata_to_platdata = coldfire_dspi_ofdata_to_platdata, +#endif group it above ifdef and move in once place.
drivers/spi/cf_spi.c static struct spi_slave *cfspi_setup_slave(struct cf_spi_slave *cfslave, · line 464
Quoted 3 lines
drivers/spi/cf_spi.c +3
-0+ .priv_auto_alloc_size = sizeof(struct coldfire_spi_priv), +}; +#endif /* CONFIG_CF_DSPI */ I think we don't need this.
Apart from above, there are extern functions in this driver which are using spi code in arch area so better to move here or handle via respective drivers.
PATCH v3 3/11 drivers: spi: cf_spi: convert to driver model
In reply to Jagan TekiHi Jagan,
still sorry for the delay,
fixed all the points except 2, ready to send patch v4, please read below.
Quoted 376 lines · Jagan Teki
Quoted 375 lines · Angelo Dureghello
Converting to driver model and removes non-dm code.
Signed-off-by Angelo Dureghello <[email protected]>---
Changes for v2:
- removed non DM code part
- add default setup of CTAR registers
- add DT CTAR register setup support
Changes for v3:
- changed commit head
- removedspi_slavereference
- add #ifdefs for the caseOF_PLATDATAis used--- drivers/spi/cf_spi.c | 517 +++++++++++++++--------- include/dm/platform_data/spi_coldfire.h | 29 ++ 2 files changed, 352 insertions(+), 194 deletions(-) create mode 100644 include/dm/platform_data/spi_coldfire.hdrivers/spi/cf_spi.c +98
-171@@ -6,16 +6,25 @@* * Copyright (C) 2004-2009 Freescale Semiconductor, Inc. * TsiChung Liew (Tsi-Chung.Liew at freescale.com) +* +* Support for DM and DT, non-DM code removed. +* Copyright (C) 2018 Angelo Dureghello <[email protected]> +* +* TODO: fsl_dspi.c should work as a driver for the DSPI module. */ #include <common.h> +#include <dm.h> +#include <dm/platform_data/spi_coldfire.h> #include <spi.h> #include <malloc.h> #include <asm/immap.h> +#include <asm/io.h> -struct cf_spi_slave { -struct spi_slave slave; +struct coldfire_spi_priv { +struct dspi *regs;uint baudrate; +int mode;int charbit; };@@ -38,14 +47,30 @@ DECLARE_GLOBAL_DATA_PTR;#define SPI_MODE_MOD 0x00200000#define SPI_DBLRATE 0x00100000 -static inline struct cf_spi_slave *to_cf_spi_slave (struct spi_slave *slave) -{ - return container_of(slave, struct cf_spi_slave, slave); -} +#define MCF_DSPI_MAX_CTAR_REGS 8 -static void cfspi_init (void ) +/* Default values */ +#define MCF_DSPI_DEFAULT_SCK_FREQ 10000000 +#define MCF_DSPI_DEFAULT_MAX_CS 4 +#define MCF_DSPI_DEFAULT_MODE 0 + +#define MCF_DSPI_DEFAULT_CTAR (DSPI_CTAR_TRSZ(7) | \ + DSPI_CTAR_PCSSCK_1CLK | \ + DSPI_CTAR_PASC(0) | \ + DSPI_CTAR_PDT(0) | \ + DSPI_CTAR_CSSCK(0) | \ + DSPI_CTAR_ASC(0) | \ + DSPI_CTAR_DT(1) | \ + DSPI_CTAR_BR(6)) + - volatile dspi_t *dspi = (dspi_t *) MMAP_DSPI; +struct dspi *dspi = cfspi->regs; +int i; + +/* Default CTARs */ +for (i =0 ; i <MCF_DSPI_MAX_CTAR_REGS ; i++) +writel (MCF_DSPI_DEFAULT_CTAR , &dspi->ctar[i]);cfspi_port_conf ();/* port configuration */ @@ -53,128 +78,9 @@ static void cfspi_init(void)DSPI_MCR_CSIS5 |DSPI_MCR_CSIS4 |DSPI_MCR_CSIS3 |DSPI_MCR_CSIS2 |DSPI_MCR_CSIS1 |DSPI_MCR_CSIS0 |DSPI_MCR_CRXF |DSPI_MCR_CTXF ; - -/* Default setting in platform configuration */ -#ifdef CONFIG_SYS_DSPI_CTAR0 - dspi->ctar[0 ] =CONFIG_SYS_DSPI_CTAR0 ; -#endif -#ifdef CONFIG_SYS_DSPI_CTAR1 - dspi->ctar[1 ] =CONFIG_SYS_DSPI_CTAR1 ; -#endif -#ifdef CONFIG_SYS_DSPI_CTAR2 - dspi->ctar[2 ] =CONFIG_SYS_DSPI_CTAR2 ; -#endif -#ifdef CONFIG_SYS_DSPI_CTAR3 - dspi->ctar[3 ] =CONFIG_SYS_DSPI_CTAR3 ; -#endif -#ifdef CONFIG_SYS_DSPI_CTAR4 - dspi->ctar[4 ] =CONFIG_SYS_DSPI_CTAR4 ; -#endif -#ifdef CONFIG_SYS_DSPI_CTAR5 - dspi->ctar[5 ] =CONFIG_SYS_DSPI_CTAR5 ; -#endif -#ifdef CONFIG_SYS_DSPI_CTAR6 - dspi->ctar[6 ] =CONFIG_SYS_DSPI_CTAR6 ; -#endif -#ifdef CONFIG_SYS_DSPI_CTAR7 - dspi->ctar[7 ] =CONFIG_SYS_DSPI_CTAR7 ; -#endif -} - -static void cfspi_tx (u32 ctrl,u16 data) -{ -volatile dspi_t *dspi = (dspi_t *)MMAP_DSPI ; - -while ((dspi->sr &0x0000F000 ) >=4 ) ; - - dspi->tfr = (ctrl | data); } -static u16 cfspi_rx (void ) -{ -volatile dspi_t *dspi = (dspi_t *)MMAP_DSPI ; - -while ((dspi->sr &0x000000F0 ) ==0 ) ; - -return (dspi->rfr &0xFFFF ); -} - -static int cfspi_xfer (struct spi_slave *slave,uint bitlen,const void *dout, -void *din,ulong flags) -{ -struct cf_spi_slave *cfslave =to_cf_spi_slave (slave); -u16 *spi_rd16 =NULL , *spi_wr16 =NULL ; -u8 *spi_rd =NULL , *spi_wr =NULL ; -static u32 ctrl =0 ; -uint len = bitlen >>3 ; - -if (cfslave->charbit ==16 ) { - bitlen >>=1 ; - spi_wr16 = (u16 *) dout; - spi_rd16 = (u16 *) din; - }else { - spi_wr = (u8 *) dout; - spi_rd = (u8 *) din; - } - -if ((flags &SPI_XFER_BEGIN ) ==SPI_XFER_BEGIN ) - ctrl |=DSPI_TFR_CONT ; - - ctrl = (ctrl &0xFF000000 ) | ((1 << slave->cs) <<16 ); - -if (len >1 ) { -int tmp_len = len -1 ; -while (tmp_len--) { -if (dout !=NULL ) { -if (cfslave->charbit ==16 ) -cfspi_tx (ctrl, *spi_wr16++); -else -cfspi_tx (ctrl, *spi_wr++); -cfspi_rx (); - } - -if (din !=NULL ) { -cfspi_tx (ctrl,CONFIG_SPI_IDLE_VAL ); -if (cfslave->charbit ==16 ) - *spi_rd16++ =cfspi_rx (); -else - *spi_rd++ =cfspi_rx (); - } - } - - len =1 ;/* remaining byte */ - } - -if ((flags &SPI_XFER_END ) ==SPI_XFER_END ) - ctrl &= ~DSPI_TFR_CONT ; - -if (len) { -if (dout !=NULL ) { -if (cfslave->charbit ==16 ) -cfspi_tx (ctrl, *spi_wr16); -else -cfspi_tx (ctrl, *spi_wr); -cfspi_rx (); - } - -if (din !=NULL ) { -cfspi_tx (ctrl,CONFIG_SPI_IDLE_VAL ); -if (cfslave->charbit ==16 ) - *spi_rd16 =cfspi_rx (); -else - *spi_rd =cfspi_rx (); - } - }else { -/* dummy read */ -cfspi_tx (ctrl,CONFIG_SPI_IDLE_VAL ); -cfspi_rx (); - } - -return 0 ; -} - -static struct spi_slave *cfspi_setup_slave (struct cf_spi_slave *cfslave, -uint mode) +int __spi_set_speed (struct coldfire_spi_priv *cfspi,uint bus) {/* * bit definition for mode: @@ -189,7 +95,7 @@ static struct spi_slave *cfspi_setup_slave(struct cf_spi_slave *cfslave,* 11 - 8: Delay after transfer scaler * 7 - 0: SPI_CPHA, SPI_CPOL, SPI_LSB_FIRST */ -volatile dspi_t *dspi = (dspi_t *)MMAP_DSPI ; +struct dspi *dspi = cfspi->regs;int prescaler[] = {2 ,3 ,5 ,7 };int scaler[] = {2 ,4 ,6 ,8 ,@@ -199,56 +105,38 @@ static struct spi_slave *cfspi_setup_slave(struct cf_spi_slave *cfslave, };int i, j, pbrcnt, brcnt, diff, tmp, dbr =0 ;int best_i, best_j, bestmatch =0x7FFFFFFF , baud_speed; -u32 bus_setup =0 ; +u32 bus_setup; + +/* Read current setup */ + bus_setup =readl (&dspi->ctar[bus]); tmp = (prescaler[3 ] * scaler[15 ]);/* Maximum and minimum baudrate it can handle */ -if ((cfslave->baudrate > (gd->bus_clk >>1 )) || - (cfslave->baudrate < (gd->bus_clk / tmp))) { +if ((cfspi->baudrate > (gd->bus_clk >>1 )) || + (cfspi->baudrate < (gd->bus_clk / tmp))) {printf ("Exceed baudrate limitation: Max %d - Min %d\n" , (int )(gd->bus_clk >>1 ), (int )(gd->bus_clk / tmp)); -return NULL ; +return -1 ; }/* Activate Double Baud when it exceed 1/4 the bus clk */ -if ((CONFIG_SYS_DSPI_CTAR0 &DSPI_CTAR_DBR ) || - (cfslave->baudrate > (gd->bus_clk / (prescaler[0 ] * scaler[0 ])))) { +if ((bus_setup &DSPI_CTAR_DBR ) || + (cfspi->baudrate > (gd->bus_clk / (prescaler[0 ] * scaler[0 ])))) { bus_setup |=DSPI_CTAR_DBR ; dbr =1 ; } -if (mode &SPI_CPOL ) - bus_setup |=DSPI_CTAR_CPOL ; -if (mode &SPI_CPHA ) - bus_setup |=DSPI_CTAR_CPHA ; -if (mode &SPI_LSB_FIRST ) - bus_setup |=DSPI_CTAR_LSBFE ; -/* Overwrite default value set in platform configuration file */ -if (mode &SPI_MODE_MOD ) { - -if ((mode &0xF0000000 ) ==0 ) - bus_setup |= - dspi->ctar[cfslave->slave.bus] &0x78000000 ; -else - bus_setup |= ((mode &0xF0000000 ) >>1 ); - +if (cfspi->mode &SPI_MODE_MOD ) {/* * Check to see if it is enabled by default in platform * config, or manual setting passed by mode parameter */ -if (mode &SPI_DBLRATE ) { +if (cfspi->mode &SPI_DBLRATE ) { bus_setup |=DSPI_CTAR_DBR ; dbr =1 ; } - bus_setup |= (mode &0x0FC00000 ) >>4 ;/* PSCSCK, PASC, PDT */ - bus_setup |= (mode &0x000FFF00 ) >>4 ;/* CSSCK, ASC, DT */ - }else - bus_setup |= (dspi->ctar[cfslave->slave.bus] &0x78FCFFF0 ); - - cfslave->charbit = - ((dspi->ctar[cfslave->slave.bus] &0x78000000 ) == -0x78000000 ) ?16 :8 ; + } pbrcnt =sizeof (prescaler) /sizeof (int ); brcnt =sizeof (scaler) /sizeof (int );@@ -259,10 +147,10 @@ static struct spi_slave *cfspi_setup_slave(struct cf_spi_slave *cfslave,for (j =0 ; j < brcnt; j++) { tmp = (baud_speed / scaler[j]) * (1 + dbr); -if (tmp > cfslave->baudrate) - diff = tmp - cfslave->baudrate; +if (tmp > cfspi->baudrate) + diff = tmp - cfspi->baudrate;else - diff = cfslave->baudrate - tmp; + diff = cfspi->baudrate - tmp;if (diff < bestmatch) { bestmatch = diff;@@ -271,65 +159,306 @@ static struct spi_slave *cfspi_setup_slave(struct cf_spi_slave *cfslave, } } } + + bus_setup &= ~(DSPI_CTAR_PBR (0x03 ) |DSPI_CTAR_BR (0x0f )); bus_setup |= (DSPI_CTAR_PBR (best_i) |DSPI_CTAR_BR (best_j)); - dspi->ctar[cfslave->slave.bus] = bus_setup; +writel (bus_setup, &dspi->ctar[bus]); + +return 0 ; +} + +static int __spi_set_mode (struct coldfire_spi_priv *cfspi,uint bus) +{ +struct dspi *dspi = cfspi->regs; +u32 bus_setup =0 ; + +if (cfspi->mode &SPI_CPOL ) + bus_setup |=DSPI_CTAR_CPOL ; +if (cfspi->mode &SPI_CPHA ) + bus_setup |=DSPI_CTAR_CPHA ; +if (cfspi->mode &SPI_LSB_FIRST ) + bus_setup |=DSPI_CTAR_LSBFE ; + +/* Overwrite default value set in platform configuration file */ +if (cfspi->mode &SPI_MODE_MOD ) { +if ((cfspi->mode &0xF0000000 ) ==0 ) + bus_setup |= +readl (&dspi->ctar[bus]) &0x78000000 ; +else + bus_setup |= ((cfspi->mode &0xF0000000 ) >>1 ); + +/* PSCSCK, PASC, PDT */ + bus_setup |= (cfspi->mode &0x0FC00000 ) >>4 ; +/* CSSCK, ASC, DT */ + bus_setup |= (cfspi->mode &0x000FFF00 ) >>4 ; + }else { + bus_setup |= (readl (&dspi->ctar[bus]) &0x78FCFFF0 ); + } + + cfspi->charbit = + ((readl (&dspi->ctar[bus]) &0x78000000 ) ==0x78000000 ) ?16 :8 ; -return &cfslave->slave; +setbits_be32 (&dspi->ctar[bus], bus_setup); + +return 0 ; } -#endif /* CONFIG_CF_DSPI */ -#ifdef CONFIG_CMD_SPI -int spi_cs_is_valid (unsigned int bus,unsigned int cs) +static inline void __cfspi_tx (struct coldfire_spi_priv *cfspi, +u32 ctrl,u16 data) { -if (((cs >=0 ) && (cs <8 )) && ((bus >=0 ) && (bus <8 ))) -return 1 ; -else -return 0 ; +while ((readl (&cfspi->regs->sr) &0x0000F000 ) >=4 ) + ; + +writel (ctrl | data, &cfspi->regs->tfr); +} + +static inline u16 __cfspi_rx (struct coldfire_spi_priv *cfspi)
Quoted 9 lines
drivers/spi/cf_spi.c static struct spi_slave *cfspi_setup_slave(struct cf_spi_slave *cfslave, · line 221
Quoted 6 lines
drivers/spi/cf_spi.c +6
-0+{ +while ((readl (&cfspi->regs->sr) &0x000000F0 ) ==0 ) + ; + +return readw (&cfspi->regs->rfr); +}Use
wait_forbit calls instead of infine loops.
Seems i cannot use wait_for_bits for both the above cases.
The first case is a fifo level check ( >= 4) (on the other hand, it was also wrong as a chek, so fixed it), while the second case waits for at least one bit to 1, and so wait_for_bit can't apply too.
Quoted 5 lines
drivers/spi/cf_spi.c static struct spi_slave *cfspi_setup_slave(struct cf_spi_slave *cfslave, · line 223
Quoted 2 lines
drivers/spi/cf_spi.c +2
-0+ +static int __spi_xfer(struct coldfire_spi_priv *cfspi, uint cs, uint bitlen,no need for __ we don't have non-dm code
done
Quoted 14 lines
Quoted 14 lines
drivers/spi/cf_spi.c +14
-0+ const void *dout, void *din, ulong flags) +{ + u16 *spi_rd16 = NULL, *spi_wr16 = NULL; +u8 *spi_rd =NULL , *spi_wr =NULL ; +static u32 ctrl; +uint len = bitlen >>3 ; + +if (cfspi->charbit ==16 ) { + bitlen >>=1 ; + spi_wr16 = (u16 *)dout; + spi_rd16 = (u16 *)din; + }else { + spi_wr = (u8 *)dout; + spi_rd = (u8 *)din;
Quoted 9 lines
drivers/spi/cf_spi.c static struct spi_slave *cfspi_setup_slave(struct cf_spi_slave *cfslave, · line 243
Quoted 6 lines
drivers/spi/cf_spi.c +6
-0+ } + +if ((flags &SPI_XFER_BEGIN ) ==SPI_XFER_BEGIN ) + ctrl |=DSPI_TFR_CONT ; + + ctrl = (ctrl &0xFF000000 ) | ((1 << cs) <<16 );macros?
done
Quoted 9 lines
Quoted 9 lines
drivers/spi/cf_spi.c +9
-0+ +if (len >1 ) { +int tmp_len = len -1 ; + +while (tmp_len--) { +if (dout) { +if (cfspi->charbit ==16 ) +__cfspi_tx (cfspi, ctrl, *spi_wr16++); +else
Quoted 9 lines
drivers/spi/cf_spi.c static struct spi_slave *cfspi_setup_slave(struct cf_spi_slave *cfslave, · line 258
Quoted 6 lines
drivers/spi/cf_spi.c +6
-0+__cfspi_tx (cfspi, ctrl, *spi_wr++); +__cfspi_rx (cfspi); + } + +if (din) { +__cfspi_tx (cfspi, ctrl,CONFIG_SPI_IDLE_VAL );same here?
done
Quoted 5 lines
Quoted 5 lines
drivers/spi/cf_spi.c +5
-0+if (cfspi->charbit ==16 ) + *spi_rd16++ =__cfspi_rx (cfspi); +else + *spi_rd++ =__cfspi_rx (cfspi); + }
Quoted 9 lines
drivers/spi/cf_spi.c static struct spi_slave *cfspi_setup_slave(struct cf_spi_slave *cfslave, · line 269
Quoted 6 lines
drivers/spi/cf_spi.c +6
-0+ } + + len =1 ;/* remaining byte */ + } + +if ((flags &SPI_XFER_END ) ==SPI_XFER_END )Why we need to check the macro again flags &
SPI_XFER_ENDenogh?
fixed
Quoted 16 lines
Quoted 16 lines
drivers/spi/cf_spi.c +16
-0+ ctrl &= ~DSPI_TFR_CONT ; + +if (len) { +if (dout) { +if (cfspi->charbit ==16 ) +__cfspi_tx (cfspi, ctrl, *spi_wr16); +else +__cfspi_tx (cfspi, ctrl, *spi_wr); +__cfspi_rx (cfspi); + } + +if (din) { +__cfspi_tx (cfspi, ctrl,CONFIG_SPI_IDLE_VAL ); +if (cfspi->charbit ==16 ) + *spi_rd16 =__cfspi_rx (cfspi); +else
Quoted 9 lines
drivers/spi/cf_spi.c static struct spi_slave *cfspi_setup_slave(struct cf_spi_slave *cfslave, · line 291
Quoted 6 lines
drivers/spi/cf_spi.c +6
-0+ *spi_rd =__cfspi_rx (cfspi); + } + }else { +/* dummy read */ +__cfspi_tx (cfspi, ctrl,CONFIG_SPI_IDLE_VAL ); +__cfspi_rx (cfspi);same here, no __
done
Quoted 5 lines
Quoted 5 lines
drivers/spi/cf_spi.c +3
-0+ } + +return 0 ; }
Quoted 7 lines
drivers/spi/cf_spi.c static struct spi_slave *cfspi_setup_slave(struct cf_spi_slave *cfslave, · line 299
Quoted 4 lines
drivers/spi/cf_spi.c +0
-1void spi_init (void ) { -cfspi_init (); }remove
spi_initif not used, can be another patch.
still cannot remove spi_init, left empty, but anyway moved cfspi_init() code inside _probe() and removed cfspi_init().
Quoted 59 lines
Quoted 43 lines
drivers/spi/cf_spi.c +24
-11-struct spi_slave *spi_setup_slave (unsigned int bus,unsigned int cs, -unsigned int max_hz,unsigned int mode) +static int coldfire_spi_claim_bus (struct udevice *dev) +{ +struct udevice *bus = dev->parent; +struct dm_spi_slave_platdata *slave_plat = +dev_get_parent_platdata (dev); + +return cfspi_claim_bus (bus->seq, slave_plat->cs); +} + +static int coldfire_spi_release_bus (struct udevice *dev) { -struct cf_spi_slave *cfslave; +struct udevice *bus = dev->parent; +struct dm_spi_slave_platdata *slave_plat = +dev_get_parent_platdata (dev); -if (!spi_cs_is_valid (bus, cs)) -return NULL ; +cfspi_release_bus (bus->seq, slave_plat->cs); - cfslave = spi_alloc_slave(struct cf_spi_slave, bus, cs); -if (!cfslave) -return NULL ; +return 0 ; +} - cfslave->baudrate = max_hz; +static int coldfire_spi_xfer (struct udevice *dev,unsigned int bitlen, +const void *dout,void *din, +unsigned long flags) +{ +struct udevice *bus =dev_get_parent (dev); +struct coldfire_spi_priv *cfspi =dev_get_priv (bus); +struct dm_spi_slave_platdata *slave_plat =dev_get_parent_platdata (dev); -/* specific setup */ -return cfspi_setup_slave (cfslave, mode); +return __spi_xfer (cfspi, slave_plat->cs, bitlen, dout, din, flags); }drivers/spi/cf_spi.c static struct spi_slave *cfspi_setup_slave(struct cf_spi_slave *cfslave, · line 338
Quoted 10 lines
drivers/spi/cf_spi.c +5
-3-void spi_free_slave (struct spi_slave *slave) +static int coldfire_spi_set_speed (struct udevice *bus,uint max_hz) { -struct cf_spi_slave *cfslave =to_cf_spi_slave (slave); +struct coldfire_spi_priv *cfspi =dev_get_priv (bus); + + cfspi->baudrate = max_hz; -free (cfslave); +return __spi_set_speed (cfspi, bus->seq);no __ and do it withough function.
Quoted 2 lines
drivers/spi/cf_spi.c +0
-0}
Quoted 12 lines
drivers/spi/cf_spi.c static struct spi_slave *cfspi_setup_slave(struct cf_spi_slave *cfslave, · line 347
Quoted 9 lines
drivers/spi/cf_spi.c +6
-2-int spi_claim_bus (struct spi_slave *slave) +static int coldfire_spi_set_mode (struct udevice *bus,uint mode) { -return cfspi_claim_bus (slave->bus, slave->cs); +struct coldfire_spi_priv *cfspi =dev_get_priv (bus); + + cfspi->mode = mode; + +return __spi_set_mode (cfspi, bus->seq);same here.
done
Quoted 28 lines
Quoted 28 lines
drivers/spi/cf_spi.c +23
-2} -void spi_release_bus (struct spi_slave *slave) +static int coldfire_spi_probe (struct udevice *bus) { -cfspi_release_bus (slave->bus, slave->cs); +struct coldfire_spi_platdata *plat =dev_get_platdata (bus); +struct coldfire_spi_priv *cfspi =dev_get_priv (bus); +int i; + + cfspi->regs = (struct dspi *)plat->regs_addr; + + cfspi->baudrate = plat->speed_hz; + cfspi->mode = plat->mode; + +for (i =0 ; i <MCF_DSPI_MAX_CTAR_REGS ; i++) { +unsigned int ctar =0 ; + +if (plat->ctar[i][0 ] ==0 ) +break ; + + ctar =DSPI_CTAR_TRSZ (plat->ctar[i][0 ]) | +DSPI_CTAR_PCSSCK (plat->ctar[i][1 ]) | +DSPI_CTAR_PASC (plat->ctar[i][2 ]) | +DSPI_CTAR_PDT (plat->ctar[i][3 ]) | +DSPI_CTAR_CSSCK (plat->ctar[i][4 ]) | +DSPI_CTAR_ASC (plat->ctar[i][5 ]) | + DSPI_CTAR_DT(plat->ctar[i][6]) |
Quoted 9 lines
drivers/spi/cf_spi.c static struct spi_slave *cfspi_setup_slave(struct cf_spi_slave *cfslave, · line 379
Quoted 6 lines
drivers/spi/cf_spi.c +6
-0+DSPI_CTAR_BR (plat->ctar[i][7 ]); + +writel (ctar, &cfspi->regs->ctar[i]); + } + +__spi_init (cfspi);no __
done
Quoted 11 lines
drivers/spi/cf_spi.c static struct spi_slave *cfspi_setup_slave(struct cf_spi_slave *cfslave, · line 384
Quoted 7 lines
drivers/spi/cf_spi.c +3
-2+ +return 0 ; } -int spi_xfer (struct spi_slave *slave,unsigned int bitlen,const void *dout, -void *din,unsigned long flags) +#if !CONFIG_IS_ENABLED (OF_PLATDATA )valid check is
#ifCONFIG_IS_ENABLED(OF_CONTROL)&& !CONFIG_IS_ENABLED(OF_PLATDATA)
done
Quoted 6 lines
Quoted 6 lines
drivers/spi/cf_spi.c +4
-1+static int coldfire_dspi_ofdata_to_platdata (struct udevice *bus) { -return cfspi_xfer (slave, bitlen, dout, din, flags); +fdt_addr_t addr; +struct coldfire_spi_platdata *plat = bus->platdata; +const void *blob = gd->fdt_blob;
Quoted 9 lines
drivers/spi/cf_spi.c static struct spi_slave *cfspi_setup_slave(struct cf_spi_slave *cfslave, · line 395
Quoted 6 lines
drivers/spi/cf_spi.c +6
-0+int node =dev_of_offset (bus); +int *ctar, len; + + addr =devfdt_get_addr (bus); +if (addr ==FDT_ADDR_T_NONE ) { +debug ("DSPI: Can't get base address or size\n" );no need this debug.
done
Quoted 43 lines
Quoted 43 lines
drivers/spi/cf_spi.c +41
-1+return -ENOMEM ; + } + plat->regs_addr = addr; + + plat->num_cs =fdtdec_get_int (blob, node,"num-cs" , +MCF_DSPI_DEFAULT_MAX_CS ); + + plat->speed_hz =fdtdec_get_int (blob, node,"spi-max-frequency" , +MCF_DSPI_DEFAULT_SCK_FREQ ); + + plat->mode =fdtdec_get_int (blob, node,"spi-mode" , +MCF_DSPI_DEFAULT_MODE ); + +memset (plat->ctar,0 ,sizeof (plat->ctar)); + + ctar = (int *)fdt_getprop (blob, node,"ctar-params" , &len); + +if (ctar && len) { +int i, q, ctar_regs; + + ctar_regs = len /sizeof (unsigned int ) /MAX_CTAR_FIELDS ; + +if (ctar_regs >MAX_CTAR_REGS ) + ctar_regs =MAX_CTAR_REGS ; + +for (i =0 ; i < ctar_regs; i++) { +for (q =0 ; q <MAX_CTAR_FIELDS ; q++) + plat->ctar[i][q] = *ctar++; + } + } + +debug ("DSPI: regs=%pa, max-frequency=%d, num-cs=%d, mode=%d\n" , + (void *)plat->regs_addr, + plat->speed_hz, plat->num_cs, plat->mode); + +return 0 ; } -#endif /* CONFIG_CMD_SPI */ +#endif + +static const struct dm_spi_ops coldfire_spi_ops = { + .claim_bus = coldfire_spi_claim_bus, + .release_bus = coldfire_spi_release_bus,
Quoted 9 lines
drivers/spi/cf_spi.c static struct spi_slave *cfspi_setup_slave(struct cf_spi_slave *cfslave, · line 443
Quoted 6 lines
drivers/spi/cf_spi.c +6
-0+ .xfer = coldfire_spi_xfer, + .set_speed = coldfire_spi_set_speed, + .set_mode = coldfire_spi_set_mode, +}; + +#if !CONFIG_IS_ENABLED (OF_PLATDATA )group this check related code at once.
done
Quoted 12 lines
Quoted 12 lines
drivers/spi/cf_spi.c +12
-0+static const struct udevice_id coldfire_spi_ids[] = { + { .compatible ="fsl,mcf-dspi" }, + { } +}; +#endif + +U_BOOT_DRIVER (coldfire_spi) = { + .name ="spi_coldfire" , + .id =UCLASS_SPI , +#if !CONFIG_IS_ENABLED(OF_PLATDATA) + .of_match = coldfire_spi_ids, +#endif
Quoted 9 lines
drivers/spi/cf_spi.c static struct spi_slave *cfspi_setup_slave(struct cf_spi_slave *cfslave, · line 461
Quoted 6 lines
drivers/spi/cf_spi.c +6
-0+ .probe = coldfire_spi_probe, + .ops = &coldfire_spi_ops, + .platdata_auto_alloc_size = sizeof(struct coldfire_spi_platdata), +#if !CONFIG_IS_ENABLED (OF_PLATDATA ) + .ofdata_to_platdata = coldfire_dspi_ofdata_to_platdata, +#endif group it above ifdef and move in once place.
done
Quoted 6 lines
drivers/spi/cf_spi.c static struct spi_slave *cfspi_setup_slave(struct cf_spi_slave *cfslave, · line 464
Quoted 3 lines
drivers/spi/cf_spi.c +3
-0+ .priv_auto_alloc_size = sizeof(struct coldfire_spi_priv), +}; +#endif /* CONFIG_CF_DSPI */ I think we don't need this.
done
Quoted 3 lines
Apart from above, there are extern functions in this driver which are using spi code in arch area so better to move here or handle via respective drivers.
I had a look but proper place for those 3 functions seems
/u-boot-coldfire/arch/m68k/cpu/mcf5445x/cpu_init.c
since there are some cpu sub-family #ifdef checks there. Just let me know, i can move them here anyway.
Regards,
Angelo
PATCH v3 4/11 drivers: serial: mcfuart: add DT support
In reply to Angelo DureghelloThis patch adds devicetree support to the mcfuart.c driver and removes non DM code.
---
Changes for v2:
- remove non DM code
Changes for v3:
- none
--- drivers/serial/mcfuart.c | 106 +++++++++++---------------------------- 1 file changed, 28 insertions(+), 78 deletions(-)
drivers/serial/mcfuart.c +28 -78
@@ -5,6 +5,9 @@* * Modified to add device model (DM) support * (C) Copyright 2015 Angelo Dureghello <[email protected]> +* +* Modified to add DM and fdt support, removed non DM code +* (C) Copyright 2018 Angelo Dureghello <[email protected]> */ /*
@@ -78,83 +81,6 @@ static void mcf_serial_setbrg_common(uart_t *uart, int baudrate)writeb (UART_UCR_RX_ENABLED |UART_UCR_TX_ENABLED , &uart->ucr); } -#ifndef CONFIG_DM_SERIAL - -static int mcf_serial_init (void ) -{ -uart_t *uart_base; -int port_idx; - - uart_base = (uart_t *)CONFIG_SYS_UART_BASE ; - port_idx =CONFIG_SYS_UART_PORT ; - -return mcf_serial_init_common (uart_base, port_idx, gd->baudrate); -} - -static void mcf_serial_putc (const char c) -{ -uart_t *uart = (uart_t *)CONFIG_SYS_UART_BASE ; - -if (c =='\n' ) -serial_putc ('\r' ); - -/* Wait for last character to go. */ -while (!(readb (&uart->usr) &UART_USR_TXRDY )) - ; - -writeb (c, &uart->utb); -} - -static int mcf_serial_getc (void ) -{ -uart_t *uart = (uart_t *)CONFIG_SYS_UART_BASE ; - -/* Wait for a character to arrive. */ -while (!(readb (&uart->usr) &UART_USR_RXRDY )) - ; - -return readb (&uart->urb); -} - -static void mcf_serial_setbrg (void ) -{ -uart_t *uart = (uart_t *)CONFIG_SYS_UART_BASE ; - -mcf_serial_setbrg_common (uart, gd->baudrate); -} - -static int mcf_serial_tstc (void ) -{ -uart_t *uart = (uart_t *)CONFIG_SYS_UART_BASE ; - -return readb (&uart->usr) &UART_USR_RXRDY ; -} - -static struct serial_device mcf_serial_drv = { - .name ="mcf_serial" , - .start = mcf_serial_init, - .stop =NULL , - .setbrg = mcf_serial_setbrg, - .putc = mcf_serial_putc, - .puts = default_serial_puts, - .getc = mcf_serial_getc, - .tstc = mcf_serial_tstc, -}; - -void mcf_serial_initialize (void ) -{ -serial_register (&mcf_serial_drv); -} - -__weak struct serial_device *default_serial_console (void ) -{ -return &mcf_serial_drv; -} - -#endif - -#ifdef CONFIG_DM_SERIAL -static int coldfire_serial_probe (struct udevice *dev) {struct coldfire_serial_platdata *plat = dev->platdata;
@@ -212,6 +138,23 @@ static int coldfire_serial_pending(struct udevice *dev, bool input)return 0 ; } +static int coldfire_ofdata_to_platdata (struct udevice *dev) +{ +struct coldfire_serial_platdata *plat =dev_get_platdata (dev); +fdt_addr_t addr_base; + + addr_base =devfdt_get_addr (dev); +if (addr_base ==FDT_ADDR_T_NONE ) +return -ENODEV ; + + plat->base = (uint32_t )addr_base; + + plat->port = dev->seq; + plat->baudrate = gd->baudrate; + +return 0 ; +} +static const struct dm_serial_ops coldfire_serial_ops = { .putc = coldfire_serial_putc, .pending = coldfire_serial_pending,
@@ -219,11 +162,18 @@ static const struct dm_serial_ops coldfire_serial_ops = { .setbrg = coldfire_serial_setbrg, }; +static const struct udevice_id coldfire_serial_ids[] = { + { .compatible ="fsl,mcf-uart" }, + { } +}; +U_BOOT_DRIVER (serial_coldfire) = { .name ="serial_coldfire" , .id =UCLASS_SERIAL , + .of_match = coldfire_serial_ids, + .ofdata_to_platdata = coldfire_ofdata_to_platdata, + .platdata_auto_alloc_size =sizeof (struct coldfire_serial_platdata ), .probe = coldfire_serial_probe, .ops = &coldfire_serial_ops, .flags =DM_FLAG_PRE_RELOC , }; -#endif
Signature · 1 line
2.19.1
PATCH v3 4/11 drivers: serial: mcfuart: add DT support
Quoted 4 lines · Angelo Dureghello
This patch adds devicetree support to the
mcfuart.cdriver and removes non DM code.Signed-off-by Angelo Dureghello <[email protected]>
Quoted 8 lines
---
Changes for v2:
- remove non DM code
Changes for v3:
- none--- drivers/serial/mcfuart.c | 106 +++++++++++---------------------------- 1 file changed, 28 insertions(+), 78 deletions(-)
Does this not break the build bisectability? If it does, you might need to make a config change here too.
PATCH v3 5/11 drivers: serial: mcfuart: add Kconfig option
In reply to Angelo DureghelloThis patch adds missing CONFIG_MCFUART to Kconfig.
---
Changes for v2:
- better Kconfig help
Changes for v3:
- none
--- drivers/serial/Kconfig | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/serial/Kconfig +9 -0
@@ -520,6 +520,15 @@ config MVEBU_A3700_UART Choose this option to add support for UART driver on the Marvell Armada 3700 SoC. The base address is configured via DT. +config MCFUART + bool "Freescale ColdFire UART support" + default n + help + Choose this option to add support for UART driver on the ColdFire + SoC's family. The serial communication channel provides a full-duplex + asynchronous/synchronous receiver and transmitter deriving an + operating frequency from the internal bus clock or an external clock. + config MXC_UART bool "IMX serial port support" depends on MX5 || MX6
Signature · 1 line
2.19.1
PATCH v3 5/11 drivers: serial: mcfuart: add Kconfig option
Quoted 11 lines · Angelo Dureghello
This patch adds missing
CONFIG_MCFUARTtoKconfig.Signed-off-by Angelo Dureghello <[email protected]>---
Changes for v2:
- betterKconfighelp
Changes for v3:
- none--- drivers/serial/Kconfig | 9 +++++++++ 1 file changed, 9 insertions(+)
(you don't need 'default n')
PATCH v3 6/11 m68k: architecture changes to support fdt
In reply to Angelo DureghelloThis patch adds fdt support to the m68k architecture.
---
Changes for v2:
- add OF_CONTROL, DM and DM_SERIAL as default config options for all cpu families
Changes for v3:
- none
--- arch/Kconfig | 1 + arch/m68k/Kconfig | 33 +++++++++++++++++++++++++++++++++ arch/m68k/cpu/u-boot.lds | 2 ++ 3 files changed, 36 insertions(+)
arch/Kconfig +1 -0
@@ -28,6 +28,7 @@ config M68K select HAVE_PRIVATE_LIBGCC select SYS_BOOT_GET_CMDLINE select SYS_BOOT_GET_KBD + select SUPPORT_OF_CONTROL config MICROBLAZE bool "MicroBlaze architecture"
arch/m68k/Kconfig +33 -0
@@ -6,36 +6,69 @@ config SYS_ARCH # processor family config MCF520x + select OF_CONTROL + select DM + select DM_SERIAL bool config MCF52x2 + select OF_CONTROL + select DM + select DM_SERIAL bool config MCF523x + select OF_CONTROL + select DM + select DM_SERIAL bool config MCF530x + select OF_CONTROL + select DM + select DM_SERIAL bool config MCF5301x + select OF_CONTROL + select DM + select DM_SERIAL bool config MCF532x + select OF_CONTROL + select DM + select DM_SERIAL bool config MCF537x + select OF_CONTROL + select DM + select DM_SERIAL bool config MCF5441x + select OF_CONTROL + select DM + select DM_SERIAL bool config MCF5445x + select OF_CONTROL + select DM + select DM_SERIAL bool config MCF5227x + select OF_CONTROL + select DM + select DM_SERIAL bool config MCF547x_8x + select OF_CONTROL + select DM + select DM_SERIAL bool # processor type
arch/m68k/cpu/u-boot.lds +2 -0
@@ -75,6 +75,8 @@ SECTIONS . = ALIGN(256); __init_end = .; + _end = .; + __bss_start = .; .bss (NOLOAD) : {
Signature · 1 line
2.19.1
PATCH v3 6/11 m68k: architecture changes to support fdt
Quoted 9 lines · Angelo Dureghello
This patch adds fdt support to the m68k architecture.
Signed-off-by Angelo Dureghello <[email protected]>---
Changes for v2:
- addOF_CONTROL, DM andDM_SERIALas default config options for all cpu families
Changes for v3:
- none
Quoted 5 lines
--- arch/Kconfig | 1 + arch/m68k/Kconfig | 33 +++++++++++++++++++++++++++++++++ arch/m68k/cpu/u-boot.lds | 2 ++ 3 files changed, 36 insertions(+)
PATCH v3 7/11 m68k: add initial dts files for all m68k boards
In reply to Angelo DureghelloThis patch adds basic dts files for all the m68k boards.
---
Changes for v2:
- new patch
Changes for v3:
- none
--- arch/m68k/dts/M5208EVBE.dts | 22 +++++++ arch/m68k/dts/M52277EVB.dts | 25 ++++++++ arch/m68k/dts/M52277EVB_stmicro.dts | 22 +++++++ arch/m68k/dts/M5235EVB.dts | 22 +++++++ arch/m68k/dts/M5235EVB_Flash32.dts | 22 +++++++ arch/m68k/dts/M5249EVB.dts | 22 +++++++ arch/m68k/dts/M5253DEMO.dts | 22 +++++++ arch/m68k/dts/M5272C3.dts | 22 +++++++ arch/m68k/dts/M5275EVB.dts | 22 +++++++ arch/m68k/dts/M5282EVB.dts | 22 +++++++ arch/m68k/dts/M53017EVB.dts | 22 +++++++ arch/m68k/dts/M5329AFEE.dts | 22 +++++++ arch/m68k/dts/M5329BFEE.dts | 22 +++++++ arch/m68k/dts/M5373EVB.dts | 22 +++++++ arch/m68k/dts/M54418TWR.dts | 25 ++++++++ arch/m68k/dts/M54418TWR_nand_mii.dts | 25 ++++++++ arch/m68k/dts/M54418TWR_nand_rmii.dts | 25 ++++++++ arch/m68k/dts/M54418TWR_nand_rmii_lowfreq.dts | 25 ++++++++ arch/m68k/dts/M54418TWR_serial_mii.dts | 25 ++++++++ arch/m68k/dts/M54418TWR_serial_rmii.dts | 25 ++++++++ arch/m68k/dts/M54451EVB.dts | 25 ++++++++ arch/m68k/dts/M54451EVB_stmicro.dts | 25 ++++++++ arch/m68k/dts/M54455EVB.dts | 25 ++++++++ arch/m68k/dts/M54455EVB_a66.dts | 25 ++++++++ arch/m68k/dts/M54455EVB_i66.dts | 25 ++++++++ arch/m68k/dts/M54455EVB_intel.dts | 26 +++++++++ arch/m68k/dts/M54455EVB_stm33.dts | 25 ++++++++ arch/m68k/dts/M5475AFE.dts | 13 +++++ arch/m68k/dts/M5475BFE.dts | 13 +++++ arch/m68k/dts/M5475CFE.dts | 13 +++++ arch/m68k/dts/M5475DFE.dts | 13 +++++ arch/m68k/dts/M5475EFE.dts | 13 +++++ arch/m68k/dts/M5475FFE.dts | 13 +++++ arch/m68k/dts/M5475GFE.dts | 13 +++++ arch/m68k/dts/M5485AFE.dts | 17 ++++++ arch/m68k/dts/M5485BFE.dts | 17 ++++++ arch/m68k/dts/M5485CFE.dts | 17 ++++++ arch/m68k/dts/M5485DFE.dts | 17 ++++++ arch/m68k/dts/M5485EFE.dts | 17 ++++++ arch/m68k/dts/M5485FFE.dts | 17 ++++++ arch/m68k/dts/M5485GFE.dts | 17 ++++++ arch/m68k/dts/M5485HFE.dts | 17 ++++++ arch/m68k/dts/Makefile | 58 +++++++++++++++++++ arch/m68k/dts/amcore.dts | 22 +++++++ arch/m68k/dts/astro_mcf5373l.dts | 22 +++++++ arch/m68k/dts/cobra5272.dts | 22 +++++++ arch/m68k/dts/eb_cpu5282.dts | 22 +++++++ arch/m68k/dts/eb_cpu5282_internal.dts | 22 +++++++ arch/m68k/dts/stmark2.dts | 34 +++++++++++ 49 files changed, 1066 insertions(+) create mode 100644 arch/m68k/dts/M5208EVBE.dts create mode 100644 arch/m68k/dts/M52277EVB.dts create mode 100644 arch/m68k/dts/M52277EVB_stmicro.dts create mode 100644 arch/m68k/dts/M5235EVB.dts create mode 100644 arch/m68k/dts/M5235EVB_Flash32.dts create mode 100644 arch/m68k/dts/M5249EVB.dts create mode 100644 arch/m68k/dts/M5253DEMO.dts create mode 100644 arch/m68k/dts/M5272C3.dts create mode 100644 arch/m68k/dts/M5275EVB.dts create mode 100644 arch/m68k/dts/M5282EVB.dts create mode 100644 arch/m68k/dts/M53017EVB.dts create mode 100644 arch/m68k/dts/M5329AFEE.dts create mode 100644 arch/m68k/dts/M5329BFEE.dts create mode 100644 arch/m68k/dts/M5373EVB.dts create mode 100644 arch/m68k/dts/M54418TWR.dts create mode 100644 arch/m68k/dts/M54418TWR_nand_mii.dts create mode 100644 arch/m68k/dts/M54418TWR_nand_rmii.dts create mode 100644 arch/m68k/dts/M54418TWR_nand_rmii_lowfreq.dts create mode 100644 arch/m68k/dts/M54418TWR_serial_mii.dts create mode 100644 arch/m68k/dts/M54418TWR_serial_rmii.dts create mode 100644 arch/m68k/dts/M54451EVB.dts create mode 100644 arch/m68k/dts/M54451EVB_stmicro.dts create mode 100644 arch/m68k/dts/M54455EVB.dts create mode 100644 arch/m68k/dts/M54455EVB_a66.dts create mode 100644 arch/m68k/dts/M54455EVB_i66.dts create mode 100644 arch/m68k/dts/M54455EVB_intel.dts create mode 100644 arch/m68k/dts/M54455EVB_stm33.dts create mode 100644 arch/m68k/dts/M5475AFE.dts create mode 100644 arch/m68k/dts/M5475BFE.dts create mode 100644 arch/m68k/dts/M5475CFE.dts create mode 100644 arch/m68k/dts/M5475DFE.dts create mode 100644 arch/m68k/dts/M5475EFE.dts create mode 100644 arch/m68k/dts/M5475FFE.dts create mode 100644 arch/m68k/dts/M5475GFE.dts create mode 100644 arch/m68k/dts/M5485AFE.dts create mode 100644 arch/m68k/dts/M5485BFE.dts create mode 100644 arch/m68k/dts/M5485CFE.dts create mode 100644 arch/m68k/dts/M5485DFE.dts create mode 100644 arch/m68k/dts/M5485EFE.dts create mode 100644 arch/m68k/dts/M5485FFE.dts create mode 100644 arch/m68k/dts/M5485GFE.dts create mode 100644 arch/m68k/dts/M5485HFE.dts create mode 100644 arch/m68k/dts/Makefile create mode 100644 arch/m68k/dts/amcore.dts create mode 100644 arch/m68k/dts/astro_mcf5373l.dts create mode 100644 arch/m68k/dts/cobra5272.dts create mode 100644 arch/m68k/dts/eb_cpu5282.dts create mode 100644 arch/m68k/dts/eb_cpu5282_internal.dts create mode 100644 arch/m68k/dts/stmark2.dts
arch/m68k/dts/M5208EVBE.dts new file +22 -0
@@ -0,0 +1,22 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Angelo Dureghello <[email protected]> + */ + +/dts-v1/; +/include/ "mcf5208.dtsi" + +/ { + model = "Freescale M5208EVBE"; + compatible = "fsl,M5208EVBE"; + + chosen { + stdout-path = "serial0:115200n8"; + }; +}; + +&uart0 { + u-boot,dm-pre-reloc; + status = "okay"; +}; +
arch/m68k/dts/M52277EVB.dts new file +25 -0
@@ -0,0 +1,25 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Angelo Dureghello <[email protected]> + */ + +/dts-v1/; +/include/ "mcf5227x.dtsi" + +/ { + model = "Freescale M52277EVB"; + compatible = "fsl,M52277EVB"; + + chosen { + stdout-path = "serial0:115200n8"; + }; +}; + +&uart0 { + u-boot,dm-pre-reloc; + status = "okay"; +}; + +&dspi0 { + status = "okay"; +};
arch/m68k/dts/M52277EVB_stmicro.dts new file +22 -0
@@ -0,0 +1,22 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Angelo Dureghello <[email protected]> + */ + +/dts-v1/; +/include/ "mcf5227x.dtsi" + +/ { + model = "Freescale M52277_stmicro"; + compatible = "fsl,M52277_stmicro"; + + chosen { + stdout-path = "serial0:115200n8"; + }; +}; + +&uart0 { + u-boot,dm-pre-reloc; + status = "okay"; +}; +
arch/m68k/dts/M5235EVB.dts new file +22 -0
@@ -0,0 +1,22 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Angelo Dureghello <[email protected]> + */ + +/dts-v1/; +/include/ "mcf523x.dtsi" + +/ { + model = "Freescale M5235EVB"; + compatible = "fsl,M5235EVB"; + + chosen { + stdout-path = "serial0:115200n8"; + }; +}; + +&uart0 { + u-boot,dm-pre-reloc; + status = "okay"; +}; +
arch/m68k/dts/M5235EVB_Flash32.dts new file +22 -0
@@ -0,0 +1,22 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Angelo Dureghello <[email protected]> + */ + +/dts-v1/; +/include/ "mcf523x.dtsi" + +/ { + model = "Freescale M5235EVB_Flash32"; + compatible = "fsl,M5235EVB_Flash32"; + + chosen { + stdout-path = "serial0:115200n8"; + }; +}; + +&uart0 { + u-boot,dm-pre-reloc; + status = "okay"; +}; +
arch/m68k/dts/M5249EVB.dts new file +22 -0
@@ -0,0 +1,22 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Angelo Dureghello <[email protected]> + */ + +/dts-v1/; +/include/ "mcf5249.dtsi" + +/ { + model = "Freescale M5249EVB"; + compatible = "fsl,M5249EVB"; + + chosen { + stdout-path = "serial0:115200n8"; + }; +}; + +&uart0 { + u-boot,dm-pre-reloc; + status = "okay"; +}; +
arch/m68k/dts/M5253DEMO.dts new file +22 -0
@@ -0,0 +1,22 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Angelo Dureghello <[email protected]> + */ + +/dts-v1/; +/include/ "mcf5253.dtsi" + +/ { + model = "Freescale M5253DEMO"; + compatible = "fsl,M5253DEMO"; + + chosen { + stdout-path = "serial0:115200n8"; + }; +}; + +&uart0 { + u-boot,dm-pre-reloc; + status = "okay"; +}; +
arch/m68k/dts/M5272C3.dts new file +22 -0
@@ -0,0 +1,22 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Angelo Dureghello <[email protected]> + */ + +/dts-v1/; +/include/ "mcf5272.dtsi" + +/ { + model = "Freescale M5272C3"; + compatible = "fsl,M5272C3"; + + chosen { + stdout-path = "serial0:115200n8"; + }; +}; + +&uart0 { + u-boot,dm-pre-reloc; + status = "okay"; +}; +
arch/m68k/dts/M5275EVB.dts new file +22 -0
@@ -0,0 +1,22 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Angelo Dureghello <[email protected]> + */ + +/dts-v1/; +/include/ "mcf5275.dtsi" + +/ { + model = "Freescale M5275EVB"; + compatible = "fsl,M5275EVB"; + + chosen { + stdout-path = "serial0:115200n8"; + }; +}; + +&uart0 { + u-boot,dm-pre-reloc; + status = "okay"; +}; +
arch/m68k/dts/M5282EVB.dts new file +22 -0
@@ -0,0 +1,22 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Angelo Dureghello <[email protected]> + */ + +/dts-v1/; +/include/ "mcf5282.dtsi" + +/ { + model = "Freescale M5282EVB"; + compatible = "fsl,M5282EVB"; + + chosen { + stdout-path = "serial0:115200n8"; + }; +}; + +&uart0 { + u-boot,dm-pre-reloc; + status = "okay"; +}; +
arch/m68k/dts/M53017EVB.dts new file +22 -0
@@ -0,0 +1,22 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Angelo Dureghello <[email protected]> + */ + +/dts-v1/; +/include/ "mcf5301x.dtsi" + +/ { + model = "Freescale M53017EVB"; + compatible = "fsl,M53017EVB"; + + chosen { + stdout-path = "serial0:115200n8"; + }; +}; + +&uart0 { + u-boot,dm-pre-reloc; + status = "okay"; +}; +
arch/m68k/dts/M5329AFEE.dts new file +22 -0
@@ -0,0 +1,22 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Angelo Dureghello <[email protected]> + */ + +/dts-v1/; +/include/ "mcf5329.dtsi" + +/ { + model = "Freescale M5329AFEE"; + compatible = "fsl,M5329AFEE"; + + chosen { + stdout-path = "serial0:115200n8"; + }; +}; + +&uart0 { + u-boot,dm-pre-reloc; + status = "okay"; +}; +
arch/m68k/dts/M5329BFEE.dts new file +22 -0
@@ -0,0 +1,22 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Angelo Dureghello <[email protected]> + */ + +/dts-v1/; +/include/ "mcf5329.dtsi" + +/ { + model = "Freescale M5329BFEE"; + compatible = "fsl,M5329BFEE"; + + chosen { + stdout-path = "serial0:115200n8"; + }; +}; + +&uart0 { + u-boot,dm-pre-reloc; + status = "okay"; +}; +
arch/m68k/dts/M5373EVB.dts new file +22 -0
@@ -0,0 +1,22 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Angelo Dureghello <[email protected]> + */ + +/dts-v1/; +/include/ "mcf537x.dtsi" + +/ { + model = "Freescale M5373EVB"; + compatible = "fsl,M5373EVB"; + + chosen { + stdout-path = "serial0:115200n8"; + }; +}; + +&uart0 { + u-boot,dm-pre-reloc; + status = "okay"; +}; +
arch/m68k/dts/M54418TWR.dts new file +25 -0
@@ -0,0 +1,25 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Angelo Dureghello <[email protected]> + */ + +/dts-v1/; +/include/ "mcf5441x.dtsi" + +/ { + model = "Freescale M54418TWR"; + compatible = "fsl,M54418TWR"; + + chosen { + stdout-path = "serial0:115200n8"; + }; +}; + +&uart0 { + u-boot,dm-pre-reloc; + status = "okay"; +}; + +&dspi0 { + status = "okay"; +};
arch/m68k/dts/M54418TWR_nand_mii.dts new file +25 -0
@@ -0,0 +1,25 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Angelo Dureghello <[email protected]> + */ + +/dts-v1/; +/include/ "mcf5441x.dtsi" + +/ { + model = "Freescale M54418TWR_nand_mii"; + compatible = "fsl,M54418TWR_nand_mii"; + + chosen { + stdout-path = "serial0:115200n8"; + }; +}; + +&uart0 { + u-boot,dm-pre-reloc; + status = "okay"; +}; + +&dspi0 { + status = "okay"; +};
arch/m68k/dts/M54418TWR_nand_rmii.dts new file +25 -0
@@ -0,0 +1,25 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Angelo Dureghello <[email protected]> + */ + +/dts-v1/; +/include/ "mcf5441x.dtsi" + +/ { + model = "Freescale M54418TWR_nand_rmii"; + compatible = "fsl,M54418TWR_nand_rmii"; + + chosen { + stdout-path = "serial0:115200n8"; + }; +}; + +&uart0 { + u-boot,dm-pre-reloc; + status = "okay"; +}; + +&dspi0 { + status = "okay"; +};
arch/m68k/dts/M54418TWR_nand_rmii_lowfreq.dts new file +25 -0
@@ -0,0 +1,25 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Angelo Dureghello <[email protected]> + */ + +/dts-v1/; +/include/ "mcf5441x.dtsi" + +/ { + model = "Freescale M54418TWR_nand_rmii_lowfreq"; + compatible = "fsl,M54418TWR_nand_rmii_lowfreq"; + + chosen { + stdout-path = "serial0:115200n8"; + }; +}; + +&uart0 { + u-boot,dm-pre-reloc; + status = "okay"; +}; + +&dspi0 { + status = "okay"; +};
arch/m68k/dts/M54418TWR_serial_mii.dts new file +25 -0
@@ -0,0 +1,25 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Angelo Dureghello <[email protected]> + */ + +/dts-v1/; +/include/ "mcf5441x.dtsi" + +/ { + model = "Freescale M54418TWR_serial_mii"; + compatible = "fsl,M54418TWR_serial_mii"; + + chosen { + stdout-path = "serial0:115200n8"; + }; +}; + +&uart0 { + u-boot,dm-pre-reloc; + status = "okay"; +}; + +&dspi0 { + status = "okay"; +};
arch/m68k/dts/M54418TWR_serial_rmii.dts new file +25 -0
@@ -0,0 +1,25 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Angelo Dureghello <[email protected]> + */ + +/dts-v1/; +/include/ "mcf5441x.dtsi" + +/ { + model = "Freescale M54418TWR_serial_rmii"; + compatible = "fsl,M54418TWR_serial_rmii"; + + chosen { + stdout-path = "serial0:115200n8"; + }; +}; + +&uart0 { + u-boot,dm-pre-reloc; + status = "okay"; +}; + +&dspi0 { + status = "okay"; +};
arch/m68k/dts/M54451EVB.dts new file +25 -0
@@ -0,0 +1,25 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Angelo Dureghello <[email protected]> + */ + +/dts-v1/; +/include/ "mcf5445x.dtsi" + +/ { + model = "Freescale M54451EVB"; + compatible = "fsl,M54451EVB"; + + chosen { + stdout-path = "serial0:115200n8"; + }; +}; + +&uart0 { + u-boot,dm-pre-reloc; + status = "okay"; +}; + +&dspi0 { + status = "okay"; +};
arch/m68k/dts/M54451EVB_stmicro.dts new file +25 -0
@@ -0,0 +1,25 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Angelo Dureghello <[email protected]> + */ + +/dts-v1/; +/include/ "mcf5445x.dtsi" + +/ { + model = "Freescale M54451EVB_stmicro"; + compatible = "fsl,M54451EVB"; + + chosen { + stdout-path = "serial0:115200n8"; + }; +}; + +&uart0 { + u-boot,dm-pre-reloc; + status = "okay"; +}; + +&dspi0 { + status = "okay"; +};
arch/m68k/dts/M54455EVB.dts new file +25 -0
@@ -0,0 +1,25 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Angelo Dureghello <[email protected]> + */ + +/dts-v1/; +/include/ "mcf5445x.dtsi" + +/ { + model = "Freescale M54455EVB"; + compatible = "fsl,M54455EVB"; + + chosen { + stdout-path = "serial0:115200n8"; + }; +}; + +&uart0 { + u-boot,dm-pre-reloc; + status = "okay"; +}; + +&dspi0 { + status = "okay"; +};
arch/m68k/dts/M54455EVB_a66.dts new file +25 -0
@@ -0,0 +1,25 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Angelo Dureghello <[email protected]> + */ + +/dts-v1/; +/include/ "mcf5445x.dtsi" + +/ { + model = "Freescale M54455EVB_a66"; + compatible = "fsl,M54455EVB_a66"; + + chosen { + stdout-path = "serial0:115200n8"; + }; +}; + +&uart0 { + u-boot,dm-pre-reloc; + status = "okay"; +}; + +&dspi0 { + status = "okay"; +};
arch/m68k/dts/M54455EVB_i66.dts new file +25 -0
@@ -0,0 +1,25 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Angelo Dureghello <[email protected]> + */ + +/dts-v1/; +/include/ "mcf5445x.dtsi" + +/ { + model = "Freescale M54455EVB_i66"; + compatible = "fsl,M54455EVB_i66"; + + chosen { + stdout-path = "serial0:115200n8"; + }; +}; + +&uart0 { + u-boot,dm-pre-reloc; + status = "okay"; +}; + +&dspi0 { + status = "okay"; +};
arch/m68k/dts/M54455EVB_intel.dts new file +26 -0
@@ -0,0 +1,26 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Angelo Dureghello <[email protected]> + */ + +/dts-v1/; +/include/ "mcf5445x.dtsi" + +/ { + model = "Freescale M54455EVB_intel"; + compatible = "fsl,M5275EVB_intel"; + + chosen { + stdout-path = "serial0:115200n8"; + }; +}; + +&uart0 { + u-boot,dm-pre-reloc; + status = "okay"; +}; + +&dspi0 { + status = "okay"; +}; +
arch/m68k/dts/M54455EVB_stm33.dts new file +25 -0
@@ -0,0 +1,25 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Angelo Dureghello <[email protected]> + */ + +/dts-v1/; +/include/ "mcf5445x.dtsi" + +/ { + model = "Freescale M54455EVB_stm33"; + compatible = "fsl,M5275EVB_stm33"; + + chosen { + stdout-path = "serial0:115200n8"; + }; +}; + +&uart0 { + u-boot,dm-pre-reloc; + status = "okay"; +}; + +&dspi0 { + status = "okay"; +};
arch/m68k/dts/M5475AFE.dts new file +13 -0
@@ -0,0 +1,13 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Angelo Dureghello <[email protected]> + */ + +/dts-v1/; +/include/ "mcf54xx.dtsi" + +/ { + model = "Freescale M5475AFE"; + compatible = "fsl,M5475AFE"; +}; +
arch/m68k/dts/M5475BFE.dts new file +13 -0
@@ -0,0 +1,13 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Angelo Dureghello <[email protected]> + */ + +/dts-v1/; +/include/ "mcf54xx.dtsi" + +/ { + model = "Freescale M5475BFE"; + compatible = "fsl,M5475BFE"; +}; +
arch/m68k/dts/M5475CFE.dts new file +13 -0
@@ -0,0 +1,13 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Angelo Dureghello <[email protected]> + */ + +/dts-v1/; +/include/ "mcf54xx.dtsi" + +/ { + model = "Freescale M5475CFE"; + compatible = "fsl,M5475CFE"; +}; +
arch/m68k/dts/M5475DFE.dts new file +13 -0
@@ -0,0 +1,13 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Angelo Dureghello <[email protected]> + */ + +/dts-v1/; +/include/ "mcf54xx.dtsi" + +/ { + model = "Freescale M5475DFE"; + compatible = "fsl,M5475DFE"; +}; +
arch/m68k/dts/M5475EFE.dts new file +13 -0
@@ -0,0 +1,13 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Angelo Dureghello <[email protected]> + */ + +/dts-v1/; +/include/ "mcf54xx.dtsi" + +/ { + model = "Freescale M5475EFE"; + compatible = "fsl,M5475EFE"; +}; +
arch/m68k/dts/M5475FFE.dts new file +13 -0
@@ -0,0 +1,13 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Angelo Dureghello <[email protected]> + */ + +/dts-v1/; +/include/ "mcf54xx.dtsi" + +/ { + model = "Freescale M5475FFE"; + compatible = "fsl,M5475FFE"; +}; +
arch/m68k/dts/M5475GFE.dts new file +13 -0
@@ -0,0 +1,13 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Angelo Dureghello <[email protected]> + */ + +/dts-v1/; +/include/ "mcf54xx.dtsi" + +/ { + model = "Freescale M5475GFE"; + compatible = "fsl,M5475GFE"; +}; +
arch/m68k/dts/M5485AFE.dts new file +17 -0
@@ -0,0 +1,17 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Angelo Dureghello <[email protected]> + */ + +/dts-v1/; +/include/ "mcf54xx.dtsi" + +/ { + model = "Freescale M5485AFE"; + compatible = "fsl,M5485AFE"; + + chosen { + stdout-path = "serial0:115200n8"; + }; +}; +
arch/m68k/dts/M5485BFE.dts new file +17 -0
@@ -0,0 +1,17 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Angelo Dureghello <[email protected]> + */ + +/dts-v1/; +/include/ "mcf54xx.dtsi" + +/ { + model = "Freescale M5485BFE"; + compatible = "fsl,M5485BFE"; + + chosen { + stdout-path = "serial0:115200n8"; + }; +}; +
arch/m68k/dts/M5485CFE.dts new file +17 -0
@@ -0,0 +1,17 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Angelo Dureghello <[email protected]> + */ + +/dts-v1/; +/include/ "mcf54xx.dtsi" + +/ { + model = "Freescale M5485CFE"; + compatible = "fsl,M5485CFE"; + + chosen { + stdout-path = "serial0:115200n8"; + }; +}; +
arch/m68k/dts/M5485DFE.dts new file +17 -0
@@ -0,0 +1,17 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Angelo Dureghello <[email protected]> + */ + +/dts-v1/; +/include/ "mcf54xx.dtsi" + +/ { + model = "Freescale M5485DFE"; + compatible = "fsl,M5485DFE"; + + chosen { + stdout-path = "serial0:115200n8"; + }; +}; +
arch/m68k/dts/M5485EFE.dts new file +17 -0
@@ -0,0 +1,17 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Angelo Dureghello <[email protected]> + */ + +/dts-v1/; +/include/ "mcf54xx.dtsi" + +/ { + model = "Freescale M5485EFE"; + compatible = "fsl,M5485EFE"; + + chosen { + stdout-path = "serial0:115200n8"; + }; +}; +
arch/m68k/dts/M5485FFE.dts new file +17 -0
@@ -0,0 +1,17 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Angelo Dureghello <[email protected]> + */ + +/dts-v1/; +/include/ "mcf54xx.dtsi" + +/ { + model = "Freescale M5485FFE"; + compatible = "fsl,M5485FFE"; + + chosen { + stdout-path = "serial0:115200n8"; + }; +}; +
arch/m68k/dts/M5485GFE.dts new file +17 -0
@@ -0,0 +1,17 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Angelo Dureghello <[email protected]> + */ + +/dts-v1/; +/include/ "mcf54xx.dtsi" + +/ { + model = "Freescale M5485GFE"; + compatible = "fsl,M5485GFE"; + + chosen { + stdout-path = "serial0:115200n8"; + }; +}; +
arch/m68k/dts/M5485HFE.dts new file +17 -0
@@ -0,0 +1,17 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Angelo Dureghello <[email protected]> + */ + +/dts-v1/; +/include/ "mcf54xx.dtsi" + +/ { + model = "Freescale M5485HFE"; + compatible = "fsl,M5485HFE"; + + chosen { + stdout-path = "serial0:115200n8"; + }; +}; +
arch/m68k/dts/Makefile new file +58 -0
58 lines not on this page · raw message
arch/m68k/dts/amcore.dts new file +22 -0
@@ -0,0 +1,22 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Angelo Dureghello <[email protected]> + */ + +/dts-v1/; +/include/ "mcf5307.dtsi" + +/ { + model = "Sysam AMCORE"; + compatible = "sysam,AMCORE"; + + chosen { + stdout-path = "serial0:115200n8"; + }; +}; + +&uart0 { + u-boot,dm-pre-reloc; + status = "okay"; +}; +
arch/m68k/dts/astro_mcf5373l.dts new file +22 -0
@@ -0,0 +1,22 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Angelo Dureghello <[email protected]> + */ + +/dts-v1/; +/include/ "mcf537x.dtsi" + +/ { + model = "Astro mcf5373l"; + compatible = "astro,mcf5373l"; + + chosen { + stdout-path = "serial0:115200n8"; + }; +}; + +&uart0 { + u-boot,dm-pre-reloc; + status = "okay"; +}; +
arch/m68k/dts/cobra5272.dts new file +22 -0
@@ -0,0 +1,22 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Angelo Dureghello <[email protected]> + */ + +/dts-v1/; +/include/ "mcf5272.dtsi" + +/ { + model = "Cobra 5272"; + compatible = "cobra,M5272"; + + chosen { + stdout-path = "serial0:115200n8"; + }; +}; + +&uart0 { + u-boot,dm-pre-reloc; + status = "okay"; +}; +
arch/m68k/dts/eb_cpu5282.dts new file +22 -0
@@ -0,0 +1,22 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Angelo Dureghello <[email protected]> + */ + +/dts-v1/; +/include/ "mcf5282.dtsi" + +/ { + model = "BuS eb_cpuM5282"; + compatible = "bus,eb_cpuM5282"; + + chosen { + stdout-path = "serial0:115200n8"; + }; +}; + +&uart0 { + u-boot,dm-pre-reloc; + status = "okay"; +}; +
arch/m68k/dts/eb_cpu5282_internal.dts new file +22 -0
@@ -0,0 +1,22 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Angelo Dureghello <[email protected]> + */ + +/dts-v1/; +/include/ "mcf5282.dtsi" + +/ { + model = "BuS eb_cpu5282_internals"; + compatible = "bus,eb_cpu5282_internals"; + + chosen { + stdout-path = "serial0:115200n8"; + }; +}; + +&uart0 { + u-boot,dm-pre-reloc; + status = "okay"; +}; +
arch/m68k/dts/stmark2.dts new file +34 -0
@@ -0,0 +1,34 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Angelo Dureghello <[email protected]> + */ + +/dts-v1/; +/include/ "mcf5441x.dtsi" + +/ { + model = "Sysam stmark2"; + compatible = "sysam,stmark2"; + + chosen { + stdout-path = "serial0:115200n8"; + }; +}; + +&uart0 { + u-boot,dm-pre-reloc; + status = "okay"; +}; + +&dspi0 { + spi-mode = <3>; + status = "okay"; + + flash: is25lp128 at 1 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "spi-flash"; + spi-max-frequency = <60000000>; + reg = <1>; + }; +};
Signature · 1 line
2.19.1
PATCH v3 7/11 m68k: add initial dts files for all m68k boards
Quoted 100 lines · Angelo Dureghello
This patch adds basic dts files for all the m68k boards.
Signed-off-by Angelo Dureghello <[email protected]>---
Changes for v2:
- new patch
Changes for v3:
- none--- arch/m68k/dts/M5208EVBE.dts | 22 +++++++ arch/m68k/dts/M52277EVB.dts | 25 ++++++++ arch/m68k/dts/M52277EVB_stmicro.dts | 22 +++++++ arch/m68k/dts/M5235EVB.dts | 22 +++++++ arch/m68k/dts/M5235EVB_Flash32.dts | 22 +++++++ arch/m68k/dts/M5249EVB.dts | 22 +++++++ arch/m68k/dts/M5253DEMO.dts | 22 +++++++ arch/m68k/dts/M5272C3.dts | 22 +++++++ arch/m68k/dts/M5275EVB.dts | 22 +++++++ arch/m68k/dts/M5282EVB.dts | 22 +++++++ arch/m68k/dts/M53017EVB.dts | 22 +++++++ arch/m68k/dts/M5329AFEE.dts | 22 +++++++ arch/m68k/dts/M5329BFEE.dts | 22 +++++++ arch/m68k/dts/M5373EVB.dts | 22 +++++++ arch/m68k/dts/M54418TWR.dts | 25 ++++++++ arch/m68k/dts/M54418TWR_nand_mii.dts | 25 ++++++++ arch/m68k/dts/M54418TWR_nand_rmii.dts | 25 ++++++++ arch/m68k/dts/M54418TWR_nand_rmii_lowfreq.dts | 25 ++++++++ arch/m68k/dts/M54418TWR_serial_mii.dts | 25 ++++++++ arch/m68k/dts/M54418TWR_serial_rmii.dts | 25 ++++++++ arch/m68k/dts/M54451EVB.dts | 25 ++++++++ arch/m68k/dts/M54451EVB_stmicro.dts | 25 ++++++++ arch/m68k/dts/M54455EVB.dts | 25 ++++++++ arch/m68k/dts/M54455EVB_a66.dts | 25 ++++++++ arch/m68k/dts/M54455EVB_i66.dts | 25 ++++++++ arch/m68k/dts/M54455EVB_intel.dts | 26 +++++++++ arch/m68k/dts/M54455EVB_stm33.dts | 25 ++++++++ arch/m68k/dts/M5475AFE.dts | 13 +++++ arch/m68k/dts/M5475BFE.dts | 13 +++++ arch/m68k/dts/M5475CFE.dts | 13 +++++ arch/m68k/dts/M5475DFE.dts | 13 +++++ arch/m68k/dts/M5475EFE.dts | 13 +++++ arch/m68k/dts/M5475FFE.dts | 13 +++++ arch/m68k/dts/M5475GFE.dts | 13 +++++ arch/m68k/dts/M5485AFE.dts | 17 ++++++ arch/m68k/dts/M5485BFE.dts | 17 ++++++ arch/m68k/dts/M5485CFE.dts | 17 ++++++ arch/m68k/dts/M5485DFE.dts | 17 ++++++ arch/m68k/dts/M5485EFE.dts | 17 ++++++ arch/m68k/dts/M5485FFE.dts | 17 ++++++ arch/m68k/dts/M5485GFE.dts | 17 ++++++ arch/m68k/dts/M5485HFE.dts | 17 ++++++ arch/m68k/dts/Makefile | 58 +++++++++++++++++++ arch/m68k/dts/amcore.dts | 22 +++++++ arch/m68k/dts/astro_mcf5373l.dts | 22 +++++++ arch/m68k/dts/cobra5272.dts | 22 +++++++ arch/m68k/dts/eb_cpu5282.dts | 22 +++++++ arch/m68k/dts/eb_cpu5282_internal.dts | 22 +++++++ arch/m68k/dts/stmark2.dts | 34 +++++++++++ 49 files changed, 1066 insertions(+) create mode 100644 arch/m68k/dts/M5208EVBE.dts create mode 100644 arch/m68k/dts/M52277EVB.dts create mode 100644 arch/m68k/dts/M52277EVB_stmicro.dts create mode 100644 arch/m68k/dts/M5235EVB.dts create mode 100644 arch/m68k/dts/M5235EVB_Flash32.dts create mode 100644 arch/m68k/dts/M5249EVB.dts create mode 100644 arch/m68k/dts/M5253DEMO.dts create mode 100644 arch/m68k/dts/M5272C3.dts create mode 100644 arch/m68k/dts/M5275EVB.dts create mode 100644 arch/m68k/dts/M5282EVB.dts create mode 100644 arch/m68k/dts/M53017EVB.dts create mode 100644 arch/m68k/dts/M5329AFEE.dts create mode 100644 arch/m68k/dts/M5329BFEE.dts create mode 100644 arch/m68k/dts/M5373EVB.dts create mode 100644 arch/m68k/dts/M54418TWR.dts create mode 100644 arch/m68k/dts/M54418TWR_nand_mii.dts create mode 100644 arch/m68k/dts/M54418TWR_nand_rmii.dts create mode 100644 arch/m68k/dts/M54418TWR_nand_rmii_lowfreq.dts create mode 100644 arch/m68k/dts/M54418TWR_serial_mii.dts create mode 100644 arch/m68k/dts/M54418TWR_serial_rmii.dts create mode 100644 arch/m68k/dts/M54451EVB.dts create mode 100644 arch/m68k/dts/M54451EVB_stmicro.dts create mode 100644 arch/m68k/dts/M54455EVB.dts create mode 100644 arch/m68k/dts/M54455EVB_a66.dts create mode 100644 arch/m68k/dts/M54455EVB_i66.dts create mode 100644 arch/m68k/dts/M54455EVB_intel.dts create mode 100644 arch/m68k/dts/M54455EVB_stm33.dts create mode 100644 arch/m68k/dts/M5475AFE.dts create mode 100644 arch/m68k/dts/M5475BFE.dts create mode 100644 arch/m68k/dts/M5475CFE.dts create mode 100644 arch/m68k/dts/M5475DFE.dts create mode 100644 arch/m68k/dts/M5475EFE.dts create mode 100644 arch/m68k/dts/M5475FFE.dts create mode 100644 arch/m68k/dts/M5475GFE.dts create mode 100644 arch/m68k/dts/M5485AFE.dts create mode 100644 arch/m68k/dts/M5485BFE.dts create mode 100644 arch/m68k/dts/M5485CFE.dts create mode 100644 arch/m68k/dts/M5485DFE.dts create mode 100644 arch/m68k/dts/M5485EFE.dts create mode 100644 arch/m68k/dts/M5485FFE.dts create mode 100644 arch/m68k/dts/M5485GFE.dts
Quoted 8 lines
create mode 100644 arch/m68k/dts/M5485HFE.dts create mode 100644 arch/m68k/dts/Makefile create mode 100644 arch/m68k/dts/amcore.dts create mode 100644 arch/m68k/dts/astro_mcf5373l.dts create mode 100644 arch/m68k/dts/cobra5272.dts create mode 100644 arch/m68k/dts/eb_cpu5282.dts create mode 100644 arch/m68k/dts/eb_cpu5282_internal.dts create mode 100644 arch/m68k/dts/stmark2.dts
PATCH v3 8/11 m68k: enabling long jumps on mcf54x5 SoCs
In reply to Angelo DureghelloGrowing of binary size asks for long assembly jumps.
---
Changes for v2:
- new patch
Changes for v3:
- none
--- arch/m68k/cpu/mcf547x_8x/start.S | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
arch/m68k/cpu/mcf547x_8x/start.S +4 -2
@@ -131,7 +131,8 @@ _start: * then (and always) gd struct space will be reserved */ move.l %sp, -(%sp) - bsr board_init_f_alloc_reserve + move.l #board_init_f_alloc_reserve, %a1 + jsr (%a1) /* update stack and frame-pointers */ move.l %d0, %sp
@@ -139,7 +140,8 @@ _start: /* initialize reserved area */ move.l %d0, -(%sp) - bsr board_init_f_init_reserve + move.l #board_init_f_init_reserve, %a1 + jsr (%a1) /* run low-level CPU init code (from flash) */ jbsr cpu_init_f
Signature · 1 line
2.19.1
PATCH v3 8/11 m68k: enabling long jumps on mcf54x5 SoCs
Quoted 12 lines · Angelo Dureghello
Growing of binary size asks for long assembly jumps.
Signed-off-by Angelo Dureghello <[email protected]>---
Changes for v2:
- new patch
Changes for v3:
- none--- arch/m68k/cpu/mcf547x_8x/start.S | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
PATCH v3 9/11 configs: enable use of DT for all m68k boards
In reply to Angelo DureghelloEnable DT usage for all m68k boards. To provide a working single binary, the dts has been kept as embedded.
---
Changes for v2:
- new patch
Changes for v3:
- none
--- configs/M5208EVBE_defconfig | 2 ++ configs/M52277EVB_defconfig | 2 ++ configs/M52277EVB_stmicro_defconfig | 2 ++ configs/M5235EVB_Flash32_defconfig | 2 ++ configs/M5235EVB_defconfig | 2 ++ configs/M5249EVB_defconfig | 2 ++ configs/M5253DEMO_defconfig | 2 ++ configs/M5272C3_defconfig | 2 ++ configs/M5275EVB_defconfig | 3 +++ configs/M5282EVB_defconfig | 2 ++ configs/M53017EVB_defconfig | 2 ++ configs/M5329AFEE_defconfig | 2 ++ configs/M5329BFEE_defconfig | 2 ++ configs/M5373EVB_defconfig | 2 ++ configs/M54418TWR_defconfig | 2 ++ configs/M54418TWR_nand_mii_defconfig | 2 ++ configs/M54418TWR_nand_rmii_defconfig | 2 ++ configs/M54418TWR_nand_rmii_lowfreq_defconfig | 2 ++ configs/M54418TWR_serial_mii_defconfig | 2 ++ configs/M54418TWR_serial_rmii_defconfig | 2 ++ configs/M54451EVB_defconfig | 2 ++ configs/M54451EVB_stmicro_defconfig | 2 ++ configs/M54455EVB_a66_defconfig | 2 ++ configs/M54455EVB_defconfig | 2 ++ configs/M54455EVB_i66_defconfig | 2 ++ configs/M54455EVB_intel_defconfig | 2 ++ configs/M54455EVB_stm33_defconfig | 2 ++ configs/M5475BFE_defconfig | 2 ++ configs/M5475CFE_defconfig | 2 ++ configs/M5475DFE_defconfig | 2 ++ configs/M5475EFE_defconfig | 2 ++ configs/M5475FFE_defconfig | 2 ++ configs/M5475GFE_defconfig | 2 ++ configs/M5485AFE_defconfig | 2 ++ configs/M5485BFE_defconfig | 2 ++ configs/M5485CFE_defconfig | 2 ++ configs/M5485DFE_defconfig | 2 ++ configs/M5485EFE_defconfig | 2 ++ configs/M5485FFE_defconfig | 2 ++ configs/M5485GFE_defconfig | 2 ++ configs/M5485HFE_defconfig | 2 ++ configs/amcore_defconfig | 2 ++ configs/astro_mcf5373l_defconfig | 2 ++ configs/cobra5272_defconfig | 2 ++ configs/eb_cpu5282_defconfig | 2 ++ configs/eb_cpu5282_internal_defconfig | 2 ++ configs/stmark2_defconfig | 2 ++ 47 files changed, 95 insertions(+)
configs/M5208EVBE_defconfig +2 -0
@@ -1,6 +1,8 @@ CONFIG_M68K=y CONFIG_SYS_TEXT_BASE=0x0 CONFIG_TARGET_M5208EVBE=y +CONFIG_DEFAULT_DEVICE_TREE="M5208EVBE" +CONFIG_OF_EMBED=y CONFIG_BOOTDELAY=1 # CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_CMDLINE_EDITING is not set
configs/M52277EVB_defconfig +2 -0
@@ -1,6 +1,8 @@ CONFIG_M68K=y CONFIG_SYS_TEXT_BASE=0x0 CONFIG_TARGET_M52277EVB=y +CONFIG_DEFAULT_DEVICE_TREE="M52277EVB" +CONFIG_OF_EMBED=y CONFIG_SYS_EXTRA_OPTIONS="SYS_SPANSION_BOOT" CONFIG_BOOTDELAY=3 # CONFIG_DISPLAY_BOARDINFO is not set
configs/M52277EVB_stmicro_defconfig +2 -0
@@ -1,6 +1,8 @@ CONFIG_M68K=y CONFIG_SYS_TEXT_BASE=0x43E00000 CONFIG_TARGET_M52277EVB=y +CONFIG_DEFAULT_DEVICE_TREE="M52277EVB_stmicro" +CONFIG_OF_EMBED=y CONFIG_SYS_EXTRA_OPTIONS="CF_SBF,SYS_STMICRO_BOOT" CONFIG_BOOTDELAY=3 # CONFIG_DISPLAY_BOARDINFO is not set
configs/M5235EVB_Flash32_defconfig +2 -0
@@ -1,6 +1,8 @@ CONFIG_M68K=y CONFIG_SYS_TEXT_BASE=0xFFC00000 CONFIG_TARGET_M5235EVB=y +CONFIG_DEFAULT_DEVICE_TREE="M5235EVB_Flash32" +CONFIG_OF_EMBED=y CONFIG_SYS_EXTRA_OPTIONS="NORFLASH_PS32BIT" CONFIG_BOOTDELAY=1 # CONFIG_DISPLAY_BOARDINFO is not set
configs/M5235EVB_defconfig +2 -0
@@ -1,6 +1,8 @@ CONFIG_M68K=y CONFIG_SYS_TEXT_BASE=0xFFE00000 CONFIG_TARGET_M5235EVB=y +CONFIG_DEFAULT_DEVICE_TREE="M5235EVB" +CONFIG_OF_EMBED=y CONFIG_BOOTDELAY=1 # CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_CMDLINE_EDITING is not set
configs/M5249EVB_defconfig +2 -0
@@ -1,6 +1,8 @@ CONFIG_M68K=y CONFIG_SYS_TEXT_BASE=0xFFE00000 CONFIG_TARGET_M5249EVB=y +CONFIG_DEFAULT_DEVICE_TREE="M5249EVB" +CONFIG_OF_EMBED=y CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_CMDLINE_EDITING is not set
configs/M5253DEMO_defconfig +2 -0
@@ -1,6 +1,8 @@ CONFIG_M68K=y CONFIG_SYS_TEXT_BASE=0xFF800000 CONFIG_TARGET_M5253DEMO=y +CONFIG_DEFAULT_DEVICE_TREE="M5253DEMO" +CONFIG_OF_EMBED=y CONFIG_BOOTDELAY=5 # CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_CMDLINE_EDITING is not set
configs/M5272C3_defconfig +2 -0
@@ -1,6 +1,8 @@ CONFIG_M68K=y CONFIG_SYS_TEXT_BASE=0xFFE00000 CONFIG_TARGET_M5272C3=y +CONFIG_DEFAULT_DEVICE_TREE="M5272C3" +CONFIG_OF_EMBED=y CONFIG_BOOTDELAY=5 # CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_CMDLINE_EDITING is not set
configs/M5275EVB_defconfig +3 -0
@@ -1,6 +1,8 @@ CONFIG_M68K=y CONFIG_SYS_TEXT_BASE=0xFFE00000 CONFIG_TARGET_M5275EVB=y +CONFIG_DEFAULT_DEVICE_TREE="M5275EVB" +CONFIG_OF_EMBED=y CONFIG_BOOTDELAY=5 # CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_CMDLINE_EDITING is not set
@@ -17,3 +19,4 @@ CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y CONFIG_MTD_NOR_FLASH=y CONFIG_MII=y +CONFIG_DM_SERIAL=y
configs/M5282EVB_defconfig +2 -0
@@ -1,6 +1,8 @@ CONFIG_M68K=y CONFIG_SYS_TEXT_BASE=0xFFE00000 CONFIG_TARGET_M5282EVB=y +CONFIG_DEFAULT_DEVICE_TREE="M5282EVB" +CONFIG_OF_EMBED=y CONFIG_BOOTDELAY=5 # CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_CMDLINE_EDITING is not set
configs/M53017EVB_defconfig +2 -0
@@ -1,6 +1,8 @@ CONFIG_M68K=y CONFIG_SYS_TEXT_BASE=0x0 CONFIG_TARGET_M53017EVB=y +CONFIG_DEFAULT_DEVICE_TREE="M53017EVB" +CONFIG_OF_EMBED=y CONFIG_BOOTDELAY=1 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="root=/dev/mtdblock3 rw rootfstype=jffs2"
configs/M5329AFEE_defconfig +2 -0
@@ -1,6 +1,8 @@ CONFIG_M68K=y CONFIG_SYS_TEXT_BASE=0x0 CONFIG_TARGET_M5329EVB=y +CONFIG_DEFAULT_DEVICE_TREE="M5329AFEE" +CONFIG_OF_EMBED=y CONFIG_SYS_EXTRA_OPTIONS="NANDFLASH_SIZE=0" CONFIG_BOOTDELAY=1 # CONFIG_DISPLAY_BOARDINFO is not set
configs/M5329BFEE_defconfig +2 -0
@@ -1,6 +1,8 @@ CONFIG_M68K=y CONFIG_SYS_TEXT_BASE=0x0 CONFIG_TARGET_M5329EVB=y +CONFIG_DEFAULT_DEVICE_TREE="M5329BFEE" +CONFIG_OF_EMBED=y CONFIG_SYS_EXTRA_OPTIONS="NANDFLASH_SIZE=16" CONFIG_BOOTDELAY=1 # CONFIG_DISPLAY_BOARDINFO is not set
configs/M5373EVB_defconfig +2 -0
@@ -1,6 +1,8 @@ CONFIG_M68K=y CONFIG_SYS_TEXT_BASE=0x0 CONFIG_TARGET_M5373EVB=y +CONFIG_DEFAULT_DEVICE_TREE="M5373EVB" +CONFIG_OF_EMBED=y CONFIG_SYS_EXTRA_OPTIONS="NANDFLASH_SIZE=16" CONFIG_BOOTDELAY=1 # CONFIG_DISPLAY_BOARDINFO is not set
configs/M54418TWR_defconfig +2 -0
@@ -1,6 +1,8 @@ CONFIG_M68K=y CONFIG_SYS_TEXT_BASE=0x47E00000 CONFIG_TARGET_M54418TWR=y +CONFIG_DEFAULT_DEVICE_TREE="M54418TWR" +CONFIG_OF_EMBED=y CONFIG_SYS_EXTRA_OPTIONS="CF_SBF,SYS_SERIAL_BOOT,SYS_INPUT_CLKSRC=50000000" CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="root=/dev/nfs rw nfsroot=192.168.1.1:/tftpboot/192.168.1.2 ip=192.168.1.2:192.168.1.1:192.168.1.1: 255.255.255.0::eth0:off:rw console=ttyS0,115200"
configs/M54418TWR_nand_mii_defconfig +2 -0
@@ -1,6 +1,8 @@ CONFIG_M68K=y CONFIG_SYS_TEXT_BASE=0x47E00000 CONFIG_TARGET_M54418TWR=y +CONFIG_DEFAULT_DEVICE_TREE="M54418TWR_nand_mii" +CONFIG_OF_EMBED=y CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BOOT,SYS_INPUT_CLKSRC=25000000" CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="root=/dev/mtdblock2 rw rootfstype=jffs2 mtdparts=NAND:1M(u-boot)ro,7M(kernel)ro,-(jffs2) console=ttyS0,115200"
configs/M54418TWR_nand_rmii_defconfig +2 -0
@@ -1,6 +1,8 @@ CONFIG_M68K=y CONFIG_SYS_TEXT_BASE=0x47E00000 CONFIG_TARGET_M54418TWR=y +CONFIG_DEFAULT_DEVICE_TREE="M54418TWR_nand_rmii" +CONFIG_OF_EMBED=y CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BOOT,SYS_INPUT_CLKSRC=50000000" CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="root=/dev/mtdblock2 rw rootfstype=jffs2 mtdparts=NAND:1M(u-boot)ro,7M(kernel)ro,-(jffs2) console=ttyS0,115200"
configs/M54418TWR_nand_rmii_lowfreq_defconfig +2 -0
@@ -1,6 +1,8 @@ CONFIG_M68K=y CONFIG_SYS_TEXT_BASE=0x47E00000 CONFIG_TARGET_M54418TWR=y +CONFIG_DEFAULT_DEVICE_TREE="M54418TWR_nand_rmii_lowfreq" +CONFIG_OF_EMBED=y CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BOOT,LOW_MCFCLK,SYS_INPUT_CLKSRC=50000000" CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="root=/dev/mtdblock2 rw rootfstype=jffs2 mtdparts=NAND:1M(u-boot)ro,7M(kernel)ro,-(jffs2) console=ttyS0,115200"
configs/M54418TWR_serial_mii_defconfig +2 -0
@@ -1,6 +1,8 @@ CONFIG_M68K=y CONFIG_SYS_TEXT_BASE=0x47E00000 CONFIG_TARGET_M54418TWR=y +CONFIG_DEFAULT_DEVICE_TREE="M54418TWR_serial_mii" +CONFIG_OF_EMBED=y CONFIG_SYS_EXTRA_OPTIONS="CF_SBF,SYS_SERIAL_BOOT,SYS_INPUT_CLKSRC=25000000" CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="root=/dev/nfs rw nfsroot=192.168.1.1:/tftpboot/192.168.1.2 ip=192.168.1.2:192.168.1.1:192.168.1.1: 255.255.255.0::eth0:off:rw console=ttyS0,115200"
configs/M54418TWR_serial_rmii_defconfig +2 -0
@@ -1,6 +1,8 @@ CONFIG_M68K=y CONFIG_SYS_TEXT_BASE=0x47E00000 CONFIG_TARGET_M54418TWR=y +CONFIG_DEFAULT_DEVICE_TREE="M54418TWR_serial_rmii" +CONFIG_OF_EMBED=y CONFIG_SYS_EXTRA_OPTIONS="CF_SBF,SYS_SERIAL_BOOT,SYS_INPUT_CLKSRC=50000000" CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="root=/dev/nfs rw nfsroot=192.168.1.1:/tftpboot/192.168.1.2 ip=192.168.1.2:192.168.1.1:192.168.1.1: 255.255.255.0::eth0:off:rw console=ttyS0,115200"
configs/M54451EVB_defconfig +2 -0
@@ -1,6 +1,8 @@ CONFIG_M68K=y CONFIG_SYS_TEXT_BASE=0x0 CONFIG_TARGET_M54451EVB=y +CONFIG_DEFAULT_DEVICE_TREE="M54451EVB" +CONFIG_OF_EMBED=y CONFIG_SYS_EXTRA_OPTIONS="SYS_INPUT_CLKSRC=24000000" CONFIG_BOOTDELAY=1 CONFIG_USE_BOOTARGS=y
configs/M54451EVB_stmicro_defconfig +2 -0
@@ -1,6 +1,8 @@ CONFIG_M68K=y CONFIG_SYS_TEXT_BASE=0x47E00000 CONFIG_TARGET_M54451EVB=y +CONFIG_DEFAULT_DEVICE_TREE="M54451EVB_stmicro" +CONFIG_OF_EMBED=y CONFIG_SYS_EXTRA_OPTIONS="CF_SBF,SYS_STMICRO_BOOT,SYS_INPUT_CLKSRC=24000000" CONFIG_BOOTDELAY=1 CONFIG_USE_BOOTARGS=y
configs/M54455EVB_a66_defconfig +2 -0
@@ -1,6 +1,8 @@ CONFIG_M68K=y CONFIG_SYS_TEXT_BASE=0x4000000 CONFIG_TARGET_M54455EVB=y +CONFIG_DEFAULT_DEVICE_TREE="M54455EVB_a66" +CONFIG_OF_EMBED=y CONFIG_SYS_EXTRA_OPTIONS="SYS_ATMEL_BOOT,SYS_INPUT_CLKSRC=66666666" CONFIG_BOOTDELAY=1 CONFIG_USE_BOOTARGS=y
configs/M54455EVB_defconfig +2 -0
@@ -1,6 +1,8 @@ CONFIG_M68K=y CONFIG_SYS_TEXT_BASE=0x4000000 CONFIG_TARGET_M54455EVB=y +CONFIG_DEFAULT_DEVICE_TREE="M54455EVB" +CONFIG_OF_EMBED=y CONFIG_SYS_EXTRA_OPTIONS="SYS_ATMEL_BOOT,SYS_INPUT_CLKSRC=33333333" CONFIG_BOOTDELAY=1 CONFIG_USE_BOOTARGS=y
configs/M54455EVB_i66_defconfig +2 -0
@@ -1,6 +1,8 @@ CONFIG_M68K=y CONFIG_SYS_TEXT_BASE=0x0 CONFIG_TARGET_M54455EVB=y +CONFIG_DEFAULT_DEVICE_TREE="M54455EVB_i66" +CONFIG_OF_EMBED=y CONFIG_SYS_EXTRA_OPTIONS="SYS_INTEL_BOOT,SYS_INPUT_CLKSRC=66666666" CONFIG_BOOTDELAY=1 CONFIG_USE_BOOTARGS=y
configs/M54455EVB_intel_defconfig +2 -0
@@ -1,6 +1,8 @@ CONFIG_M68K=y CONFIG_SYS_TEXT_BASE=0x0 CONFIG_TARGET_M54455EVB=y +CONFIG_DEFAULT_DEVICE_TREE="M54455EVB_intel" +CONFIG_OF_EMBED=y CONFIG_SYS_EXTRA_OPTIONS="SYS_INTEL_BOOT,SYS_INPUT_CLKSRC=33333333" CONFIG_BOOTDELAY=1 CONFIG_USE_BOOTARGS=y
configs/M54455EVB_stm33_defconfig +2 -0
@@ -1,6 +1,8 @@ CONFIG_M68K=y CONFIG_SYS_TEXT_BASE=0x4FE00000 CONFIG_TARGET_M54455EVB=y +CONFIG_DEFAULT_DEVICE_TREE="M54455EVB_stm33" +CONFIG_OF_EMBED=y CONFIG_SYS_EXTRA_OPTIONS="SYS_STMICRO_BOOT,CF_SBF,SYS_INPUT_CLKSRC=33333333" CONFIG_BOOTDELAY=1 CONFIG_USE_BOOTARGS=y
configs/M5475BFE_defconfig +2 -0
@@ -1,6 +1,8 @@ CONFIG_M68K=y CONFIG_SYS_TEXT_BASE=0xFF800000 CONFIG_TARGET_M5475EVB=y +CONFIG_DEFAULT_DEVICE_TREE="M5475BFE" +CONFIG_OF_EMBED=y CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16" CONFIG_BOOTDELAY=1 # CONFIG_CMDLINE_EDITING is not set
configs/M5475CFE_defconfig +2 -0
@@ -1,6 +1,8 @@ CONFIG_M68K=y CONFIG_SYS_TEXT_BASE=0xFF800000 CONFIG_TARGET_M5475EVB=y +CONFIG_DEFAULT_DEVICE_TREE="M5475CFE" +CONFIG_OF_EMBED=y CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16,SYS_VIDEO,SYS_USBCTRL" CONFIG_BOOTDELAY=1 # CONFIG_CMDLINE_EDITING is not set
configs/M5475DFE_defconfig +2 -0
@@ -1,6 +1,8 @@ CONFIG_M68K=y CONFIG_SYS_TEXT_BASE=0xFF800000 CONFIG_TARGET_M5475EVB=y +CONFIG_DEFAULT_DEVICE_TREE="M5475DFE" +CONFIG_OF_EMBED=y CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_USBCTRL" CONFIG_BOOTDELAY=1 # CONFIG_CMDLINE_EDITING is not set
configs/M5475EFE_defconfig +2 -0
@@ -1,6 +1,8 @@ CONFIG_M68K=y CONFIG_SYS_TEXT_BASE=0xFF800000 CONFIG_TARGET_M5475EVB=y +CONFIG_DEFAULT_DEVICE_TREE="M5475EFE" +CONFIG_OF_EMBED=y CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_VIDEO,SYS_USBCTRL" CONFIG_BOOTDELAY=1 # CONFIG_CMDLINE_EDITING is not set
configs/M5475FFE_defconfig +2 -0
@@ -1,6 +1,8 @@ CONFIG_M68K=y CONFIG_SYS_TEXT_BASE=0xFF800000 CONFIG_TARGET_M5475EVB=y +CONFIG_DEFAULT_DEVICE_TREE="M5475FFE" +CONFIG_OF_EMBED=y CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=32,SYS_VIDEO,SYS_USBCTRL,SYS_DRAMSZ1=64" CONFIG_BOOTDELAY=1 # CONFIG_CMDLINE_EDITING is not set
configs/M5475GFE_defconfig +2 -0
@@ -1,6 +1,8 @@ CONFIG_M68K=y CONFIG_SYS_TEXT_BASE=0xFF800000 CONFIG_TARGET_M5475EVB=y +CONFIG_DEFAULT_DEVICE_TREE="M5475GFE" +CONFIG_OF_EMBED=y CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=133333333,SYS_BOOTSZ=4,SYS_DRAMSZ=64" CONFIG_BOOTDELAY=1 # CONFIG_CMDLINE_EDITING is not set
configs/M5485AFE_defconfig +2 -0
@@ -1,6 +1,8 @@ CONFIG_M68K=y CONFIG_SYS_TEXT_BASE=0xFF800000 CONFIG_TARGET_M5485EVB=y +CONFIG_DEFAULT_DEVICE_TREE="M5485AFE" +CONFIG_OF_EMBED=y CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64" CONFIG_BOOTDELAY=1 # CONFIG_CMDLINE_EDITING is not set
configs/M5485BFE_defconfig +2 -0
@@ -1,6 +1,8 @@ CONFIG_M68K=y CONFIG_SYS_TEXT_BASE=0xFF800000 CONFIG_TARGET_M5485EVB=y +CONFIG_DEFAULT_DEVICE_TREE="M5485BFE" +CONFIG_OF_EMBED=y CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16" CONFIG_BOOTDELAY=1 # CONFIG_CMDLINE_EDITING is not set
configs/M5485CFE_defconfig +2 -0
@@ -1,6 +1,8 @@ CONFIG_M68K=y CONFIG_SYS_TEXT_BASE=0xFF800000 CONFIG_TARGET_M5485EVB=y +CONFIG_DEFAULT_DEVICE_TREE="M5485CFE" +CONFIG_OF_EMBED=y CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16,SYS_VIDEO,SYS_USBCTRL" CONFIG_BOOTDELAY=1 # CONFIG_CMDLINE_EDITING is not set
configs/M5485DFE_defconfig +2 -0
@@ -1,6 +1,8 @@ CONFIG_M68K=y CONFIG_SYS_TEXT_BASE=0xFF800000 CONFIG_TARGET_M5485EVB=y +CONFIG_DEFAULT_DEVICE_TREE="M5485DFE" +CONFIG_OF_EMBED=y CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_USBCTRL" CONFIG_BOOTDELAY=1 # CONFIG_CMDLINE_EDITING is not set
configs/M5485EFE_defconfig +2 -0
@@ -1,6 +1,8 @@ CONFIG_M68K=y CONFIG_SYS_TEXT_BASE=0xFF800000 CONFIG_TARGET_M5485EVB=y +CONFIG_DEFAULT_DEVICE_TREE="M5485EFE" +CONFIG_OF_EMBED=y CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_VIDEO,SYS_USBCTRL" CONFIG_BOOTDELAY=1 # CONFIG_CMDLINE_EDITING is not set
configs/M5485FFE_defconfig +2 -0
@@ -1,6 +1,8 @@ CONFIG_M68K=y CONFIG_SYS_TEXT_BASE=0xFF800000 CONFIG_TARGET_M5485EVB=y +CONFIG_DEFAULT_DEVICE_TREE="M5485FFE" +CONFIG_OF_EMBED=y CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=32,SYS_VIDEO,SYS_USBCTRL,SYS_DRAMSZ1=64" CONFIG_BOOTDELAY=1 # CONFIG_CMDLINE_EDITING is not set
configs/M5485GFE_defconfig +2 -0
@@ -1,6 +1,8 @@ CONFIG_M68K=y CONFIG_SYS_TEXT_BASE=0xFF800000 CONFIG_TARGET_M5485EVB=y +CONFIG_DEFAULT_DEVICE_TREE="M5485GFE" +CONFIG_OF_EMBED=y CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=4,SYS_DRAMSZ=64" CONFIG_BOOTDELAY=1 # CONFIG_CMDLINE_EDITING is not set
configs/M5485HFE_defconfig +2 -0
@@ -1,6 +1,8 @@ CONFIG_M68K=y CONFIG_SYS_TEXT_BASE=0xFF800000 CONFIG_TARGET_M5485EVB=y +CONFIG_DEFAULT_DEVICE_TREE="M5485HFE" +CONFIG_OF_EMBED=y CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16,SYS_VIDEO" CONFIG_BOOTDELAY=1 # CONFIG_CMDLINE_EDITING is not set
configs/amcore_defconfig +2 -0
@@ -2,6 +2,8 @@ CONFIG_M68K=y CONFIG_SYS_TEXT_BASE=0xFFC00000 CONFIG_SYS_MALLOC_F_LEN=0x800 CONFIG_TARGET_AMCORE=y +CONFIG_DEFAULT_DEVICE_TREE="amcore" +CONFIG_OF_EMBED=y CONFIG_BOOTDELAY=1 CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_BOARDINFO is not set
configs/astro_mcf5373l_defconfig +2 -0
@@ -1,6 +1,8 @@ CONFIG_M68K=y CONFIG_SYS_TEXT_BASE=0x00000000 CONFIG_TARGET_ASTRO_MCF5373L=y +CONFIG_DEFAULT_DEVICE_TREE="astro_mcf5373l" +CONFIG_OF_EMBED=y CONFIG_BOOTDELAY=1 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS=" console=ttyS2,115200 rootfstype=romfs loaderversion=$loaderversion"
configs/cobra5272_defconfig +2 -0
@@ -1,6 +1,8 @@ CONFIG_M68K=y CONFIG_SYS_TEXT_BASE=0xFFE00000 CONFIG_TARGET_COBRA5272=y +CONFIG_DEFAULT_DEVICE_TREE="cobra5272" +CONFIG_OF_EMBED=y CONFIG_BOOTDELAY=5 # CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_CMDLINE_EDITING is not set
configs/eb_cpu5282_defconfig +2 -0
@@ -1,6 +1,8 @@ CONFIG_M68K=y CONFIG_SYS_TEXT_BASE=0xFF000000 CONFIG_TARGET_EB_CPU5282=y +CONFIG_DEFAULT_DEVICE_TREE="eb_cpu5282" +CONFIG_OF_EMBED=y CONFIG_SYS_EXTRA_OPTIONS="SYS_MONITOR_BASE=0xFF000400" CONFIG_BOOTDELAY=5 # CONFIG_CONSOLE_MUX is not set
configs/eb_cpu5282_internal_defconfig +2 -0
@@ -1,6 +1,8 @@ CONFIG_M68K=y CONFIG_SYS_TEXT_BASE=0xF0000000 CONFIG_TARGET_EB_CPU5282=y +CONFIG_DEFAULT_DEVICE_TREE="eb_cpu5282_internal" +CONFIG_OF_EMBED=y CONFIG_SYS_EXTRA_OPTIONS="SYS_MONITOR_BASE=0xF0000418" CONFIG_BOOTDELAY=5 # CONFIG_CONSOLE_MUX is not set
configs/stmark2_defconfig +2 -0
@@ -1,6 +1,8 @@ CONFIG_M68K=y CONFIG_SYS_TEXT_BASE=0x47E00000 CONFIG_TARGET_STMARK2=y +CONFIG_DEFAULT_DEVICE_TREE="stmark2" +CONFIG_OF_EMBED=y CONFIG_SYS_EXTRA_OPTIONS="CF_SBF,SYS_SERIAL_BOOT,SYS_INPUT_CLKSRC=30000000" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y
Signature · 1 line
2.19.1
PATCH v3 9/11 configs: enable use of DT for all m68k boards
Quoted 50 lines · Angelo Dureghello
Enable DT usage for all m68k boards. To provide a working single binary, the dts has been kept as embedded.
Signed-off-by Angelo Dureghello <[email protected]>---
Changes for v2:
- new patch
Changes for v3:
- none--- configs/M5208EVBE_defconfig | 2 ++ configs/M52277EVB_defconfig | 2 ++ configs/M52277EVB_stmicro_defconfig | 2 ++ configs/M5235EVB_Flash32_defconfig | 2 ++ configs/M5235EVB_defconfig | 2 ++ configs/M5249EVB_defconfig | 2 ++ configs/M5253DEMO_defconfig | 2 ++ configs/M5272C3_defconfig | 2 ++ configs/M5275EVB_defconfig | 3 +++ configs/M5282EVB_defconfig | 2 ++ configs/M53017EVB_defconfig | 2 ++ configs/M5329AFEE_defconfig | 2 ++ configs/M5329BFEE_defconfig | 2 ++ configs/M5373EVB_defconfig | 2 ++ configs/M54418TWR_defconfig | 2 ++ configs/M54418TWR_nand_mii_defconfig | 2 ++ configs/M54418TWR_nand_rmii_defconfig | 2 ++ configs/M54418TWR_nand_rmii_lowfreq_defconfig | 2 ++ configs/M54418TWR_serial_mii_defconfig | 2 ++ configs/M54418TWR_serial_rmii_defconfig | 2 ++ configs/M54451EVB_defconfig | 2 ++ configs/M54451EVB_stmicro_defconfig | 2 ++ configs/M54455EVB_a66_defconfig | 2 ++ configs/M54455EVB_defconfig | 2 ++ configs/M54455EVB_i66_defconfig | 2 ++ configs/M54455EVB_intel_defconfig | 2 ++ configs/M54455EVB_stm33_defconfig | 2 ++ configs/M5475BFE_defconfig | 2 ++ configs/M5475CFE_defconfig | 2 ++ configs/M5475DFE_defconfig | 2 ++ configs/M5475EFE_defconfig | 2 ++ configs/M5475FFE_defconfig | 2 ++ configs/M5475GFE_defconfig | 2 ++ configs/M5485AFE_defconfig | 2 ++ configs/M5485BFE_defconfig | 2 ++ configs/M5485CFE_defconfig | 2 ++ configs/M5485DFE_defconfig | 2 ++ configs/M5485EFE_defconfig | 2 ++ configs/M5485FFE_defconfig | 2 ++ configs/M5485GFE_defconfig | 2 ++
Quoted 8 lines
configs/M5485HFE_defconfig | 2 ++ configs/amcore_defconfig | 2 ++ configs/astro_mcf5373l_defconfig | 2 ++ configs/cobra5272_defconfig | 2 ++ configs/eb_cpu5282_defconfig | 2 ++ configs/eb_cpu5282_internal_defconfig | 2 ++ configs/stmark2_defconfig | 2 ++ 47 files changed, 95 insertions(+)
Can you do this in arch/Kconfig?
Also please don't use CONFIG_OF_EMBED - that is just for debugging.
Regards,
Simon
PATCH v3 10/11 configs: add DM_SPI config option
In reply to Angelo DureghelloThis patch adds CONFIG_DM_SPI for all m68k boards using the cf_spi.c driver (DSPI module).
---
Changes for v2:
- new patch
Changes for v3:
- none
--- configs/M52277EVB_defconfig | 1 + configs/M52277EVB_stmicro_defconfig | 1 + configs/M54418TWR_defconfig | 1 + configs/M54418TWR_nand_mii_defconfig | 1 + configs/M54418TWR_nand_rmii_defconfig | 1 + configs/M54418TWR_nand_rmii_lowfreq_defconfig | 1 + configs/M54418TWR_serial_mii_defconfig | 1 + configs/M54418TWR_serial_rmii_defconfig | 1 + configs/M54451EVB_defconfig | 1 + configs/M54451EVB_stmicro_defconfig | 1 + configs/M54455EVB_a66_defconfig | 1 + configs/M54455EVB_defconfig | 1 + configs/M54455EVB_i66_defconfig | 1 + configs/M54455EVB_intel_defconfig | 1 + configs/M54455EVB_stm33_defconfig | 1 + configs/M5475AFE_defconfig | 2 ++ configs/stmark2_defconfig | 2 ++ 17 files changed, 19 insertions(+)
configs/M52277EVB_defconfig +1 -0
@@ -23,4 +23,5 @@ CONFIG_MTD_NOR_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_CF_SPI=y
configs/M52277EVB_stmicro_defconfig +1 -0
@@ -22,4 +22,5 @@ CONFIG_MTD_NOR_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_CF_SPI=y
configs/M54418TWR_defconfig +1 -0
@@ -27,3 +27,4 @@ CONFIG_SPI_FLASH_ATMEL=y CONFIG_MII=y CONFIG_SPI=y CONFIG_CF_SPI=y +CONFIG_DM_SPI=y
configs/M54418TWR_nand_mii_defconfig +1 -0
@@ -25,4 +25,5 @@ CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y CONFIG_MII=y CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_CF_SPI=y
configs/M54418TWR_nand_rmii_defconfig +1 -0
@@ -25,4 +25,5 @@ CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y CONFIG_MII=y CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_CF_SPI=y
configs/M54418TWR_nand_rmii_lowfreq_defconfig +1 -0
@@ -25,4 +25,5 @@ CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y CONFIG_MII=y CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_CF_SPI=y
configs/M54418TWR_serial_mii_defconfig +1 -0
@@ -26,4 +26,5 @@ CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y CONFIG_MII=y CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_CF_SPI=y
configs/M54418TWR_serial_rmii_defconfig +1 -0
@@ -26,4 +26,5 @@ CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y CONFIG_MII=y CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_CF_SPI=y
configs/M54451EVB_defconfig +1 -0
@@ -28,4 +28,5 @@ CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_MII=y CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_CF_SPI=y
configs/M54451EVB_stmicro_defconfig +1 -0
@@ -27,4 +27,5 @@ CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_MII=y CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_CF_SPI=y
configs/M54455EVB_a66_defconfig +1 -0
@@ -32,4 +32,5 @@ CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_MII=y CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_CF_SPI=y
configs/M54455EVB_defconfig +1 -0
@@ -33,4 +33,5 @@ CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_MII=y CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_CF_SPI=y
configs/M54455EVB_i66_defconfig +1 -0
@@ -32,4 +32,5 @@ CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_MII=y CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_CF_SPI=y
configs/M54455EVB_intel_defconfig +1 -0
@@ -32,4 +32,5 @@ CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_MII=y CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_CF_SPI=y
configs/M54455EVB_stm33_defconfig +1 -0
@@ -32,4 +32,5 @@ CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_MII=y CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_CF_SPI=y
configs/M5475AFE_defconfig +2 -0
@@ -1,6 +1,8 @@ CONFIG_M68K=y CONFIG_SYS_TEXT_BASE=0xFF800000 CONFIG_TARGET_M5475EVB=y +CONFIG_DEFAULT_DEVICE_TREE="M5475AFE" +CONFIG_OF_EMBED=y CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64" CONFIG_BOOTDELAY=1 # CONFIG_CMDLINE_EDITING is not set
configs/stmark2_defconfig +2 -0
@@ -28,5 +28,7 @@ CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ISSI=y CONFIG_SPI_FLASH_MTD=y CONFIG_SPI=y +CONFIG_DM_SPI=y +CONFIG_DM_SPI_FLASH=y CONFIG_CF_SPI=y CONFIG_REGEX=y
Signature · 1 line
2.19.1
PATCH v3 10/11 configs: add DM_SPI config option
Quoted 20 lines · Angelo Dureghello
This patch adds
CONFIG_DM_SPIfor all m68k boards using thecf_spi.cdriver (DSPI module).Signed-off-by Angelo Dureghello <[email protected]>---
Changes for v2:
- new patch
Changes for v3:
- none--- configs/M52277EVB_defconfig | 1 + configs/M52277EVB_stmicro_defconfig | 1 + configs/M54418TWR_defconfig | 1 + configs/M54418TWR_nand_mii_defconfig | 1 + configs/M54418TWR_nand_rmii_defconfig | 1 + configs/M54418TWR_nand_rmii_lowfreq_defconfig | 1 + configs/M54418TWR_serial_mii_defconfig | 1 + configs/M54418TWR_serial_rmii_defconfig | 1 + configs/M54451EVB_defconfig | 1 + configs/M54451EVB_stmicro_defconfig | 1 +
Quoted 8 lines
configs/M54455EVB_a66_defconfig | 1 + configs/M54455EVB_defconfig | 1 + configs/M54455EVB_i66_defconfig | 1 + configs/M54455EVB_intel_defconfig | 1 + configs/M54455EVB_stm33_defconfig | 1 + configs/M5475AFE_defconfig | 2 ++ configs/stmark2_defconfig | 2 ++ 17 files changed, 19 insertions(+)
PATCH v3 11/11 configs: remove CONFIG_SYS_DSPI_XX references
In reply to Angelo DureghelloThis patch removes CONFIG_SYS_DSPI_XX options from include/configs "m68k" .h board files, since CTAR registers are now set with default values in the cf_spi driver initialization, and configurable by devicetree.
Note, these options cannot be totally removed from the whitelist, since still used from boards using fsl_dspi.c (mostly arm-based boards).
---
Changes for v2:
- new patch
Changes for v3:
- none
--- include/configs/M52277EVB.h | 11 ----------- include/configs/M54418TWR.h | 12 ------------ include/configs/M54451EVB.h | 12 ------------ include/configs/M54455EVB.h | 10 ---------- include/configs/stmark2.h | 11 ----------- 5 files changed, 56 deletions(-)
include/configs/M52277EVB.h +0 -11
@@ -104,17 +104,6 @@#define CONFIG_CF_DSPI #define CONFIG_HARD_SPI #define CONFIG_SYS_SBFHDR_SIZE 0x7 -#ifdef CONFIG_CMD_SPI -# define CONFIG_SYS_DSPI_CS2 - -# define CONFIG_SYS_DSPI_CTAR0 (DSPI_CTAR_TRSZ(7) | \ - DSPI_CTAR_PCSSCK_1CLK | \ - DSPI_CTAR_PASC(0) | \ - DSPI_CTAR_PDT(0) | \ - DSPI_CTAR_CSSCK(0) | \ - DSPI_CTAR_ASC(0) | \ - DSPI_CTAR_DT(1)) -#endif /* Input, PCI, Flexbus, and VCO */ #define CONFIG_EXTRA_CLOCK
include/configs/M54418TWR.h +0 -12
@@ -153,18 +153,6 @@#define CONFIG_SERIAL_FLASH #define CONFIG_HARD_SPI #define CONFIG_SYS_SBFHDR_SIZE 0x7 -#ifdef CONFIG_CMD_SPI - -# define CONFIG_SYS_DSPI_CTAR0 (DSPI_CTAR_TRSZ(7) | \ - DSPI_CTAR_PCSSCK_1CLK | \ - DSPI_CTAR_PASC(0) | \ - DSPI_CTAR_PDT(0) | \ - DSPI_CTAR_CSSCK(0) | \ - DSPI_CTAR_ASC(0) | \ - DSPI_CTAR_DT(1)) -# define CONFIG_SYS_DSPI_CTAR1 (CONFIG_SYS_DSPI_CTAR0) -# define CONFIG_SYS_DSPI_CTAR2 (CONFIG_SYS_DSPI_CTAR0) -#endif /* Input, PCI, Flexbus, and VCO */ #define CONFIG_EXTRA_CLOCK
include/configs/M54451EVB.h +0 -12
@@ -118,18 +118,6 @@#define CONFIG_SERIAL_FLASH #define CONFIG_HARD_SPI #define CONFIG_SYS_SBFHDR_SIZE 0x7 -#ifdef CONFIG_CMD_SPI - -# define CONFIG_SYS_DSPI_CTAR0 (DSPI_CTAR_TRSZ(7) | \ - DSPI_CTAR_PCSSCK_1CLK | \ - DSPI_CTAR_PASC(0) | \ - DSPI_CTAR_PDT(0) | \ - DSPI_CTAR_CSSCK(0) | \ - DSPI_CTAR_ASC(0) | \ - DSPI_CTAR_DT(1)) -# define CONFIG_SYS_DSPI_CTAR1 (CONFIG_SYS_DSPI_CTAR0) -# define CONFIG_SYS_DSPI_CTAR2 (CONFIG_SYS_DSPI_CTAR0) -#endif /* Input, PCI, Flexbus, and VCO */ #define CONFIG_EXTRA_CLOCK
include/configs/M54455EVB.h +0 -10
@@ -144,16 +144,6 @@#define CONFIG_CF_DSPI #define CONFIG_HARD_SPI #define CONFIG_SYS_SBFHDR_SIZE 0x13 -#ifdef CONFIG_CMD_SPI - -# define CONFIG_SYS_DSPI_CTAR0 (DSPI_CTAR_TRSZ(7) | \ - DSPI_CTAR_PCSSCK_1CLK | \ - DSPI_CTAR_PASC(0) | \ - DSPI_CTAR_PDT(0) | \ - DSPI_CTAR_CSSCK(0) | \ - DSPI_CTAR_ASC(0) | \ - DSPI_CTAR_DT(1)) -#endif /* PCI */ #ifdef CONFIG_CMD_PCI
include/configs/stmark2.h +0 -11
@@ -72,17 +72,6 @@#define CONFIG_SYS_SBFHDR_SIZE 0x7 -#define CONFIG_SYS_DSPI_CTAR0 (DSPI_CTAR_TRSZ(7) | \ - DSPI_CTAR_PCSSCK_1CLK | \ - DSPI_CTAR_PASC(0) | \ - DSPI_CTAR_PDT(0) | \ - DSPI_CTAR_CSSCK(0) | \ - DSPI_CTAR_ASC(0) | \ - DSPI_CTAR_DT(1) | \ - DSPI_CTAR_BR(6)) -#define CONFIG_SYS_DSPI_CTAR1 (CONFIG_SYS_DSPI_CTAR0) -#define CONFIG_SYS_DSPI_CTAR2 (CONFIG_SYS_DSPI_CTAR0) -/* Input, PCI, Flexbus, and VCO */ #define CONFIG_EXTRA_CLOCK
Signature · 1 line
2.19.1
PATCH v3 11/11 configs: remove CONFIG_SYS_DSPI_XX references
Quoted 15 lines · Angelo Dureghello
This patch removes
CONFIG_SYS_DSPI_XXoptions frominclude/configs"m68k" .h board files, since CTAR registers are now set with default values in thecf_spidriver initialization, and configurable by devicetree.Note, these options cannot be totally removed from the whitelist, since still used from boards using
fsl_dspi.c(mostly arm-based boards).Signed-off-by Angelo Dureghello <[email protected]>---
Changes for v2:
- new patch
Changes for v3:
- none
Quoted 7 lines
--- include/configs/M52277EVB.h | 11 ----------- include/configs/M54418TWR.h | 12 ------------ include/configs/M54451EVB.h | 12 ------------ include/configs/M54455EVB.h | 10 ---------- include/configs/stmark2.h | 11 ----------- 5 files changed, 56 deletions(-)