| Message ID | 1544439166-5749-5-git-send-email-patrick.delaunay@st.com |
|---|---|
| State | Changes Requested |
| Delegated to: | Jagannadha Sutradharudu Teki |
| Headers | show |
| Series | Remove defines for SPI default speed and mode | expand |
On Mon, 10 Dec 2018 11:52:43 +0100 Patrick Delaunay <patrick.delaunay@st.com> wrote: > In case of DT boot, don't read default speed and mode for SPI from > CONFIG_*, instead read from DT node. > > Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com> > --- > > drivers/dfu/dfu_sf.c | 10 ++++++++-- > 1 file changed, 8 insertions(+), 2 deletions(-) > > diff --git a/drivers/dfu/dfu_sf.c b/drivers/dfu/dfu_sf.c > index 066e767..5e32f80 100644 > --- a/drivers/dfu/dfu_sf.c > +++ b/drivers/dfu/dfu_sf.c > @@ -69,11 +69,17 @@ static struct spi_flash *parse_dev(char *devstr) > { > unsigned int bus; > unsigned int cs; > - unsigned int speed = CONFIG_SF_DEFAULT_SPEED; > - unsigned int mode = CONFIG_SF_DEFAULT_MODE; > + /* In DM mode, defaults will be taken from DT */ > + unsigned int speed = 0; > + unsigned int mode = 0; > char *s, *endp; > struct spi_flash *dev; > > +#ifndef CONFIG_DM_SPI_FLASH > + speed = CONFIG_SF_DEFAULT_SPEED; > + mode = CONFIG_SF_DEFAULT_MODE; > +#endif > + > s = strsep(&devstr, ":"); > if (!s || !*s || (bus = simple_strtoul(s, &endp, 0), *endp)) > { printf("Invalid SPI bus %s\n", s); Reviewed-by: Lukasz Majewski <lukma@denx.de> Best regards, Lukasz Majewski -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma@denx.de
Hi Patrick, > In case of DT boot, don't read default speed and mode for SPI from > CONFIG_*, instead read from DT node. > Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com> Reviewed-by: Petr Vorel <petr.vorel@gmail.com> Kind regards, Petr
diff --git a/drivers/dfu/dfu_sf.c b/drivers/dfu/dfu_sf.c index 066e767..5e32f80 100644 --- a/drivers/dfu/dfu_sf.c +++ b/drivers/dfu/dfu_sf.c @@ -69,11 +69,17 @@ static struct spi_flash *parse_dev(char *devstr) { unsigned int bus; unsigned int cs; - unsigned int speed = CONFIG_SF_DEFAULT_SPEED; - unsigned int mode = CONFIG_SF_DEFAULT_MODE; + /* In DM mode, defaults will be taken from DT */ + unsigned int speed = 0; + unsigned int mode = 0; char *s, *endp; struct spi_flash *dev; +#ifndef CONFIG_DM_SPI_FLASH + speed = CONFIG_SF_DEFAULT_SPEED; + mode = CONFIG_SF_DEFAULT_MODE; +#endif + s = strsep(&devstr, ":"); if (!s || !*s || (bus = simple_strtoul(s, &endp, 0), *endp)) { printf("Invalid SPI bus %s\n", s);
In case of DT boot, don't read default speed and mode for SPI from CONFIG_*, instead read from DT node. Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com> --- drivers/dfu/dfu_sf.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)