Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e2d663d authored by Ralf Baechle's avatar Ralf Baechle
Browse files

Merge branch 'wip-mips-pm' of https://github.com/paulburton/linux into mips-for-linux-next

parents 5ec79bf9 32201453

arch/mips/Kconfig

+13 −2
Original line number Diff line number Diff line
@@ -50,6 +50,8 @@ config MIPS 
	select CLONE_BACKWARDS

	select HAVE_DEBUG_STACKOVERFLOW

	select HAVE_CC_STACKPROTECTOR

	select CPU_PM if CPU_IDLE

	select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST



menu "Machine selection"
@@ -2012,9 +2014,11 @@ config MIPS_CPS 
	depends on SYS_SUPPORTS_MIPS_CPS

	select MIPS_CM

	select MIPS_CPC

	select MIPS_CPS_PM if HOTPLUG_CPU

	select MIPS_GIC_IPI

	select SMP

	select SYNC_R4K if (CEVT_R4K || CSRC_R4K)

	select SYS_SUPPORTS_HOTPLUG_CPU

	select SYS_SUPPORTS_SMP

	select WEAK_ORDERING

	help
@@ -2024,6 +2028,9 @@ config MIPS_CPS 
	  no external assistance. It is safe to enable this when hardware

	  support is unavailable.



config MIPS_CPS_PM

	bool



config MIPS_GIC_IPI

	bool
@@ -2633,12 +2640,16 @@ endmenu 
config MIPS_EXTERNAL_TIMER

	bool



if CPU_SUPPORTS_CPUFREQ && MIPS_EXTERNAL_TIMER

menu "CPU Power Management"



if CPU_SUPPORTS_CPUFREQ && MIPS_EXTERNAL_TIMER

source "drivers/cpufreq/Kconfig"

endmenu

endif



source "drivers/cpuidle/Kconfig"



endmenu



source "net/Kconfig"



source "drivers/Kconfig"

arch/mips/configs/maltasmvp_defconfig

+1 −2
Original line number Diff line number Diff line
@@ -4,10 +4,9 @@ CONFIG_CPU_MIPS32_R2=y 
CONFIG_PAGE_SIZE_16KB=y

CONFIG_MIPS_MT_SMP=y

CONFIG_SCHED_SMT=y

CONFIG_MIPS_CMP=y

CONFIG_MIPS_CPS=y

CONFIG_NR_CPUS=8

CONFIG_HZ_100=y

CONFIG_LOCALVERSION="cmp"

CONFIG_SYSVIPC=y

CONFIG_POSIX_MQUEUE=y

CONFIG_AUDIT=y

arch/mips/configs/maltasmvp_eva_defconfig

+1 −2
Original line number Diff line number Diff line
@@ -5,10 +5,9 @@ CONFIG_CPU_MIPS32_3_5_FEATURES=y 
CONFIG_PAGE_SIZE_16KB=y

CONFIG_MIPS_MT_SMP=y

CONFIG_SCHED_SMT=y

CONFIG_MIPS_CMP=y

CONFIG_MIPS_CPS=y

CONFIG_NR_CPUS=8

CONFIG_HZ_100=y

CONFIG_LOCALVERSION="cmp"

CONFIG_SYSVIPC=y

CONFIG_POSIX_MQUEUE=y

CONFIG_AUDIT=y

arch/mips/include/asm/cacheflush.h

+6 −0
Original line number Diff line number Diff line
@@ -113,6 +113,12 @@ unsigned long run_uncached(void *func); 


extern void *kmap_coherent(struct page *page, unsigned long addr);

extern void kunmap_coherent(void);

extern void *kmap_noncoherent(struct page *page, unsigned long addr);



static inline void kunmap_noncoherent(void)

{

	kunmap_coherent();

}



#define ARCH_HAS_FLUSH_KERNEL_DCACHE_PAGE

static inline void flush_kernel_dcache_page(struct page *page)

arch/mips/include/asm/gic.h

+1 −0
Original line number Diff line number Diff line
@@ -380,6 +380,7 @@ extern unsigned int gic_compare_int (void); 
extern cycle_t gic_read_count(void);

extern cycle_t gic_read_compare(void);

extern void gic_write_compare(cycle_t cnt);

extern void gic_write_cpu_compare(cycle_t cnt, int cpu);

extern void gic_send_ipi(unsigned int intr);

extern unsigned int plat_ipi_call_int_xlate(unsigned int);

extern unsigned int plat_ipi_resched_int_xlate(unsigned int);