You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
Merge 3.5-rc4 into usb-next
This is to get the USB fixes that were merged in the 3.5-rc4 tree into usb-next so that everyone can sync up properly. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
@@ -111,6 +111,7 @@ Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
|
|||||||
Uwe Kleine-König <ukl@pengutronix.de>
|
Uwe Kleine-König <ukl@pengutronix.de>
|
||||||
Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
|
Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
|
||||||
Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
|
Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
|
||||||
|
Viresh Kumar <viresh.linux@gmail.com> <viresh.kumar@st.com>
|
||||||
Takashi YOSHII <takashi.yoshii.zj@renesas.com>
|
Takashi YOSHII <takashi.yoshii.zj@renesas.com>
|
||||||
Yusuke Goda <goda.yusuke@renesas.com>
|
Yusuke Goda <goda.yusuke@renesas.com>
|
||||||
Gustavo Padovan <gustavo@las.ic.unicamp.br>
|
Gustavo Padovan <gustavo@las.ic.unicamp.br>
|
||||||
|
|||||||
@@ -219,6 +219,7 @@ What: /sys/bus/iio/devices/iio:deviceX/in_voltageY_scale
|
|||||||
What: /sys/bus/iio/devices/iio:deviceX/in_voltageY_supply_scale
|
What: /sys/bus/iio/devices/iio:deviceX/in_voltageY_supply_scale
|
||||||
What: /sys/bus/iio/devices/iio:deviceX/in_voltage_scale
|
What: /sys/bus/iio/devices/iio:deviceX/in_voltage_scale
|
||||||
What: /sys/bus/iio/devices/iio:deviceX/out_voltageY_scale
|
What: /sys/bus/iio/devices/iio:deviceX/out_voltageY_scale
|
||||||
|
What: /sys/bus/iio/devices/iio:deviceX/out_altvoltageY_scale
|
||||||
What: /sys/bus/iio/devices/iio:deviceX/in_accel_scale
|
What: /sys/bus/iio/devices/iio:deviceX/in_accel_scale
|
||||||
What: /sys/bus/iio/devices/iio:deviceX/in_accel_peak_scale
|
What: /sys/bus/iio/devices/iio:deviceX/in_accel_peak_scale
|
||||||
What: /sys/bus/iio/devices/iio:deviceX/in_anglvel_scale
|
What: /sys/bus/iio/devices/iio:deviceX/in_anglvel_scale
|
||||||
@@ -273,6 +274,7 @@ What: /sys/bus/iio/devices/iio:deviceX/in_accel_scale_available
|
|||||||
What: /sys/.../iio:deviceX/in_voltageX_scale_available
|
What: /sys/.../iio:deviceX/in_voltageX_scale_available
|
||||||
What: /sys/.../iio:deviceX/in_voltage-voltage_scale_available
|
What: /sys/.../iio:deviceX/in_voltage-voltage_scale_available
|
||||||
What: /sys/.../iio:deviceX/out_voltageX_scale_available
|
What: /sys/.../iio:deviceX/out_voltageX_scale_available
|
||||||
|
What: /sys/.../iio:deviceX/out_altvoltageX_scale_available
|
||||||
What: /sys/.../iio:deviceX/in_capacitance_scale_available
|
What: /sys/.../iio:deviceX/in_capacitance_scale_available
|
||||||
KernelVersion: 2.635
|
KernelVersion: 2.635
|
||||||
Contact: linux-iio@vger.kernel.org
|
Contact: linux-iio@vger.kernel.org
|
||||||
@@ -298,14 +300,19 @@ Description:
|
|||||||
gives the 3dB frequency of the filter in Hz.
|
gives the 3dB frequency of the filter in Hz.
|
||||||
|
|
||||||
What: /sys/bus/iio/devices/iio:deviceX/out_voltageY_raw
|
What: /sys/bus/iio/devices/iio:deviceX/out_voltageY_raw
|
||||||
|
What: /sys/bus/iio/devices/iio:deviceX/out_altvoltageY_raw
|
||||||
KernelVersion: 2.6.37
|
KernelVersion: 2.6.37
|
||||||
Contact: linux-iio@vger.kernel.org
|
Contact: linux-iio@vger.kernel.org
|
||||||
Description:
|
Description:
|
||||||
Raw (unscaled, no bias etc.) output voltage for
|
Raw (unscaled, no bias etc.) output voltage for
|
||||||
channel Y. The number must always be specified and
|
channel Y. The number must always be specified and
|
||||||
unique if the output corresponds to a single channel.
|
unique if the output corresponds to a single channel.
|
||||||
|
While DAC like devices typically use out_voltage,
|
||||||
|
a continuous frequency generating device, such as
|
||||||
|
a DDS or PLL should use out_altvoltage.
|
||||||
|
|
||||||
What: /sys/bus/iio/devices/iio:deviceX/out_voltageY&Z_raw
|
What: /sys/bus/iio/devices/iio:deviceX/out_voltageY&Z_raw
|
||||||
|
What: /sys/bus/iio/devices/iio:deviceX/out_altvoltageY&Z_raw
|
||||||
KernelVersion: 2.6.37
|
KernelVersion: 2.6.37
|
||||||
Contact: linux-iio@vger.kernel.org
|
Contact: linux-iio@vger.kernel.org
|
||||||
Description:
|
Description:
|
||||||
@@ -316,6 +323,8 @@ Description:
|
|||||||
|
|
||||||
What: /sys/bus/iio/devices/iio:deviceX/out_voltageY_powerdown_mode
|
What: /sys/bus/iio/devices/iio:deviceX/out_voltageY_powerdown_mode
|
||||||
What: /sys/bus/iio/devices/iio:deviceX/out_voltage_powerdown_mode
|
What: /sys/bus/iio/devices/iio:deviceX/out_voltage_powerdown_mode
|
||||||
|
What: /sys/bus/iio/devices/iio:deviceX/out_altvoltageY_powerdown_mode
|
||||||
|
What: /sys/bus/iio/devices/iio:deviceX/out_altvoltage_powerdown_mode
|
||||||
KernelVersion: 2.6.38
|
KernelVersion: 2.6.38
|
||||||
Contact: linux-iio@vger.kernel.org
|
Contact: linux-iio@vger.kernel.org
|
||||||
Description:
|
Description:
|
||||||
@@ -330,6 +339,8 @@ Description:
|
|||||||
|
|
||||||
What: /sys/.../iio:deviceX/out_votlageY_powerdown_mode_available
|
What: /sys/.../iio:deviceX/out_votlageY_powerdown_mode_available
|
||||||
What: /sys/.../iio:deviceX/out_voltage_powerdown_mode_available
|
What: /sys/.../iio:deviceX/out_voltage_powerdown_mode_available
|
||||||
|
What: /sys/.../iio:deviceX/out_altvotlageY_powerdown_mode_available
|
||||||
|
What: /sys/.../iio:deviceX/out_altvoltage_powerdown_mode_available
|
||||||
KernelVersion: 2.6.38
|
KernelVersion: 2.6.38
|
||||||
Contact: linux-iio@vger.kernel.org
|
Contact: linux-iio@vger.kernel.org
|
||||||
Description:
|
Description:
|
||||||
@@ -338,6 +349,8 @@ Description:
|
|||||||
|
|
||||||
What: /sys/bus/iio/devices/iio:deviceX/out_voltageY_powerdown
|
What: /sys/bus/iio/devices/iio:deviceX/out_voltageY_powerdown
|
||||||
What: /sys/bus/iio/devices/iio:deviceX/out_voltage_powerdown
|
What: /sys/bus/iio/devices/iio:deviceX/out_voltage_powerdown
|
||||||
|
What: /sys/bus/iio/devices/iio:deviceX/out_altvoltageY_powerdown
|
||||||
|
What: /sys/bus/iio/devices/iio:deviceX/out_altvoltage_powerdown
|
||||||
KernelVersion: 2.6.38
|
KernelVersion: 2.6.38
|
||||||
Contact: linux-iio@vger.kernel.org
|
Contact: linux-iio@vger.kernel.org
|
||||||
Description:
|
Description:
|
||||||
@@ -346,6 +359,24 @@ Description:
|
|||||||
normal operation. Y may be suppressed if all outputs are
|
normal operation. Y may be suppressed if all outputs are
|
||||||
controlled together.
|
controlled together.
|
||||||
|
|
||||||
|
What: /sys/bus/iio/devices/iio:deviceX/out_altvoltageY_frequency
|
||||||
|
KernelVersion: 3.4.0
|
||||||
|
Contact: linux-iio@vger.kernel.org
|
||||||
|
Description:
|
||||||
|
Output frequency for channel Y in Hz. The number must always be
|
||||||
|
specified and unique if the output corresponds to a single
|
||||||
|
channel.
|
||||||
|
|
||||||
|
What: /sys/bus/iio/devices/iio:deviceX/out_altvoltageY_phase
|
||||||
|
KernelVersion: 3.4.0
|
||||||
|
Contact: linux-iio@vger.kernel.org
|
||||||
|
Description:
|
||||||
|
Phase in radians of one frequency/clock output Y
|
||||||
|
(out_altvoltageY) relative to another frequency/clock output
|
||||||
|
(out_altvoltageZ) of the device X. The number must always be
|
||||||
|
specified and unique if the output corresponds to a single
|
||||||
|
channel.
|
||||||
|
|
||||||
What: /sys/bus/iio/devices/iio:deviceX/events
|
What: /sys/bus/iio/devices/iio:deviceX/events
|
||||||
KernelVersion: 2.6.35
|
KernelVersion: 2.6.35
|
||||||
Contact: linux-iio@vger.kernel.org
|
Contact: linux-iio@vger.kernel.org
|
||||||
|
|||||||
@@ -60,4 +60,4 @@ Introduction
|
|||||||
Document Author
|
Document Author
|
||||||
---------------
|
---------------
|
||||||
|
|
||||||
Viresh Kumar <viresh.kumar@st.com>, (c) 2010-2012 ST Microelectronics
|
Viresh Kumar <viresh.linux@gmail.com>, (c) 2010-2012 ST Microelectronics
|
||||||
|
|||||||
@@ -6,7 +6,9 @@ Supported chips:
|
|||||||
Prefix: 'coretemp'
|
Prefix: 'coretemp'
|
||||||
CPUID: family 0x6, models 0xe (Pentium M DC), 0xf (Core 2 DC 65nm),
|
CPUID: family 0x6, models 0xe (Pentium M DC), 0xf (Core 2 DC 65nm),
|
||||||
0x16 (Core 2 SC 65nm), 0x17 (Penryn 45nm),
|
0x16 (Core 2 SC 65nm), 0x17 (Penryn 45nm),
|
||||||
0x1a (Nehalem), 0x1c (Atom), 0x1e (Lynnfield)
|
0x1a (Nehalem), 0x1c (Atom), 0x1e (Lynnfield),
|
||||||
|
0x26 (Tunnel Creek Atom), 0x27 (Medfield Atom),
|
||||||
|
0x36 (Cedar Trail Atom)
|
||||||
Datasheet: Intel 64 and IA-32 Architectures Software Developer's Manual
|
Datasheet: Intel 64 and IA-32 Architectures Software Developer's Manual
|
||||||
Volume 3A: System Programming Guide
|
Volume 3A: System Programming Guide
|
||||||
http://softwarecommunity.intel.com/Wiki/Mobility/720.htm
|
http://softwarecommunity.intel.com/Wiki/Mobility/720.htm
|
||||||
@@ -52,6 +54,17 @@ Some information comes from ark.intel.com
|
|||||||
|
|
||||||
Process Processor TjMax(C)
|
Process Processor TjMax(C)
|
||||||
|
|
||||||
|
22nm Core i5/i7 Processors
|
||||||
|
i7 3920XM, 3820QM, 3720QM, 3667U, 3520M 105
|
||||||
|
i5 3427U, 3360M/3320M 105
|
||||||
|
i7 3770/3770K 105
|
||||||
|
i5 3570/3570K, 3550, 3470/3450 105
|
||||||
|
i7 3770S 103
|
||||||
|
i5 3570S/3550S, 3475S/3470S/3450S 103
|
||||||
|
i7 3770T 94
|
||||||
|
i5 3570T 94
|
||||||
|
i5 3470T 91
|
||||||
|
|
||||||
32nm Core i3/i5/i7 Processors
|
32nm Core i3/i5/i7 Processors
|
||||||
i7 660UM/640/620, 640LM/620, 620M, 610E 105
|
i7 660UM/640/620, 640LM/620, 620M, 610E 105
|
||||||
i5 540UM/520/430, 540M/520/450/430 105
|
i5 540UM/520/430, 540M/520/450/430 105
|
||||||
@@ -65,6 +78,11 @@ Process Processor TjMax(C)
|
|||||||
U3400 105
|
U3400 105
|
||||||
P4505/P4500 90
|
P4505/P4500 90
|
||||||
|
|
||||||
|
32nm Atom Processors
|
||||||
|
Z2460 90
|
||||||
|
D2700/2550/2500 100
|
||||||
|
N2850/2800/2650/2600 100
|
||||||
|
|
||||||
45nm Xeon Processors 5400 Quad-Core
|
45nm Xeon Processors 5400 Quad-Core
|
||||||
X5492, X5482, X5472, X5470, X5460, X5450 85
|
X5492, X5482, X5472, X5470, X5460, X5450 85
|
||||||
E5472, E5462, E5450/40/30/20/10/05 85
|
E5472, E5462, E5450/40/30/20/10/05 85
|
||||||
@@ -85,6 +103,8 @@ Process Processor TjMax(C)
|
|||||||
N475/470/455/450 100
|
N475/470/455/450 100
|
||||||
N280/270 90
|
N280/270 90
|
||||||
330/230 125
|
330/230 125
|
||||||
|
E680/660/640/620 90
|
||||||
|
E680T/660T/640T/620T 110
|
||||||
|
|
||||||
45nm Core2 Processors
|
45nm Core2 Processors
|
||||||
Solo ULV SU3500/3300 100
|
Solo ULV SU3500/3300 100
|
||||||
|
|||||||
+10
-10
@@ -579,7 +579,7 @@ F: drivers/net/appletalk/
|
|||||||
F: net/appletalk/
|
F: net/appletalk/
|
||||||
|
|
||||||
ARASAN COMPACT FLASH PATA CONTROLLER
|
ARASAN COMPACT FLASH PATA CONTROLLER
|
||||||
M: Viresh Kumar <viresh.kumar@st.com>
|
M: Viresh Kumar <viresh.linux@gmail.com>
|
||||||
L: linux-ide@vger.kernel.org
|
L: linux-ide@vger.kernel.org
|
||||||
S: Maintained
|
S: Maintained
|
||||||
F: include/linux/pata_arasan_cf_data.h
|
F: include/linux/pata_arasan_cf_data.h
|
||||||
@@ -5296,7 +5296,7 @@ S: Maintained
|
|||||||
F: drivers/pinctrl/
|
F: drivers/pinctrl/
|
||||||
|
|
||||||
PIN CONTROLLER - ST SPEAR
|
PIN CONTROLLER - ST SPEAR
|
||||||
M: Viresh Kumar <viresh.kumar@st.com>
|
M: Viresh Kumar <viresh.linux@gmail.com>
|
||||||
L: spear-devel@list.st.com
|
L: spear-devel@list.st.com
|
||||||
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
|
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
|
||||||
W: http://www.st.com/spear
|
W: http://www.st.com/spear
|
||||||
@@ -5873,7 +5873,7 @@ S: Maintained
|
|||||||
F: drivers/tty/serial
|
F: drivers/tty/serial
|
||||||
|
|
||||||
SYNOPSYS DESIGNWARE DMAC DRIVER
|
SYNOPSYS DESIGNWARE DMAC DRIVER
|
||||||
M: Viresh Kumar <viresh.kumar@st.com>
|
M: Viresh Kumar <viresh.linux@gmail.com>
|
||||||
S: Maintained
|
S: Maintained
|
||||||
F: include/linux/dw_dmac.h
|
F: include/linux/dw_dmac.h
|
||||||
F: drivers/dma/dw_dmac_regs.h
|
F: drivers/dma/dw_dmac_regs.h
|
||||||
@@ -6021,7 +6021,7 @@ S: Maintained
|
|||||||
F: drivers/mmc/host/sdhci-s3c.c
|
F: drivers/mmc/host/sdhci-s3c.c
|
||||||
|
|
||||||
SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) ST SPEAR DRIVER
|
SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) ST SPEAR DRIVER
|
||||||
M: Viresh Kumar <viresh.kumar@st.com>
|
M: Viresh Kumar <viresh.linux@gmail.com>
|
||||||
L: spear-devel@list.st.com
|
L: spear-devel@list.st.com
|
||||||
L: linux-mmc@vger.kernel.org
|
L: linux-mmc@vger.kernel.org
|
||||||
S: Maintained
|
S: Maintained
|
||||||
@@ -6377,7 +6377,7 @@ S: Maintained
|
|||||||
F: include/linux/compiler.h
|
F: include/linux/compiler.h
|
||||||
|
|
||||||
SPEAR PLATFORM SUPPORT
|
SPEAR PLATFORM SUPPORT
|
||||||
M: Viresh Kumar <viresh.kumar@st.com>
|
M: Viresh Kumar <viresh.linux@gmail.com>
|
||||||
M: Shiraz Hashim <shiraz.hashim@st.com>
|
M: Shiraz Hashim <shiraz.hashim@st.com>
|
||||||
L: spear-devel@list.st.com
|
L: spear-devel@list.st.com
|
||||||
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
|
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
|
||||||
@@ -6386,7 +6386,7 @@ S: Maintained
|
|||||||
F: arch/arm/plat-spear/
|
F: arch/arm/plat-spear/
|
||||||
|
|
||||||
SPEAR13XX MACHINE SUPPORT
|
SPEAR13XX MACHINE SUPPORT
|
||||||
M: Viresh Kumar <viresh.kumar@st.com>
|
M: Viresh Kumar <viresh.linux@gmail.com>
|
||||||
M: Shiraz Hashim <shiraz.hashim@st.com>
|
M: Shiraz Hashim <shiraz.hashim@st.com>
|
||||||
L: spear-devel@list.st.com
|
L: spear-devel@list.st.com
|
||||||
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
|
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
|
||||||
@@ -6395,7 +6395,7 @@ S: Maintained
|
|||||||
F: arch/arm/mach-spear13xx/
|
F: arch/arm/mach-spear13xx/
|
||||||
|
|
||||||
SPEAR3XX MACHINE SUPPORT
|
SPEAR3XX MACHINE SUPPORT
|
||||||
M: Viresh Kumar <viresh.kumar@st.com>
|
M: Viresh Kumar <viresh.linux@gmail.com>
|
||||||
M: Shiraz Hashim <shiraz.hashim@st.com>
|
M: Shiraz Hashim <shiraz.hashim@st.com>
|
||||||
L: spear-devel@list.st.com
|
L: spear-devel@list.st.com
|
||||||
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
|
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
|
||||||
@@ -6406,7 +6406,7 @@ F: arch/arm/mach-spear3xx/
|
|||||||
SPEAR6XX MACHINE SUPPORT
|
SPEAR6XX MACHINE SUPPORT
|
||||||
M: Rajeev Kumar <rajeev-dlh.kumar@st.com>
|
M: Rajeev Kumar <rajeev-dlh.kumar@st.com>
|
||||||
M: Shiraz Hashim <shiraz.hashim@st.com>
|
M: Shiraz Hashim <shiraz.hashim@st.com>
|
||||||
M: Viresh Kumar <viresh.kumar@st.com>
|
M: Viresh Kumar <viresh.linux@gmail.com>
|
||||||
L: spear-devel@list.st.com
|
L: spear-devel@list.st.com
|
||||||
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
|
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
|
||||||
W: http://www.st.com/spear
|
W: http://www.st.com/spear
|
||||||
@@ -6414,7 +6414,7 @@ S: Maintained
|
|||||||
F: arch/arm/mach-spear6xx/
|
F: arch/arm/mach-spear6xx/
|
||||||
|
|
||||||
SPEAR CLOCK FRAMEWORK SUPPORT
|
SPEAR CLOCK FRAMEWORK SUPPORT
|
||||||
M: Viresh Kumar <viresh.kumar@st.com>
|
M: Viresh Kumar <viresh.linux@gmail.com>
|
||||||
L: spear-devel@list.st.com
|
L: spear-devel@list.st.com
|
||||||
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
|
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
|
||||||
W: http://www.st.com/spear
|
W: http://www.st.com/spear
|
||||||
@@ -7421,7 +7421,7 @@ F: include/linux/vlynq.h
|
|||||||
|
|
||||||
VME SUBSYSTEM
|
VME SUBSYSTEM
|
||||||
M: Martyn Welch <martyn.welch@ge.com>
|
M: Martyn Welch <martyn.welch@ge.com>
|
||||||
M: Manohar Vanga <manohar.vanga@cern.ch>
|
M: Manohar Vanga <manohar.vanga@gmail.com>
|
||||||
M: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
M: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||||||
L: devel@driverdev.osuosl.org
|
L: devel@driverdev.osuosl.org
|
||||||
S: Maintained
|
S: Maintained
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
VERSION = 3
|
VERSION = 3
|
||||||
PATCHLEVEL = 5
|
PATCHLEVEL = 5
|
||||||
SUBLEVEL = 0
|
SUBLEVEL = 0
|
||||||
EXTRAVERSION = -rc3
|
EXTRAVERSION = -rc4
|
||||||
NAME = Saber-toothed Squirrel
|
NAME = Saber-toothed Squirrel
|
||||||
|
|
||||||
# *DOCUMENTATION*
|
# *DOCUMENTATION*
|
||||||
@@ -561,6 +561,8 @@ else
|
|||||||
KBUILD_CFLAGS += -O2
|
KBUILD_CFLAGS += -O2
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
include $(srctree)/arch/$(SRCARCH)/Makefile
|
||||||
|
|
||||||
ifdef CONFIG_READABLE_ASM
|
ifdef CONFIG_READABLE_ASM
|
||||||
# Disable optimizations that make assembler listings hard to read.
|
# Disable optimizations that make assembler listings hard to read.
|
||||||
# reorder blocks reorders the control in the function
|
# reorder blocks reorders the control in the function
|
||||||
@@ -571,8 +573,6 @@ KBUILD_CFLAGS += $(call cc-option,-fno-reorder-blocks,) \
|
|||||||
$(call cc-option,-fno-partial-inlining)
|
$(call cc-option,-fno-partial-inlining)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
include $(srctree)/arch/$(SRCARCH)/Makefile
|
|
||||||
|
|
||||||
ifneq ($(CONFIG_FRAME_WARN),0)
|
ifneq ($(CONFIG_FRAME_WARN),0)
|
||||||
KBUILD_CFLAGS += $(call cc-option,-Wframe-larger-than=${CONFIG_FRAME_WARN})
|
KBUILD_CFLAGS += $(call cc-option,-Wframe-larger-than=${CONFIG_FRAME_WARN})
|
||||||
endif
|
endif
|
||||||
|
|||||||
@@ -293,6 +293,7 @@ config ARCH_VERSATILE
|
|||||||
select ICST
|
select ICST
|
||||||
select GENERIC_CLOCKEVENTS
|
select GENERIC_CLOCKEVENTS
|
||||||
select ARCH_WANT_OPTIONAL_GPIOLIB
|
select ARCH_WANT_OPTIONAL_GPIOLIB
|
||||||
|
select NEED_MACH_IO_H if PCI
|
||||||
select PLAT_VERSATILE
|
select PLAT_VERSATILE
|
||||||
select PLAT_VERSATILE_CLCD
|
select PLAT_VERSATILE_CLCD
|
||||||
select PLAT_VERSATILE_FPGA_IRQ
|
select PLAT_VERSATILE_FPGA_IRQ
|
||||||
@@ -588,6 +589,7 @@ config ARCH_ORION5X
|
|||||||
select PCI
|
select PCI
|
||||||
select ARCH_REQUIRE_GPIOLIB
|
select ARCH_REQUIRE_GPIOLIB
|
||||||
select GENERIC_CLOCKEVENTS
|
select GENERIC_CLOCKEVENTS
|
||||||
|
select NEED_MACH_IO_H
|
||||||
select PLAT_ORION
|
select PLAT_ORION
|
||||||
help
|
help
|
||||||
Support for the following Marvell Orion 5x series SoCs:
|
Support for the following Marvell Orion 5x series SoCs:
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
/include/ "mmp2.dtsi"
|
/include/ "mmp2.dtsi"
|
||||||
|
|
||||||
/ {
|
/ {
|
||||||
model = "Marvell MMP2 Aspenite Development Board";
|
model = "Marvell MMP2 Brownstone Development Board";
|
||||||
compatible = "mrvl,mmp2-brownstone", "mrvl,mmp2";
|
compatible = "mrvl,mmp2-brownstone", "mrvl,mmp2";
|
||||||
|
|
||||||
chosen {
|
chosen {
|
||||||
@@ -19,7 +19,7 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
memory {
|
memory {
|
||||||
reg = <0x00000000 0x04000000>;
|
reg = <0x00000000 0x08000000>;
|
||||||
};
|
};
|
||||||
|
|
||||||
soc {
|
soc {
|
||||||
|
|||||||
@@ -44,6 +44,8 @@
|
|||||||
compatible = "ti,omap2-intc";
|
compatible = "ti,omap2-intc";
|
||||||
interrupt-controller;
|
interrupt-controller;
|
||||||
#interrupt-cells = <1>;
|
#interrupt-cells = <1>;
|
||||||
|
ti,intc-size = <96>;
|
||||||
|
reg = <0x480FE000 0x1000>;
|
||||||
};
|
};
|
||||||
|
|
||||||
uart1: serial@4806a000 {
|
uart1: serial@4806a000 {
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* DTS file for SPEAr1310 Evaluation Baord
|
* DTS file for SPEAr1310 Evaluation Baord
|
||||||
*
|
*
|
||||||
* Copyright 2012 Viresh Kumar <viresh.kumar@st.com>
|
* Copyright 2012 Viresh Kumar <viresh.linux@gmail.com>
|
||||||
*
|
*
|
||||||
* The code contained herein is licensed under the GNU General Public
|
* The code contained herein is licensed under the GNU General Public
|
||||||
* License. You may obtain a copy of the GNU General Public License
|
* License. You may obtain a copy of the GNU General Public License
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* DTS file for all SPEAr1310 SoCs
|
* DTS file for all SPEAr1310 SoCs
|
||||||
*
|
*
|
||||||
* Copyright 2012 Viresh Kumar <viresh.kumar@st.com>
|
* Copyright 2012 Viresh Kumar <viresh.linux@gmail.com>
|
||||||
*
|
*
|
||||||
* The code contained herein is licensed under the GNU General Public
|
* The code contained herein is licensed under the GNU General Public
|
||||||
* License. You may obtain a copy of the GNU General Public License
|
* License. You may obtain a copy of the GNU General Public License
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* DTS file for SPEAr1340 Evaluation Baord
|
* DTS file for SPEAr1340 Evaluation Baord
|
||||||
*
|
*
|
||||||
* Copyright 2012 Viresh Kumar <viresh.kumar@st.com>
|
* Copyright 2012 Viresh Kumar <viresh.linux@gmail.com>
|
||||||
*
|
*
|
||||||
* The code contained herein is licensed under the GNU General Public
|
* The code contained herein is licensed under the GNU General Public
|
||||||
* License. You may obtain a copy of the GNU General Public License
|
* License. You may obtain a copy of the GNU General Public License
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* DTS file for all SPEAr1340 SoCs
|
* DTS file for all SPEAr1340 SoCs
|
||||||
*
|
*
|
||||||
* Copyright 2012 Viresh Kumar <viresh.kumar@st.com>
|
* Copyright 2012 Viresh Kumar <viresh.linux@gmail.com>
|
||||||
*
|
*
|
||||||
* The code contained herein is licensed under the GNU General Public
|
* The code contained herein is licensed under the GNU General Public
|
||||||
* License. You may obtain a copy of the GNU General Public License
|
* License. You may obtain a copy of the GNU General Public License
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* DTS file for all SPEAr13xx SoCs
|
* DTS file for all SPEAr13xx SoCs
|
||||||
*
|
*
|
||||||
* Copyright 2012 Viresh Kumar <viresh.kumar@st.com>
|
* Copyright 2012 Viresh Kumar <viresh.linux@gmail.com>
|
||||||
*
|
*
|
||||||
* The code contained herein is licensed under the GNU General Public
|
* The code contained herein is licensed under the GNU General Public
|
||||||
* License. You may obtain a copy of the GNU General Public License
|
* License. You may obtain a copy of the GNU General Public License
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* DTS file for SPEAr300 Evaluation Baord
|
* DTS file for SPEAr300 Evaluation Baord
|
||||||
*
|
*
|
||||||
* Copyright 2012 Viresh Kumar <viresh.kumar@st.com>
|
* Copyright 2012 Viresh Kumar <viresh.linux@gmail.com>
|
||||||
*
|
*
|
||||||
* The code contained herein is licensed under the GNU General Public
|
* The code contained herein is licensed under the GNU General Public
|
||||||
* License. You may obtain a copy of the GNU General Public License
|
* License. You may obtain a copy of the GNU General Public License
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* DTS file for SPEAr300 SoC
|
* DTS file for SPEAr300 SoC
|
||||||
*
|
*
|
||||||
* Copyright 2012 Viresh Kumar <viresh.kumar@st.com>
|
* Copyright 2012 Viresh Kumar <viresh.linux@gmail.com>
|
||||||
*
|
*
|
||||||
* The code contained herein is licensed under the GNU General Public
|
* The code contained herein is licensed under the GNU General Public
|
||||||
* License. You may obtain a copy of the GNU General Public License
|
* License. You may obtain a copy of the GNU General Public License
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* DTS file for SPEAr310 Evaluation Baord
|
* DTS file for SPEAr310 Evaluation Baord
|
||||||
*
|
*
|
||||||
* Copyright 2012 Viresh Kumar <viresh.kumar@st.com>
|
* Copyright 2012 Viresh Kumar <viresh.linux@gmail.com>
|
||||||
*
|
*
|
||||||
* The code contained herein is licensed under the GNU General Public
|
* The code contained herein is licensed under the GNU General Public
|
||||||
* License. You may obtain a copy of the GNU General Public License
|
* License. You may obtain a copy of the GNU General Public License
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* DTS file for SPEAr310 SoC
|
* DTS file for SPEAr310 SoC
|
||||||
*
|
*
|
||||||
* Copyright 2012 Viresh Kumar <viresh.kumar@st.com>
|
* Copyright 2012 Viresh Kumar <viresh.linux@gmail.com>
|
||||||
*
|
*
|
||||||
* The code contained herein is licensed under the GNU General Public
|
* The code contained herein is licensed under the GNU General Public
|
||||||
* License. You may obtain a copy of the GNU General Public License
|
* License. You may obtain a copy of the GNU General Public License
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* DTS file for SPEAr320 Evaluation Baord
|
* DTS file for SPEAr320 Evaluation Baord
|
||||||
*
|
*
|
||||||
* Copyright 2012 Viresh Kumar <viresh.kumar@st.com>
|
* Copyright 2012 Viresh Kumar <viresh.linux@gmail.com>
|
||||||
*
|
*
|
||||||
* The code contained herein is licensed under the GNU General Public
|
* The code contained herein is licensed under the GNU General Public
|
||||||
* License. You may obtain a copy of the GNU General Public License
|
* License. You may obtain a copy of the GNU General Public License
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* DTS file for SPEAr320 SoC
|
* DTS file for SPEAr320 SoC
|
||||||
*
|
*
|
||||||
* Copyright 2012 Viresh Kumar <viresh.kumar@st.com>
|
* Copyright 2012 Viresh Kumar <viresh.linux@gmail.com>
|
||||||
*
|
*
|
||||||
* The code contained herein is licensed under the GNU General Public
|
* The code contained herein is licensed under the GNU General Public
|
||||||
* License. You may obtain a copy of the GNU General Public License
|
* License. You may obtain a copy of the GNU General Public License
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user