Linus Walleij <[email protected]> writes: > On Fri, Sep 23, 2016 at 3:15 PM, Eric Anholt <[email protected]> wrote: >> Linus Walleij <[email protected]> writes: >>>> diff --git a/include/soc/bcm2835/raspberrypi-firmware.h >>>> b/include/soc/bcm2835/raspberrypi-firmware.h >>>> index 3fb357193f09..671ccd00aea2 100644 >>>> --- a/include/soc/bcm2835/raspberrypi-firmware.h >>>> +++ b/include/soc/bcm2835/raspberrypi-firmware.h >>>> @@ -73,11 +73,13 @@ enum rpi_firmware_property_tag { >>>> RPI_FIRMWARE_GET_DISPMANX_RESOURCE_MEM_HANDLE = 0x00030014, >>>> RPI_FIRMWARE_GET_EDID_BLOCK = 0x00030020, >>>> RPI_FIRMWARE_GET_DOMAIN_STATE = 0x00030030, >>>> + RPI_FIRMWARE_GET_GPIO_STATE = 0x00030041, >>>> 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_DOMAIN_STATE = 0x00038030, >>>> + RPI_FIRMWARE_SET_GPIO_STATE = 0x00038041, >>> >>> Can you please merge this orthogonally into the rpi tree to ARM SoC? >> >> This driver would appear in the rpi downstream tree once we settle the >> driver here. Or are you asking me to delay this series until I can get >> them to pull just a patch extending the set of packets? > > Sorry I am not familiar with your development model. I don't know > about any RPI downstream tree... What I mean is that the patch to > include/soc/bcm2835/raspberrypi-firmware.h should be merged by > whoever is maintaining that file, it is not a GPIO file. > > If I get an ACK from the maintainer I can take it into the GPIO > tree.
Oh, people often say "the rpi tree" to mean downstream (currently 4.4). The maintainer of that file upstream is me, and I was hoping you could merge through your tree.
signature.asc
Description: PGP signature
