From: Magnus Damm <damm+renesas@xxxxxxxxxxxxx>
The latest renesas-drivers release does not build for me with
the arm64 defconfig. Probably related to my old toolchain.
Take the easy way out and work around the build issues locally.
Not for upstream merge.
Not-Signed-off-by: Magnus Damm <damm+renesas@xxxxxxxxxxxxx>
---
Applies on top of renesas-drivers-2018-12-18-v4.20-rc7
arch/arm64/include/asm/smp.h | 2 +-
drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 2 +-
drivers/tty/serial/sh-sci.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
--- 0001/arch/arm64/include/asm/smp.h
+++ work/arch/arm64/include/asm/smp.h 2018-12-19 13:51:47.246815997 +0900
@@ -30,7 +30,7 @@
#define CPU_PANIC_KERNEL (3)
#define CPU_STUCK_REASON_52_BIT_VA (1U << CPU_STUCK_REASON_SHIFT)
-#define CPU_STUCK_REASON_NO_GRAN (2U << CPU_STUCK_REASON_SHIFT)
+#define CPU_STUCK_REASON_NO_GRAN (2 << CPU_STUCK_REASON_SHIFT)
#ifndef __ASSEMBLY__
--- 0001/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c
+++ work/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c 2018-12-19 14:06:48.699077685 +0900
@@ -560,7 +560,7 @@ dw_mipi_dsi_get_lane_mbps(void *priv_dat
static const struct dw_mipi_dsi_phy_ops dw_mipi_dsi_rockchip_phy_ops = {
.init = dw_mipi_dsi_phy_init,
- .get_lane_mbps = dw_mipi_dsi_get_lane_mbps,
+ //.get_lane_mbps = dw_mipi_dsi_get_lane_mbps,
};
static void dw_mipi_dsi_rockchip_config(struct dw_mipi_dsi_rockchip *dsi,
--- 0001/drivers/tty/serial/sh-sci.c
+++ work/drivers/tty/serial/sh-sci.c 2018-12-19 13:42:38.328037070 +0900
@@ -1347,7 +1347,7 @@ static int sci_submit_rx(struct sci_port
{
struct dma_chan *chan = s->chan_rx;
struct uart_port *port = &s->port;
- unsigned long flags;
+ unsigned long flags = 0;
int i;
for (i = 0; i < 2; i++) {
