On Wed, Dec 6, 2017 at 5:44 PM, Yixun Lan <yixun.lan@xxxxxxxxxxx> wrote: > Hi Kevin > > > On 12/07/17 04:18, Kevin Hilman wrote: >> Yixun Lan <yixun.lan@xxxxxxxxxxx> writes: >> >>> From: Xingyu Chen <xingyu.chen@xxxxxxxxxxx> >>> >>> Add new pinctrl DT info for the Amlogic's Meson-AXG SoC. >>> >>> Reviewed-by: Neil Armstrong <narmstrong@xxxxxxxxxxxx> >>> Signed-off-by: Xingyu Chen <xingyu.chen@xxxxxxxxxxx> >>> Signed-off-by: Yixun Lan <yixun.lan@xxxxxxxxxxx> >>> --- >>> arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 44 ++++++++++++++++++++++++++++++ >>> 1 file changed, 44 insertions(+) >>> >>> diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi >>> index 5fc33b76b91c..e0fb860e12c5 100644 >>> --- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi >>> +++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi >>> @@ -9,6 +9,7 @@ >>> #include <dt-bindings/interrupt-controller/arm-gic.h> >>> #include <dt-bindings/clock/axg-clkc.h> >>> #include <dt-bindings/clock/axg-aoclkc.h> >> >> This doesn't apply because this aoclkc.h header does not exist in >> mainline. >> >> Kevin >> > > this is due to I create the patch in serial sequence (first clk, then > pinctrl), I probably will fix my work flow next time - to rebase all the > patch separately on the -rc version > > but here, the pinctrl DT part has no dependency on DT clk patch.. > you could drop the above two #include and just apply the reset > > could you amend & apply this? or do you want me to send another updated > version? I prefer that you rebase (either on -rc or my v4.16/dt64 branch[1]) and resend. Thanks, Kevin [1] https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic.git/log/?h=v4.16/dt64 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
