diff mbox

[v2,1/4] ARM: bcm2835: sync firmware properties with downstream

Message ID e68675d54955c754ebe8ffc2491585fde5b396bc.1515698418.git.baruch@tkos.co.il (mailing list archive)
State New, archived
Headers show

Commit Message

Baruch Siach Jan. 11, 2018, 7:44 p.m. UTC
Add latest firmware property tags from the latest Raspberry Pi downstream
kernel. This is needed for the GPIO tags, so we can control the GPIO
multiplexor lines.

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
 include/soc/bcm2835/raspberrypi-firmware.h | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

Comments

Stefan Wahren Jan. 13, 2018, 9:57 a.m. UTC | #1
> Baruch Siach <baruch@tkos.co.il> hat am 11. Januar 2018 um 20:44 geschrieben:
> 
> 
> Add latest firmware property tags from the latest Raspberry Pi downstream
> kernel. This is needed for the GPIO tags, so we can control the GPIO
> multiplexor lines.
> 
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>

Acked-by: Stefan Wahren <stefan.wahren@i2se.com>

Maybe this is obvious, but patch #3 depends on this change so no cherry-picking allowed.
Linus Walleij Jan. 16, 2018, 9:57 a.m. UTC | #2
On Sat, Jan 13, 2018 at 10:57 AM, Stefan Wahren <stefan.wahren@i2se.com> wrote:
>> Baruch Siach <baruch@tkos.co.il> hat am 11. Januar 2018 um 20:44 geschrieben:
>>
>>
>> Add latest firmware property tags from the latest Raspberry Pi downstream
>> kernel. This is needed for the GPIO tags, so we can control the GPIO
>> multiplexor lines.
>>
>> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
>
> Acked-by: Stefan Wahren <stefan.wahren@i2se.com>
>
> Maybe this is obvious, but patch #3 depends on this change so no cherry-picking allowed.

I will save this for after the merge window as it feels now.

But as far as I have the right ACKs I can put it in the GPIO tree.

Baruch: can you resend the series with all ACKs and push me
to apply it all in the GPIO tree if you're fine with this approach?

Yours,
Linus Walleij
Baruch Siach Jan. 16, 2018, 10:49 a.m. UTC | #3
Hi Linus,

On Tue, Jan 16, 2018 at 10:57:32AM +0100, Linus Walleij wrote:
> On Sat, Jan 13, 2018 at 10:57 AM, Stefan Wahren <stefan.wahren@i2se.com> wrote:
> >> Baruch Siach <baruch@tkos.co.il> hat am 11. Januar 2018 um 20:44 geschrieben:
> >>
> >> Add latest firmware property tags from the latest Raspberry Pi downstream
> >> kernel. This is needed for the GPIO tags, so we can control the GPIO
> >> multiplexor lines.
> >>
> >> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> >
> > Acked-by: Stefan Wahren <stefan.wahren@i2se.com>
> >
> > Maybe this is obvious, but patch #3 depends on this change so no cherry-picking allowed.
> 
> I will save this for after the merge window as it feels now.
> 
> But as far as I have the right ACKs I can put it in the GPIO tree.
> 
> Baruch: can you resend the series with all ACKs and push me
> to apply it all in the GPIO tree if you're fine with this approach?

I plan to send another revision of this series later today to address Stefan's 
comments on this one. Once Stefan and/or Eric ack the entire series, I'm fine 
with you taking it through the GPIO tree if it is OK with the BCM2835 
maintainers.

baruch
Stefan Wahren Jan. 16, 2018, 12:01 p.m. UTC | #4
Hi Baruch,

Am 16.01.2018 um 11:49 schrieb Baruch Siach:
> Hi Linus,
>
> On Tue, Jan 16, 2018 at 10:57:32AM +0100, Linus Walleij wrote:
>> On Sat, Jan 13, 2018 at 10:57 AM, Stefan Wahren <stefan.wahren@i2se.com> wrote:
>>>> Baruch Siach <baruch@tkos.co.il> hat am 11. Januar 2018 um 20:44 geschrieben:
>>>>
>>>> Add latest firmware property tags from the latest Raspberry Pi downstream
>>>> kernel. This is needed for the GPIO tags, so we can control the GPIO
>>>> multiplexor lines.
>>>>
>>>> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
>>> Acked-by: Stefan Wahren <stefan.wahren@i2se.com>
>>>
>>> Maybe this is obvious, but patch #3 depends on this change so no cherry-picking allowed.
>> I will save this for after the merge window as it feels now.
>>
>> But as far as I have the right ACKs I can put it in the GPIO tree.
>>
>> Baruch: can you resend the series with all ACKs and push me
>> to apply it all in the GPIO tree if you're fine with this approach?
> I plan to send another revision of this series later today to address Stefan's
> comments on this one. Once Stefan and/or Eric ack the entire series, I'm fine
> with you taking it through the GPIO tree if it is OK with the BCM2835
> maintainers.
>
> baruch
>

we also need an ACK from the devicetree maintainers. So please send a 
copy of the binding patch V3 to Rob Herring and Marc Rutland.

Thanks
Eric Anholt Jan. 18, 2018, 8:50 p.m. UTC | #5
Stefan Wahren <stefan.wahren@i2se.com> writes:

> Hi Baruch,
>
> Am 16.01.2018 um 11:49 schrieb Baruch Siach:
>> Hi Linus,
>>
>> On Tue, Jan 16, 2018 at 10:57:32AM +0100, Linus Walleij wrote:
>>> On Sat, Jan 13, 2018 at 10:57 AM, Stefan Wahren <stefan.wahren@i2se.com> wrote:
>>>>> Baruch Siach <baruch@tkos.co.il> hat am 11. Januar 2018 um 20:44 geschrieben:
>>>>>
>>>>> Add latest firmware property tags from the latest Raspberry Pi downstream
>>>>> kernel. This is needed for the GPIO tags, so we can control the GPIO
>>>>> multiplexor lines.
>>>>>
>>>>> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
>>>> Acked-by: Stefan Wahren <stefan.wahren@i2se.com>
>>>>
>>>> Maybe this is obvious, but patch #3 depends on this change so no cherry-picking allowed.
>>> I will save this for after the merge window as it feels now.
>>>
>>> But as far as I have the right ACKs I can put it in the GPIO tree.
>>>
>>> Baruch: can you resend the series with all ACKs and push me
>>> to apply it all in the GPIO tree if you're fine with this approach?
>> I plan to send another revision of this series later today to address Stefan's
>> comments on this one. Once Stefan and/or Eric ack the entire series, I'm fine
>> with you taking it through the GPIO tree if it is OK with the BCM2835
>> maintainers.
>>
>> baruch
>>
>
> we also need an ACK from the devicetree maintainers. So please send a 
> copy of the binding patch V3 to Rob Herring and Marc Rutland.

I'll be happy to see patch 1-3 go through the GPIO tree, and we'd take
#4 in the 2835 tree.  The only risk I see is if we need patch 1 for some
other change in this cycle -- seems unlikely, but if Linus applied the
series starting from a rc1 tag and merged it in, then we'll also be able
to merge that patch over to any other branch we need without duplicating
it in git history.

Once you get this resent with the DT folks Cced, hopefully it'll be
pretty quick.
diff mbox

Patch

diff --git a/include/soc/bcm2835/raspberrypi-firmware.h b/include/soc/bcm2835/raspberrypi-firmware.h
index cb979ad90401..50df5b28d2c9 100644
--- a/include/soc/bcm2835/raspberrypi-firmware.h
+++ b/include/soc/bcm2835/raspberrypi-firmware.h
@@ -63,6 +63,7 @@  enum rpi_firmware_property_tag {
 	RPI_FIRMWARE_GET_MIN_VOLTAGE =                        0x00030008,
 	RPI_FIRMWARE_GET_TURBO =                              0x00030009,
 	RPI_FIRMWARE_GET_MAX_TEMPERATURE =                    0x0003000a,
+	RPI_FIRMWARE_GET_STC =                                0x0003000b,
 	RPI_FIRMWARE_ALLOCATE_MEMORY =                        0x0003000c,
 	RPI_FIRMWARE_LOCK_MEMORY =                            0x0003000d,
 	RPI_FIRMWARE_UNLOCK_MEMORY =                          0x0003000e,
@@ -72,12 +73,22 @@  enum rpi_firmware_property_tag {
 	RPI_FIRMWARE_SET_ENABLE_QPU =                         0x00030012,
 	RPI_FIRMWARE_GET_DISPMANX_RESOURCE_MEM_HANDLE =       0x00030014,
 	RPI_FIRMWARE_GET_EDID_BLOCK =                         0x00030020,
+	RPI_FIRMWARE_GET_CUSTOMER_OTP =                       0x00030021,
 	RPI_FIRMWARE_GET_DOMAIN_STATE =                       0x00030030,
 	RPI_FIRMWARE_SET_CLOCK_STATE =                        0x00038001,
 	RPI_FIRMWARE_SET_CLOCK_RATE =                         0x00038002,
 	RPI_FIRMWARE_SET_VOLTAGE =                            0x00038003,
 	RPI_FIRMWARE_SET_TURBO =                              0x00038009,
+	RPI_FIRMWARE_SET_CUSTOMER_OTP =                       0x00038021,
 	RPI_FIRMWARE_SET_DOMAIN_STATE =                       0x00038030,
+	RPI_FIRMWARE_GET_GPIO_STATE =                         0x00030041,
+	RPI_FIRMWARE_SET_GPIO_STATE =                         0x00038041,
+	RPI_FIRMWARE_SET_SDHOST_CLOCK =                       0x00038042,
+	RPI_FIRMWARE_GET_GPIO_CONFIG =                        0x00030043,
+	RPI_FIRMWARE_SET_GPIO_CONFIG =                        0x00038043,
+	RPI_FIRMWARE_GET_PERIPH_REG =                         0x00030045,
+	RPI_FIRMWARE_SET_PERIPH_REG =                         0x00038045,
+
 
 	/* Dispmanx TAGS */
 	RPI_FIRMWARE_FRAMEBUFFER_ALLOCATE =                   0x00040001,
@@ -91,6 +102,8 @@  enum rpi_firmware_property_tag {
 	RPI_FIRMWARE_FRAMEBUFFER_GET_VIRTUAL_OFFSET =         0x00040009,
 	RPI_FIRMWARE_FRAMEBUFFER_GET_OVERSCAN =               0x0004000a,
 	RPI_FIRMWARE_FRAMEBUFFER_GET_PALETTE =                0x0004000b,
+	RPI_FIRMWARE_FRAMEBUFFER_GET_TOUCHBUF =               0x0004000f,
+	RPI_FIRMWARE_FRAMEBUFFER_GET_GPIOVIRTBUF =            0x00040010,
 	RPI_FIRMWARE_FRAMEBUFFER_RELEASE =                    0x00048001,
 	RPI_FIRMWARE_FRAMEBUFFER_TEST_PHYSICAL_WIDTH_HEIGHT = 0x00044003,
 	RPI_FIRMWARE_FRAMEBUFFER_TEST_VIRTUAL_WIDTH_HEIGHT =  0x00044004,
@@ -100,6 +113,7 @@  enum rpi_firmware_property_tag {
 	RPI_FIRMWARE_FRAMEBUFFER_TEST_VIRTUAL_OFFSET =        0x00044009,
 	RPI_FIRMWARE_FRAMEBUFFER_TEST_OVERSCAN =              0x0004400a,
 	RPI_FIRMWARE_FRAMEBUFFER_TEST_PALETTE =               0x0004400b,
+	RPI_FIRMWARE_FRAMEBUFFER_TEST_VSYNC =                 0x0004400e,
 	RPI_FIRMWARE_FRAMEBUFFER_SET_PHYSICAL_WIDTH_HEIGHT =  0x00048003,
 	RPI_FIRMWARE_FRAMEBUFFER_SET_VIRTUAL_WIDTH_HEIGHT =   0x00048004,
 	RPI_FIRMWARE_FRAMEBUFFER_SET_DEPTH =                  0x00048005,
@@ -108,6 +122,10 @@  enum rpi_firmware_property_tag {
 	RPI_FIRMWARE_FRAMEBUFFER_SET_VIRTUAL_OFFSET =         0x00048009,
 	RPI_FIRMWARE_FRAMEBUFFER_SET_OVERSCAN =               0x0004800a,
 	RPI_FIRMWARE_FRAMEBUFFER_SET_PALETTE =                0x0004800b,
+	RPI_FIRMWARE_FRAMEBUFFER_SET_TOUCHBUF =               0x0004801f,
+	RPI_FIRMWARE_FRAMEBUFFER_SET_GPIOVIRTBUF =            0x00048020,
+	RPI_FIRMWARE_FRAMEBUFFER_SET_VSYNC =                  0x0004800e,
+	RPI_FIRMWARE_FRAMEBUFFER_SET_BACKLIGHT =              0x0004800f,
 
 	RPI_FIRMWARE_VCHIQ_INIT =                             0x00048010,