Merge branch 'firefly' into squashCM

Change-Id: I53c4317c04c651aabdd91052263e64adef55bd5c

diff --cc arch/arm64/boot/dts/rockchip/rk3399.dtsi
Simple merge

diff --cc arch/arm64/configs/rockchip_linux_defconfig
Simple merge

diff --cc drivers/char/Kconfig
Simple merge

diff --cc drivers/gpu/drm/panel/panel-simple.c
Simple merge

diff --cc drivers/input/touchscreen/Makefile
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
index 0109c48f1533c1f6306c0f0a7459e314d5ff0c64,3080502e79de43be647875ce0793f677915e169d..a471018a5e9ffefcb595c12ba81c2c90203f08cd
--- 1/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
--- 2/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
@@@ -1048,11 -1077,12 +1077,12 @@@ void rk_get_eth_addr(void *priv, unsign
                if (ret != 0)
                        dev_err(dev, "%s: rk_vendor_write eth mac address failed (%d)",
                                        __func__, ret);
-       } else {
-               dev_dbg(dev, "%s: rk_vendor_read eth mac address: %02x:%02x:%02x:%02x:%02x:%02x",
-                                       __func__, addr[0], addr[1], addr[2],
-                                       addr[3], addr[4], addr[5]);
        }
 -      dev_err(dev, "%s: mac address: %02x:%02x:%02x:%02x:%02x:%02x",
+ 
+ out:
++      dev_dbg(dev, "%s: mac address: %02x:%02x:%02x:%02x:%02x:%02x",
+                               __func__, addr[0], addr[1], addr[2],
+                               addr[3], addr[4], addr[5]);
  }
  
  static int rk_gmac_probe(struct platform_device *pdev)

diff --cc drivers/usb/serial/option.c
Simple merge