Commit 88de3d0d authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull arm-soc bug fixes from Arnd Bergmann:
 "These are a bunch of bug fixes that came in after the merge window and
  one update for the MAINTAINERS file.

  The largest part of the fixes are patches that address bugs found by
  building all the ARM defconfig files.  There are a lot more warnings
  that we have patches for, but the others are either still under
  discussion or are harmless and do not cause actual problems besides
  making the build slightly noisy."

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (30 commits)
  ARM: davinci: remove broken ntosd2_init_i2c
  ARM: s3c24xx: enable CONFIG_BUG for tct_hammer
  omap-rng: fix use of SIMPLE_DEV_PM_OPS
  spi/s3c64xx: improve error handling
  mtd/omap2: fix dmaengine_slave_config error handling
  gpio: em: do not discard em_gio_irq_domain_cleanup
  ARM: exynos: exynos_pm_add_dev_to_genpd may be unused
  ARM: imx: gpmi-nand depends on mxs-dma
  ARM: integrator: include <linux/export.h>
  ARM: s3c24xx: use new PWM driver
  ARM: sa1100: include linux/io.h in hackkit leds code
  Input: eeti_ts: pass gpio value instead of IRQ
  ARM: pxa: remove irq_to_gpio from ezx-pcap driver
  ARM: tegra: more regulator fixes for Harmony
  usb/ohci-omap: remove unused variable
  mfd/asic3: fix asic3_mfd_probe return value
  ARM: kirkwood: fix typo in Makefile.boot
  i.MX27: Fix emma-prp and csi clocks.
  ARM: integrator: use clk_prepare_enable() for timer
  MAINTAINERS: update entry for Linus Walleij
  ...
parents f720e7ea de923430
...@@ -925,14 +925,14 @@ S: Maintained ...@@ -925,14 +925,14 @@ S: Maintained
ARM/NOMADIK ARCHITECTURE ARM/NOMADIK ARCHITECTURE
M: Alessandro Rubini <rubini@unipv.it> M: Alessandro Rubini <rubini@unipv.it>
M: Linus Walleij <linus.walleij@stericsson.com> M: Linus Walleij <linus.walleij@linaro.org>
M: STEricsson <STEricsson_nomadik_linux@list.st.com> M: STEricsson <STEricsson_nomadik_linux@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)
S: Maintained S: Maintained
F: arch/arm/mach-nomadik/ F: arch/arm/mach-nomadik/
F: arch/arm/plat-nomadik/ F: arch/arm/plat-nomadik/
F: drivers/i2c/busses/i2c-nomadik.c F: drivers/i2c/busses/i2c-nomadik.c
T: git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git T: git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git
ARM/OPENMOKO NEO FREERUNNER (GTA02) MACHINE SUPPORT ARM/OPENMOKO NEO FREERUNNER (GTA02) MACHINE SUPPORT
M: Nelson Castillo <arhuaco@freaks-unidos.net> M: Nelson Castillo <arhuaco@freaks-unidos.net>
...@@ -1146,7 +1146,7 @@ F: drivers/usb/host/ehci-w90x900.c ...@@ -1146,7 +1146,7 @@ F: drivers/usb/host/ehci-w90x900.c
F: drivers/video/nuc900fb.c F: drivers/video/nuc900fb.c
ARM/U300 MACHINE SUPPORT ARM/U300 MACHINE SUPPORT
M: Linus Walleij <linus.walleij@stericsson.com> M: Linus Walleij <linus.walleij@linaro.org>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S: Supported S: Supported
F: arch/arm/mach-u300/ F: arch/arm/mach-u300/
...@@ -1161,15 +1161,20 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git ...@@ -1161,15 +1161,20 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git
ARM/Ux500 ARM ARCHITECTURE ARM/Ux500 ARM ARCHITECTURE
M: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com> M: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
M: Linus Walleij <linus.walleij@stericsson.com> M: Linus Walleij <linus.walleij@linaro.org>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S: Maintained S: Maintained
F: arch/arm/mach-ux500/ F: arch/arm/mach-ux500/
F: drivers/clocksource/clksrc-dbx500-prcmu.c
F: drivers/dma/ste_dma40* F: drivers/dma/ste_dma40*
F: drivers/hwspinlock/u8500_hsem.c
F: drivers/mfd/abx500* F: drivers/mfd/abx500*
F: drivers/mfd/ab8500* F: drivers/mfd/ab8500*
F: drivers/mfd/stmpe* F: drivers/mfd/dbx500*
F: drivers/mfd/db8500*
F: drivers/pinctrl/pinctrl-nomadik*
F: drivers/rtc/rtc-ab8500.c F: drivers/rtc/rtc-ab8500.c
F: drivers/rtc/rtc-pl031.c
T: git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git T: git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git
ARM/VFP SUPPORT ARM/VFP SUPPORT
...@@ -3094,7 +3099,7 @@ F: include/linux/gigaset_dev.h ...@@ -3094,7 +3099,7 @@ F: include/linux/gigaset_dev.h
GPIO SUBSYSTEM GPIO SUBSYSTEM
M: Grant Likely <grant.likely@secretlab.ca> M: Grant Likely <grant.likely@secretlab.ca>
M: Linus Walleij <linus.walleij@stericsson.com> M: Linus Walleij <linus.walleij@linaro.org>
S: Maintained S: Maintained
T: git git://git.secretlab.ca/git/linux-2.6.git T: git git://git.secretlab.ca/git/linux-2.6.git
F: Documentation/gpio.txt F: Documentation/gpio.txt
......
...@@ -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";
}; };
}; };
......
...@@ -27,7 +27,7 @@ wdog@10002000 { ...@@ -27,7 +27,7 @@ wdog@10002000 {
status = "okay"; status = "okay";
}; };
uart@1000a000 { uart1: serial@1000a000 {
fsl,uart-has-rtscts; fsl,uart-has-rtscts;
status = "okay"; status = "okay";
}; };
......
...@@ -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";
}; };
......
...@@ -53,7 +53,7 @@ pmic: mc13892@0 { ...@@ -53,7 +53,7 @@ pmic: mc13892@0 {
spi-max-frequency = <6000000>; spi-max-frequency = <6000000>;
reg = <0>; reg = <0>;
interrupt-parent = <&gpio1>; interrupt-parent = <&gpio1>;
interrupts = <8>; interrupts = <8 0x4>;
regulators { regulators {
sw1_reg: sw1 { sw1_reg: sw1 {
......
...@@ -64,12 +64,32 @@ lan9220@f4000000 { ...@@ -64,12 +64,32 @@ lan9220@f4000000 {
reg = <0xf4000000 0x2000000>; reg = <0xf4000000 0x2000000>;
phy-mode = "mii"; phy-mode = "mii";
interrupt-parent = <&gpio2>; interrupt-parent = <&gpio2>;
interrupts = <31>; interrupts = <31 0x8>;
reg-io-width = <4>; reg-io-width = <4>;
/*
* VDD33A and VDDVARIO of LAN9220 are supplied by
* SW4_3V3 of LTC3589. Before the regulator driver
* for this PMIC is available, we use a fixed dummy
* 3V3 regulator to get LAN9220 driver probing work.
*/
vdd33a-supply = <&reg_3p3v>;
vddvario-supply = <&reg_3p3v>;
smsc,irq-push-pull; smsc,irq-push-pull;
}; };
}; };
regulators {
compatible = "simple-bus";
reg_3p3v: 3p3v {
compatible = "regulator-fixed";
regulator-name = "3P3V";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-always-on;
};
};
gpio-keys { gpio-keys {
compatible = "gpio-keys"; compatible = "gpio-keys";
......
...@@ -53,6 +53,7 @@ pinctrl_gpio_hog: gpiohog { ...@@ -53,6 +53,7 @@ pinctrl_gpio_hog: gpiohog {
fsl,pins = < fsl,pins = <
144 0x80000000 /* MX6Q_PAD_EIM_D22__GPIO_3_22 */ 144 0x80000000 /* MX6Q_PAD_EIM_D22__GPIO_3_22 */
121 0x80000000 /* MX6Q_PAD_EIM_D19__GPIO_3_19 */ 121 0x80000000 /* MX6Q_PAD_EIM_D19__GPIO_3_19 */
953 0x80000000 /* MX6Q_PAD_GPIO_0__CCM_CLKO */
>; >;
}; };
}; };
......
...@@ -192,6 +192,7 @@ CONFIG_RTC_DRV_MC13XXX=y ...@@ -192,6 +192,7 @@ CONFIG_RTC_DRV_MC13XXX=y
CONFIG_RTC_DRV_MXC=y CONFIG_RTC_DRV_MXC=y
CONFIG_DMADEVICES=y CONFIG_DMADEVICES=y
CONFIG_IMX_SDMA=y CONFIG_IMX_SDMA=y
CONFIG_MXS_DMA=y
CONFIG_COMMON_CLK_DEBUG=y CONFIG_COMMON_CLK_DEBUG=y
# CONFIG_IOMMU_SUPPORT is not set # CONFIG_IOMMU_SUPPORT is not set
CONFIG_EXT2_FS=y CONFIG_EXT2_FS=y
......
...@@ -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
......
...@@ -7,7 +7,7 @@ CONFIG_SYSFS_DEPRECATED_V2=y ...@@ -7,7 +7,7 @@ CONFIG_SYSFS_DEPRECATED_V2=y
CONFIG_BLK_DEV_INITRD=y CONFIG_BLK_DEV_INITRD=y
CONFIG_EXPERT=y CONFIG_EXPERT=y
# CONFIG_KALLSYMS is not set # CONFIG_KALLSYMS is not set
# CONFIG_BUG is not set # CONFIG_BUGVERBOSE is not set
# CONFIG_ELF_CORE is not set # CONFIG_ELF_CORE is not set
# CONFIG_SHMEM is not set # CONFIG_SHMEM is not set
CONFIG_SLOB=y CONFIG_SLOB=y
......
...@@ -162,38 +162,6 @@ static void __init davinci_ntosd2_map_io(void) ...@@ -162,38 +162,6 @@ static void __init davinci_ntosd2_map_io(void)
dm644x_init(); dm644x_init();
} }
/*
I2C initialization
*/
static struct davinci_i2c_platform_data ntosd2_i2c_pdata = {
.bus_freq = 20 /* kHz */,
.bus_delay = 100 /* usec */,
};
static struct i2c_board_info __initdata ntosd2_i2c_info[] = {
};
static int ntosd2_init_i2c(void)
{
int status;
davinci_init_i2c(&ntosd2_i2c_pdata);
status = gpio_request(NTOSD2_MSP430_IRQ, ntosd2_i2c_info[0].type);
if (status == 0) {
status = gpio_direction_input(NTOSD2_MSP430_IRQ);
if (status == 0) {
status = gpio_to_irq(NTOSD2_MSP430_IRQ);
if (status > 0) {
ntosd2_i2c_info[0].irq = status;
i2c_register_board_info(1,
ntosd2_i2c_info,
ARRAY_SIZE(ntosd2_i2c_info));
}
}
}
return status;
}
static struct davinci_mmc_config davinci_ntosd2_mmc_config = { static struct davinci_mmc_config davinci_ntosd2_mmc_config = {
.wires = 4, .wires = 4,
.version = MMC_CTLR_VERSION_1 .version = MMC_CTLR_VERSION_1
...@@ -218,7 +186,6 @@ static __init void davinci_ntosd2_init(void) ...@@ -218,7 +186,6 @@ static __init void davinci_ntosd2_init(void)
{ {
struct clk *aemif_clk; struct clk *aemif_clk;
struct davinci_soc_info *soc_info = &davinci_soc_info; struct davinci_soc_info *soc_info = &davinci_soc_info;
int status;
aemif_clk = clk_get(NULL, "aemif"); aemif_clk = clk_get(NULL, "aemif");
clk_enable(aemif_clk); clk_enable(aemif_clk);
...@@ -242,12 +209,6 @@ static __init void davinci_ntosd2_init(void) ...@@ -242,12 +209,6 @@ static __init void davinci_ntosd2_init(void)
platform_add_devices(davinci_ntosd2_devices, platform_add_devices(davinci_ntosd2_devices,
ARRAY_SIZE(davinci_ntosd2_devices)); ARRAY_SIZE(davinci_ntosd2_devices));
/* Initialize I2C interface specific for this board */
status = ntosd2_init_i2c();
if (status < 0)
pr_warning("davinci_ntosd2_init: msp430 irq setup failed:"
" %d\n", status);
davinci_serial_init(&uart_config); davinci_serial_init(&uart_config);
dm644x_init_asp(&dm644x_ntosd2_snd_data); dm644x_init_asp(&dm644x_ntosd2_snd_data);
......
...@@ -115,7 +115,7 @@ static __init int exynos_pm_dt_parse_domains(void) ...@@ -115,7 +115,7 @@ static __init int exynos_pm_dt_parse_domains(void)
} }
#endif /* CONFIG_OF */ #endif /* CONFIG_OF */
static __init void exynos_pm_add_dev_to_genpd(struct platform_device *pdev, static __init __maybe_unused void exynos_pm_add_dev_to_genpd(struct platform_device *pdev,
struct exynos_pm_domain *pd) struct exynos_pm_domain *pd)
{ {
if (pdev->dev.bus) { if (pdev->dev.bus) {
......
...@@ -223,7 +223,7 @@ int __init mx27_clocks_init(unsigned long fref) ...@@ -223,7 +223,7 @@ int __init mx27_clocks_init(unsigned long fref)
clk_register_clkdev(clk[per3_gate], "per", "imx-fb.0"); clk_register_clkdev(clk[per3_gate], "per", "imx-fb.0");
clk_register_clkdev(clk[lcdc_ipg_gate], "ipg", "imx-fb.0"); clk_register_clkdev(clk[lcdc_ipg_gate], "ipg", "imx-fb.0");
clk_register_clkdev(clk[lcdc_ahb_gate], "ahb", "imx-fb.0"); clk_register_clkdev(clk[lcdc_ahb_gate], "ahb", "imx-fb.0");
clk_register_clkdev(clk[csi_ahb_gate], NULL, "mx2-camera.0"); clk_register_clkdev(clk[csi_ahb_gate], "ahb", "mx2-camera.0");
clk_register_clkdev(clk[usb_div], "per", "fsl-usb2-udc"); clk_register_clkdev(clk[usb_div], "per", "fsl-usb2-udc");
clk_register_clkdev(clk[usb_ipg_gate], "ipg", "fsl-usb2-udc"); clk_register_clkdev(clk[usb_ipg_gate], "ipg", "fsl-usb2-udc");
clk_register_clkdev(clk[usb_ahb_gate], "ahb", "fsl-usb2-udc"); clk_register_clkdev(clk[usb_ahb_gate], "ahb", "fsl-usb2-udc");
...@@ -250,8 +250,10 @@ int __init mx27_clocks_init(unsigned long fref) ...@@ -250,8 +250,10 @@ int __init mx27_clocks_init(unsigned long fref)
clk_register_clkdev(clk[i2c2_ipg_gate], NULL, "imx-i2c.1"); clk_register_clkdev(clk[i2c2_ipg_gate], NULL, "imx-i2c.1");
clk_register_clkdev(clk[owire_ipg_gate], NULL, "mxc_w1.0"); clk_register_clkdev(clk[owire_ipg_gate], NULL, "mxc_w1.0");
clk_register_clkdev(clk[kpp_ipg_gate], NULL, "imx-keypad"); clk_register_clkdev(clk[kpp_ipg_gate], NULL, "imx-keypad");
clk_register_clkdev(clk[emma_ahb_gate], "ahb", "imx-emma"); clk_register_clkdev(clk[emma_ahb_gate], "emma-ahb", "mx2-camera.0");
clk_register_clkdev(clk[emma_ipg_gate], "ipg", "imx-emma"); clk_register_clkdev(clk[emma_ipg_gate], "emma-ipg", "mx2-camera.0");
clk_register_clkdev(clk[emma_ahb_gate], "ahb", "m2m-emmaprp.0");
clk_register_clkdev(clk[emma_ipg_gate], "ipg", "m2m-emmaprp.0");
clk_register_clkdev(clk[iim_ipg_gate], "iim", NULL); clk_register_clkdev(clk[iim_ipg_gate], "iim", NULL);
clk_register_clkdev(clk[gpio_ipg_gate], "gpio", NULL); clk_register_clkdev(clk[gpio_ipg_gate], "gpio", NULL);
clk_register_clkdev(clk[brom_ahb_gate], "brom", NULL); clk_register_clkdev(clk[brom_ahb_gate], "brom", NULL);
......
...@@ -130,7 +130,7 @@ int __init mx31_clocks_init(unsigned long fref) ...@@ -130,7 +130,7 @@ int __init mx31_clocks_init(unsigned long fref)
clk_register_clkdev(clk[nfc], NULL, "mxc_nand.0"); clk_register_clkdev(clk[nfc], NULL, "mxc_nand.0");
clk_register_clkdev(clk[ipu_gate], NULL, "ipu-core"); clk_register_clkdev(clk[ipu_gate], NULL, "ipu-core");
clk_register_clkdev(clk[ipu_gate], NULL, "mx3_sdc_fb"); clk_register_clkdev(clk[ipu_gate], NULL, "mx3_sdc_fb");
clk_register_clkdev(clk[kpp_gate], "kpp", NULL); clk_register_clkdev(clk[kpp_gate], NULL, "imx-keypad");
clk_register_clkdev(clk[usb_div_post], "per", "mxc-ehci.0"); clk_register_clkdev(clk[usb_div_post], "per", "mxc-ehci.0");
clk_register_clkdev(clk[usb_gate], "ahb", "mxc-ehci.0"); clk_register_clkdev(clk[usb_gate], "ahb", "mxc-ehci.0");
clk_register_clkdev(clk[ipg], "ipg", "mxc-ehci.0"); clk_register_clkdev(clk[ipg], "ipg", "mxc-ehci.0");
......
...@@ -303,6 +303,7 @@ static void __init mx5_clocks_common_init(unsigned long rate_ckil, ...@@ -303,6 +303,7 @@ static void __init mx5_clocks_common_init(unsigned long rate_ckil,
clk_prepare_enable(clk[aips_tz2]); /* fec */ clk_prepare_enable(clk[aips_tz2]); /* fec */
clk_prepare_enable(clk[spba]); clk_prepare_enable(clk[spba]);
clk_prepare_enable(clk[emi_fast_gate]); /* fec */ clk_prepare_enable(clk[emi_fast_gate]); /* fec */
clk_prepare_enable(clk[emi_slow_gate]); /* eim */
clk_prepare_enable(clk[tmax1]); clk_prepare_enable(clk[tmax1]);
clk_prepare_enable(clk[tmax2]); /* esdhc2, fec */ clk_prepare_enable(clk[tmax2]); /* esdhc2, fec */
clk_prepare_enable(clk[tmax3]); /* esdhc1, esdhc4 */ clk_prepare_enable(clk[tmax3]); /* esdhc1, esdhc4 */
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/export.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/irq.h> #include <linux/irq.h>
......
...@@ -456,7 +456,7 @@ static void __init ap_init_timer(void) ...@@ -456,7 +456,7 @@ static void __init ap_init_timer(void)
clk = clk_get_sys("ap_timer", NULL); clk = clk_get_sys("ap_timer", NULL);
BUG_ON(IS_ERR(clk)); BUG_ON(IS_ERR(clk));
clk_enable(clk); clk_prepare_enable(clk);
rate = clk_get_rate(clk); rate = clk_get_rate(clk);
writel(0, TIMER0_VA_BASE + TIMER_CTRL); writel(0, TIMER0_VA_BASE + TIMER_CTRL);
......
...@@ -9,5 +9,5 @@ dtb-$(CONFIG_MACH_ICONNECT_DT) += kirkwood-iconnect.dtb ...@@ -9,5 +9,5 @@ dtb-$(CONFIG_MACH_ICONNECT_DT) += kirkwood-iconnect.dtb
dtb-$(CONFIG_MACH_IB62X0_DT) += kirkwood-ib62x0.dtb dtb-$(CONFIG_MACH_IB62X0_DT) += kirkwood-ib62x0.dtb
dtb-$(CONFIG_MACH_TS219_DT) += kirkwood-qnap-ts219.dtb dtb-$(CONFIG_MACH_TS219_DT) += kirkwood-qnap-ts219.dtb
dtb-$(CONFIG_MACH_GOFLEXNET_DT) += kirkwood-goflexnet.dtb dtb-$(CONFIG_MACH_GOFLEXNET_DT) += kirkwood-goflexnet.dtb
dbt-$(CONFIG_MACH_LSXL_DT) += kirkwood-lschlv2.dtb dtb-$(CONFIG_MACH_LSXL_DT) += kirkwood-lschlv2.dtb
dbt-$(CONFIG_MACH_LSXL_DT) += kirkwood-lsxhl.dtb dtb-$(CONFIG_MACH_LSXL_DT) += kirkwood-lsxhl.dtb
...@@ -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"
......
# 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
......
...@@ -953,12 +953,12 @@ static struct i2c_board_info raumfeld_connector_i2c_board_info __initdata = { ...@@ -953,12 +953,12 @@ static struct i2c_board_info raumfeld_connector_i2c_board_info __initdata = {
static struct eeti_ts_platform_data eeti_ts_pdata = { static struct eeti_ts_platform_data eeti_ts_pdata = {
.irq_active_high = 1, .irq_active_high = 1,
.irq_gpio = GPIO_TOUCH_IRQ,
}; };
static struct i2c_board_info raumfeld_controller_i2c_board_info __initdata = { static struct i2c_board_info raumfeld_controller_i2c_board_info __initdata = {
.type = "eeti_ts", .type = "eeti_ts",
.addr = 0x0a, .addr = 0x0a,
.irq = PXA_GPIO_TO_IRQ(GPIO_TOUCH_IRQ),
.platform_data = &eeti_ts_pdata, .platform_data = &eeti_ts_pdata,
}; };
......
...@@ -483,7 +483,7 @@ config MACH_NEO1973_GTA02 ...@@ -483,7 +483,7 @@ config MACH_NEO1973_GTA02
select I2C select I2C
select POWER_SUPPLY select POWER_SUPPLY
select MACH_NEO1973 select MACH_NEO1973
select S3C2410_PWM select S3C24XX_PWM
select S3C_DEV_USB_HOST select S3C_DEV_USB_HOST
help help
Say Y here if you are using the Openmoko GTA02 / Freerunner GSM Phone Say Y here if you are using the Openmoko GTA02 / Freerunner GSM Phone
...@@ -493,7 +493,7 @@ config MACH_RX1950 ...@@ -493,7 +493,7 @@ config MACH_RX1950
select S3C24XX_DCLK select S3C24XX_DCLK
select PM_H1940 if PM select PM_H1940 if PM
select I2C select I2C
select S3C2410_PWM select S3C24XX_PWM
select S3C_DEV_NAND select S3C_DEV_NAND
select S3C2410_IOTIMING if S3C2440_CPUFREQ select S3C2410_IOTIMING if S3C2440_CPUFREQ
select S3C2440_XTAL_16934400 select S3C2440_XTAL_16934400
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
* as cpu led, the green one is used as timer led. * as cpu led, the green one is used as timer led.
*/ */
#include <linux/init.h> #include <linux/init.h>
#include <linux/io.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <asm/leds.h> #include <asm/leds.h>
......
...@@ -51,7 +51,7 @@ static struct regulator_init_data ldo0_data = { ...@@ -51,7 +51,7 @@ static struct regulator_init_data ldo0_data = {
.consumer_supplies = tps658621_ldo0_supply, .consumer_supplies = tps658621_ldo0_supply,
}; };
#define HARMONY_REGULATOR_INIT(_id, _name, _supply, _minmv, _maxmv) \ #define HARMONY_REGULATOR_INIT(_id, _name, _supply, _minmv, _maxmv, _on)\
static struct regulator_init_data _id##_data = { \ static struct regulator_init_data _id##_data = { \
.supply_regulator = _supply, \ .supply_regulator = _supply, \
.constraints = { \ .constraints = { \
...@@ -63,21 +63,22 @@ static struct regulator_init_data ldo0_data = { ...@@ -63,21 +63,22 @@ static struct regulator_init_data ldo0_data = {
.valid_ops_mask = (REGULATOR_CHANGE_MODE | \ .valid_ops_mask = (REGULATOR_CHANGE_MODE | \
REGULATOR_CHANGE_STATUS | \ REGULATOR_CHANGE_STATUS | \
REGULATOR_CHANGE_VOLTAGE), \ REGULATOR_CHANGE_VOLTAGE), \
.always_on = _on, \
}, \ }, \
} }
HARMONY_REGULATOR_INIT(sm0, "vdd_sm0", "vdd_sys", 725, 1500); HARMONY_REGULATOR_INIT(sm0, "vdd_sm0", "vdd_sys", 725, 1500, 1);
HARMONY_REGULATOR_INIT(sm1, "vdd_sm1", "vdd_sys", 725, 1500); HARMONY_REGULATOR_INIT(sm1, "vdd_sm1", "vdd_sys", 725, 1500, 1);
HARMONY_REGULATOR_INIT(sm2, "vdd_sm2", "vdd_sys", 3000, 4550); HARMONY_REGULATOR_INIT(sm2, "vdd_sm2", "vdd_sys", 3000, 4550, 1);
HARMONY_REGULATOR_INIT(ldo1, "vdd_ldo1", "vdd_sm2", 725, 1500); HARMONY_REGULATOR_INIT(ldo1, "vdd_ldo1", "vdd_sm2", 725, 1500, 1);
HARMONY_REGULATOR_INIT(ldo2, "vdd_ldo2", "vdd_sm2", 725, 1500); HARMONY_REGULATOR_INIT(ldo2, "vdd_ldo2", "vdd_sm2", 725, 1500, 0);
HARMONY_REGULATOR_INIT(ldo3, "vdd_ldo3", "vdd_sm2", 1250, 3300); HARMONY_REGULATOR_INIT(ldo3, "vdd_ldo3", "vdd_sm2", 1250, 3300, 1);
HARMONY_REGULATOR_INIT(ldo4, "vdd_ldo4", "vdd_sm2", 1700, 2475); HARMONY_REGULATOR_INIT(ldo4, "vdd_ldo4", "vdd_sm2", 1700, 2475, 1);
HARMONY_REGULATOR_INIT(ldo5, "vdd_ldo5", NULL, 1250, 3300); HARMONY_REGULATOR_INIT(ldo5, "vdd_ldo5", NULL, 1250, 3300, 1);
HARMONY_REGULATOR_INIT(ldo6, "vdd_ldo6", "vdd_sm2", 1250, 3300); HARMONY_REGULATOR_INIT(ldo6, "vdd_ldo6", "vdd_sm2", 1250, 3300, 0);
HARMONY_REGULATOR_INIT(ldo7, "vdd_ldo7", "vdd_sm2", 1250, 3300); HARMONY_REGULATOR_INIT(ldo7, "vdd_ldo7", "vdd_sm2", 1250, 3300, 0);
HARMONY_REGULATOR_INIT(ldo8, "vdd_ldo8", "vdd_sm2", 1250, 3300); HARMONY_REGULATOR_INIT(ldo8, "vdd_ldo8", "vdd_sm2", 1250, 3300, 0);
HARMONY_REGULATOR_INIT(ldo9, "vdd_ldo9", "vdd_sm2", 1250, 3300); HARMONY_REGULATOR_INIT(ldo9, "vdd_ldo9", "vdd_sm2", 1250, 3300, 1);
#define TPS_REG(_id, _data) \ #define TPS_REG(_id, _data) \
{ \ { \
...@@ -119,9 +120,10 @@ static struct i2c_board_info __initdata harmony_regulators[] = { ...@@ -119,9 +120,10 @@ static struct i2c_board_info __initdata harmony_regulators[] = {
int __init harmony_regulator_init(void) int __init harmony_regulator_init(void)
{ {
regulator_register_always_on(0, "vdd_sys",
NULL, 0, 5000000);
if (machine_is_harmony()) { if (machine_is_harmony()) {
regulator_register_always_on(0, "vdd_sys",
NULL, 0, 5000000);
i2c_register_board_info(3, harmony_regulators, 1); i2c_register_board_info(3, harmony_regulators, 1);
} else { /* Harmony, booted using device tree */ } else { /* Harmony, booted using device tree */
struct device_node *np; struct device_node *np;
......
...@@ -403,7 +403,8 @@ config S5P_DEV_USB_EHCI ...@@ -403,7 +403,8 @@ config S5P_DEV_USB_EHCI
config S3C24XX_PWM config S3C24XX_PWM
bool "PWM device support" bool "PWM device support"
select HAVE_PWM select PWM
select PWM_SAMSUNG
help help
Support for exporting the PWM timer blocks via the pwm device Support for exporting the PWM timer blocks via the pwm device
system system
......
...@@ -160,7 +160,7 @@ static int __exit omap_rng_remove(struct platform_device *pdev) ...@@ -160,7 +160,7 @@ static int __exit omap_rng_remove(struct platform_device *pdev)
return 0; return 0;
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int omap_rng_suspend(struct device *dev) static int omap_rng_suspend(struct device *dev)
{ {
......
...@@ -266,7 +266,7 @@ static int __devinit em_gio_irq_domain_init(struct em_gio_priv *p) ...@@ -266,7 +266,7 @@ static int __devinit em_gio_irq_domain_init(struct em_gio_priv *p)
return 0; return 0;
} }
static void __devexit em_gio_irq_domain_cleanup(struct em_gio_priv *p) static void em_gio_irq_domain_cleanup(struct em_gio_priv *p)
{ {
struct gpio_em_config *pdata = p->pdev->dev.platform_data; struct gpio_em_config *pdata = p->pdev->dev.platform_data;
......
...@@ -48,7 +48,7 @@ struct eeti_ts_priv { ...@@ -48,7 +48,7 @@ struct eeti_ts_priv {
struct input_dev *input; struct input_dev *input;
struct work_struct work; struct work_struct work;
struct mutex mutex; struct mutex mutex;
int irq, irq_active_high; int irq_gpio, irq, irq_active_high;
}; };
#define EETI_TS_BITDEPTH (11) #define EETI_TS_BITDEPTH (11)
...@@ -62,7 +62,7 @@ struct eeti_ts_priv { ...@@ -62,7 +62,7 @@ struct eeti_ts_priv {
static inline int eeti_ts_irq_active(struct eeti_ts_priv *priv) static inline int eeti_ts_irq_active(struct eeti_ts_priv *priv)
{ {
return gpio_get_value(irq_to_gpio(priv->irq)) == priv->irq_active_high; return gpio_get_value(priv->irq_gpio) == priv->irq_active_high;
} }
static void eeti_ts_read(struct work_struct *work) static void eeti_ts_read(struct work_struct *work)
...@@ -157,7 +157,7 @@ static void eeti_ts_close(struct input_dev *dev) ...@@ -157,7 +157,7 @@ static void eeti_ts_close(struct input_dev *dev)
static int __devinit eeti_ts_probe(struct i2c_client *client, static int __devinit eeti_ts_probe(struct i2c_client *client,
const struct i2c_device_id *idp) const struct i2c_device_id *idp)
{ {
struct eeti_ts_platform_data *pdata; struct eeti_ts_platform_data *pdata = client->dev.platform_data;
struct eeti_ts_priv *priv; struct eeti_ts_priv *priv;
struct input_dev *input; struct input_dev *input;
unsigned int irq_flags; unsigned int irq_flags;
...@@ -199,9 +199,12 @@ static int __devinit eeti_ts_probe(struct i2c_client *client, ...@@ -199,9 +199,12 @@ static int __devinit eeti_ts_probe(struct i2c_client *client,
priv->client = client; priv->client = client;
priv->input = input; priv->input = input;
priv->irq = client->irq; priv->irq_gpio = pdata->irq_gpio;
priv->irq = gpio_to_irq(pdata->irq_gpio);
pdata = client->dev.platform_data; err = gpio_request_one(pdata->irq_gpio, GPIOF_IN, client->name);
if (err < 0)
goto err1;
if (pdata) if (pdata)
priv->irq_active_high = pdata->irq_active_high; priv->irq_active_high = pdata->irq_active_high;
...@@ -215,13 +218,13 @@ static int __devinit eeti_ts_probe(struct i2c_client *client, ...@@ -215,13 +218,13 @@ static int __devinit eeti_ts_probe(struct i2c_client *client,
err = input_register_device(input); err = input_register_device(input);
if (err) if (err)
goto err1; goto err2;
err = request_irq(priv->irq, eeti_ts_isr, irq_flags, err = request_irq(priv->irq, eeti_ts_isr, irq_flags,
client->name, priv); client->name, priv);
if (err) { if (err) {
dev_err(&client->dev, "Unable to request touchscreen IRQ.\n"); dev_err(&client->dev, "Unable to request touchscreen IRQ.\n");
goto err2; goto err3;
} }
/* /*
...@@ -233,9 +236,11 @@ static int __devinit eeti_ts_probe(struct i2c_client *client, ...@@ -233,9 +236,11 @@ static int __devinit eeti_ts_probe(struct i2c_client *client,
device_init_wakeup(&client->dev, 0); device_init_wakeup(&client->dev, 0);
return 0; return 0;
err2: err3:
input_unregister_device(input); input_unregister_device(input);
input = NULL; /* so we dont try to free it below */ input = NULL; /* so we dont try to free it below */
err2:
gpio_free(pdata->irq_gpio);
err1: err1:
input_free_device(input); input_free_device(input);
kfree(priv); kfree(priv);
......
...@@ -925,6 +925,7 @@ static int __init asic3_mfd_probe(struct platform_device *pdev, ...@@ -925,6 +925,7 @@ static int __init asic3_mfd_probe(struct platform_device *pdev,
goto out; goto out;
} }
ret = 0;
if (pdata->leds) { if (pdata->leds) {
int i; int i;
......
...@@ -202,7 +202,7 @@ static void pcap_isr_work(struct work_struct *work) ...@@ -202,7 +202,7 @@ static void pcap_isr_work(struct work_struct *work)
} }
local_irq_enable(); local_irq_enable();
ezx_pcap_write(pcap, PCAP_REG_MSR, pcap->msr); ezx_pcap_write(pcap, PCAP_REG_MSR, pcap->msr);
} while (gpio_get_value(irq_to_gpio(pcap->spi->irq))); } while (gpio_get_value(pdata->gpio));
} }
static void pcap_irq_handler(unsigned int irq, struct irq_desc *desc) static void pcap_irq_handler(unsigned int irq, struct irq_desc *desc)
......
...@@ -480,7 +480,7 @@ config MTD_NAND_NANDSIM ...@@ -480,7 +480,7 @@ config MTD_NAND_NANDSIM
config MTD_NAND_GPMI_NAND config MTD_NAND_GPMI_NAND
bool "GPMI NAND Flash Controller driver" bool "GPMI NAND Flash Controller driver"
depends on MTD_NAND && (SOC_IMX23 || SOC_IMX28 || SOC_IMX6Q) depends on MTD_NAND && MXS_DMA
help help
Enables NAND Flash support for IMX23 or IMX28. Enables NAND Flash support for IMX23 or IMX28.
The GPMI controller is very powerful, with the help of BCH The GPMI controller is very powerful, with the help of BCH
......
...@@ -1245,7 +1245,6 @@ static int __devinit omap_nand_probe(struct platform_device *pdev) ...@@ -1245,7 +1245,6 @@ static int __devinit omap_nand_probe(struct platform_device *pdev)
goto out_release_mem_region; goto out_release_mem_region;
} else { } else {
struct dma_slave_config cfg; struct dma_slave_config cfg;
int rc;
memset(&cfg, 0, sizeof(cfg)); memset(&cfg, 0, sizeof(cfg));
cfg.src_addr = info->phys_base; cfg.src_addr = info->phys_base;
...@@ -1254,10 +1253,10 @@ static int __devinit omap_nand_probe(struct platform_device *pdev) ...@@ -1254,10 +1253,10 @@ static int __devinit omap_nand_probe(struct platform_device *pdev)
cfg.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; cfg.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
cfg.src_maxburst = 16; cfg.src_maxburst = 16;
cfg.dst_maxburst = 16; cfg.dst_maxburst = 16;
rc = dmaengine_slave_config(info->dma, &cfg); err = dmaengine_slave_config(info->dma, &cfg);
if (rc) { if (err) {
dev_err(&pdev->dev, "DMA engine slave config failed: %d\n", dev_err(&pdev->dev, "DMA engine slave config failed: %d\n",
rc); err);
goto out_release_mem_region; goto out_release_mem_region;
} }
info->nand.read_buf = omap_read_buf_dma_pref; info->nand.read_buf = omap_read_buf_dma_pref;
......
...@@ -826,7 +826,7 @@ static struct s3c64xx_spi_csinfo *s3c64xx_get_slave_ctrldata( ...@@ -826,7 +826,7 @@ static struct s3c64xx_spi_csinfo *s3c64xx_get_slave_ctrldata(
struct spi_device *spi) struct spi_device *spi)
{ {
struct s3c64xx_spi_csinfo *cs; struct s3c64xx_spi_csinfo *cs;
struct device_node *slave_np, *data_np; struct device_node *slave_np, *data_np = NULL;
u32 fb_delay = 0; u32 fb_delay = 0;
slave_np = spi->dev.of_node; slave_np = spi->dev.of_node;
......
...@@ -403,8 +403,6 @@ static int usb_hcd_omap_probe (const struct hc_driver *driver, ...@@ -403,8 +403,6 @@ static int usb_hcd_omap_probe (const struct hc_driver *driver,
static inline void static inline void
usb_hcd_omap_remove (struct usb_hcd *hcd, struct platform_device *pdev) usb_hcd_omap_remove (struct usb_hcd *hcd, struct platform_device *pdev)
{ {
struct ohci_hcd *ohci = hcd_to_ohci (hcd);
usb_remove_hcd(hcd); usb_remove_hcd(hcd);
if (!IS_ERR_OR_NULL(hcd->phy)) { if (!IS_ERR_OR_NULL(hcd->phy)) {
(void) otg_set_host(hcd->phy->otg, 0); (void) otg_set_host(hcd->phy->otg, 0);
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
#define LINUX_INPUT_EETI_TS_H #define LINUX_INPUT_EETI_TS_H
struct eeti_ts_platform_data { struct eeti_ts_platform_data {
int irq_gpio;
unsigned int irq_active_high; unsigned int irq_active_high;
}; };
......
...@@ -16,6 +16,7 @@ struct pcap_subdev { ...@@ -16,6 +16,7 @@ struct pcap_subdev {
struct pcap_platform_data { struct pcap_platform_data {
unsigned int irq_base; unsigned int irq_base;
unsigned int config; unsigned int config;
int gpio;
void (*init) (void *); /* board specific init */ void (*init) (void *); /* board specific init */
int num_subdevs; int num_subdevs;
struct pcap_subdev *subdevs; struct pcap_subdev *subdevs;
......
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