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

Commit 756c08b0 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'renesas-soc-cleanup-for-v4.1' of... 

Merge tag 'renesas-soc-cleanup-for-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/multiplatform

Pull "Renesas ARM Based SoC Cleanup for v4.1" from Simon Horman:

* Remove redundant cpu_disable implementation from r8a7779 SoC
* Remove mach/{uncompress,clkdev,system}.h

* tag 'renesas-soc-cleanup-for-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: r8a7779: Remove redundant cpu_disable implementation
  ARM: shmobile: Remove mach/uncompress.h
  ARM: shmobile: Remove mach/clkdev.h
  ARM: shmobile: Remove mach/system.h
parents 13a7a6ac fd9454ab

arch/arm/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -646,7 +646,6 @@ config ARCH_SHMOBILE_LEGACY 
	select GENERIC_CLOCKEVENTS

	select HAVE_ARM_SCU if SMP

	select HAVE_ARM_TWD if SMP

	select HAVE_MACH_CLKDEV

	select HAVE_SMP

	select MIGHT_HAVE_CACHE_L2X0

	select MULTI_IRQ_HANDLER

arch/arm/Kconfig.debug

+2 −1
Original line number Diff line number Diff line
@@ -1573,7 +1573,8 @@ config DEBUG_UNCOMPRESS 
config UNCOMPRESS_INCLUDE

	string

	default "debug/uncompress.h" if ARCH_MULTIPLATFORM || ARCH_MSM || \

					PLAT_SAMSUNG || ARCH_EFM32

					PLAT_SAMSUNG || ARCH_EFM32 || \

					ARCH_SHMOBILE_LEGACY

	default "mach/uncompress.h"



config EARLY_PRINTK

arch/arm/mach-shmobile/clock.c

+0 −11
Original line number Diff line number Diff line
@@ -45,14 +45,3 @@ int __init shmobile_clk_init(void) 


	return 0;

}
 


int __clk_get(struct clk *clk)

{

	return 1;

}

EXPORT_SYMBOL(__clk_get);



void __clk_put(struct clk *clk)

{

}

EXPORT_SYMBOL(__clk_put);

arch/arm/mach-shmobile/include/mach/clkdev.h

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
#ifndef __ASM_MACH_CLKDEV_H

#define __ASM_MACH_CLKDEV_H



int __clk_get(struct clk *clk);

void __clk_put(struct clk *clk);



#endif /* __ASM_MACH_CLKDEV_H */

arch/arm/mach-shmobile/include/mach/system.h

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line 
#ifndef __ASM_ARCH_SYSTEM_H

#define __ASM_ARCH_SYSTEM_H



#include <asm/system_misc.h>



static inline void arch_reset(char mode, const char *cmd)

{

	soft_restart(0);

}



#endif