forked from Minki/linux
fa91515cbf
Lots of cleanup and refactoring and some SMP additions for Renesas
platforms. Due to some inter-dependencies with other arm-soc
branches, this Renesas stuff was separated out for sending after the
other branches were merged.
Highlights:
- remove unused board support and cleanup of unused headers
- refactoring of init and device registration
- simplify IRQ initialization
Conflicts: Too many. Most of these are because Simon chose to send
some board updates through the V4L tree that ends up colliding with
the main platform changes. We'll work with him on sorting out his
workflow:
- arch/arm/boot/dts/r8a7740.dtsi:
- Add/add conflict in a devicetree file (keep both)
- arch/arm/mach-shmobile/Makefile:
- Splitting out of clock files collides with intc move to DT.
Keep HEAD version but remove intc-* files for R8A7740 and R8A7779.
- arch/arm/mach-shmobile/board-bockw.c:
- Keep HEAD but remove i2c, hspi and mmc device init calls
- arch/arm/mach-shmobile/board-marzen.c
- Remove mach/hardware.h include and r8a7779_add_usb_phy_device() call,
everything else stays.
- arch/arm/mach-shmobile/include/mach/r8a7778.h:
- From HEAD, Keep camera-rcar.h include and r8a7778_add_vin_device()
- From branch, keep everything
- arch/arm/mach-shmobile/include/mach/r8a7779.h:
- From HEAD, Keep only camera-rcar.h include and r8a7779_add_vin_device()
- arch/arm/mach-shmobile/setup-r8a7778.c
- Keep HEAD, but drop the MMC section (struct resource + add_mmc_device())
- take the new function name from our side (r8a7778_add_dt_devices())
- arch/arm/mach-shmobile/setup-r8a7779.c
- Keep HEAD, but drop r8a7779_add_usb_phy_device()
I've also pushed a test-merge2 branch where you can see how I resolved
them.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAABAgAGBQJSLkaWAAoJEFk3GJrT+8Zl5l8P/3oJ83VJHcjD2fMpAb8Dz5b6
pdRLxFLJrLxN+WTC1LylPom3EsSAJuuaG3Z8Cr9Xa6yoWuUYLy/A6MwsyLXBOGLC
3tVWa96xt1cHhd3p/NAOQwvRz/CFdMLM7MStd0mgSihj/pq3jtc2V697+dRtmJih
J0mIc8+jnig+uwVl1DMCmBqdEmasccaDZeX30PcjaPL9ZDyZBeSXI8brdDx8A21e
5RiAsqn9HCxrLZjedL9TWA23BJ7NccsI3aVGpQVtCa9N/MHKp8gZft3v8FrWzFjk
cOeaZY55Xq8hbbbmkF1LoezLrlQDF5aJcj6tl85lyuSJfR5d5BXmLswI7bglw8Qy
ZU7/aF28pbhUT3oozNuRx5yl8oqpxmUoCwfP5hfnFf590OJ3noIELbOoIZQkJQUy
LsCf3GMUQaWzrvs0IenM1lMJmw5zfDXbrUWUti95OAd5bbTdBE30z7EouejoKRVh
1/Wg4keBdtem4CpU+C4fUVtLL4XJhe/uadbjKteA7DRpTRMvrLYNutQgyOAuQjRM
RiLvDPnsIZEGV+YMsj+IemN0hanae4kR3v8At+HwvVK1hROWEQWyL6cGxXH9n9jB
VToxoYoyiAOk01X2BnPVMVTXEl5XMAVgZ1IgZNhnhaIUxi3HKrUfNG4oXE5Jx8Lw
XruUAUKHknTUJ2Q/3y4D
=Fagt
-----END PGP SIGNATURE-----
Merge tag 'renesas-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM Renesas SoC cleanup, refactoring and more SMP support from Kevin Hilman:
"Lots of cleanup and refactoring and some SMP additions for Renesas
platforms. Due to some inter-dependencies with other arm-soc
branches, this Renesas stuff was separated out for sending after the
other branches were merged.
Highlights:
- remove unused board support and cleanup of unused headers
- refactoring of init and device registration
- simplify IRQ initialization"
* tag 'renesas-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (68 commits)
ARM: shmobile: Per-CPU SMP boot / sleep code for SCU SoCs
ARM: shmobile: Introduce per-CPU SMP boot / sleep code
ARM: shmobile: Use shared SCU CPU Hotplug code on r8a7779
ARM: shmobile: Use shared SCU CPU Hotplug code on sh73a0
ARM: shmobile: Add shared SCU CPU Hotplug code
ARM: shmobile: Use shared SCU SMP boot code on emev2
ARM: shmobile: Use shared SCU SMP boot code on r8a7779
ARM: shmobile: Use shared SCU SMP boot code on sh73a0
ARM: shmobile: Introduce shared SCU SMP boot code
ARM: shmobile: sh73a0: Remove global GPIO_NR definition
ARM: shmobile: kzm9d: remove nfsroot settings from bootargs
ARM: shmobile: armadillo800eva: remove nfsroot settings from bootargs
ARM: shmobile: r8a7779: move r8a7779_init_irq_xxx() to setup
ARM: shmobile: r8a7740: move r8a7740_init_irq_of() to setup
ARM: shmobile: bockw: add missing __initdata
ARM: shmobile: r8a7790: add missing __initdata
ARM: shmobile: r8a7779: add missing __initdata
ARM: shmobile: Remove unused shmobile_init_time()
ARM: shmobile: Use clocksource_of_init() on r8a7790
ARM: shmobile: Use default ->init_time() on KZM9G DT ref
...
308 lines
7.4 KiB
Plaintext
308 lines
7.4 KiB
Plaintext
config ARCH_SHMOBILE_MULTI
|
|
bool "SH-Mobile Series" if ARCH_MULTI_V7
|
|
depends on MMU
|
|
select CPU_V7
|
|
select GENERIC_CLOCKEVENTS
|
|
select HAVE_ARM_SCU if SMP
|
|
select HAVE_ARM_TWD if LOCAL_TIMERS
|
|
select HAVE_SMP
|
|
select ARM_GIC
|
|
select MIGHT_HAVE_CACHE_L2X0
|
|
select NO_IOPORT
|
|
select PINCTRL
|
|
select ARCH_REQUIRE_GPIOLIB
|
|
select CLKDEV_LOOKUP
|
|
|
|
if ARCH_SHMOBILE_MULTI
|
|
|
|
comment "SH-Mobile System Type"
|
|
|
|
config ARCH_EMEV2
|
|
bool "Emma Mobile EV2"
|
|
|
|
comment "SH-Mobile Board Type"
|
|
|
|
config MACH_KZM9D_REFERENCE
|
|
bool "KZM9D board - Reference Device Tree Implementation"
|
|
depends on ARCH_EMEV2
|
|
select REGULATOR_FIXED_VOLTAGE if REGULATOR
|
|
---help---
|
|
Use reference implementation of KZM9D board support
|
|
which makes a greater use of device tree at the expense
|
|
of not supporting a number of devices.
|
|
|
|
This is intended to aid developers
|
|
|
|
comment "SH-Mobile System Configuration"
|
|
endif
|
|
|
|
if ARCH_SHMOBILE
|
|
|
|
comment "SH-Mobile System Type"
|
|
|
|
config ARCH_SH7372
|
|
bool "SH-Mobile AP4 (SH7372)"
|
|
select ARCH_WANT_OPTIONAL_GPIOLIB
|
|
select ARM_CPU_SUSPEND if PM || CPU_IDLE
|
|
select CPU_V7
|
|
select SH_CLK_CPG
|
|
|
|
config ARCH_SH73A0
|
|
bool "SH-Mobile AG5 (R8A73A00)"
|
|
select ARCH_WANT_OPTIONAL_GPIOLIB
|
|
select ARM_GIC
|
|
select CPU_V7
|
|
select I2C
|
|
select SH_CLK_CPG
|
|
select RENESAS_INTC_IRQPIN
|
|
|
|
config ARCH_R8A73A4
|
|
bool "R-Mobile APE6 (R8A73A40)"
|
|
select ARCH_WANT_OPTIONAL_GPIOLIB
|
|
select ARM_GIC
|
|
select CPU_V7
|
|
select SH_CLK_CPG
|
|
select RENESAS_IRQC
|
|
select ARCH_HAS_CPUFREQ
|
|
select ARCH_HAS_OPP
|
|
|
|
config ARCH_R8A7740
|
|
bool "R-Mobile A1 (R8A77400)"
|
|
select ARCH_WANT_OPTIONAL_GPIOLIB
|
|
select ARM_GIC
|
|
select CPU_V7
|
|
select SH_CLK_CPG
|
|
select RENESAS_INTC_IRQPIN
|
|
|
|
config ARCH_R8A7778
|
|
bool "R-Car M1A (R8A77781)"
|
|
select ARCH_WANT_OPTIONAL_GPIOLIB
|
|
select CPU_V7
|
|
select SH_CLK_CPG
|
|
select ARM_GIC
|
|
select USB_ARCH_HAS_EHCI
|
|
select USB_ARCH_HAS_OHCI
|
|
|
|
config ARCH_R8A7779
|
|
bool "R-Car H1 (R8A77790)"
|
|
select ARCH_WANT_OPTIONAL_GPIOLIB
|
|
select ARM_GIC
|
|
select CPU_V7
|
|
select SH_CLK_CPG
|
|
select USB_ARCH_HAS_EHCI
|
|
select USB_ARCH_HAS_OHCI
|
|
select RENESAS_INTC_IRQPIN
|
|
|
|
config ARCH_R8A7790
|
|
bool "R-Car H2 (R8A77900)"
|
|
select ARCH_WANT_OPTIONAL_GPIOLIB
|
|
select ARM_GIC
|
|
select CPU_V7
|
|
select SH_CLK_CPG
|
|
select RENESAS_IRQC
|
|
|
|
config ARCH_EMEV2
|
|
bool "Emma Mobile EV2"
|
|
select ARCH_WANT_OPTIONAL_GPIOLIB
|
|
select ARM_GIC
|
|
select CPU_V7
|
|
|
|
comment "SH-Mobile Board Type"
|
|
|
|
config MACH_APE6EVM
|
|
bool "APE6EVM board"
|
|
depends on ARCH_R8A73A4
|
|
select USE_OF
|
|
|
|
config MACH_APE6EVM_REFERENCE
|
|
bool "APE6EVM board - Reference Device Tree Implementation"
|
|
depends on ARCH_R8A73A4
|
|
select USE_OF
|
|
---help---
|
|
Use reference implementation of APE6EVM board support
|
|
which makes a greater use of device tree at the expense
|
|
of not supporting a number of devices.
|
|
|
|
This is intended to aid developers
|
|
|
|
config MACH_MACKEREL
|
|
bool "mackerel board"
|
|
depends on ARCH_SH7372
|
|
select ARCH_REQUIRE_GPIOLIB
|
|
select REGULATOR_FIXED_VOLTAGE if REGULATOR
|
|
select SND_SOC_AK4642 if SND_SIMPLE_CARD
|
|
select USE_OF
|
|
|
|
config MACH_ARMADILLO800EVA
|
|
bool "Armadillo-800 EVA board"
|
|
depends on ARCH_R8A7740
|
|
select ARCH_REQUIRE_GPIOLIB
|
|
select REGULATOR_FIXED_VOLTAGE if REGULATOR
|
|
select SND_SOC_WM8978 if SND_SIMPLE_CARD
|
|
select USE_OF
|
|
|
|
config MACH_ARMADILLO800EVA_REFERENCE
|
|
bool "Armadillo-800 EVA board - Reference Device Tree Implementation"
|
|
depends on ARCH_R8A7740
|
|
select ARCH_REQUIRE_GPIOLIB
|
|
select REGULATOR_FIXED_VOLTAGE if REGULATOR
|
|
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
|
|
of not supporting a number of devices.
|
|
|
|
This is intended to aid developers
|
|
|
|
config MACH_BOCKW
|
|
bool "BOCK-W platform"
|
|
depends on ARCH_R8A7778
|
|
select ARCH_REQUIRE_GPIOLIB
|
|
select RENESAS_INTC_IRQPIN
|
|
select REGULATOR_FIXED_VOLTAGE if REGULATOR
|
|
select USE_OF
|
|
|
|
config MACH_BOCKW_REFERENCE
|
|
bool "BOCK-W - Reference Device Tree Implementation"
|
|
depends on ARCH_R8A7778
|
|
select ARCH_REQUIRE_GPIOLIB
|
|
select RENESAS_INTC_IRQPIN
|
|
select REGULATOR_FIXED_VOLTAGE if REGULATOR
|
|
select USE_OF
|
|
---help---
|
|
Use reference implementation of BockW board support
|
|
which makes use of device tree at the expense
|
|
of not supporting a number of devices.
|
|
|
|
This is intended to aid developers
|
|
|
|
config MACH_MARZEN
|
|
bool "MARZEN board"
|
|
depends on ARCH_R8A7779
|
|
select ARCH_REQUIRE_GPIOLIB
|
|
select REGULATOR_FIXED_VOLTAGE if REGULATOR
|
|
select USE_OF
|
|
|
|
config MACH_MARZEN_REFERENCE
|
|
bool "MARZEN board - Reference Device Tree Implementation"
|
|
depends on ARCH_R8A7779
|
|
select ARCH_REQUIRE_GPIOLIB
|
|
select REGULATOR_FIXED_VOLTAGE if REGULATOR
|
|
select USE_OF
|
|
---help---
|
|
Use reference implementation of Marzen board support
|
|
which makes use of device tree at the expense
|
|
of not supporting a number of devices.
|
|
|
|
This is intended to aid developers
|
|
|
|
config MACH_LAGER
|
|
bool "Lager board"
|
|
depends on ARCH_R8A7790
|
|
select USE_OF
|
|
|
|
config MACH_LAGER_REFERENCE
|
|
bool "Lager board - Reference Device Tree Implementation"
|
|
depends on ARCH_R8A7790
|
|
select USE_OF
|
|
---help---
|
|
Use reference implementation of Lager board support
|
|
which makes use of device tree at the expense
|
|
of not supporting a number of devices.
|
|
|
|
This is intended to aid developers
|
|
|
|
config MACH_KZM9D
|
|
bool "KZM9D board"
|
|
depends on ARCH_EMEV2
|
|
select REGULATOR_FIXED_VOLTAGE if REGULATOR
|
|
select USE_OF
|
|
|
|
config MACH_KZM9D_REFERENCE
|
|
bool "KZM9D board - Reference Device Tree Implementation"
|
|
depends on ARCH_EMEV2
|
|
select REGULATOR_FIXED_VOLTAGE if REGULATOR
|
|
select USE_OF
|
|
---help---
|
|
Use reference implementation of KZM9D board support
|
|
which makes a greater use of device tree at the expense
|
|
of not supporting a number of devices.
|
|
|
|
This is intended to aid developers
|
|
|
|
config MACH_KZM9G
|
|
bool "KZM-A9-GT board"
|
|
depends on ARCH_SH73A0
|
|
select ARCH_HAS_CPUFREQ
|
|
select ARCH_HAS_OPP
|
|
select ARCH_REQUIRE_GPIOLIB
|
|
select REGULATOR_FIXED_VOLTAGE if REGULATOR
|
|
select SND_SOC_AK4642 if SND_SIMPLE_CARD
|
|
select USE_OF
|
|
|
|
config MACH_KZM9G_REFERENCE
|
|
bool "KZM-A9-GT board - Reference Device Tree Implementation"
|
|
depends on ARCH_SH73A0
|
|
select ARCH_REQUIRE_GPIOLIB
|
|
select REGULATOR_FIXED_VOLTAGE if REGULATOR
|
|
select SND_SOC_AK4642 if SND_SIMPLE_CARD
|
|
select USE_OF
|
|
---help---
|
|
Use reference implementation of KZM-A9-GT board support
|
|
which makes as greater use of device tree at the expense
|
|
of not supporting a number of devices.
|
|
|
|
This is intended to aid developers
|
|
|
|
comment "SH-Mobile System Configuration"
|
|
|
|
config CPU_HAS_INTEVT
|
|
bool
|
|
default y
|
|
|
|
config SH_CLK_CPG
|
|
bool
|
|
|
|
source "drivers/sh/Kconfig"
|
|
|
|
endif
|
|
|
|
if ARCH_SHMOBILE || ARCH_SHMOBILE_MULTI
|
|
|
|
menu "Timer and clock configuration"
|
|
|
|
config SHMOBILE_TIMER_HZ
|
|
int "Kernel HZ (jiffies per second)"
|
|
range 32 1024
|
|
default "128"
|
|
help
|
|
Allows the configuration of the timer frequency. It is customary
|
|
to have the timer interrupt run at 1000 Hz or 100 Hz, but in the
|
|
case of low timer frequencies other values may be more suitable.
|
|
SH-Mobile systems using a 32768 Hz RCLK for clock events may want
|
|
to select a HZ value such as 128 that can evenly divide RCLK.
|
|
A HZ value that does not divide evenly may cause timer drift.
|
|
|
|
config SH_TIMER_CMT
|
|
bool "CMT timer driver"
|
|
default y
|
|
help
|
|
This enables build of the CMT timer driver.
|
|
|
|
config SH_TIMER_TMU
|
|
bool "TMU timer driver"
|
|
default y
|
|
help
|
|
This enables build of the TMU timer driver.
|
|
|
|
config EM_TIMER_STI
|
|
bool "STI timer driver"
|
|
default y
|
|
help
|
|
This enables build of the STI timer driver.
|
|
|
|
endmenu
|
|
|
|
endif
|