Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
nexedi
linux
Commits
53640f41
Commit
53640f41
authored
12 years ago
by
Sascha Hauer
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'arm-soc/imx/multiplatform' into imx25-dt
parents
77b67063
68b25325
Changes
217
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
160 additions
and
47 deletions
+160
-47
Documentation/devicetree/bindings/i2c/fsl-imx-i2c.txt
Documentation/devicetree/bindings/i2c/fsl-imx-i2c.txt
+2
-2
MAINTAINERS
MAINTAINERS
+0
-1
arch/arm/Kconfig
arch/arm/Kconfig
+1
-14
arch/arm/Kconfig.debug
arch/arm/Kconfig.debug
+8
-0
arch/arm/Makefile
arch/arm/Makefile
+0
-1
arch/arm/boot/dts/imx27.dtsi
arch/arm/boot/dts/imx27.dtsi
+2
-2
arch/arm/boot/dts/imx51.dtsi
arch/arm/boot/dts/imx51.dtsi
+2
-2
arch/arm/boot/dts/imx53.dtsi
arch/arm/boot/dts/imx53.dtsi
+3
-3
arch/arm/boot/dts/imx6q.dtsi
arch/arm/boot/dts/imx6q.dtsi
+3
-3
arch/arm/configs/imx_v4_v5_defconfig
arch/arm/configs/imx_v4_v5_defconfig
+3
-1
arch/arm/configs/imx_v6_v7_defconfig
arch/arm/configs/imx_v6_v7_defconfig
+2
-0
arch/arm/include/debug/imx.S
arch/arm/include/debug/imx.S
+22
-11
arch/arm/mach-imx/3ds_debugboard.c
arch/arm/mach-imx/3ds_debugboard.c
+1
-1
arch/arm/mach-imx/3ds_debugboard.h
arch/arm/mach-imx/3ds_debugboard.h
+0
-0
arch/arm/mach-imx/Kconfig
arch/arm/mach-imx/Kconfig
+87
-3
arch/arm/mach-imx/Makefile
arch/arm/mach-imx/Makefile
+22
-0
arch/arm/mach-imx/avic.c
arch/arm/mach-imx/avic.c
+2
-3
arch/arm/mach-imx/board-mx31lilly.h
arch/arm/mach-imx/board-mx31lilly.h
+0
-0
arch/arm/mach-imx/board-mx31lite.h
arch/arm/mach-imx/board-mx31lite.h
+0
-0
arch/arm/mach-imx/board-mx31moboard.h
arch/arm/mach-imx/board-mx31moboard.h
+0
-0
No files found.
Documentation/devicetree/bindings/i2c/fsl-imx-i2c.txt
View file @
53640f41
...
...
@@ -12,13 +12,13 @@ Optional properties:
Examples:
i2c@83fc4000 { /* I2C2 on i.MX51 */
compatible = "fsl,imx51-i2c", "fsl,imx1-i2c";
compatible = "fsl,imx51-i2c", "fsl,imx
2
1-i2c";
reg = <0x83fc4000 0x4000>;
interrupts = <63>;
};
i2c@70038000 { /* HS-I2C on i.MX51 */
compatible = "fsl,imx51-i2c", "fsl,imx1-i2c";
compatible = "fsl,imx51-i2c", "fsl,imx
2
1-i2c";
reg = <0x70038000 0x4000>;
interrupts = <64>;
clock-frequency = <400000>;
...
...
This diff is collapsed.
Click to expand it.
MAINTAINERS
View file @
53640f41
...
...
@@ -797,7 +797,6 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S: Maintained
T: git git://git.pengutronix.de/git/imx/linux-2.6.git
F: arch/arm/mach-imx/
F: arch/arm/plat-mxc/
F: arch/arm/configs/imx*_defconfig
ARM/FREESCALE IMX6
...
...
This diff is collapsed.
Click to expand it.
arch/arm/Kconfig
View file @
53640f41
...
...
@@ -433,19 +433,6 @@ config ARCH_FOOTBRIDGE
Support for systems based on the DC21285 companion chip
("FootBridge"), such as the Simtec CATS and the Rebel NetWinder.
config ARCH_MXC
bool "Freescale MXC/iMX-based"
select ARCH_REQUIRE_GPIOLIB
select CLKDEV_LOOKUP
select CLKSRC_MMIO
select GENERIC_CLOCKEVENTS
select GENERIC_IRQ_CHIP
select MULTI_IRQ_HANDLER
select SPARSE_IRQ
select USE_OF
help
Support for Freescale MXC/iMX-based family of processors
config ARCH_MXS
bool "Freescale MXS-based"
select ARCH_REQUIRE_GPIOLIB
...
...
@@ -1058,7 +1045,7 @@ source "arch/arm/mach-msm/Kconfig"
source "arch/arm/mach-mv78xx0/Kconfig"
source "arch/arm/
plat-
mx
c
/Kconfig"
source "arch/arm/
mach-i
mx/Kconfig"
source "arch/arm/mach-mxs/Kconfig"
...
...
This diff is collapsed.
Click to expand it.
arch/arm/Kconfig.debug
View file @
53640f41
...
...
@@ -412,6 +412,14 @@ endchoice
config DEBUG_LL_INCLUDE
string
default "debug/icedcc.S" if DEBUG_ICEDCC
default "debug/imx.S" if DEBUG_IMX1_UART || \
DEBUG_IMX25_UART || \
DEBUG_IMX21_IMX27_UART || \
DEBUG_IMX31_IMX35_UART || \
DEBUG_IMX51_UART || \
DEBUG_IMX50_IMX53_UART ||\
DEBUG_IMX6Q_UART2 || \
DEBUG_IMX6Q_UART4
default "debug/highbank.S" if DEBUG_HIGHBANK_UART
default "debug/mvebu.S" if DEBUG_MVEBU_UART
default "debug/picoxcell.S" if DEBUG_PICOXCELL_UART
...
...
This diff is collapsed.
Click to expand it.
arch/arm/Makefile
View file @
53640f41
...
...
@@ -196,7 +196,6 @@ machine-$(CONFIG_ARCH_ZYNQ) += zynq
# Platform directory name. This list is sorted alphanumerically
# by CONFIG_* macro name.
plat-$(CONFIG_ARCH_MXC)
+=
mxc
plat-$(CONFIG_ARCH_OMAP)
+=
omap
plat-$(CONFIG_ARCH_S3C64XX)
+=
samsung
plat-$(CONFIG_ARCH_ZYNQ)
+=
versatile
...
...
This diff is collapsed.
Click to expand it.
arch/arm/boot/dts/imx27.dtsi
View file @
53640f41
...
...
@@ -113,7 +113,7 @@ cspi2: cspi@1000f000 {
i2c1: i2c@10012000 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "fsl,imx27-i2c", "fsl,imx1-i2c";
compatible = "fsl,imx27-i2c", "fsl,imx
2
1-i2c";
reg = <0x10012000 0x1000>;
interrupts = <12>;
status = "disabled";
...
...
@@ -205,7 +205,7 @@ uart6: serial@1001c000 {
i2c2: i2c@1001d000 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "fsl,imx27-i2c", "fsl,imx1-i2c";
compatible = "fsl,imx27-i2c", "fsl,imx
2
1-i2c";
reg = <0x1001d000 0x1000>;
interrupts = <1>;
status = "disabled";
...
...
This diff is collapsed.
Click to expand it.
arch/arm/boot/dts/imx51.dtsi
View file @
53640f41
...
...
@@ -377,7 +377,7 @@ cspi@83fc0000 {
i2c@83fc4000 { /* I2C2 */
#address-cells = <1>;
#size-cells = <0>;
compatible = "fsl,imx51-i2c", "fsl,imx1-i2c";
compatible = "fsl,imx51-i2c", "fsl,imx
2
1-i2c";
reg = <0x83fc4000 0x4000>;
interrupts = <63>;
status = "disabled";
...
...
@@ -386,7 +386,7 @@ i2c@83fc4000 { /* I2C2 */
i2c@83fc8000 { /* I2C1 */
#address-cells = <1>;
#size-cells = <0>;
compatible = "fsl,imx51-i2c", "fsl,imx1-i2c";
compatible = "fsl,imx51-i2c", "fsl,imx
2
1-i2c";
reg = <0x83fc8000 0x4000>;
interrupts = <62>;
status = "disabled";
...
...
This diff is collapsed.
Click to expand it.
arch/arm/boot/dts/imx53.dtsi
View file @
53640f41
...
...
@@ -432,7 +432,7 @@ gpio7: gpio@53fe4000 {
i2c@53fec000 { /* I2C3 */
#address-cells = <1>;
#size-cells = <0>;
compatible = "fsl,imx53-i2c", "fsl,imx1-i2c";
compatible = "fsl,imx53-i2c", "fsl,imx
2
1-i2c";
reg = <0x53fec000 0x4000>;
interrupts = <64>;
status = "disabled";
...
...
@@ -488,7 +488,7 @@ cspi@63fc0000 {
i2c@63fc4000 { /* I2C2 */
#address-cells = <1>;
#size-cells = <0>;
compatible = "fsl,imx53-i2c", "fsl,imx1-i2c";
compatible = "fsl,imx53-i2c", "fsl,imx
2
1-i2c";
reg = <0x63fc4000 0x4000>;
interrupts = <63>;
status = "disabled";
...
...
@@ -497,7 +497,7 @@ i2c@63fc4000 { /* I2C2 */
i2c@63fc8000 { /* I2C1 */
#address-cells = <1>;
#size-cells = <0>;
compatible = "fsl,imx53-i2c", "fsl,imx1-i2c";
compatible = "fsl,imx53-i2c", "fsl,imx
2
1-i2c";
reg = <0x63fc8000 0x4000>;
interrupts = <62>;
status = "disabled";
...
...
This diff is collapsed.
Click to expand it.
arch/arm/boot/dts/imx6q.dtsi
View file @
53640f41
...
...
@@ -882,7 +882,7 @@ usdhc@0219c000 { /* uSDHC4 */
i2c@021a0000 { /* I2C1 */
#address-cells = <1>;
#size-cells = <0>;
compatible = "fsl,imx6q-i2c", "fsl,imx1-i2c";
compatible = "fsl,imx6q-i2c", "fsl,imx
2
1-i2c";
reg = <0x021a0000 0x4000>;
interrupts = <0 36 0x04>;
clocks = <&clks 125>;
...
...
@@ -892,7 +892,7 @@ i2c@021a0000 { /* I2C1 */
i2c@021a4000 { /* I2C2 */
#address-cells = <1>;
#size-cells = <0>;
compatible = "fsl,imx6q-i2c", "fsl,imx1-i2c";
compatible = "fsl,imx6q-i2c", "fsl,imx
2
1-i2c";
reg = <0x021a4000 0x4000>;
interrupts = <0 37 0x04>;
clocks = <&clks 126>;
...
...
@@ -902,7 +902,7 @@ i2c@021a4000 { /* I2C2 */
i2c@021a8000 { /* I2C3 */
#address-cells = <1>;
#size-cells = <0>;
compatible = "fsl,imx6q-i2c", "fsl,imx1-i2c";
compatible = "fsl,imx6q-i2c", "fsl,imx
2
1-i2c";
reg = <0x021a8000 0x4000>;
interrupts = <0 38 0x04>;
clocks = <&clks 127>;
...
...
This diff is collapsed.
Click to expand it.
arch/arm/configs/imx_v4_v5_defconfig
View file @
53640f41
...
...
@@ -18,7 +18,9 @@ CONFIG_MODULE_UNLOAD=y
# CONFIG_IOSCHED_DEADLINE is not set
# CONFIG_IOSCHED_CFQ is not set
CONFIG_ARCH_MXC=y
CONFIG_ARCH_IMX_V4_V5=y
CONFIG_ARCH_MULTI_V4T=y
CONFIG_ARCH_MULTI_V5=y
# CONFIG_ARCH_MULTI_V7 is not set
CONFIG_ARCH_MX1ADS=y
CONFIG_MACH_SCB9328=y
CONFIG_MACH_APF9328=y
...
...
This diff is collapsed.
Click to expand it.
arch/arm/configs/imx_v6_v7_defconfig
View file @
53640f41
...
...
@@ -17,6 +17,8 @@ CONFIG_MODVERSIONS=y
CONFIG_MODULE_SRCVERSION_ALL=y
# CONFIG_BLK_DEV_BSG is not set
CONFIG_ARCH_MXC=y
CONFIG_ARCH_MULTI_V6=y
CONFIG_ARCH_MULTI_V7=y
CONFIG_MACH_MX31LILLY=y
CONFIG_MACH_MX31LITE=y
CONFIG_MACH_PCM037=y
...
...
This diff is collapsed.
Click to expand it.
arch/arm/
plat-mxc/include/mach/debug-macro
.S
→
arch/arm/
include/debug/imx
.S
View file @
53640f41
...
...
@@ -10,27 +10,38 @@
*
published
by
the
Free
Software
Foundation
.
*
*/
#include <mach/hardware.h>
#ifdef CONFIG_DEBUG_IMX1_UART
#define UART_PADDR
MX1_UART1_BASE_ADDR
#define UART_PADDR
0x00206000
#elif defined (CONFIG_DEBUG_IMX25_UART)
#define UART_PADDR
MX25_UART1_BASE_ADDR
#define UART_PADDR
0x43f90000
#elif defined (CONFIG_DEBUG_IMX21_IMX27_UART)
#define UART_PADDR
MX2x_UART1_BASE_ADDR
#define UART_PADDR
0x1000a000
#elif defined (CONFIG_DEBUG_IMX31_IMX35_UART)
#define UART_PADDR
MX3x_UART1_BASE_ADDR
#define UART_PADDR
0x43f90000
#elif defined (CONFIG_DEBUG_IMX51_UART)
#define UART_PADDR
MX51_UART1_BASE_ADDR
#define UART_PADDR
0x73fbc000
#elif defined (CONFIG_DEBUG_IMX50_IMX53_UART)
#define UART_PADDR
MX53_UART1_BASE_ADDR
#define UART_PADDR
0x53fbc000
#elif defined (CONFIG_DEBUG_IMX6Q_UART2)
#define UART_PADDR
MX6Q_UART2_BASE_ADDR
#define UART_PADDR
0x021e8000
#elif defined (CONFIG_DEBUG_IMX6Q_UART4)
#define UART_PADDR
MX6Q_UART4_BASE_ADDR
#define UART_PADDR
0x021f0000
#endif
#define UART_VADDR IMX_IO_ADDRESS(UART_PADDR)
/*
*
FIXME
:
This
is
a
copy
of
IMX_IO_P2V
in
hardware
.
h
,
and
needs
to
*
stay
sync
with
that
.
It
's hard to maintain, and should be fixed
*
globally
for
multi
-
platform
build
to
use
a
fixed
virtual
address
*
for
low
-
level
debug
uart
port
across
platforms
.
*/
#define IMX_IO_P2V(x) ( \
(((
x
)
&
0x80000000
)
>>
7
)
|
\
(0
xf4000000
+
\
(((
x
)
&
0x50000000
)
>>
6
)
+
\
(((
x
)
&
0x0b000000
)
>>
4
)
+
\
(((
x
)
&
0x000fffff
))))
#define UART_VADDR IMX_IO_P2V(UART_PADDR)
.
macro
addruart
,
rp
,
rv
,
tmp
ldr
\
rp
,
=
UART_PADDR
@
physical
...
...
This diff is collapsed.
Click to expand it.
arch/arm/
plat-
mx
c
/3ds_debugboard.c
→
arch/arm/
mach-i
mx/3ds_debugboard.c
View file @
53640f41
...
...
@@ -21,7 +21,7 @@
#include <linux/regulator/machine.h>
#include <linux/regulator/fixed.h>
#include
<mach/
hardware.h
>
#include
"
hardware.h
"
/* LAN9217 ethernet base address */
#define LAN9217_BASE_ADDR(n) (n + 0x0)
...
...
This diff is collapsed.
Click to expand it.
arch/arm/
plat-mxc/include/
mach/3ds_debugboard.h
→
arch/arm/mach
-imx
/3ds_debugboard.h
View file @
53640f41
File moved
This diff is collapsed.
Click to expand it.
arch/arm/mach-imx/Kconfig
View file @
53640f41
config ARCH_MXC
bool "Freescale i.MX family" if ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7
select ARCH_REQUIRE_GPIOLIB
select ARM_PATCH_PHYS_VIRT
select AUTO_ZRELADDR if !ZBOOT_ROM
select CLKDEV_LOOKUP
select CLKSRC_MMIO
select GENERIC_CLOCKEVENTS
select GENERIC_IRQ_CHIP
select MULTI_IRQ_HANDLER
select SPARSE_IRQ
select USE_OF
help
Support for Freescale MXC/iMX-based family of processors
menu "Freescale i.MX support"
depends on ARCH_MXC
config MXC_IRQ_PRIOR
bool "Use IRQ priority"
help
Select this if you want to use prioritized IRQ handling.
This feature prevents higher priority ISR to be interrupted
by lower priority IRQ even IRQF_DISABLED flag is not set.
This may be useful in embedded applications, where are strong
requirements for timing.
Say N here, unless you have a specialized requirement.
config MXC_TZIC
bool
config MXC_AVIC
bool
config MXC_DEBUG_BOARD
bool "Enable MXC debug board(for 3-stack)"
help
The debug board is an integral part of the MXC 3-stack(PDK)
platforms, it can be attached or removed from the peripheral
board. On debug board, several debug devices(ethernet, UART,
buttons, LEDs and JTAG) are implemented. Between the MCU and
these devices, a CPLD is added as a bridge which performs
data/address de-multiplexing and decode, signal level shift,
interrupt control and various board functions.
config HAVE_EPIT
bool
config MXC_USE_EPIT
bool "Use EPIT instead of GPT"
depends on HAVE_EPIT
help
Use EPIT as the system timer on systems that have it. Normally you
don't have a reason to do so as the EPIT has the same features and
uses the same clocks as the GPT. Anyway, on some systems the GPT
may be in use for other purposes.
config MXC_ULPI
bool
config ARCH_HAS_RNGA
bool
config IRAM_ALLOC
bool
select GENERIC_ALLOCATOR
config HAVE_IMX_GPC
bool
...
...
@@ -5,6 +72,12 @@ config HAVE_IMX_MMDC
bool
config HAVE_IMX_SRC
def_bool y if SMP
config IMX_HAVE_IOMUX_V1
bool
config ARCH_MXC_IOMUX_V3
bool
config ARCH_MX1
...
...
@@ -104,7 +177,7 @@ config SOC_IMX51
select PINCTRL_IMX51
select SOC_IMX5
if ARCH_
IMX_V4_V5
if ARCH_
MULTI_V4T
comment "MX1 platforms:"
config MACH_MXLADS
...
...
@@ -133,6 +206,10 @@ config MACH_APF9328
help
Say Yes here if you are using the Armadeus APF9328 development board
endif
if ARCH_MULTI_V5
comment "MX21 platforms:"
config MACH_MX21ADS
...
...
@@ -384,7 +461,7 @@ config MACH_IMX27_DT
endif
if ARCH_
IMX_V6_V7
if ARCH_
MULTI_V6
comment "MX31 platforms:"
...
...
@@ -649,6 +726,10 @@ config MACH_VPR200
Include support for VPR200 platform. This includes specific
configurations for the board and its peripherals.
endif
if ARCH_MULTI_V7
comment "i.MX5 platforms:"
config MACH_MX50_RDP
...
...
@@ -756,7 +837,6 @@ config SOC_IMX6Q
select HAVE_CAN_FLEXCAN if CAN
select HAVE_IMX_GPC
select HAVE_IMX_MMDC
select HAVE_IMX_SRC
select HAVE_SMP
select MFD_SYSCON
select PINCTRL
...
...
@@ -766,3 +846,7 @@ config SOC_IMX6Q
This enables support for Freescale i.MX6 Quad processor.
endif
source "arch/arm/mach-imx/devices/Kconfig"
endmenu
This diff is collapsed.
Click to expand it.
arch/arm/mach-imx/Makefile
View file @
53640f41
obj-y
:=
time.o cpu.o system.o irq-common.o
obj-$(CONFIG_SOC_IMX1)
+=
clk-imx1.o mm-imx1.o
obj-$(CONFIG_SOC_IMX21)
+=
clk-imx21.o mm-imx21.o
...
...
@@ -15,6 +17,24 @@ obj-$(CONFIG_SOC_IMX5) += cpu-imx5.o mm-imx5.o clk-imx51-imx53.o ehci-imx5.o $(i
obj-$(CONFIG_COMMON_CLK)
+=
clk-pllv1.o clk-pllv2.o clk-pllv3.o clk-gate2.o
\
clk-pfd.o clk-busy.o clk.o
obj-$(CONFIG_IMX_HAVE_IOMUX_V1)
+=
iomux-v1.o
obj-$(CONFIG_ARCH_MXC_IOMUX_V3)
+=
iomux-v3.o
obj-$(CONFIG_MXC_TZIC)
+=
tzic.o
obj-$(CONFIG_MXC_AVIC)
+=
avic.o
obj-$(CONFIG_IRAM_ALLOC)
+=
iram_alloc.o
obj-$(CONFIG_MXC_ULPI)
+=
ulpi.o
obj-$(CONFIG_MXC_USE_EPIT)
+=
epit.o
obj-$(CONFIG_MXC_DEBUG_BOARD)
+=
3ds_debugboard.o
obj-$(CONFIG_CPU_FREQ_IMX)
+=
cpufreq.o
obj-$(CONFIG_CPU_IDLE)
+=
cpuidle.o
ifdef
CONFIG_SND_IMX_SOC
obj-y
+=
ssi-fiq.o
obj-y
+=
ssi-fiq-ksym.o
endif
# Support for CMOS sensor interface
obj-$(CONFIG_MX1_VIDEO)
+=
mx1-camera-fiq.o mx1-camera-fiq-ksym.o
...
...
@@ -89,3 +109,5 @@ obj-$(CONFIG_MACH_MX50_RDP) += mach-mx50_rdp.o
obj-$(CONFIG_MACH_IMX51_DT)
+=
imx51-dt.o
obj-$(CONFIG_SOC_IMX53)
+=
mach-imx53.o
obj-y
+=
devices/
This diff is collapsed.
Click to expand it.
arch/arm/
plat-
mx
c
/avic.c
→
arch/arm/
mach-i
mx/avic.c
View file @
53640f41
...
...
@@ -22,12 +22,11 @@
#include <linux/irqdomain.h>
#include <linux/io.h>
#include <linux/of.h>
#include <mach/common.h>
#include <asm/mach/irq.h>
#include <asm/exception.h>
#include <mach/hardware.h>
#include <mach/irqs.h>
#include "common.h"
#include "hardware.h"
#include "irq-common.h"
#define AVIC_INTCNTL 0x00
/* int control reg */
...
...
This diff is collapsed.
Click to expand it.
arch/arm/
plat-mxc/include/
mach/board-mx31lilly.h
→
arch/arm/mach
-imx
/board-mx31lilly.h
View file @
53640f41
File moved
This diff is collapsed.
Click to expand it.
arch/arm/
plat-mxc/include/
mach/board-mx31lite.h
→
arch/arm/mach
-imx
/board-mx31lite.h
View file @
53640f41
File moved
This diff is collapsed.
Click to expand it.
arch/arm/
plat-mxc/include/
mach/board-mx31moboard.h
→
arch/arm/mach
-imx
/board-mx31moboard.h
View file @
53640f41
File moved
This diff is collapsed.
Click to expand it.
Prev
1
2
3
4
5
…
11
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment