mirror of
https://github.com/Fishwaldo/linux-bl808.git
synced 2025-03-19 05:24:11 +00:00
SH Drivers Updates For v3.17
* Confine SH_INTC to platforms that need it -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJT+oswAAoJENfPZGlqN0++/A8QAK2yp96zl7gABtddgkunNJiV xWCm4wcP+7dIrLpwizxtt/6HMPj9ZJHYtcxRRKVlzquwcukeVCIkfZ3Qvn2JilWM +b4rVRGzQ+z0M7SCpNGjtgFc1IFrVrzuxZpPwgseQ5I6HQsZJKUi3qn5rRJSEax2 w+ANis2eZfmSBdu3Qsx2QBDXvS7ZPlLpimoAE+rjr60dZnljcrvBrVHQvSgpEHxn 4rXPbYrrkIee32J4lxLRDPtn5fvAsrr+vcLXEYqyFr2292U2PAxIrjZgrRzZYNtD L6xmhZAhdmIpC0gLDLyKQhwj/9pfGFxFErZX9jeGdPT2KTEEYPkSxb75kdTwmxP4 DEtZG9Nuu6CQCBldrMt6kpujn+XCYRl94cSyUffJ5KVhNUiqB+e+JP80Yj9HB7QU nGUfs2hQ/azY8XEiwvnls0314thkB5gN7KHxmlaFa9Wz7cgYFwWAguHH8qrq839U +i+7dUg7nlmVoIAvzYIIA+L7x3xX4gEwsf88x3i04DPp0A8/oDAwGrqM5QzsaZpD ghodnKRG7foc+29RLYka5CxF/MqKzpJu675sSBCVB3uW9NZpoGSwml/NN9yUu1JD uvU2FECcbxF5OU6RHfq8FFql0fAOVeVWsMCEXgkjpZOXynKU15VTf1K2d+qkUZ/Y gV45Jj+yCZhYs0wbXUml =QSyy -----END PGP SIGNATURE----- Merge tag 'renesas-sh-drivers-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas Pull SH driver fix from Simon Horman: "Confine SH_INTC to platforms that need it" * tag 'renesas-sh-drivers-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: sh: intc: Confine SH_INTC to platforms that need it
This commit is contained in:
commit
dd5957b78f
4 changed files with 11 additions and 3 deletions
|
@ -75,6 +75,7 @@ config ARCH_SH7372
|
||||||
select ARM_CPU_SUSPEND if PM || CPU_IDLE
|
select ARM_CPU_SUSPEND if PM || CPU_IDLE
|
||||||
select CPU_V7
|
select CPU_V7
|
||||||
select SH_CLK_CPG
|
select SH_CLK_CPG
|
||||||
|
select SH_INTC
|
||||||
select SYS_SUPPORTS_SH_CMT
|
select SYS_SUPPORTS_SH_CMT
|
||||||
select SYS_SUPPORTS_SH_TMU
|
select SYS_SUPPORTS_SH_TMU
|
||||||
|
|
||||||
|
@ -85,6 +86,7 @@ config ARCH_SH73A0
|
||||||
select CPU_V7
|
select CPU_V7
|
||||||
select I2C
|
select I2C
|
||||||
select SH_CLK_CPG
|
select SH_CLK_CPG
|
||||||
|
select SH_INTC
|
||||||
select RENESAS_INTC_IRQPIN
|
select RENESAS_INTC_IRQPIN
|
||||||
select SYS_SUPPORTS_SH_CMT
|
select SYS_SUPPORTS_SH_CMT
|
||||||
select SYS_SUPPORTS_SH_TMU
|
select SYS_SUPPORTS_SH_TMU
|
||||||
|
|
|
@ -172,6 +172,7 @@ menu "System type"
|
||||||
#
|
#
|
||||||
config CPU_SH2
|
config CPU_SH2
|
||||||
bool
|
bool
|
||||||
|
select SH_INTC
|
||||||
|
|
||||||
config CPU_SH2A
|
config CPU_SH2A
|
||||||
bool
|
bool
|
||||||
|
@ -182,6 +183,7 @@ config CPU_SH3
|
||||||
bool
|
bool
|
||||||
select CPU_HAS_INTEVT
|
select CPU_HAS_INTEVT
|
||||||
select CPU_HAS_SR_RB
|
select CPU_HAS_SR_RB
|
||||||
|
select SH_INTC
|
||||||
select SYS_SUPPORTS_SH_TMU
|
select SYS_SUPPORTS_SH_TMU
|
||||||
|
|
||||||
config CPU_SH4
|
config CPU_SH4
|
||||||
|
@ -189,6 +191,7 @@ config CPU_SH4
|
||||||
select CPU_HAS_INTEVT
|
select CPU_HAS_INTEVT
|
||||||
select CPU_HAS_SR_RB
|
select CPU_HAS_SR_RB
|
||||||
select CPU_HAS_FPU if !CPU_SH4AL_DSP
|
select CPU_HAS_FPU if !CPU_SH4AL_DSP
|
||||||
|
select SH_INTC
|
||||||
select SYS_SUPPORTS_SH_TMU
|
select SYS_SUPPORTS_SH_TMU
|
||||||
select SYS_SUPPORTS_HUGETLBFS if MMU
|
select SYS_SUPPORTS_HUGETLBFS if MMU
|
||||||
|
|
||||||
|
|
|
@ -1,8 +1,7 @@
|
||||||
#
|
#
|
||||||
# Makefile for the SuperH specific drivers.
|
# Makefile for the SuperH specific drivers.
|
||||||
#
|
#
|
||||||
obj-$(CONFIG_SUPERH) += intc/
|
obj-$(CONFIG_SH_INTC) += intc/
|
||||||
obj-$(CONFIG_ARCH_SHMOBILE_LEGACY) += intc/
|
|
||||||
ifneq ($(CONFIG_COMMON_CLK),y)
|
ifneq ($(CONFIG_COMMON_CLK),y)
|
||||||
obj-$(CONFIG_HAVE_CLK) += clk/
|
obj-$(CONFIG_HAVE_CLK) += clk/
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -1,7 +1,9 @@
|
||||||
config SH_INTC
|
config SH_INTC
|
||||||
def_bool y
|
bool
|
||||||
select IRQ_DOMAIN
|
select IRQ_DOMAIN
|
||||||
|
|
||||||
|
if SH_INTC
|
||||||
|
|
||||||
comment "Interrupt controller options"
|
comment "Interrupt controller options"
|
||||||
|
|
||||||
config INTC_USERIMASK
|
config INTC_USERIMASK
|
||||||
|
@ -37,3 +39,5 @@ config INTC_MAPPING_DEBUG
|
||||||
between system IRQs and the per-controller id tables.
|
between system IRQs and the per-controller id tables.
|
||||||
|
|
||||||
If in doubt, say N.
|
If in doubt, say N.
|
||||||
|
|
||||||
|
endif
|
||||||
|
|
Loading…
Add table
Reference in a new issue