On Wed, Nov 6, 2024 at 12:00 PM Lee Jones <lee@xxxxxxxxxx> wrote: > On Wed, 06 Nov 2024, Lorenzo Bianconi wrote: > > > On Nov 06, Lee Jones wrote: > > > On Wed, 23 Oct 2024 01:20:04 +0200, Lorenzo Bianconi wrote: > > > > Add support for Airoha EN7581 GPIO System Controller which provide a > > > > register map for controlling the GPIO, pinctrl and PWM of the SoC via > > > > dedicated pinctrl and pwm child nodes. > > > > > > > > > > > > > > Applied, thanks! > > > > > > [4/6] dt-bindings: mfd: Add support for Airoha EN7581 GPIO System Controller > > > commit: f49f37f3cfe1482d4dc77d26f3e8c38eab630d52 > > > > > > -- > > > Lee Jones [李琼斯] > > > > > > > Hi Lee, > > > > according to my understanding this patch has been already applied by Linus > > here: > > > > https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git/commit/?h=devel&id=50dedb1eb1e6755ccab55f6140916c2d192be765 > > An interesting choice. Linus? Yes I suggested that I merge patches 1-5 on oct 29 and applied the day after: https://lore.kernel.org/linux-gpio/CACRpkdYshPusdA7bDW2y8H_wp-Fm3N-YCsY1_Qn=dZqRiFy12w@xxxxxxxxxxxxxx/ It's because the bindings are dependent on each other, this one patch has: + pinctrl: + type: object + $ref: /schemas/pinctrl/airoha,en7581-pinctrl.yaml + description: + Child node definition for EN7581 Pin controller + + pwm: + type: object + $ref: /schemas/pwm/airoha,en7581-pwm.yaml + description: + Child node definition for EN7581 PWM controller Those refs will explode unless the two others are merged at the same time. Usually we merge the whole shebang through MFD but this one felt different because there is no actual MFD driver, just using simple-mfd. In hindsight I should probs not have been so trigger happy and give some more time for this to settle... Merge window stress I guess. :/ It's fine to apply textually identical patches to two trees though as git will sort that out so technically it's no big deal, you can keep it applied if you want. Yours, Linus Walleij
