Commit 8527cfce authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'renesas-cleanup-for-v4.6' of... 

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

Renesas ARM Based SoC Cleanup for v4.6

* Remove remnants of removed SCU boot setup code for r8a7779
* Correct s/MIPDR/MPIDR/ typo
* Add includes providing forward declarations
* Make rcar_gen2_dma_contiguous static

* tag 'renesas-cleanup-for-v4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

:
  ARM: shmobile: r8a7779: Remove remainings of removed SCU boot setup code
  ARM: shmobile: Typo s/MIPDR/MPIDR/
  ARM: shmobile: Add includes providing forward declarations
  ARM: shmobile: rcar-gen2: Make rcar_gen2_dma_contiguous static

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 95650655 cdef6b0b

arch/arm/mach-shmobile/cpufreq.c

+2 −0
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ 


#include <linux/platform_device.h>



#include "common.h"



int __init shmobile_cpufreq_init(void)

{

	platform_device_register_simple("cpufreq-dt", -1, NULL, 0);

arch/arm/mach-shmobile/headsmp-scu.S

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
 */

ENTRY(shmobile_boot_scu)

					@ r0 = SCU base address

	mrc     p15, 0, r1, c0, c0, 5	@ read MIPDR

	mrc     p15, 0, r1, c0, c0, 5	@ read MPIDR

	and	r1, r1, #3		@ mask out cpu ID

	lsl	r1, r1, #3		@ we will shift by cpu_id * 8 bits

	ldr	r2, [r0, #8]		@ SCU Power Status Register

arch/arm/mach-shmobile/setup-rcar-gen2.c

+4 −3
Original line number Diff line number Diff line
@@ -182,8 +182,6 @@ static int __init rcar_gen2_scan_mem(unsigned long node, const char *uname, 
	return 0;

}



struct cma *rcar_gen2_dma_contiguous;



void __init rcar_gen2_reserve(void)

{

	struct memory_reserve_config mrc;
@@ -194,8 +192,11 @@ void __init rcar_gen2_reserve(void) 


	of_scan_flat_dt(rcar_gen2_scan_mem, &mrc);

#ifdef CONFIG_DMA_CMA

	if (mrc.size && memblock_is_region_memory(mrc.base, mrc.size))

	if (mrc.size && memblock_is_region_memory(mrc.base, mrc.size)) {

		static struct cma *rcar_gen2_dma_contiguous;



		dma_contiguous_reserve_area(mrc.size, mrc.base, 0,

					    &rcar_gen2_dma_contiguous, true);

	}

#endif

}

arch/arm/mach-shmobile/smp-r8a7779.c

+0 −2
Original line number Diff line number Diff line
@@ -92,8 +92,6 @@ static void __init r8a7779_smp_prepare_cpus(unsigned int max_cpus) 
{

	/* Map the reset vector (in headsmp-scu.S, headsmp.S) */

	__raw_writel(__pa(shmobile_boot_vector), AVECR);

	shmobile_boot_fn = virt_to_phys(shmobile_boot_scu);

	shmobile_boot_arg = (unsigned long)shmobile_scu_base;



	/* setup r8a7779 specific SCU bits */

	shmobile_scu_base = IOMEM(R8A7779_SCU_BASE);

arch/arm/mach-shmobile/suspend.c

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
#include <asm/io.h>

#include <asm/system_misc.h>



#include "common.h"



static int shmobile_suspend_default_enter(suspend_state_t suspend_state)

{

	cpu_do_idle();

CRA Git | Maintained and supported by SUSTech CRA and CCSE