| Message ID | 1492449567-31399-2-git-send-email-daniel.lezcano@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Apr 17, 2017 at 07:19:26PM +0200, Daniel Lezcano wrote: Commit msg? > Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> > --- > Documentation/devicetree/bindings/mfd/hisilicon,hi655x.txt | 6 ++++++ > arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 1 + > 2 files changed, 7 insertions(+) Otherwise, Acked-by: Rob Herring <robh@kernel.org>
On 04/17, Daniel Lezcano wrote: > Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> > --- > Documentation/devicetree/bindings/mfd/hisilicon,hi655x.txt | 6 ++++++ > arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 1 + > 2 files changed, 7 insertions(+) > I take it this goes through arm-soc? Not sure why I'm on To: line.
On 22/04/2017 04:02, Stephen Boyd wrote: > On 04/17, Daniel Lezcano wrote: >> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> >> --- >> Documentation/devicetree/bindings/mfd/hisilicon,hi655x.txt | 6 ++++++ >> arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 1 + >> 2 files changed, 7 insertions(+) >> > > I take it this goes through arm-soc? Not sure why I'm on To: > line. Probably it should go through Lee's tree.
On Sat, 22 Apr 2017, Daniel Lezcano wrote: > On 22/04/2017 04:02, Stephen Boyd wrote: > > On 04/17, Daniel Lezcano wrote: > >> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> > >> --- > >> Documentation/devicetree/bindings/mfd/hisilicon,hi655x.txt | 6 ++++++ > >> arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 1 + > >> 2 files changed, 7 insertions(+) > >> > > > > I take it this goes through arm-soc? Not sure why I'm on To: > > line. > > Probably it should go through Lee's tree. Unlikely. The document and the DTS change should really have gone separately, but to save you from having to mess around so close to the merge window: Acked-by: Lee Jones <lee.jones@linaro.org>
On Mon, Apr 24, 2017 at 09:59:44AM +0100, Lee Jones wrote: > On Sat, 22 Apr 2017, Daniel Lezcano wrote: > > > On 22/04/2017 04:02, Stephen Boyd wrote: > > > On 04/17, Daniel Lezcano wrote: > > >> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> > > >> --- > > >> Documentation/devicetree/bindings/mfd/hisilicon,hi655x.txt | 6 ++++++ > > >> arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 1 + > > >> 2 files changed, 7 insertions(+) > > >> > > > > > > I take it this goes through arm-soc? Not sure why I'm on To: > > > line. > > > > Probably it should go through Lee's tree. > > Unlikely. > > The document and the DTS change should really have gone separately, > but to save you from having to mess around so close to the merge window: > > Acked-by: Lee Jones <lee.jones@linaro.org> Thanks Lee. Usually, I take the DT changes (including doc) with the timers changes with the maintainer and Rob's blessing. So the DT and the driver changes are aligned in my tree and make the submission changes easier. I agree mixing the patches for different destinations into a single patchset is fuzzy, I will take care next time to separate the patches. -- Daniel > -- > Lee Jones > Linaro STMicroelectronics Landing Team Lead > Linaro.org │ Open source software for ARM SoCs > Follow Linaro: Facebook | Twitter | Blog
On Mon, 24 Apr 2017, Daniel Lezcano wrote: > On Mon, Apr 24, 2017 at 09:59:44AM +0100, Lee Jones wrote: > > On Sat, 22 Apr 2017, Daniel Lezcano wrote: > > > > > On 22/04/2017 04:02, Stephen Boyd wrote: > > > > On 04/17, Daniel Lezcano wrote: > > > >> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> > > > >> --- > > > >> Documentation/devicetree/bindings/mfd/hisilicon,hi655x.txt | 6 ++++++ > > > >> arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 1 + > > > >> 2 files changed, 7 insertions(+) > > > >> > > > > > > > > I take it this goes through arm-soc? Not sure why I'm on To: > > > > line. > > > > > > Probably it should go through Lee's tree. > > > > Unlikely. > > > > The document and the DTS change should really have gone separately, > > but to save you from having to mess around so close to the merge window: > > > > Acked-by: Lee Jones <lee.jones@linaro.org> > > Thanks Lee. > > Usually, I take the DT changes (including doc) with the timers changes with the > maintainer and Rob's blessing. So the DT and the driver changes are aligned in > my tree and make the submission changes easier. The binding docs go with the bindings, not the DTS changes. > I agree mixing the patches for different destinations into a single patchset is > fuzzy, I will take care next time to separate the patches.
On Mon, Apr 24, 2017 at 09:59:44AM +0100, Lee Jones wrote: > On Sat, 22 Apr 2017, Daniel Lezcano wrote: > > > On 22/04/2017 04:02, Stephen Boyd wrote: > > > On 04/17, Daniel Lezcano wrote: > > >> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> > > >> --- > > >> Documentation/devicetree/bindings/mfd/hisilicon,hi655x.txt | 6 ++++++ > > >> arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 1 + > > >> 2 files changed, 7 insertions(+) > > >> > > > > > > I take it this goes through arm-soc? Not sure why I'm on To: > > > line. > > > > Probably it should go through Lee's tree. > > Unlikely. > > The document and the DTS change should really have gone separately, > but to save you from having to mess around so close to the merge window: > > Acked-by: Lee Jones <lee.jones@linaro.org> So who is supposed to take this patch? Xu? Rob?
On Mon, Apr 24, 2017 at 10:11 PM, Daniel Lezcano <daniel.lezcano@linaro.org> wrote: > On Mon, Apr 24, 2017 at 09:59:44AM +0100, Lee Jones wrote: >> On Sat, 22 Apr 2017, Daniel Lezcano wrote: >> >> > On 22/04/2017 04:02, Stephen Boyd wrote: >> > > On 04/17, Daniel Lezcano wrote: >> > >> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> >> > >> --- >> > >> Documentation/devicetree/bindings/mfd/hisilicon,hi655x.txt | 6 ++++++ >> > >> arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 1 + >> > >> 2 files changed, 7 insertions(+) >> > >> >> > > >> > > I take it this goes through arm-soc? Not sure why I'm on To: >> > > line. >> > >> > Probably it should go through Lee's tree. >> >> Unlikely. >> >> The document and the DTS change should really have gone separately, >> but to save you from having to mess around so close to the merge window: >> >> Acked-by: Lee Jones <lee.jones@linaro.org> > > So who is supposed to take this patch? Xu? Rob? The DTS file changes should normally go through the platform maintainer and from there to arm-soc, to minimize the risk for patch conflicts. For binding changes, conflicts are much rarer, so we any of the tree (arm-soc, driver subsystem, or devicetree) works equally well IMHO. In this particular case,keeping the two together is best, so please send it to Wei Xu with the added chagnelog and Acks. Arnd
diff --git a/Documentation/devicetree/bindings/mfd/hisilicon,hi655x.txt b/Documentation/devicetree/bindings/mfd/hisilicon,hi655x.txt index 0548569..9630ac0 100644 --- a/Documentation/devicetree/bindings/mfd/hisilicon,hi655x.txt +++ b/Documentation/devicetree/bindings/mfd/hisilicon,hi655x.txt @@ -16,6 +16,11 @@ Required properties: - reg: Base address of PMIC on Hi6220 SoC. - interrupt-controller: Hi655x has internal IRQs (has own IRQ domain). - pmic-gpios: The GPIO used by PMIC IRQ. +- #clock-cells: From common clock binding; shall be set to 0 + +Optional properties: +- clock-output-names: From common clock binding to override the + default output clock name Example: pmic: pmic@f8000000 { @@ -24,4 +29,5 @@ Example: interrupt-controller; #interrupt-cells = <2>; pmic-gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>; + #clock-cells = <0>; } diff --git a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts index dba3c13..e0496f7 100644 --- a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts +++ b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts @@ -325,6 +325,7 @@ pmic: pmic@f8000000 { compatible = "hisilicon,hi655x-pmic"; reg = <0x0 0xf8000000 0x0 0x1000>; + #clock-cells = <0>; interrupt-controller; #interrupt-cells = <2>; pmic-gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>;
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> --- Documentation/devicetree/bindings/mfd/hisilicon,hi655x.txt | 6 ++++++ arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 1 + 2 files changed, 7 insertions(+)