diff options
| author | Amit Pundir <amit.pundir@linaro.org> | 2015-01-14 20:25:27 +0530 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2015-01-14 20:25:27 +0530 |
| commit | 90aa78347ffcb3df400e953d279391cf347a965a (patch) | |
| tree | 06df79ee52b1cefd6a5b40c1fef420efba298208 | |
| parent | b14f9770699eec163c49b68cfedd23c2b9961cf5 (diff) | |
| parent | 3864fdfd6177460aad802ef1cea4161b4a86e93e (diff) | |
| download | juno-linaro-armv8-15.01.tar.gz | |
Merge branch 'integration-lsk-3.10-juno-android' into linaro-armv8linaro-armv8-15.01
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Conflicts:
drivers/base/cpu.c
linaro/configs/vexpress64.conf
| -rw-r--r-- | drivers/gpu/drm/arm/hdlcd_drv.c | 3 | ||||
| -rw-r--r-- | drivers/mailbox/scpi_protocol.c | 5 | ||||
| -rw-r--r-- | linaro/configs/linaro-base.conf | 10 | ||||
| -rw-r--r-- | linaro/configs/vexpress64.conf | 3 |
4 files changed, 14 insertions, 7 deletions
diff --git a/drivers/gpu/drm/arm/hdlcd_drv.c b/drivers/gpu/drm/arm/hdlcd_drv.c index 51e385ace0b..a3019ab75a4 100644 --- a/drivers/gpu/drm/arm/hdlcd_drv.c +++ b/drivers/gpu/drm/arm/hdlcd_drv.c @@ -424,7 +424,8 @@ static void __exit hdlcd_exit(void) platform_driver_unregister(&hdlcd_platform_driver); } -module_init(hdlcd_init); +/* need late_initcall() so we load after i2c driver */ +late_initcall(hdlcd_init); module_exit(hdlcd_exit); MODULE_AUTHOR("Liviu Dudau"); diff --git a/drivers/mailbox/scpi_protocol.c b/drivers/mailbox/scpi_protocol.c index bbfca39e6f4..a46cdf564ba 100644 --- a/drivers/mailbox/scpi_protocol.c +++ b/drivers/mailbox/scpi_protocol.c @@ -161,15 +161,12 @@ static void scpi_rx_callback(struct mbox_client *cl, void *msg) static int send_scpi_cmd(struct scpi_data_buf *scpi_buf, bool high_priority) { struct mbox_chan *chan; - struct mbox_client cl; + struct mbox_client cl = {0}; struct mhu_data_buf *data = scpi_buf->data; u32 status; cl.dev = the_scpi_device; cl.rx_callback = scpi_rx_callback; - cl.tx_done = NULL; - cl.tx_block = false; - cl.knows_txdone = false; chan = mbox_request_channel(&cl, high_priority); if (IS_ERR(chan)) diff --git a/linaro/configs/linaro-base.conf b/linaro/configs/linaro-base.conf index aef7892210c..15f6ea784f6 100644 --- a/linaro/configs/linaro-base.conf +++ b/linaro/configs/linaro-base.conf @@ -103,6 +103,16 @@ CONFIG_FTRACE_SYSCALLS=y CONFIG_STACK_TRACER=y CONFIG_FUNCTION_PROFILER=y CONFIG_MAILBOX=y +CONFIG_AUDIT=y +CONFIG_NF_CONNTRACK_SECMARK=y +CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y +CONFIG_NETFILTER_XT_TARGET_SECMARK=y +CONFIG_IP_NF_SECURITY=y +CONFIG_SECURITY=y +CONFIG_SECURITY_NETWORK=y +CONFIG_LSM_MMAP_MIN_ADDR=4096 +CONFIG_SECURITY_SELINUX=y +CONFIG_EXT4_FS_SECURITY=y CONFIG_BLK_DEV_LOOP=y CONFIG_DEBUG_INFO=y CONFIG_FANOTIFY=y diff --git a/linaro/configs/vexpress64.conf b/linaro/configs/vexpress64.conf index 48d6da87ec0..f00eee50f8c 100644 --- a/linaro/configs/vexpress64.conf +++ b/linaro/configs/vexpress64.conf @@ -69,9 +69,8 @@ CONFIG_SCPI_THERMAL=y CONFIG_MALI_DEVFREQ=y CONFIG_DRM=y CONFIG_DRM_ARM=y -CONFIG_DRM_HDLCD=m +CONFIG_DRM_HDLCD=y CONFIG_DRM_VIRTUAL_HDLCD=y -CONFIG_MODULES=y CONFIG_CMA_SIZE_MBYTES=32 CONFIG_I2C_DESIGNWARE_PLATFORM=y CONFIG_DRM_I2C_NXP_TDA998X=y |