Merge tag 'lsk-v3.10-android-15.01'

LSK Android 15.01 v3.10

Conflicts:
	arch/arm/Kconfig.debug
	arch/arm64/mm/init.c
	drivers/Makefile
	drivers/cpufreq/cpufreq_interactive.c

diff --cc Makefile
Simple merge

diff --cc arch/arm/Kconfig.debug
index 31508289061dee0fba9468a95346a7ee8f6d8dcc,4d1793474c9cc2975284a223a243ba594259cbf4..11acee61fa5f09f16b7d0073924478add41b6c0a
--- 1/arch/arm/Kconfig.debug
--- 2/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@@ -698,22 -690,6 +698,14 @@@ config EARLY_PRINT
          kernel low-level debugging functions. Add earlyprintk to your
          kernel parameters to enable this console.
  
- config OC_ETM
-       bool "On-chip ETM and ETB"
-       depends on ARM_AMBA
-       help
-         Enables the on-chip embedded trace macrocell and embedded trace
-         buffer driver that will allow you to collect traces of the
-         kernel code.
- 
 +config EARLY_PRINTK_DIRECT
 +      bool "Early printk direct"
 +      depends on DEBUG_LL
 +      help
 +        Say Y here if you want to have an early console using the
 +        kernel low-level debugging functions and EARLY_PRINTK is
 +        not early enough.
 +
  config ARM_KPROBES_TEST
        tristate "Kprobes test module"
        depends on KPROBES && MODULES

diff --cc arch/arm/kernel/Makefile
Simple merge

diff --cc arch/arm/mm/dma-mapping.c
Simple merge

diff --cc arch/arm64/Kconfig
Simple merge

diff --cc arch/arm64/Makefile
Simple merge

diff --cc arch/arm64/kernel/process.c
Simple merge

diff --cc arch/arm64/mm/init.c
index 1adb46528fb27246a5417e3ceb970341c8c575aa,109a0442b6a1766d182aea772e03f7d3e51ef1e6..ea0c0812ef8e6dd48da001737fb2d375c031f0ed
--- 1/arch/arm64/mm/init.c
--- 2/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c
@@@ -189,10 -183,11 +199,14 @@@ void __init arm64_memblock_init(void
        }
  
        early_init_fdt_scan_reserved_mem();
-       dma_contiguous_reserve(0);
 +#ifdef CONFIG_ARCH_ROCKCHIP
 +      rockchip_ion_reserve_bit64();
 +#endif
+ 
+       /* 4GB maximum for 32-bit only capable devices */
+       if (IS_ENABLED(CONFIG_ZONE_DMA))
+               dma_phys_limit = max_zone_dma_phys();
+       dma_contiguous_reserve(dma_phys_limit);
  
        memblock_allow_resize();
        memblock_dump_all();

diff --cc drivers/Makefile
index 2c0f180ab34316d77571e5edc0abbabaaa63f992,65ac273d67be7acc0f9a13cf43c97286e3ac4ebe..a77fca50d5505cff8689081eabe8a0679bea1905
mode 100755,100644..100755
--- 1/drivers/Makefile
--- 2/drivers/Makefile
+++ b/drivers/Makefile
@@@ -157,4 -155,4 +157,5 @@@ obj-$(CONFIG_IPACK_BUS)            += ipack
  obj-$(CONFIG_NTB)             += ntb/
  
  obj-$(CONFIG_GATOR)           += gator/
- obj-y                         += headset_observe/
++obj-y                         += headset_observe/
+ obj-$(CONFIG_CORESIGHT)               += coresight/

diff --cc drivers/amba/bus.c
index 7e35fed9d5bf3517312ed5eab30afa144ff426ce,4144a3a999bd72322dea3a1105e5c19323bd1516..9d3a90397d16e68bafda9eb4650778b8ef26cef8
--- 1/drivers/amba/bus.c
--- 2/drivers/amba/bus.c
+++ b/drivers/amba/bus.c
@@@ -506,9 -504,9 +506,9 @@@ int amba_device_add(struct amba_device 
                        cid |= (readl(tmp + size - 0x10 + 4 * i) & 255) <<
                                (i * 8);
  
 -              amba_put_disable_pclk(dev);
 +//            amba_put_disable_pclk(dev);
  
-               if (cid == AMBA_CID)
+               if (cid == AMBA_CID || cid == CORESIGHT_CID)
                        dev->periphid = pid;
  
                if (!dev->periphid)

diff --cc drivers/cpufreq/cpufreq_interactive.c
index 1956eea7df166313a719a23abb3dfe9e07e59848,55c499df8bb88c05f07f34cfc69d61f74f3beddf..f77778e9e463eabe8b7e0d3e69ffac281674b9f1
--- 1/drivers/cpufreq/cpufreq_interactive.c
--- 2/drivers/cpufreq/cpufreq_interactive.c
+++ b/drivers/cpufreq/cpufreq_interactive.c
@@@ -109,14 -106,7 +109,15 @@@ struct cpufreq_interactive_tunables 
        int boostpulse_duration_val;
        /* End time of boost pulse in ktime converted to usecs */
        u64 boostpulse_endtime;
 +#ifdef CONFIG_ARCH_ROCKCHIP
 +      /* Frequency to which a touch boost takes the cpus to */
 +      unsigned long touchboost_freq;
 +      /* Duration of a touchboost pulse in usecs */
 +      int touchboostpulse_duration_val;
 +      /* End time of touchboost pulse in ktime converted to usecs */
 +      u64 touchboostpulse_endtime;
 +#endif
+       bool boosted;
        /*
         * Max additional time to wait in idle, beyond timer_rate, at speeds
         * above minimum before wakeup to reduce speed, or -1 if unnecessary.
@@@ -376,21 -365,9 +376,21 @@@ static void cpufreq_interactive_timer(u
        do_div(cputime_speedadj, delta_time);
        loadadjfreq = (unsigned int)cputime_speedadj * 100;
        cpu_load = loadadjfreq / pcpu->target_freq;
-       boosted = tunables->boost_val || now < tunables->boostpulse_endtime;
+       tunables->boosted = tunables->boost_val || now < tunables->boostpulse_endtime;
  
-       boosted |= now < tunables->touchboostpulse_endtime;
 +#ifdef CONFIG_ARCH_ROCKCHIP
 +      pcpu->target_freq = pcpu->policy->cur;
-       if (cpu_load >= tunables->go_hispeed_load || boosted) {
++      tunables->boosted |= now < tunables->touchboostpulse_endtime;
 +#endif
 +
+       if (cpu_load >= tunables->go_hispeed_load || tunables->boosted) {
 +#ifdef CONFIG_ARCH_ROCKCHIP
 +              if (now < tunables->touchboostpulse_endtime) {
 +                      new_freq = choose_freq(pcpu, loadadjfreq);
 +                      if (new_freq < tunables->touchboost_freq)
 +                              new_freq = tunables->touchboost_freq;
 +              } else
 +#endif
                if (pcpu->target_freq < tunables->hispeed_freq) {
                        new_freq = tunables->hispeed_freq;
                } else {

diff --cc drivers/mmc/card/block.c
index a5eb95bc4717bc478829bfd075f95a29b18e6061,c0ac6f4d646ee84f65aba0a5db666bac664fed49..6df820652d6d85096a9cf44da5272dae3953d582
mode 100755,100644..100755
--- 1/drivers/mmc/card/block.c
--- 2/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c

diff --cc drivers/of/base.c
Simple merge

diff --cc include/linux/device.h
Simple merge

diff --cc mm/mmap.c
Simple merge