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

Commit 08115a13 authored by Kukjin Kim's avatar Kukjin Kim
Browse files

ARM: S5P: Should be S3C_VA_USB_HSPHY instead of S5P_VA_XX 



Basically, other S3C SoCs and S5PC100 use 'S3C_VA_USB_HSPHY'
commonly. It should be changed to 'S3C_VA_USB_HSPHY' for common
usage and others. Now happens build error on S5PC100.

Cc: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 457d4fe8

arch/arm/mach-exynos4/cpu.c

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ static struct map_desc exynos4_iodesc[] __initdata = { 
		.length		= SZ_4K,

		.type		= MT_DEVICE,

	}, {

		.virtual	= (unsigned long)S5P_VA_USB_HSPHY,

		.virtual	= (unsigned long)S3C_VA_USB_HSPHY,

		.pfn		= __phys_to_pfn(EXYNOS4_PA_HSPHY),

		.length		= SZ_4K,

		.type		= MT_DEVICE,

arch/arm/mach-exynos4/include/mach/regs-usb-phy.h

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
#ifndef __PLAT_S5P_REGS_USB_PHY_H

#define __PLAT_S5P_REGS_USB_PHY_H



#define EXYNOS4_HSOTG_PHYREG(x)		((x) + S5P_VA_USB_HSPHY)

#define EXYNOS4_HSOTG_PHYREG(x)		((x) + S3C_VA_USB_HSPHY)



#define EXYNOS4_PHYPWR			EXYNOS4_HSOTG_PHYREG(0x00)

#define PHY1_HSIC_NORMAL_MASK		(0xf << 9)

arch/arm/plat-s5p/include/plat/map-s5p.h

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
#define S5P_VA_TWD		S5P_VA_COREPERI(0x600)

#define S5P_VA_GIC_DIST		S5P_VA_COREPERI(0x1000)



#define S5P_VA_USB_HSPHY	S3C_ADDR(0x02900000)

#define S3C_VA_USB_HSPHY	S3C_ADDR(0x02900000)



#define VA_VIC(x)		(S3C_VA_IRQ + ((x) * 0x10000))

#define VA_VIC0			VA_VIC(0)