mirror of
https://github.com/torvalds/linux.git
synced 2024-11-07 04:32:03 +00:00
98abaf1370
* Use shmobile_init_late on r8a7791 and r8a7790 whien booting using DT-only * Support Core-Standby for Suspend to RAM on r8a7791 and r8a7790 SoCs * Shared CMA reservation for R-Car Gen2 SoCs * Add r8a7791 SYSC power management support -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJTqnn+AAoJENfPZGlqN0++SZIP/jn48ADVugeEANLibUl10IBb hWKh80Fr4/ELaXd0KJTa8SDzLW/JB3rr29bwBhkRWIcsMIeWObI2wJEnSVX2yZkO ZBijr9FbdmhQ5VmkXEqjUqYkGKx/0IGHMFQ8R6Io3tiwpLXFdz2+moT8cu3Rl4TP WNvP+xEPjvPUb/7PygXg2Ypdq5jmV4j24LUCJj+yo3ULP2zv92d620CuWT3P0zbv 5PRP3SvbzgwYHhINFF8e4StYsjrl++V+w5pjdm3XDcVNkDoc6p/e8Jqse6wjAYY+ 2ShUXhfg7/D56BlEChHb6xwlJmImO81x1NrB5zM69vpvGGQ9fW1XwDAtrFzocDag vDDp4KIY8TD/T6E6KhEpOdW1GSWYukJ2PBqsgxuYaY8eBO7HDPbG5klj8VEfACgu ZeY0F2Uq/wb1mJNh32s1FIaWQPGAGPY5Yi77ShHbo3xKQBlqtY2M3Snw8hYLUKgS tDowT94fWAdXXlFCtvOUMyPEa5+hqZ68PlYFU7Z0jvYcaUm9Ui/EEgo7YqdBWh9e CVN1fG5SvV8HY5h81GqvC87B45EzALqMG28rhv4e0rSP9PxHuIGWd/m22ea+aV8G eDKinQ0+EXeyG6BKjbx63s3zGiv60gNcj8anG7Kd6UNpyLnRGewWJkIpSonmqO9R TQNXLY08LHnONq/gw5Xc =6J6K -----END PGP SIGNATURE----- Merge tag 'renesas-soc-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc Merge "Renesas ARM Based SoC Updates for v3.17" from Simon Horman: - Use shmobile_init_late on r8a7791 and r8a7790 whien booting using DT-only - Support Core-Standby for Suspend to RAM on r8a7791 and r8a7790 SoCs - Shared CMA reservation for R-Car Gen2 SoCs - Add r8a7791 SYSC power management support * tag 'renesas-soc-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: Remove ARCH_HAS_CPUFREQ config for shmobile ARM: shmobile: rcar-gen2: update call to dma_contiguous_reserve_area ARM: shmobile: rcar-gen2: correct return value of shmobile_smp_apmu_suspend_init ARM: shmobile: rcar-gen2: Remove useless copied section for LongTrail ARM: shmobile: rcar-gen2: Use "1ULL" instead of "(u64)1" ARM: shmobile: rcar-gen2: Update for of_get_flat_dt_prop() update ARM: shmobile: Add shared R-Car Gen2 CMA reservation code ARM: shmobile: Use shmobile_init_late() on r8a7791 DT-only ARM: shmobile: Use shmobile_init_late() on r8a7790 DT-only ARM: shmobile: Mark all SoCs in shmobile as CPUFreq, capable ARM: shmobile: r8a7791: Support Core-Standby for Suspend to RAM ARM: shmobile: r8a7790: Support Core-Standby for Suspend to RAM ARM: shmobile: APMU: Add Core-Standby-state for Suspend to RAM ARM: shmobile: r8a7791 SYSC setup code Signed-off-by: Olof Johansson <olof@lixom.net>
316 lines
7.2 KiB
Plaintext
316 lines
7.2 KiB
Plaintext
config ARCH_SHMOBILE
|
|
bool
|
|
|
|
menuconfig ARCH_SHMOBILE_MULTI
|
|
bool "Renesas ARM SoCs" if ARCH_MULTI_V7
|
|
depends on MMU
|
|
select ARCH_SHMOBILE
|
|
select HAVE_ARM_SCU if SMP
|
|
select HAVE_ARM_TWD if SMP
|
|
select ARM_GIC
|
|
select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
|
|
select NO_IOPORT_MAP
|
|
select PINCTRL
|
|
select ARCH_REQUIRE_GPIOLIB
|
|
select ARCH_HAS_OPP
|
|
|
|
if ARCH_SHMOBILE_MULTI
|
|
|
|
#comment "Renesas ARM SoCs System Type"
|
|
|
|
config ARCH_EMEV2
|
|
bool "Emma Mobile EV2"
|
|
select SYS_SUPPORTS_EM_STI
|
|
|
|
config ARCH_R7S72100
|
|
bool "RZ/A1H (R7S72100)"
|
|
select SYS_SUPPORTS_SH_MTU2
|
|
|
|
config ARCH_R8A7779
|
|
bool "R-Car H1 (R8A77790)"
|
|
select RENESAS_INTC_IRQPIN
|
|
select SYS_SUPPORTS_SH_TMU
|
|
|
|
config ARCH_R8A7790
|
|
bool "R-Car H2 (R8A77900)"
|
|
select RENESAS_IRQC
|
|
select SYS_SUPPORTS_SH_CMT
|
|
|
|
config ARCH_R8A7791
|
|
bool "R-Car M2 (R8A77910)"
|
|
select RENESAS_IRQC
|
|
select SYS_SUPPORTS_SH_CMT
|
|
|
|
comment "Renesas ARM SoCs Board Type"
|
|
|
|
config MACH_GENMAI
|
|
bool "Genmai board"
|
|
depends on ARCH_R7S72100
|
|
|
|
config MACH_KOELSCH
|
|
bool "Koelsch board"
|
|
depends on ARCH_R8A7791
|
|
select MICREL_PHY if SH_ETH
|
|
|
|
config MACH_LAGER
|
|
bool "Lager board"
|
|
depends on ARCH_R8A7790
|
|
select MICREL_PHY if SH_ETH
|
|
|
|
config MACH_MARZEN
|
|
bool "MARZEN board"
|
|
depends on ARCH_R8A7779
|
|
select REGULATOR_FIXED_VOLTAGE if REGULATOR
|
|
|
|
comment "Renesas ARM SoCs System Configuration"
|
|
endif
|
|
|
|
if ARCH_SHMOBILE_LEGACY
|
|
|
|
comment "Renesas ARM SoCs 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
|
|
select SYS_SUPPORTS_SH_CMT
|
|
select SYS_SUPPORTS_SH_TMU
|
|
|
|
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
|
|
select SYS_SUPPORTS_SH_CMT
|
|
select SYS_SUPPORTS_SH_TMU
|
|
|
|
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_OPP
|
|
select SYS_SUPPORTS_SH_CMT
|
|
select SYS_SUPPORTS_SH_TMU
|
|
|
|
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
|
|
select SYS_SUPPORTS_SH_CMT
|
|
select SYS_SUPPORTS_SH_TMU
|
|
|
|
config ARCH_R8A7778
|
|
bool "R-Car M1A (R8A77781)"
|
|
select ARCH_WANT_OPTIONAL_GPIOLIB
|
|
select CPU_V7
|
|
select SH_CLK_CPG
|
|
select ARM_GIC
|
|
select SYS_SUPPORTS_SH_TMU
|
|
select RENESAS_INTC_IRQPIN
|
|
|
|
config ARCH_R8A7779
|
|
bool "R-Car H1 (R8A77790)"
|
|
select ARCH_WANT_OPTIONAL_GPIOLIB
|
|
select ARM_GIC
|
|
select CPU_V7
|
|
select SH_CLK_CPG
|
|
select RENESAS_INTC_IRQPIN
|
|
select SYS_SUPPORTS_SH_TMU
|
|
|
|
config ARCH_R8A7790
|
|
bool "R-Car H2 (R8A77900)"
|
|
select ARCH_WANT_OPTIONAL_GPIOLIB
|
|
select ARM_GIC
|
|
select CPU_V7
|
|
select MIGHT_HAVE_PCI
|
|
select SH_CLK_CPG
|
|
select RENESAS_IRQC
|
|
select SYS_SUPPORTS_SH_CMT
|
|
select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
|
|
|
|
config ARCH_R8A7791
|
|
bool "R-Car M2 (R8A77910)"
|
|
select ARCH_WANT_OPTIONAL_GPIOLIB
|
|
select ARM_GIC
|
|
select CPU_V7
|
|
select MIGHT_HAVE_PCI
|
|
select SH_CLK_CPG
|
|
select RENESAS_IRQC
|
|
select SYS_SUPPORTS_SH_CMT
|
|
select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
|
|
|
|
config ARCH_R7S72100
|
|
bool "RZ/A1H (R7S72100)"
|
|
select ARCH_WANT_OPTIONAL_GPIOLIB
|
|
select ARM_GIC
|
|
select CPU_V7
|
|
select SH_CLK_CPG
|
|
select SYS_SUPPORTS_SH_MTU2
|
|
|
|
comment "Renesas ARM SoCs Board Type"
|
|
|
|
config MACH_APE6EVM
|
|
bool "APE6EVM board"
|
|
depends on ARCH_R8A73A4
|
|
select SMSC_PHY if SMSC911X
|
|
select USE_OF
|
|
|
|
config MACH_APE6EVM_REFERENCE
|
|
bool "APE6EVM board - Reference Device Tree Implementation"
|
|
depends on ARCH_R8A73A4
|
|
select SMSC_PHY if SMSC911X
|
|
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 SMSC_PHY if SMSC911X
|
|
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 SMSC_PHY if SH_ETH
|
|
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 SMSC_PHY if SH_ETH
|
|
select SND_SOC_WM8978 if SND_SIMPLE_CARD
|
|
select USE_OF
|
|
---help---
|
|
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
|
|
|
|
config MACH_BOCKW
|
|
bool "BOCK-W platform"
|
|
depends on ARCH_R8A7778
|
|
select ARCH_REQUIRE_GPIOLIB
|
|
select REGULATOR_FIXED_VOLTAGE if REGULATOR
|
|
select SND_SOC_AK4554 if SND_SIMPLE_CARD
|
|
select SND_SOC_AK4642 if SND_SIMPLE_CARD
|
|
select USE_OF
|
|
|
|
config MACH_BOCKW_REFERENCE
|
|
bool "BOCK-W - Reference Device Tree Implementation"
|
|
depends on ARCH_R8A7778
|
|
select ARCH_REQUIRE_GPIOLIB
|
|
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_GENMAI
|
|
bool "Genmai board"
|
|
depends on ARCH_R7S72100
|
|
select USE_OF
|
|
|
|
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_LAGER
|
|
bool "Lager board"
|
|
depends on ARCH_R8A7790
|
|
select USE_OF
|
|
select MICREL_PHY if SH_ETH
|
|
select SND_SOC_AK4642 if SND_SIMPLE_CARD
|
|
|
|
config MACH_KOELSCH
|
|
bool "Koelsch board"
|
|
depends on ARCH_R8A7791
|
|
select USE_OF
|
|
select MICREL_PHY if SH_ETH
|
|
|
|
config MACH_KZM9G
|
|
bool "KZM-A9-GT board"
|
|
depends on ARCH_SH73A0
|
|
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 "Renesas ARM SoCs System Configuration"
|
|
|
|
config CPU_HAS_INTEVT
|
|
bool
|
|
default y
|
|
|
|
config SH_CLK_CPG
|
|
bool
|
|
|
|
source "drivers/sh/Kconfig"
|
|
|
|
endif
|
|
|
|
if ARCH_SHMOBILE
|
|
|
|
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.
|
|
Renesas ARM SoC 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.
|
|
|
|
endmenu
|
|
|
|
endif
|