On Fri, Jan 5, 2018 at 8:18 PM, Olof's autobuilder build@lixom.net wrote:
Here are the build results from automated periodic testing.
The tree being built was arm-soc, found at:
URL: git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git
Branch: drivers
Topmost commits: 57e3615 Merge tag 'at91-ab-4.16-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/drivers 11077e9 Merge tag 'keystone_driver_soc_for_4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/drivers 8102324 Merge tag 'omap-for-v4.16/ti-sysc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/drivers
Build logs (stderr only) can be found at the following link (experimental):
http://arm-soc.lixom.net/buildlogs/arm-soc/v4.15-rc4-61-g57e3615/
Apparently, commit 3ad85b08f778 ("soc: actions: sps: Add S700") caused a build regression:
arm64.allmodconfig:/work/build/batch/drivers/soc/actions/owl-sps.c:20:10: fatal error: dt-bindings/power/owl-s700-powergate.h: No such file or directory
arm.allmodconfig:/work/build/batch/drivers/soc/actions/owl-sps.c:20:10: fatal error: dt-bindings/power/owl-s700-powergate.h: No such file or directory
Andreas, can you send a fixup? An easy solution would be to just use the constants from include/dt-bindings/power/owl-s500-powergate.h and not bother introducing a new header file, like this:
diff --git a/drivers/soc/actions/owl-sps.c b/drivers/soc/actions/owl-sps.c index 8477f0f18e24..ce2c630c5a1f 100644 --- a/drivers/soc/actions/owl-sps.c +++ b/drivers/soc/actions/owl-sps.c @@ -17,7 +17,6 @@ #include <linux/pm_domain.h> #include <linux/soc/actions/owl-sps.h> #include <dt-bindings/power/owl-s500-powergate.h> -#include <dt-bindings/power/owl-s700-powergate.h>
struct owl_sps_domain_info { const char *name; @@ -205,15 +204,15 @@ static const struct owl_sps_info s500_sps_info = { };
static const struct owl_sps_domain_info s700_sps_domains[] = { - [S700_PD_VDE] = { + [S500_PD_VDE] = { .name = "VDE", .pwr_bit = 0, }, - [S700_PD_VCE_SI] = { + [S500_PD_VCE_SI] = { .name = "VCE_SI", .pwr_bit = 1, }, - [S700_PD_USB2_1] = { + [S500_PD_USB2_1] = { .name = "USB2_1", .pwr_bit = 2, }, @@ -221,19 +220,19 @@ static const struct owl_sps_domain_info s700_sps_domains[] = { .name = "HDE", .pwr_bit = 7, }, - [S700_PD_DMA] = { + [S500_PD_DMA] = { .name = "DMA", .pwr_bit = 8, }, - [S700_PD_DS] = { + [S500_PD_DS] = { .name = "DS", .pwr_bit = 9, }, - [S700_PD_USB3] = { + [S500_PD_USB3] = { .name = "USB3", .pwr_bit = 10, }, - [S700_PD_USB2_0] = { + [S500_PD_USB2_0] = { .name = "USB2_0", .pwr_bit = 11, }, diff --git a/include/dt-bindings/power/owl-s500-powergate.h b/include/dt-bindings/power/owl-s500-powergate.h index 0a1c451865ea..0f42da3264c6 100644 --- a/include/dt-bindings/power/owl-s500-powergate.h +++ b/include/dt-bindings/power/owl-s500-powergate.h @@ -15,5 +15,6 @@ #define S500_PD_DS 6 #define S500_PD_USB3 7 #define S500_PD_USB2_0 8 +#define S700_PD_HDE 9
#endif
Arnd