hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Few SoC related improvments for omaps. 

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.15 (GNU/Linux)
 
 iQIcBAABAgAGBQJTE7lcAAoJEBvUPslcq6VzVq4QAMe5j5Y/3RSFPSQRrmRNrq/h
 6sbLNCPvzrvgm54LxNRy8kZ9mZcDCVnivvvGUx62FC7wFVOXIkAzM3Eg8D+S4Amu
 ZmYbIpxi+IYkqFsFpkeSKAv8EAlHuNZ0ljPGVduxiZJwM3s/0rGUSxD+8hdB1V7d
 nHlhKv4WWCR5+TwW88+BRb4yWIJllEOKABzZihTTPTTiFfwd5U62hIUwtAp1dC9Y
 ObBUTUmXXuCVwVXFrpjp1Y/2B0g4fQ/y+t76Rjmb1SrpEqQKh5oG1zfrDLFjLRMS
 trc5DbZK+Oo//ZxHbKGijJjSIoPU1pZTzz7sUr8xy+x2OHEForgNB3JWZCKgkrtC
 M4JQQkQqZCi018pzpLpksBv1TggrHlnu8KpdrGOWNTwtT3r/t6VX/5Xmn5RyRD3l
 gl4EEXSLEja88xmJZb7AX0KAee/xxvxmgl84yX/OSIGqzOjMd7tPlg0IL/+sYJtw
 P1k2NYItCknxN9pykUrYFmwveJ9coco8GV0nu6vxxjvJJhEsUuRAwS3Df9K/hrpZ
 1xDGG3wrRGlgb+S9FrbN6YXZdXIIPDdjXXPYW/LDdifPu1SOd5a2WKthmC1nGB0U
 LDw3GPEk3znWF+aB2oN4cGbU51K3yg+jdd1T9QlFkPqH74o3T5d9zpF0lLyaluI2
 8E2CYUuN5+9XJ1xs+6f4
 =1Hkf
 -----END PGP SIGNATURE-----

Merge tag 'omap-for-v3.15/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc

OMAP SoC changes from Tony Lindgren:

Few SoC related improvments for omaps.

* tag 'omap-for-v3.15/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP2+: remove OMAP_PACKAGE_ZAC and OMAP_PACKAGE_ZAF
  ARM: OMAP2+: AM43x: Use gptimer as clocksource
  ARM: OMAP2+: AM43x: determine features
  ARM: OMAP2+: AM43x: Add ID for ES1.1
  ARM: OMAP2+: AM43x: enable in default config

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2014-03-08 23:02:00 -08:00
parent c381585fcc 9b91bd81fa
commit f2f91bee92
8 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/configs/omap2plus_defconfig
View File

@ -28,6 +28,7 @@ CONFIG_ARCH_OMAP3=y
CONFIG_ARCH_OMAP4=y
CONFIG_SOC_OMAP5=y
CONFIG_SOC_AM33XX=y
CONFIG_SOC_AM43XX=y
CONFIG_SOC_DRA7XX=y
CONFIG_ARM_THUMBEE=y
CONFIG_ARM_ERRATA_411920=y

7
arch/arm/mach-omap2/Kconfig
View File

@ -165,12 +165,6 @@ config SOC_TI81XX
depends on ARCH_OMAP3
default y
config OMAP_PACKAGE_ZAF
bool
config OMAP_PACKAGE_ZAC
bool
config OMAP_PACKAGE_CBC
bool
@ -284,7 +278,6 @@ config MACH_NOKIA_N8X0
select MACH_NOKIA_N800
select MACH_NOKIA_N810
select MACH_NOKIA_N810_WIMAX
select OMAP_PACKAGE_ZAC
config MACH_NOKIA_RX51
bool "Nokia N900 (RX-51) phone"

2
arch/arm/mach-omap2/board-generic.c
View File

@ -229,7 +229,7 @@ DT_MACHINE_START(AM43_DT, "Generic AM43 (Flattened Device Tree)")
.init_late = am43xx_init_late,
.init_irq = omap_gic_of_init,
.init_machine = omap_generic_init,
.init_time = omap3_sync32k_timer_init,
.init_time = omap3_gptimer_timer_init,
.dt_compat = am43_boards_compat,
MACHINE_END
#endif

16
arch/arm/mach-omap2/id.c
View File

@ -465,8 +465,18 @@ void __init omap3xxx_check_revision(void)
}
break;
case 0xb98c:
omap_revision = AM437X_REV_ES1_0;
cpu_rev = "1.0";
switch (rev) {
case 0:
omap_revision = AM437X_REV_ES1_0;
cpu_rev = "1.0";
break;
case 1:
/* FALLTHROUGH */
default:
omap_revision = AM437X_REV_ES1_1;
cpu_rev = "1.1";
break;
}
break;
case 0xb8f2:
switch (rev) {
@ -657,6 +667,8 @@ static const char * __init omap_get_family(void)
return kasprintf(GFP_KERNEL, "OMAP4");
else if (soc_is_omap54xx())
return kasprintf(GFP_KERNEL, "OMAP5");
else if (soc_is_am43xx())
return kasprintf(GFP_KERNEL, "AM43xx");
else
return kasprintf(GFP_KERNEL, "Unknown");
}

1
arch/arm/mach-omap2/io.c
View File

@ -613,6 +613,7 @@ void __init am43xx_init_early(void)
omap_prm_base_init();
omap_cm_base_init();
omap3xxx_check_revision();
am33xx_check_features();
am43xx_powerdomains_init();
am43xx_clockdomains_init();
am43xx_hwmod_init();

3
arch/arm/mach-omap2/mux.h
View File

@ -63,9 +63,6 @@
#define OMAP_PACKAGE_CUS 5 /* 423-pin 0.65 */
#define OMAP_PACKAGE_CBB 4 /* 515-pin 0.40 0.50 */
#define OMAP_PACKAGE_CBC 3 /* 515-pin 0.50 0.65 */
#define OMAP_PACKAGE_ZAC 2 /* 24xx 447-pin POP */
#define OMAP_PACKAGE_ZAF 1 /* 2420 447-pin SIP */
#define OMAP_MUX_NR_MODES 8 /* Available modes */
#define OMAP_MUX_NR_SIDES 2 /* Bottom & top */

3
arch/arm/mach-omap2/soc.h
View File

@ -438,7 +438,8 @@ IS_OMAP_TYPE(3430, 0x3430)
#define AM335X_REV_ES2_1 (AM335X_CLASS | (0x2 << 8))
#define AM437X_CLASS 0x43700000
#define AM437X_REV_ES1_0 AM437X_CLASS
#define AM437X_REV_ES1_0 (AM437X_CLASS | (0x10 << 8))
#define AM437X_REV_ES1_1 (AM437X_CLASS | (0x11 << 8))
#define OMAP443X_CLASS 0x44300044
#define OMAP4430_REV_ES1_0 (OMAP443X_CLASS | (0x10 << 8))

3
arch/arm/mach-omap2/timer.c
View File

@ -604,7 +604,8 @@ OMAP_SYS_32K_TIMER_INIT(3_secure, 12, "secure_32k_fck", "ti,timer-secure",
2, "timer_sys_ck", NULL);
#endif /* CONFIG_ARCH_OMAP3 */
#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_SOC_AM33XX)
#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_SOC_AM33XX) || \
defined(CONFIG_SOC_AM43XX)
OMAP_SYS_GP_TIMER_INIT(3, 2, "timer_sys_ck", NULL,
1, "timer_sys_ck", "ti,timer-alwon");
#endif