Merge tag 'v4.4.154' into artik-nexell-4.4
authorChanho Park <chanho61.park@samsung.com>
Tue, 11 Sep 2018 06:11:36 +0000 (15:11 +0900)
committerChanho Park <chanho61.park@samsung.com>
Tue, 11 Sep 2018 06:11:36 +0000 (15:11 +0900)
This is the 4.4.154 stable release

27 files changed:
1  2 
arch/arm64/Kconfig
arch/arm64/Kconfig.platforms
arch/arm64/mm/init.c
drivers/Makefile
drivers/cpufreq/cpufreq.c
drivers/devfreq/devfreq.c
drivers/input/touchscreen/atmel_mxt_ts.c
drivers/mmc/core/core.c
drivers/mmc/host/dw_mmc.c
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
drivers/power/Kconfig
drivers/spi/spi.c
drivers/thermal/Kconfig
drivers/thermal/samsung/exynos_tmu.c
drivers/tty/serial/samsung.c
drivers/usb/core/hub.c
drivers/usb/dwc2/core.h
drivers/usb/dwc2/gadget.c
drivers/usb/dwc2/hcd.c
drivers/usb/dwc2/hcd_intr.c
drivers/usb/host/Kconfig
drivers/usb/host/ohci-hcd.c
drivers/video/fbdev/Kconfig
mm/memory.c
net/bluetooth/hci_event.c
scripts/Makefile.lib
sound/soc/generic/simple-card.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
  #include "stmmac.h"
  #include <linux/reset.h>
  #include <linux/of_mdio.h>
 +#ifdef CONFIG_ARM_S5Pxx18_DEVFREQ
 +#include <linux/pm_qos.h>
 +#include <linux/soc/nexell/cpufreq.h>
 +#include <linux/workqueue.h>
 +#endif
 +
 +#ifdef CONFIG_ARM_S5Pxx18_DEVFREQ
 +#define QOS_REQUEST_TIMEOUT_US        100000 /* 100 milliseconds */
 +static struct pm_qos_request nx_net_qos;
 +
 +static void nx_net_qos_update(int val, int timeout)
 +{
 +      if (!pm_qos_request_active(&nx_net_qos))
 +              pm_qos_add_request(&nx_net_qos, PM_QOS_BUS_THROUGHPUT, val);
 +      else
 +              pm_qos_update_request_timeout(&nx_net_qos, val,
 +                                            timeout);
 +}
 +
 +static void qos_request_work(struct work_struct *work)
 +{
 +      struct stmmac_priv *priv = container_of(work, struct stmmac_priv,
 +                                              qos_work);
 +      int timeout = priv->plat->boost_busfreq_timeout ? :
 +              QOS_REQUEST_TIMEOUT_US;
 +
 +      nx_net_qos_update(NX_BUS_CLK_HIGH_KHZ, timeout);
 +}
 +#endif
  
- #define STMMAC_ALIGN(x)       L1_CACHE_ALIGN(x)
+ #define       STMMAC_ALIGN(x)         __ALIGN_KERNEL(x, SMP_CACHE_BYTES)
  
  /* Module parameters */
  #define TX_TIMEO      5000
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc mm/memory.c
Simple merge
Simple merge
Simple merge
Simple merge