diff mbox

[GIT,PULL] ARM: Mediatek soc drivers for v4.13

Message ID CAK8P3a2jG9TZgqwM9_2iE7bUsW9duCuXw+ZpW8NfMANHO4_T7w@mail.gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Arnd Bergmann June 23, 2017, 10:32 a.m. UTC 
On Tue, Jun 20, 2017 at 12:10 PM, Matthias Brugger
<matthias.bgg@gmail.com> wrote:
> Hi Olof and Arnd,
>
> Olof merged my v4.12-next-dts32 and v4.12-next-dts64 branch, but didn't
> merge this one.

AFAICT, he merged it but forgot to send an email about it.

> Actually dts64 depends on a this branch as it provides the dt-binding header
> for the scpsys on mt6797. Not sure if I screwed up here having such
> dependencies between my branches.

You did, but it already went in unnoticed and I now get this build
error in next/dt:

make O=obj-arm64 ARCH=arm64 dtbs
CROSS_COMPILE=/home/arnd/cross-gcc/bin/aarch64-linux- -skj30
In file included from ../arch/arm64/boot/dts/mediatek/mt6797-evb.dts:16:0:
../arch/arm64/boot/dts/mediatek/mt6797.dtsi:15:10: fatal error:
dt-bindings/power/mt6797-power.h: No such file or directory
 #include <dt-bindings/power/mt6797-power.h>

I've fixed it up for now with this patch:

From 10c235cdc9350c6da40760f7468d1189bfd4e7ff Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 23 Jun 2017 12:28:34 +0200
Subject: [PATCH] arm64: dts: mediatek: don't include missing file

This resolves a build error in the next/dt branch:

In file included from arch/arm64/boot/dts/mediatek/mt6797-evb.dts:16:0:
arch/arm64/boot/dts/mediatek/mt6797.dtsi:15:10: fatal error:
dt-bindings/power/mt6797-power.h: No such file or directory

003f5d0c3462 ("arm64: dts: mediatek: add clk and scp nodes for MT6797")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Once you actually start using the symbols from mt6797-power.h,
you'll have to add this back, but after the merge window it will be
there from the drivers branch.

In the future, please make sure each branch can be built by itself
and produce a working kernel image, including "make dtb".

      Arnd
diff mbox

Patch

diff --git a/arch/arm64/boot/dts/mediatek/mt6797.dtsi
b/arch/arm64/boot/dts/mediatek/mt6797.dtsi
index 3512c8e6dc65..31088a9f71de 100644
--- a/arch/arm64/boot/dts/mediatek/mt6797.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt6797.dtsi
@@ -12,7 +12,6 @@ 
  */

 #include <dt-bindings/clock/mt6797-clk.h>
-#include <dt-bindings/power/mt6797-power.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>