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

Commit 3c6f4b15 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'renesas-soc-cleanups2-for-v3.19' of... 

Merge tag 'renesas-soc-cleanups2-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/cleanup

Pull "Second Round of Renesas ARM Based SoC Cleanups for v3.19" from Simon Horman:

* Spelling and grammar fixes

* tag 'renesas-soc-cleanups2-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

:
  ARM: shmobile: r8a7779: Spelling/grammar s/entity/identity/, s/map/mapping/
  ARM: shmobile: sh7372: Spelling/grammar s/entity map/identity mapping/
  ARM: shmobile: sh73a0: Spelling/grammar s/entity map/identity mapping/

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 58a9e8f8 3e940958

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

+3 −3
Original line number Diff line number Diff line
@@ -48,14 +48,14 @@ 
#include "r8a7779.h"



static struct map_desc r8a7779_io_desc[] __initdata = {

	/* 2M entity map for 0xf0000000 (MPCORE) */

	/* 2M identity mapping for 0xf0000000 (MPCORE) */

	{

		.virtual	= 0xf0000000,

		.pfn		= __phys_to_pfn(0xf0000000),

		.length		= SZ_2M,

		.type		= MT_DEVICE_NONSHARED

	},

	/* 16M entity map for 0xfexxxxxx (DMAC-S/HPBREG/INTC2/LRAM/DBSC) */

	/* 16M identity mapping for 0xfexxxxxx (DMAC-S/HPBREG/INTC2/LRAM/DBSC) */

	{

		.virtual	= 0xfe000000,

		.pfn		= __phys_to_pfn(0xfe000000),
@@ -679,7 +679,7 @@ void __init r8a7779_add_early_devices(void) 


	/* Early serial console setup is not included here due to

	 * memory map collisions. The SCIF serial ports in r8a7779

	 * are difficult to entity map 1:1 due to collision with the

	 * are difficult to identity map 1:1 due to collision with the

	 * virtual memory range used by the coherent DMA code on ARM.

	 *

	 * Anyone wanting to debug early can remove UPF_IOREMAP from

arch/arm/mach-shmobile/setup-sh7372.c

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
#include "sh7372.h"



static struct map_desc sh7372_io_desc[] __initdata = {

	/* create a 1:1 entity map for 0xe6xxxxxx

	/* create a 1:1 identity mapping for 0xe6xxxxxx

	 * used by CPGA, INTC and PFC.

	 */

	{

arch/arm/mach-shmobile/setup-sh73a0.c

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
#include "sh73a0.h"



static struct map_desc sh73a0_io_desc[] __initdata = {

	/* create a 1:1 entity map for 0xe6xxxxxx

	/* create a 1:1 identity mapping for 0xe6xxxxxx

	 * used by CPGA, INTC and PFC.

	 */

	{