leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'keystone/soc' into next/soc

Browse Source 
From Santosh Shilimkar:
* keystone/soc:
  ARM: keystone: defconfig: enable USB support
  ARM: keystone: Avoid calling of_clk_init() twice
  ARM: keystone: Make PM bus ready before populating platform devices
  ARM: keystone: enable DMA zone for LPAE
  ARM: keystone: enable big endian support

Signed-off-by: Kevin Hilman <khilman@linaro.org>
This commit is contained in:
Kevin Hilman 2013-12-20 08:59:45 -08:00
commit 02ee25c3a9
5 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
arch/arm/configs/keystone_defconfig
View File

@ -115,6 +115,8 @@ CONFIG_MTD_UBI=y
CONFIG_PROC_DEVICETREE=y CONFIG_PROC_DEVICETREE=y
CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_LOOP=y
CONFIG_EEPROM_AT24=y CONFIG_EEPROM_AT24=y
CONFIG_SCSI=y
CONFIG_BLK_DEV_SD=y
CONFIG_NETDEVICES=y CONFIG_NETDEVICES=y
CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_CONSOLE=y
@ -129,10 +131,24 @@ CONFIG_SPI_DAVINCI=y
CONFIG_SPI_SPIDEV=y CONFIG_SPI_SPIDEV=y
# CONFIG_HWMON is not set # CONFIG_HWMON is not set
CONFIG_WATCHDOG=y CONFIG_WATCHDOG=y
# CONFIG_USB_SUPPORT is not set CONFIG_USB=y
CONFIG_USB_DEBUG=y
CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
CONFIG_USB_MON=y
CONFIG_USB_XHCI_HCD=y
CONFIG_USB_STORAGE=y
CONFIG_USB_DWC3=y
CONFIG_USB_DWC3_DEBUG=y
CONFIG_USB_DWC3_VERBOSE=y
CONFIG_KEYSTONE_USB_PHY=y
CONFIG_DMADEVICES=y CONFIG_DMADEVICES=y
CONFIG_COMMON_CLK_DEBUG=y CONFIG_COMMON_CLK_DEBUG=y
CONFIG_MEMORY=y CONFIG_MEMORY=y
CONFIG_EXT4_FS=y
CONFIG_EXT4_FS_POSIX_ACL=y
CONFIG_MSDOS_FS=y
CONFIG_VFAT_FS=y
CONFIG_NTFS_FS=y
CONFIG_TMPFS=y CONFIG_TMPFS=y
CONFIG_JFFS2_FS=y CONFIG_JFFS2_FS=y
CONFIG_JFFS2_FS_WBUF_VERIFY=y CONFIG_JFFS2_FS_WBUF_VERIFY=y
@ -144,6 +160,8 @@ CONFIG_ROOT_NFS=y
CONFIG_NFSD=y CONFIG_NFSD=y
CONFIG_NFSD_V3=y CONFIG_NFSD_V3=y
CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V3_ACL=y
CONFIG_NLS_CODEPAGE_437=y
CONFIG_NLS_ISO8859_1=y
CONFIG_PRINTK_TIME=y CONFIG_PRINTK_TIME=y
CONFIG_DEBUG_SHIRQ=y CONFIG_DEBUG_SHIRQ=y
CONFIG_DEBUG_INFO=y CONFIG_DEBUG_INFO=y

2
arch/arm/mach-keystone/Kconfig
View File

@ -11,6 +11,8 @@ config ARCH_KEYSTONE
select ARM_ERRATA_798181 if SMP select ARM_ERRATA_798181 if SMP
select COMMON_CLK_KEYSTONE select COMMON_CLK_KEYSTONE
select TI_EDMA select TI_EDMA
select ARCH_SUPPORTS_BIG_ENDIAN
select ZONE_DMA if ARM_LPAE
help help
Support for boards based on the Texas Instruments Keystone family of Support for boards based on the Texas Instruments Keystone family of
SoCs. SoCs.

4
arch/arm/mach-keystone/keystone.c
View File

@ -41,6 +41,7 @@ static void __init keystone_init(void)
if (WARN_ON(!keystone_rstctrl)) if (WARN_ON(!keystone_rstctrl))
pr_warn("ti,keystone-reset iomap error\n"); pr_warn("ti,keystone-reset iomap error\n");
keystone_pm_runtime_init();
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
} }
@ -68,6 +69,9 @@ void keystone_restart(enum reboot_mode mode, const char *cmd)
} }
DT_MACHINE_START(KEYSTONE, "Keystone") DT_MACHINE_START(KEYSTONE, "Keystone")
#if defined(CONFIG_ZONE_DMA) && defined(CONFIG_ARM_LPAE)
.dma_zone_size = SZ_2G,
#endif
.smp = smp_ops(keystone_smp_ops), .smp = smp_ops(keystone_smp_ops),
.init_machine = keystone_init, .init_machine = keystone_init,
.dt_compat = keystone_match, .dt_compat = keystone_match,

1
arch/arm/mach-keystone/keystone.h
View File

@ -18,6 +18,7 @@
extern struct smp_operations keystone_smp_ops; extern struct smp_operations keystone_smp_ops;
extern void secondary_startup(void); extern void secondary_startup(void);
extern u32 keystone_cpu_smc(u32 command, u32 cpu, u32 addr); extern u32 keystone_cpu_smc(u32 command, u32 cpu, u32 addr);
extern int keystone_pm_runtime_init(void);
#endif /* __ASSEMBLER__ */ #endif /* __ASSEMBLER__ */
#endif /* __KEYSTONE_H__ */ #endif /* __KEYSTONE_H__ */

2
arch/arm/mach-keystone/pm_domain.c
View File

@ -74,9 +74,7 @@ int __init keystone_pm_runtime_init(void)
if (!np) if (!np)
return 0; return 0;
of_clk_init(NULL);
pm_clk_add_notifier(&platform_bus_type, &platform_domain_notifier); pm_clk_add_notifier(&platform_bus_type, &platform_domain_notifier);
return 0; return 0;
} }
subsys_initcall(keystone_pm_runtime_init);