Skip to content

L
linux
Commit 1b984fbe authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files
Options

Merge branch 'mxs/fixes-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes 

* 'mxs/fixes-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6:
  ARM: mxs: always build ocotp
  ARM: mxs: Remove MMAP_MIN_ADDR setting from mxs_defconfig
  ARM: mx28: Fix registers range
  ARM: mx23: Fix registers range
parents b29ee91c 6eec0152
Hide whitespace changes
Inline Side-by-side
Showing with 64 additions and 72 deletions
arch/arm/boot/dts/imx23.dtsi
View file @ 1b984fbe
...@@ -51,11 +51,11 @@ icoll: interrupt-controller@80000000 { ...@@ -51,11 +51,11 @@ icoll: interrupt-controller@80000000 {
dma-apbh@80004000 { dma-apbh@80004000 {
compatible = "fsl,imx23-dma-apbh"; compatible = "fsl,imx23-dma-apbh";
reg = <0x80004000 2000>; reg = <0x80004000 0x2000>;
}; };
ecc@80008000 { ecc@80008000 {
reg = <0x80008000 2000>; reg = <0x80008000 0x2000>;
status = "disabled"; status = "disabled";
}; };
...@@ -63,7 +63,7 @@ gpmi-nand@8000c000 { ...@@ -63,7 +63,7 @@ gpmi-nand@8000c000 {
compatible = "fsl,imx23-gpmi-nand"; compatible = "fsl,imx23-gpmi-nand";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
reg = <0x8000c000 2000>, <0x8000a000 2000>; reg = <0x8000c000 0x2000>, <0x8000a000 0x2000>;
reg-names = "gpmi-nand", "bch"; reg-names = "gpmi-nand", "bch";
interrupts = <13>, <56>; interrupts = <13>, <56>;
interrupt-names = "gpmi-dma", "bch"; interrupt-names = "gpmi-dma", "bch";
...@@ -72,14 +72,14 @@ gpmi-nand@8000c000 { ...@@ -72,14 +72,14 @@ gpmi-nand@8000c000 {
}; };
ssp0: ssp@80010000 { ssp0: ssp@80010000 {
reg = <0x80010000 2000>; reg = <0x80010000 0x2000>;
interrupts = <15 14>; interrupts = <15 14>;
fsl,ssp-dma-channel = <1>; fsl,ssp-dma-channel = <1>;
status = "disabled"; status = "disabled";
}; };
etm@80014000 { etm@80014000 {
reg = <0x80014000 2000>; reg = <0x80014000 0x2000>;
status = "disabled"; status = "disabled";
}; };
...@@ -87,7 +87,7 @@ pinctrl@80018000 { ...@@ -87,7 +87,7 @@ pinctrl@80018000 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
compatible = "fsl,imx23-pinctrl", "simple-bus"; compatible = "fsl,imx23-pinctrl", "simple-bus";
reg = <0x80018000 2000>; reg = <0x80018000 0x2000>;
gpio0: gpio@0 { gpio0: gpio@0 {
compatible = "fsl,imx23-gpio", "fsl,mxs-gpio"; compatible = "fsl,imx23-gpio", "fsl,mxs-gpio";
...@@ -273,32 +273,32 @@ digctl@8001c000 { ...@@ -273,32 +273,32 @@ digctl@8001c000 {
}; };
emi@80020000 { emi@80020000 {
reg = <0x80020000 2000>; reg = <0x80020000 0x2000>;
status = "disabled"; status = "disabled";
}; };
dma-apbx@80024000 { dma-apbx@80024000 {
compatible = "fsl,imx23-dma-apbx"; compatible = "fsl,imx23-dma-apbx";
reg = <0x80024000 2000>; reg = <0x80024000 0x2000>;
}; };
dcp@80028000 { dcp@80028000 {
reg = <0x80028000 2000>; reg = <0x80028000 0x2000>;
status = "disabled"; status = "disabled";
}; };
pxp@8002a000 { pxp@8002a000 {
reg = <0x8002a000 2000>; reg = <0x8002a000 0x2000>;
status = "disabled"; status = "disabled";
}; };
ocotp@8002c000 { ocotp@8002c000 {
reg = <0x8002c000 2000>; reg = <0x8002c000 0x2000>;
status = "disabled"; status = "disabled";
}; };
axi-ahb@8002e000 { axi-ahb@8002e000 {
reg = <0x8002e000 2000>; reg = <0x8002e000 0x2000>;
status = "disabled"; status = "disabled";
}; };
...@@ -310,14 +310,14 @@ lcdif@80030000 { ...@@ -310,14 +310,14 @@ lcdif@80030000 {
}; };
ssp1: ssp@80034000 { ssp1: ssp@80034000 {
reg = <0x80034000 2000>; reg = <0x80034000 0x2000>;
interrupts = <2 20>; interrupts = <2 20>;
fsl,ssp-dma-channel = <2>; fsl,ssp-dma-channel = <2>;
status = "disabled"; status = "disabled";
}; };
tvenc@80038000 { tvenc@80038000 {
reg = <0x80038000 2000>; reg = <0x80038000 0x2000>;
status = "disabled"; status = "disabled";
}; };
}; };
...@@ -330,37 +330,37 @@ apbx@80040000 { ...@@ -330,37 +330,37 @@ apbx@80040000 {
ranges; ranges;
clkctl@80040000 { clkctl@80040000 {
reg = <0x80040000 2000>; reg = <0x80040000 0x2000>;
status = "disabled"; status = "disabled";
}; };
saif0: saif@80042000 { saif0: saif@80042000 {
reg = <0x80042000 2000>; reg = <0x80042000 0x2000>;
status = "disabled"; status = "disabled";
}; };
power@80044000 { power@80044000 {
reg = <0x80044000 2000>; reg = <0x80044000 0x2000>;
status = "disabled"; status = "disabled";
}; };
saif1: saif@80046000 { saif1: saif@80046000 {
reg = <0x80046000 2000>; reg = <0x80046000 0x2000>;
status = "disabled"; status = "disabled";
}; };
audio-out@80048000 { audio-out@80048000 {
reg = <0x80048000 2000>; reg = <0x80048000 0x2000>;
status = "disabled"; status = "disabled";
}; };
audio-in@8004c000 { audio-in@8004c000 {
reg = <0x8004c000 2000>; reg = <0x8004c000 0x2000>;
status = "disabled"; status = "disabled";
}; };
lradc@80050000 { lradc@80050000 {
reg = <0x80050000 2000>; reg = <0x80050000 0x2000>;
status = "disabled"; status = "disabled";
}; };
...@@ -370,26 +370,26 @@ spdif@80054000 { ...@@ -370,26 +370,26 @@ spdif@80054000 {
}; };
i2c@80058000 { i2c@80058000 {
reg = <0x80058000 2000>; reg = <0x80058000 0x2000>;
status = "disabled"; status = "disabled";
}; };
rtc@8005c000 { rtc@8005c000 {
compatible = "fsl,imx23-rtc", "fsl,stmp3xxx-rtc"; compatible = "fsl,imx23-rtc", "fsl,stmp3xxx-rtc";
reg = <0x8005c000 2000>; reg = <0x8005c000 0x2000>;
interrupts = <22>; interrupts = <22>;
}; };
pwm: pwm@80064000 { pwm: pwm@80064000 {
compatible = "fsl,imx23-pwm"; compatible = "fsl,imx23-pwm";
reg = <0x80064000 2000>; reg = <0x80064000 0x2000>;
#pwm-cells = <2>; #pwm-cells = <2>;
fsl,pwm-number = <5>; fsl,pwm-number = <5>;
status = "disabled"; status = "disabled";
}; };
timrot@80068000 { timrot@80068000 {
reg = <0x80068000 2000>; reg = <0x80068000 0x2000>;
status = "disabled"; status = "disabled";
}; };
...@@ -429,7 +429,7 @@ ahb@80080000 { ...@@ -429,7 +429,7 @@ ahb@80080000 {
ranges; ranges;
usbctrl@80080000 { usbctrl@80080000 {
reg = <0x80080000 0x10000>; reg = <0x80080000 0x40000>;
status = "disabled"; status = "disabled";
}; };
}; };
......
arch/arm/boot/dts/imx28.dtsi
View file @ 1b984fbe
...@@ -57,18 +57,18 @@ icoll: interrupt-controller@80000000 { ...@@ -57,18 +57,18 @@ icoll: interrupt-controller@80000000 {
}; };
hsadc@80002000 { hsadc@80002000 {
reg = <0x80002000 2000>; reg = <0x80002000 0x2000>;
interrupts = <13 87>; interrupts = <13 87>;
status = "disabled"; status = "disabled";
}; };
dma-apbh@80004000 { dma-apbh@80004000 {
compatible = "fsl,imx28-dma-apbh"; compatible = "fsl,imx28-dma-apbh";
reg = <0x80004000 2000>; reg = <0x80004000 0x2000>;
}; };
perfmon@80006000 { perfmon@80006000 {
reg = <0x80006000 800>; reg = <0x80006000 0x800>;
interrupts = <27>; interrupts = <27>;
status = "disabled"; status = "disabled";
}; };
...@@ -77,7 +77,7 @@ gpmi-nand@8000c000 { ...@@ -77,7 +77,7 @@ gpmi-nand@8000c000 {
compatible = "fsl,imx28-gpmi-nand"; compatible = "fsl,imx28-gpmi-nand";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
reg = <0x8000c000 2000>, <0x8000a000 2000>; reg = <0x8000c000 0x2000>, <0x8000a000 0x2000>;
reg-names = "gpmi-nand", "bch"; reg-names = "gpmi-nand", "bch";
interrupts = <88>, <41>; interrupts = <88>, <41>;
interrupt-names = "gpmi-dma", "bch"; interrupt-names = "gpmi-dma", "bch";
...@@ -86,28 +86,28 @@ gpmi-nand@8000c000 { ...@@ -86,28 +86,28 @@ gpmi-nand@8000c000 {
}; };
ssp0: ssp@80010000 { ssp0: ssp@80010000 {
reg = <0x80010000 2000>; reg = <0x80010000 0x2000>;
interrupts = <96 82>; interrupts = <96 82>;
fsl,ssp-dma-channel = <0>; fsl,ssp-dma-channel = <0>;
status = "disabled"; status = "disabled";
}; };
ssp1: ssp@80012000 { ssp1: ssp@80012000 {
reg = <0x80012000 2000>; reg = <0x80012000 0x2000>;
interrupts = <97 83>; interrupts = <97 83>;
fsl,ssp-dma-channel = <1>; fsl,ssp-dma-channel = <1>;
status = "disabled"; status = "disabled";
}; };
ssp2: ssp@80014000 { ssp2: ssp@80014000 {
reg = <0x80014000 2000>; reg = <0x80014000 0x2000>;
interrupts = <98 84>; interrupts = <98 84>;
fsl,ssp-dma-channel = <2>; fsl,ssp-dma-channel = <2>;
status = "disabled"; status = "disabled";
}; };
ssp3: ssp@80016000 { ssp3: ssp@80016000 {
reg = <0x80016000 2000>; reg = <0x80016000 0x2000>;
interrupts = <99 85>; interrupts = <99 85>;
fsl,ssp-dma-channel = <3>; fsl,ssp-dma-channel = <3>;
status = "disabled"; status = "disabled";
...@@ -117,7 +117,7 @@ pinctrl@80018000 { ...@@ -117,7 +117,7 @@ pinctrl@80018000 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
compatible = "fsl,imx28-pinctrl", "simple-bus"; compatible = "fsl,imx28-pinctrl", "simple-bus";
reg = <0x80018000 2000>; reg = <0x80018000 0x2000>;
gpio0: gpio@0 { gpio0: gpio@0 {
compatible = "fsl,imx28-gpio", "fsl,mxs-gpio"; compatible = "fsl,imx28-gpio", "fsl,mxs-gpio";
...@@ -510,96 +510,96 @@ can1_pins_a: can1@0 { ...@@ -510,96 +510,96 @@ can1_pins_a: can1@0 {
}; };
digctl@8001c000 { digctl@8001c000 {
reg = <0x8001c000 2000>; reg = <0x8001c000 0x2000>;
interrupts = <89>; interrupts = <89>;
status = "disabled"; status = "disabled";
}; };
etm@80022000 { etm@80022000 {
reg = <0x80022000 2000>; reg = <0x80022000 0x2000>;
status = "disabled"; status = "disabled";
}; };
dma-apbx@80024000 { dma-apbx@80024000 {
compatible = "fsl,imx28-dma-apbx"; compatible = "fsl,imx28-dma-apbx";
reg = <0x80024000 2000>; reg = <0x80024000 0x2000>;
}; };
dcp@80028000 { dcp@80028000 {
reg = <0x80028000 2000>; reg = <0x80028000 0x2000>;
interrupts = <52 53 54>; interrupts = <52 53 54>;
status = "disabled"; status = "disabled";
}; };
pxp@8002a000 { pxp@8002a000 {
reg = <0x8002a000 2000>; reg = <0x8002a000 0x2000>;
interrupts = <39>; interrupts = <39>;
status = "disabled"; status = "disabled";
}; };
ocotp@8002c000 { ocotp@8002c000 {
reg = <0x8002c000 2000>; reg = <0x8002c000 0x2000>;
status = "disabled"; status = "disabled";
}; };
axi-ahb@8002e000 { axi-ahb@8002e000 {
reg = <0x8002e000 2000>; reg = <0x8002e000 0x2000>;
status = "disabled"; status = "disabled";
}; };
lcdif@80030000 { lcdif@80030000 {
compatible = "fsl,imx28-lcdif"; compatible = "fsl,imx28-lcdif";
reg = <0x80030000 2000>; reg = <0x80030000 0x2000>;
interrupts = <38 86>; interrupts = <38 86>;
status = "disabled"; status = "disabled";
}; };
can0: can@80032000 { can0: can@80032000 {
compatible = "fsl,imx28-flexcan", "fsl,p1010-flexcan"; compatible = "fsl,imx28-flexcan", "fsl,p1010-flexcan";
reg = <0x80032000 2000>; reg = <0x80032000 0x2000>;
interrupts = <8>; interrupts = <8>;
status = "disabled"; status = "disabled";
}; };
can1: can@80034000 { can1: can@80034000 {
compatible = "fsl,imx28-flexcan", "fsl,p1010-flexcan"; compatible = "fsl,imx28-flexcan", "fsl,p1010-flexcan";
reg = <0x80034000 2000>; reg = <0x80034000 0x2000>;
interrupts = <9>; interrupts = <9>;
status = "disabled"; status = "disabled";
}; };
simdbg@8003c000 { simdbg@8003c000 {
reg = <0x8003c000 200>; reg = <0x8003c000 0x200>;
status = "disabled"; status = "disabled";
}; };
simgpmisel@8003c200 { simgpmisel@8003c200 {
reg = <0x8003c200 100>; reg = <0x8003c200 0x100>;
status = "disabled"; status = "disabled";
}; };
simsspsel@8003c300 { simsspsel@8003c300 {
reg = <0x8003c300 100>; reg = <0x8003c300 0x100>;
status = "disabled"; status = "disabled";
}; };
simmemsel@8003c400 { simmemsel@8003c400 {
reg = <0x8003c400 100>; reg = <0x8003c400 0x100>;
status = "disabled"; status = "disabled";
}; };
gpiomon@8003c500 { gpiomon@8003c500 {
reg = <0x8003c500 100>; reg = <0x8003c500 0x100>;
status = "disabled"; status = "disabled";
}; };
simenet@8003c700 { simenet@8003c700 {
reg = <0x8003c700 100>; reg = <0x8003c700 0x100>;
status = "disabled"; status = "disabled";
}; };
armjtag@8003c800 { armjtag@8003c800 {
reg = <0x8003c800 100>; reg = <0x8003c800 0x100>;
status = "disabled"; status = "disabled";
}; };
}; };
...@@ -612,45 +612,45 @@ apbx@80040000 { ...@@ -612,45 +612,45 @@ apbx@80040000 {
ranges; ranges;
clkctl@80040000 { clkctl@80040000 {
reg = <0x80040000 2000>; reg = <0x80040000 0x2000>;
status = "disabled"; status = "disabled";
}; };
saif0: saif@80042000 { saif0: saif@80042000 {
compatible = "fsl,imx28-saif"; compatible = "fsl,imx28-saif";
reg = <0x80042000 2000>; reg = <0x80042000 0x2000>;
interrupts = <59 80>; interrupts = <59 80>;
fsl,saif-dma-channel = <4>; fsl,saif-dma-channel = <4>;
status = "disabled"; status = "disabled";
}; };
power@80044000 { power@80044000 {
reg = <0x80044000 2000>; reg = <0x80044000 0x2000>;
status = "disabled"; status = "disabled";
}; };
saif1: saif@80046000 { saif1: saif@80046000 {
compatible = "fsl,imx28-saif"; compatible = "fsl,imx28-saif";
reg = <0x80046000 2000>; reg = <0x80046000 0x2000>;
interrupts = <58 81>; interrupts = <58 81>;
fsl,saif-dma-channel = <5>; fsl,saif-dma-channel = <5>;
status = "disabled"; status = "disabled";
}; };
lradc@80050000 { lradc@80050000 {
reg = <0x80050000 2000>; reg = <0x80050000 0x2000>;
status = "disabled"; status = "disabled";
}; };
spdif@80054000 { spdif@80054000 {
reg = <0x80054000 2000>; reg = <0x80054000 0x2000>;
interrupts = <45 66>; interrupts = <45 66>;
status = "disabled"; status = "disabled";
}; };
rtc@80056000 { rtc@80056000 {
compatible = "fsl,imx28-rtc", "fsl,stmp3xxx-rtc"; compatible = "fsl,imx28-rtc", "fsl,stmp3xxx-rtc";
reg = <0x80056000 2000>; reg = <0x80056000 0x2000>;
interrupts = <29>; interrupts = <29>;
}; };
...@@ -658,7 +658,7 @@ i2c0: i2c@80058000 { ...@@ -658,7 +658,7 @@ i2c0: i2c@80058000 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
compatible = "fsl,imx28-i2c"; compatible = "fsl,imx28-i2c";
reg = <0x80058000 2000>; reg = <0x80058000 0x2000>;
interrupts = <111 68>; interrupts = <111 68>;
clock-frequency = <100000>; clock-frequency = <100000>;
status = "disabled"; status = "disabled";
...@@ -668,7 +668,7 @@ i2c1: i2c@8005a000 { ...@@ -668,7 +668,7 @@ i2c1: i2c@8005a000 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
compatible = "fsl,imx28-i2c"; compatible = "fsl,imx28-i2c";
reg = <0x8005a000 2000>; reg = <0x8005a000 0x2000>;
interrupts = <110 69>; interrupts = <110 69>;
clock-frequency = <100000>; clock-frequency = <100000>;
status = "disabled"; status = "disabled";
...@@ -676,14 +676,14 @@ i2c1: i2c@8005a000 { ...@@ -676,14 +676,14 @@ i2c1: i2c@8005a000 {
pwm: pwm@80064000 { pwm: pwm@80064000 {
compatible = "fsl,imx28-pwm", "fsl,imx23-pwm"; compatible = "fsl,imx28-pwm", "fsl,imx23-pwm";
reg = <0x80064000 2000>; reg = <0x80064000 0x2000>;
#pwm-cells = <2>; #pwm-cells = <2>;
fsl,pwm-number = <8>; fsl,pwm-number = <8>;
status = "disabled"; status = "disabled";
}; };
timrot@80068000 { timrot@80068000 {
reg = <0x80068000 2000>; reg = <0x80068000 0x2000>;
status = "disabled"; status = "disabled";
}; };
......
arch/arm/configs/mxs_defconfig
View file @ 1b984fbe
...@@ -34,7 +34,6 @@ CONFIG_NO_HZ=y ...@@ -34,7 +34,6 @@ CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y CONFIG_HIGH_RES_TIMERS=y
CONFIG_PREEMPT_VOLUNTARY=y CONFIG_PREEMPT_VOLUNTARY=y
CONFIG_AEABI=y CONFIG_AEABI=y
CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
CONFIG_AUTO_ZRELADDR=y CONFIG_AUTO_ZRELADDR=y
CONFIG_FPE_NWFPE=y CONFIG_FPE_NWFPE=y
CONFIG_NET=y CONFIG_NET=y
......
arch/arm/mach-mxs/Kconfig
View file @ 1b984fbe
...@@ -2,9 +2,6 @@ if ARCH_MXS ...@@ -2,9 +2,6 @@ if ARCH_MXS
source "arch/arm/mach-mxs/devices/Kconfig" source "arch/arm/mach-mxs/devices/Kconfig"
config MXS_OCOTP
bool
config SOC_IMX23 config SOC_IMX23
bool bool
select ARM_AMBA select ARM_AMBA
...@@ -66,7 +63,6 @@ config MACH_MX28EVK ...@@ -66,7 +63,6 @@ config MACH_MX28EVK
select MXS_HAVE_PLATFORM_MXS_SAIF select MXS_HAVE_PLATFORM_MXS_SAIF
select MXS_HAVE_PLATFORM_MXS_I2C select MXS_HAVE_PLATFORM_MXS_I2C
select MXS_HAVE_PLATFORM_RTC_STMP3XXX select MXS_HAVE_PLATFORM_RTC_STMP3XXX
select MXS_OCOTP
help help
Include support for MX28EVK platform. This includes specific Include support for MX28EVK platform. This includes specific
configurations for the board and its peripherals. configurations for the board and its peripherals.
...@@ -94,7 +90,6 @@ config MODULE_M28 ...@@ -94,7 +90,6 @@ config MODULE_M28
select MXS_HAVE_PLATFORM_MXS_I2C select MXS_HAVE_PLATFORM_MXS_I2C
select MXS_HAVE_PLATFORM_MXS_MMC select MXS_HAVE_PLATFORM_MXS_MMC
select MXS_HAVE_PLATFORM_MXSFB select MXS_HAVE_PLATFORM_MXSFB
select MXS_OCOTP
config MODULE_APX4 config MODULE_APX4
bool bool
...@@ -106,7 +101,6 @@ config MODULE_APX4 ...@@ -106,7 +101,6 @@ config MODULE_APX4
select MXS_HAVE_PLATFORM_MXS_I2C select MXS_HAVE_PLATFORM_MXS_I2C
select MXS_HAVE_PLATFORM_MXS_MMC select MXS_HAVE_PLATFORM_MXS_MMC
select MXS_HAVE_PLATFORM_MXS_SAIF select MXS_HAVE_PLATFORM_MXS_SAIF
select MXS_OCOTP
config MACH_TX28 config MACH_TX28
bool "Ka-Ro TX28 module" bool "Ka-Ro TX28 module"
......
arch/arm/mach-mxs/Makefile
View file @ 1b984fbe
# Common support # Common support
obj-y := devices.o icoll.o iomux.o system.o timer.o mm.o obj-y := devices.o icoll.o iomux.o ocotp.o system.o timer.o mm.o
obj-$(CONFIG_MXS_OCOTP) += ocotp.o
obj-$(CONFIG_PM) += pm.o obj-$(CONFIG_PM) += pm.o
obj-$(CONFIG_MACH_MXS_DT) += mach-mxs.o obj-$(CONFIG_MACH_MXS_DT) += mach-mxs.o
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7