| Message ID | 20190130141724.22574-1-jsg@jsg.id.au |
|---|---|
| State | Superseded |
| Delegated to: | Alexander Graf |
| Headers | show |
| Series | [U-Boot] rpi: add Compute Module 3+ | expand |
Hi Jonathan, On 30.01.19 15:17, Jonathan Gray wrote: > Add Raspberry Pi Compute Module 3+ to list of models, the revision code > is 0x10 according to the list on raspberrypi.org. > > Signed-off-by: Jonathan Gray <jsg@jsg.id.au> > --- > board/raspberrypi/rpi/rpi.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c > index 153a1fdcb7..c118250740 100644 > --- a/board/raspberrypi/rpi/rpi.c > +++ b/board/raspberrypi/rpi/rpi.c > @@ -143,6 +143,11 @@ static const struct rpi_model rpi_models_new_scheme[] = { > DTB_DIR "bcm2837-rpi-3-a-plus.dtb", > false, > }, > + [0x10] = { > + "Compute Module 3+", > + DTB_DIR "bcm2837-rpi-cm3-plus.dtb", Is the dtb name already committed to? I haven't seen patches on the rpi kernel ML. Alex > + false, > + }, > }; > > static const struct rpi_model rpi_models_old_scheme[] = { >
On Wed, Jan 30, 2019 at 04:13:44PM +0100, Alexander Graf wrote: > Hi Jonathan, > > On 30.01.19 15:17, Jonathan Gray wrote: > > Add Raspberry Pi Compute Module 3+ to list of models, the revision code > > is 0x10 according to the list on raspberrypi.org. > > > > Signed-off-by: Jonathan Gray <jsg@jsg.id.au> > > --- > > board/raspberrypi/rpi/rpi.c | 5 +++++ > > 1 file changed, 5 insertions(+) > > > > diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c > > index 153a1fdcb7..c118250740 100644 > > --- a/board/raspberrypi/rpi/rpi.c > > +++ b/board/raspberrypi/rpi/rpi.c > > @@ -143,6 +143,11 @@ static const struct rpi_model rpi_models_new_scheme[] = { > > DTB_DIR "bcm2837-rpi-3-a-plus.dtb", > > false, > > }, > > + [0x10] = { > > + "Compute Module 3+", > > + DTB_DIR "bcm2837-rpi-cm3-plus.dtb", > > Is the dtb name already committed to? I haven't seen patches on the rpi > kernel ML. I didn't see an existing name in various linux trees. There is currently no new dtb provided with the firmware either, though https://raw.githubusercontent.com/raspberrypi/documentation/master/hardware/computemodule/datasheets/rpi_DATA_CM3plus_1p0.pdf states "CM3+ modules require a software/firmware image dated November 2018 or newer to function correctly." So the firmware likely patches bcm2710-rpi-cm3.dtb before passing it on.
> Am 30.01.2019 um 22:38 schrieb Jonathan Gray <jsg@jsg.id.au>: > >> On Wed, Jan 30, 2019 at 04:13:44PM +0100, Alexander Graf wrote: >> Hi Jonathan, >> >>> On 30.01.19 15:17, Jonathan Gray wrote: >>> Add Raspberry Pi Compute Module 3+ to list of models, the revision code >>> is 0x10 according to the list on raspberrypi.org. >>> >>> Signed-off-by: Jonathan Gray <jsg@jsg.id.au> >>> --- >>> board/raspberrypi/rpi/rpi.c | 5 +++++ >>> 1 file changed, 5 insertions(+) >>> >>> diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c >>> index 153a1fdcb7..c118250740 100644 >>> --- a/board/raspberrypi/rpi/rpi.c >>> +++ b/board/raspberrypi/rpi/rpi.c >>> @@ -143,6 +143,11 @@ static const struct rpi_model rpi_models_new_scheme[] = { >>> DTB_DIR "bcm2837-rpi-3-a-plus.dtb", >>> false, >>> }, >>> + [0x10] = { >>> + "Compute Module 3+", >>> + DTB_DIR "bcm2837-rpi-cm3-plus.dtb", >> >> Is the dtb name already committed to? I haven't seen patches on the rpi >> kernel ML. > > I didn't see an existing name in various linux trees. > > There is currently no new dtb provided with the firmware either, though > https://raw.githubusercontent.com/raspberrypi/documentation/master/hardware/computemodule/datasheets/rpi_DATA_CM3plus_1p0.pdf > states > > "CM3+ modules require a software/firmware image dated November 2018 or > newer to function correctly." > > So the firmware likely patches bcm2710-rpi-cm3.dtb before passing it on. Or maybe it's identical to the CM3? It's supposed to be a drop in replacement after all - and the other differences (wifi chip, usb hub) of the 3+ should not apply to a CM. So I guess either you send a patch to Linux that adds the cm3plus and only changes the compatible/model properties over cm3 or we make the dtb name in this patch the cm3 one. Alex
On Wed, Jan 30, 2019 at 10:56:37PM +0100, Alexander Graf wrote: > > > > Am 30.01.2019 um 22:38 schrieb Jonathan Gray <jsg@jsg.id.au>: > > > >> On Wed, Jan 30, 2019 at 04:13:44PM +0100, Alexander Graf wrote: > >> Hi Jonathan, > >> > >>> On 30.01.19 15:17, Jonathan Gray wrote: > >>> Add Raspberry Pi Compute Module 3+ to list of models, the revision code > >>> is 0x10 according to the list on raspberrypi.org. > >>> > >>> Signed-off-by: Jonathan Gray <jsg@jsg.id.au> > >>> --- > >>> board/raspberrypi/rpi/rpi.c | 5 +++++ > >>> 1 file changed, 5 insertions(+) > >>> > >>> diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c > >>> index 153a1fdcb7..c118250740 100644 > >>> --- a/board/raspberrypi/rpi/rpi.c > >>> +++ b/board/raspberrypi/rpi/rpi.c > >>> @@ -143,6 +143,11 @@ static const struct rpi_model rpi_models_new_scheme[] = { > >>> DTB_DIR "bcm2837-rpi-3-a-plus.dtb", > >>> false, > >>> }, > >>> + [0x10] = { > >>> + "Compute Module 3+", > >>> + DTB_DIR "bcm2837-rpi-cm3-plus.dtb", > >> > >> Is the dtb name already committed to? I haven't seen patches on the rpi > >> kernel ML. > > > > I didn't see an existing name in various linux trees. > > > > There is currently no new dtb provided with the firmware either, though > > https://raw.githubusercontent.com/raspberrypi/documentation/master/hardware/computemodule/datasheets/rpi_DATA_CM3plus_1p0.pdf > > states > > > > "CM3+ modules require a software/firmware image dated November 2018 or > > newer to function correctly." > > > > So the firmware likely patches bcm2710-rpi-cm3.dtb before passing it on. > > Or maybe it's identical to the CM3? It's supposed to be a drop in replacement after all - and the other differences (wifi chip, usb hub) of the 3+ should not apply to a CM. > > So I guess either you send a patch to Linux that adds the cm3plus and only changes the compatible/model properties over cm3 or we make the dtb name in this patch the cm3 one. > > Alex Ok, I'll send a v2 with "bcm2837-rpi-cm3.dtb".
diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c index 153a1fdcb7..c118250740 100644 --- a/board/raspberrypi/rpi/rpi.c +++ b/board/raspberrypi/rpi/rpi.c @@ -143,6 +143,11 @@ static const struct rpi_model rpi_models_new_scheme[] = { DTB_DIR "bcm2837-rpi-3-a-plus.dtb", false, }, + [0x10] = { + "Compute Module 3+", + DTB_DIR "bcm2837-rpi-cm3-plus.dtb", + false, + }, }; static const struct rpi_model rpi_models_old_scheme[] = {
Add Raspberry Pi Compute Module 3+ to list of models, the revision code is 0x10 according to the list on raspberrypi.org. Signed-off-by: Jonathan Gray <jsg@jsg.id.au> --- board/raspberrypi/rpi/rpi.c | 5 +++++ 1 file changed, 5 insertions(+)