shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-05-31 08:16:39 +09:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Merge "Renesas ARM Based SoC Cleanup Updates for v3.16" from Simon Horman:

r8a7740 (R-Mobile A1) SoC
* Make r8a7740_meram_workaround() __init
* Remove unused r8a7740_add_early_devices_dt()

r8a7740 (R-Mobile A1) based Armadillo800 EVA board
* Spelling and grammar fixes

sh7372 (SH-Mobile AP4) SoC
* Call sh7372_add_early_devices() instead of open coding

* tag 'renesas-cleanup-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: r8a7740: Make r8a7740_meram_workaround() __init
  ARM: shmobile: sh7372: Call sh7372_add_early_devices() instead of open coding
  ARM: shmobile: r8a7740: Remove unused r8a7740_add_early_devices_dt()
  ARM: shmobile: armadillo800eva: Spelling and grammar

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson
2014-05-05 14:29:05 -07:00
parent 186a73dc9a bb6c3d58c3
commit 8df3211971
3 changed files with 4 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/mach-shmobile/Kconfig
View File

@@ -205,8 +205,8 @@ config MACH_ARMADILLO800EVA_REFERENCE
select SND_SOC_WM8978 if SND_SIMPLE_CARD
select USE_OF
---help---
Use reference implementation of Aramdillo800 EVA board support
which makes a greater use of device tree at the expense
Use reference implementation of Armadillo800 EVA board support
which makes greater use of device tree at the expense
of not supporting a number of devices.
This is intended to aid developers

13
arch/arm/mach-shmobile/setup-r8a7740.c
View File

@@ -765,7 +765,7 @@ static struct platform_device *r8a7740_late_devices[] __initdata = {
* "Media RAM (MERAM)" on r8a7740 documentation
*/
#define MEBUFCNTR 0xFE950098
void r8a7740_meram_workaround(void)
void __init r8a7740_meram_workaround(void)
{
void __iomem *reg;
@@ -869,17 +869,6 @@ void __init r8a7740_add_early_devices(void)
#ifdef CONFIG_USE_OF
void __init r8a7740_add_early_devices_dt(void)
{
shmobile_setup_delay(800, 1, 3); /* Cortex-A9 @ 800MHz */
early_platform_add_devices(r8a7740_early_devices,
ARRAY_SIZE(r8a7740_early_devices));
/* setup early console here as well */
shmobile_setup_console();
}
void __init r8a7740_add_standard_devices_dt(void)
{
platform_add_devices(r8a7740_devices_dt,

6
arch/arm/mach-shmobile/setup-sh7372.c
View File

@@ -1037,11 +1037,7 @@ void __init sh7372_add_early_devices_dt(void)
{
shmobile_setup_delay(800, 1, 3); /* Cortex-A8 @ 800MHz */
early_platform_add_devices(sh7372_early_devices,
ARRAY_SIZE(sh7372_early_devices));
/* setup early console here as well */
shmobile_setup_console();
sh7372_add_early_devices();
}
void __init sh7372_add_standard_devices_dt(void)