Commit ea1e61cb 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 fixes from Olof Johansson:
 "Another week, another batch of fixes.

  Again, OMAP regressions due to move to DT is the bulk of the changes
  here, but this should be the last of it for 3.13.  There are also a
  handful of OMAP hwmod changes (power management, reset handling) for
  USB on OMAP3 that fixes some longish-standing bugs around USB resets.

  There are a couple of other changes that also add up line count a bit:
  One is a long-standing bug with the keyboard layout on one of the PXA
  platforms.  The other is a fix for highbank that moves their
  power-off/reset button handling to be done in-kernel since relying on
  userspace to handle it was fragile and awkward"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: sun6i: dt: Fix interrupt trigger types
  ARM: sun7i: dt: Fix interrupt trigger types
  MAINTAINERS: merge IMX6 entry into IMX
  ARM: tegra: add missing break to fuse initialization code
  ARM: pxa: prevent PXA270 occasional reboot freezes
  ARM: pxa: tosa: fix keys mapping
  ARM: OMAP2+: omap_device: add fail hook for runtime_pm when bad data is detected
  ARM: OMAP2+: hwmod: Fix usage of invalid iclk / oclk when clock node is not present
  ARM: OMAP3: hwmod data: Don't prevent RESET of USB Host module
  ARM: OMAP2+: hwmod: Fix SOFTRESET logic
  ARM: OMAP4+: hwmod data: Don't prevent RESET of USB Host module
  ARM: dts: Fix booting for secure omaps
  ARM: OMAP2+: Fix the machine entry for am3517
  ARM: dts: Fix missing entries for am3517
  ARM: OMAP2+: Fix overwriting hwmod data with data from device tree
  ARM: davinci: Fix McASP mem resource names
  ARM: highbank: handle soft poweroff and reset key events
  ARM: davinci: fix number of resources passed to davinci_gpio_register()
  gpio: davinci: fix check for unbanked gpio
parents e09f67f1 6f97dc8d
...@@ -893,20 +893,15 @@ F: arch/arm/include/asm/hardware/dec21285.h ...@@ -893,20 +893,15 @@ F: arch/arm/include/asm/hardware/dec21285.h
F: arch/arm/mach-footbridge/ F: arch/arm/mach-footbridge/
ARM/FREESCALE IMX / MXC ARM ARCHITECTURE ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
M: Shawn Guo <shawn.guo@linaro.org>
M: Sascha Hauer <kernel@pengutronix.de> M: Sascha Hauer <kernel@pengutronix.de>
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
T: git git://git.pengutronix.de/git/imx/linux-2.6.git T: git git://git.linaro.org/people/shawnguo/linux-2.6.git
F: arch/arm/mach-imx/ F: arch/arm/mach-imx/
F: arch/arm/boot/dts/imx*
F: arch/arm/configs/imx*_defconfig F: arch/arm/configs/imx*_defconfig
ARM/FREESCALE IMX6
M: Shawn Guo <shawn.guo@linaro.org>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S: Maintained
T: git git://git.linaro.org/people/shawnguo/linux-2.6.git
F: arch/arm/mach-imx/*imx6*
ARM/FREESCALE MXS ARM ARCHITECTURE ARM/FREESCALE MXS ARM ARCHITECTURE
M: Shawn Guo <shawn.guo@linaro.org> M: Shawn Guo <shawn.guo@linaro.org>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
......
...@@ -7,11 +7,11 @@ ...@@ -7,11 +7,11 @@
*/ */
/dts-v1/; /dts-v1/;
#include "omap34xx.dtsi" #include "am3517.dtsi"
/ { / {
model = "TI AM3517 EVM (AM3517/05)"; model = "TI AM3517 EVM (AM3517/05 TMDSEVM3517)";
compatible = "ti,am3517-evm", "ti,omap3"; compatible = "ti,am3517-evm", "ti,am3517", "ti,omap3";
memory { memory {
device_type = "memory"; device_type = "memory";
......
/*
* Device Tree Source for am3517 SoC
*
* Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/
*
* This file is licensed under the terms of the GNU General Public License
* version 2. This program is licensed "as is" without any warranty of any
* kind, whether express or implied.
*/
#include "omap3.dtsi"
/ {
aliases {
serial3 = &uart4;
};
ocp {
am35x_otg_hs: am35x_otg_hs@5c040000 {
compatible = "ti,omap3-musb";
ti,hwmods = "am35x_otg_hs";
status = "disabled";
reg = <0x5c040000 0x1000>;
interrupts = <71>;
interrupt-names = "mc";
};
davinci_emac: ethernet@0x5c000000 {
compatible = "ti,am3517-emac";
ti,hwmods = "davinci_emac";
status = "disabled";
reg = <0x5c000000 0x30000>;
interrupts = <67 68 69 70>;
ti,davinci-ctrl-reg-offset = <0x10000>;
ti,davinci-ctrl-mod-reg-offset = <0>;
ti,davinci-ctrl-ram-offset = <0x20000>;
ti,davinci-ctrl-ram-size = <0x2000>;
ti,davinci-rmii-en = /bits/ 8 <1>;
local-mac-address = [ 00 00 00 00 00 00 ];
};
davinci_mdio: ethernet@0x5c030000 {
compatible = "ti,davinci_mdio";
ti,hwmods = "davinci_mdio";
status = "disabled";
reg = <0x5c030000 0x1000>;
bus_freq = <1000000>;
#address-cells = <1>;
#size-cells = <0>;
};
uart4: serial@4809e000 {
compatible = "ti,omap3-uart";
ti,hwmods = "uart4";
status = "disabled";
reg = <0x4809e000 0x400>;
interrupts = <84>;
dmas = <&sdma 55 &sdma 54>;
dma-names = "tx", "rx";
clock-frequency = <48000000>;
};
};
};
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
/dts-v1/; /dts-v1/;
#include "omap34xx.dtsi" #include "omap34xx-hs.dtsi"
/ { / {
model = "Nokia N900"; model = "Nokia N900";
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* published by the Free Software Foundation. * published by the Free Software Foundation.
*/ */
#include "omap36xx.dtsi" #include "omap36xx-hs.dtsi"
/ { / {
cpus { cpus {
......
/* Disabled modules for secure omaps */
#include "omap34xx.dtsi"
/* Secure omaps have some devices inaccessible depending on the firmware */
&aes {
status = "disabled";
};
&sham {
status = "disabled";
};
&timer12 {
status = "disabled";
};
/* Disabled modules for secure omaps */
#include "omap36xx.dtsi"
/* Secure omaps have some devices inaccessible depending on the firmware */
&aes {
status = "disabled";
};
&sham {
status = "disabled";
};
&timer12 {
status = "disabled";
};
...@@ -193,7 +193,10 @@ soc@01c00000 { ...@@ -193,7 +193,10 @@ soc@01c00000 {
pio: pinctrl@01c20800 { pio: pinctrl@01c20800 {
compatible = "allwinner,sun6i-a31-pinctrl"; compatible = "allwinner,sun6i-a31-pinctrl";
reg = <0x01c20800 0x400>; reg = <0x01c20800 0x400>;
interrupts = <0 11 1>, <0 15 1>, <0 16 1>, <0 17 1>; interrupts = <0 11 4>,
<0 15 4>,
<0 16 4>,
<0 17 4>;
clocks = <&apb1_gates 5>; clocks = <&apb1_gates 5>;
gpio-controller; gpio-controller;
interrupt-controller; interrupt-controller;
...@@ -212,11 +215,11 @@ uart0_pins_a: uart0@0 { ...@@ -212,11 +215,11 @@ uart0_pins_a: uart0@0 {
timer@01c20c00 { timer@01c20c00 {
compatible = "allwinner,sun4i-timer"; compatible = "allwinner,sun4i-timer";
reg = <0x01c20c00 0xa0>; reg = <0x01c20c00 0xa0>;
interrupts = <0 18 1>, interrupts = <0 18 4>,
<0 19 1>, <0 19 4>,
<0 20 1>, <0 20 4>,
<0 21 1>, <0 21 4>,
<0 22 1>; <0 22 4>;
clocks = <&osc24M>; clocks = <&osc24M>;
}; };
...@@ -228,7 +231,7 @@ wdt1: watchdog@01c20ca0 { ...@@ -228,7 +231,7 @@ wdt1: watchdog@01c20ca0 {
uart0: serial@01c28000 { uart0: serial@01c28000 {
compatible = "snps,dw-apb-uart"; compatible = "snps,dw-apb-uart";
reg = <0x01c28000 0x400>; reg = <0x01c28000 0x400>;
interrupts = <0 0 1>; interrupts = <0 0 4>;
reg-shift = <2>; reg-shift = <2>;
reg-io-width = <4>; reg-io-width = <4>;
clocks = <&apb2_gates 16>; clocks = <&apb2_gates 16>;
...@@ -238,7 +241,7 @@ uart0: serial@01c28000 { ...@@ -238,7 +241,7 @@ uart0: serial@01c28000 {
uart1: serial@01c28400 { uart1: serial@01c28400 {
compatible = "snps,dw-apb-uart"; compatible = "snps,dw-apb-uart";
reg = <0x01c28400 0x400>; reg = <0x01c28400 0x400>;
interrupts = <0 1 1>; interrupts = <0 1 4>;
reg-shift = <2>; reg-shift = <2>;
reg-io-width = <4>; reg-io-width = <4>;
clocks = <&apb2_gates 17>; clocks = <&apb2_gates 17>;
...@@ -248,7 +251,7 @@ uart1: serial@01c28400 { ...@@ -248,7 +251,7 @@ uart1: serial@01c28400 {
uart2: serial@01c28800 { uart2: serial@01c28800 {
compatible = "snps,dw-apb-uart"; compatible = "snps,dw-apb-uart";
reg = <0x01c28800 0x400>; reg = <0x01c28800 0x400>;
interrupts = <0 2 1>; interrupts = <0 2 4>;
reg-shift = <2>; reg-shift = <2>;
reg-io-width = <4>; reg-io-width = <4>;
clocks = <&apb2_gates 18>; clocks = <&apb2_gates 18>;
...@@ -258,7 +261,7 @@ uart2: serial@01c28800 { ...@@ -258,7 +261,7 @@ uart2: serial@01c28800 {
uart3: serial@01c28c00 { uart3: serial@01c28c00 {
compatible = "snps,dw-apb-uart"; compatible = "snps,dw-apb-uart";
reg = <0x01c28c00 0x400>; reg = <0x01c28c00 0x400>;
interrupts = <0 3 1>; interrupts = <0 3 4>;
reg-shift = <2>; reg-shift = <2>;
reg-io-width = <4>; reg-io-width = <4>;
clocks = <&apb2_gates 19>; clocks = <&apb2_gates 19>;
...@@ -268,7 +271,7 @@ uart3: serial@01c28c00 { ...@@ -268,7 +271,7 @@ uart3: serial@01c28c00 {
uart4: serial@01c29000 { uart4: serial@01c29000 {
compatible = "snps,dw-apb-uart"; compatible = "snps,dw-apb-uart";
reg = <0x01c29000 0x400>; reg = <0x01c29000 0x400>;
interrupts = <0 4 1>; interrupts = <0 4 4>;
reg-shift = <2>; reg-shift = <2>;
reg-io-width = <4>; reg-io-width = <4>;
clocks = <&apb2_gates 20>; clocks = <&apb2_gates 20>;
...@@ -278,7 +281,7 @@ uart4: serial@01c29000 { ...@@ -278,7 +281,7 @@ uart4: serial@01c29000 {
uart5: serial@01c29400 { uart5: serial@01c29400 {
compatible = "snps,dw-apb-uart"; compatible = "snps,dw-apb-uart";
reg = <0x01c29400 0x400>; reg = <0x01c29400 0x400>;
interrupts = <0 5 1>; interrupts = <0 5 4>;
reg-shift = <2>; reg-shift = <2>;
reg-io-width = <4>; reg-io-width = <4>;
clocks = <&apb2_gates 21>; clocks = <&apb2_gates 21>;
......
...@@ -170,7 +170,7 @@ soc@01c00000 { ...@@ -170,7 +170,7 @@ soc@01c00000 {
emac: ethernet@01c0b000 { emac: ethernet@01c0b000 {
compatible = "allwinner,sun4i-emac"; compatible = "allwinner,sun4i-emac";
reg = <0x01c0b000 0x1000>; reg = <0x01c0b000 0x1000>;
interrupts = <0 55 1>; interrupts = <0 55 4>;
clocks = <&ahb_gates 17>; clocks = <&ahb_gates 17>;
status = "disabled"; status = "disabled";
}; };
...@@ -186,7 +186,7 @@ mdio@01c0b080 { ...@@ -186,7 +186,7 @@ mdio@01c0b080 {
pio: pinctrl@01c20800 { pio: pinctrl@01c20800 {
compatible = "allwinner,sun7i-a20-pinctrl"; compatible = "allwinner,sun7i-a20-pinctrl";
reg = <0x01c20800 0x400>; reg = <0x01c20800 0x400>;
interrupts = <0 28 1>; interrupts = <0 28 4>;
clocks = <&apb0_gates 5>; clocks = <&apb0_gates 5>;
gpio-controller; gpio-controller;
interrupt-controller; interrupt-controller;
...@@ -251,12 +251,12 @@ emac_pins_a: emac0@0 { ...@@ -251,12 +251,12 @@ emac_pins_a: emac0@0 {
timer@01c20c00 { timer@01c20c00 {
compatible = "allwinner,sun4i-timer"; compatible = "allwinner,sun4i-timer";
reg = <0x01c20c00 0x90>; reg = <0x01c20c00 0x90>;
interrupts = <0 22 1>, interrupts = <0 22 4>,
<0 23 1>, <0 23 4>,
<0 24 1>, <0 24 4>,
<0 25 1>, <0 25 4>,
<0 67 1>, <0 67 4>,
<0 68 1>; <0 68 4>;
clocks = <&osc24M>; clocks = <&osc24M>;
}; };
...@@ -273,7 +273,7 @@ sid: eeprom@01c23800 { ...@@ -273,7 +273,7 @@ sid: eeprom@01c23800 {
uart0: serial@01c28000 { uart0: serial@01c28000 {
compatible = "snps,dw-apb-uart"; compatible = "snps,dw-apb-uart";
reg = <0x01c28000 0x400>; reg = <0x01c28000 0x400>;
interrupts = <0 1 1>; interrupts = <0 1 4>;
reg-shift = <2>; reg-shift = <2>;
reg-io-width = <4>; reg-io-width = <4>;
clocks = <&apb1_gates 16>; clocks = <&apb1_gates 16>;
...@@ -283,7 +283,7 @@ uart0: serial@01c28000 { ...@@ -283,7 +283,7 @@ uart0: serial@01c28000 {
uart1: serial@01c28400 { uart1: serial@01c28400 {
compatible = "snps,dw-apb-uart"; compatible = "snps,dw-apb-uart";
reg = <0x01c28400 0x400>; reg = <0x01c28400 0x400>;
interrupts = <0 2 1>; interrupts = <0 2 4>;
reg-shift = <2>; reg-shift = <2>;
reg-io-width = <4>; reg-io-width = <4>;
clocks = <&apb1_gates 17>; clocks = <&apb1_gates 17>;
...@@ -293,7 +293,7 @@ uart1: serial@01c28400 { ...@@ -293,7 +293,7 @@ uart1: serial@01c28400 {
uart2: serial@01c28800 { uart2: serial@01c28800 {
compatible = "snps,dw-apb-uart"; compatible = "snps,dw-apb-uart";
reg = <0x01c28800 0x400>; reg = <0x01c28800 0x400>;
interrupts = <0 3 1>; interrupts = <0 3 4>;
reg-shift = <2>; reg-shift = <2>;
reg-io-width = <4>; reg-io-width = <4>;
clocks = <&apb1_gates 18>; clocks = <&apb1_gates 18>;
...@@ -303,7 +303,7 @@ uart2: serial@01c28800 { ...@@ -303,7 +303,7 @@ uart2: serial@01c28800 {
uart3: serial@01c28c00 { uart3: serial@01c28c00 {
compatible = "snps,dw-apb-uart"; compatible = "snps,dw-apb-uart";
reg = <0x01c28c00 0x400>; reg = <0x01c28c00 0x400>;
interrupts = <0 4 1>; interrupts = <0 4 4>;
reg-shift = <2>; reg-shift = <2>;
reg-io-width = <4>; reg-io-width = <4>;
clocks = <&apb1_gates 19>; clocks = <&apb1_gates 19>;
...@@ -313,7 +313,7 @@ uart3: serial@01c28c00 { ...@@ -313,7 +313,7 @@ uart3: serial@01c28c00 {
uart4: serial@01c29000 { uart4: serial@01c29000 {
compatible = "snps,dw-apb-uart"; compatible = "snps,dw-apb-uart";
reg = <0x01c29000 0x400>; reg = <0x01c29000 0x400>;
interrupts = <0 17 1>; interrupts = <0 17 4>;
reg-shift = <2>; reg-shift = <2>;
reg-io-width = <4>; reg-io-width = <4>;
clocks = <&apb1_gates 20>; clocks = <&apb1_gates 20>;
...@@ -323,7 +323,7 @@ uart4: serial@01c29000 { ...@@ -323,7 +323,7 @@ uart4: serial@01c29000 {
uart5: serial@01c29400 { uart5: serial@01c29400 {
compatible = "snps,dw-apb-uart"; compatible = "snps,dw-apb-uart";
reg = <0x01c29400 0x400>; reg = <0x01c29400 0x400>;
interrupts = <0 18 1>; interrupts = <0 18 4>;
reg-shift = <2>; reg-shift = <2>;
reg-io-width = <4>; reg-io-width = <4>;
clocks = <&apb1_gates 21>; clocks = <&apb1_gates 21>;
...@@ -333,7 +333,7 @@ uart5: serial@01c29400 { ...@@ -333,7 +333,7 @@ uart5: serial@01c29400 {
uart6: serial@01c29800 { uart6: serial@01c29800 {
compatible = "snps,dw-apb-uart"; compatible = "snps,dw-apb-uart";
reg = <0x01c29800 0x400>; reg = <0x01c29800 0x400>;
interrupts = <0 19 1>; interrupts = <0 19 4>;
reg-shift = <2>; reg-shift = <2>;
reg-io-width = <4>; reg-io-width = <4>;
clocks = <&apb1_gates 22>; clocks = <&apb1_gates 22>;
...@@ -343,7 +343,7 @@ uart6: serial@01c29800 { ...@@ -343,7 +343,7 @@ uart6: serial@01c29800 {
uart7: serial@01c29c00 { uart7: serial@01c29c00 {
compatible = "snps,dw-apb-uart"; compatible = "snps,dw-apb-uart";
reg = <0x01c29c00 0x400>; reg = <0x01c29c00 0x400>;
interrupts = <0 20 1>; interrupts = <0 20 4>;
reg-shift = <2>; reg-shift = <2>;
reg-io-width = <4>; reg-io-width = <4>;
clocks = <&apb1_gates 23>; clocks = <&apb1_gates 23>;
...@@ -353,7 +353,7 @@ uart7: serial@01c29c00 { ...@@ -353,7 +353,7 @@ uart7: serial@01c29c00 {
i2c0: i2c@01c2ac00 { i2c0: i2c@01c2ac00 {
compatible = "allwinner,sun4i-i2c"; compatible = "allwinner,sun4i-i2c";
reg = <0x01c2ac00 0x400>; reg = <0x01c2ac00 0x400>;
interrupts = <0 7 1>; interrupts = <0 7 4>;
clocks = <&apb1_gates 0>; clocks = <&apb1_gates 0>;
clock-frequency = <100000>; clock-frequency = <100000>;
status = "disabled"; status = "disabled";
...@@ -362,7 +362,7 @@ i2c0: i2c@01c2ac00 { ...@@ -362,7 +362,7 @@ i2c0: i2c@01c2ac00 {
i2c1: i2c@01c2b000 { i2c1: i2c@01c2b000 {
compatible = "allwinner,sun4i-i2c"; compatible = "allwinner,sun4i-i2c";
reg = <0x01c2b000 0x400>; reg = <0x01c2b000 0x400>;
interrupts = <0 8 1>; interrupts = <0 8 4>;
clocks = <&apb1_gates 1>; clocks = <&apb1_gates 1>;
clock-frequency = <100000>; clock-frequency = <100000>;
status = "disabled"; status = "disabled";
...@@ -371,7 +371,7 @@ i2c1: i2c@01c2b000 { ...@@ -371,7 +371,7 @@ i2c1: i2c@01c2b000 {
i2c2: i2c@01c2b400 { i2c2: i2c@01c2b400 {
compatible = "allwinner,sun4i-i2c"; compatible = "allwinner,sun4i-i2c";
reg = <0x01c2b400 0x400>; reg = <0x01c2b400 0x400>;
interrupts = <0 9 1>; interrupts = <0 9 4>;
clocks = <&apb1_gates 2>; clocks = <&apb1_gates 2>;
clock-frequency = <100000>; clock-frequency = <100000>;
status = "disabled"; status = "disabled";
...@@ -380,7 +380,7 @@ i2c2: i2c@01c2b400 { ...@@ -380,7 +380,7 @@ i2c2: i2c@01c2b400 {
i2c3: i2c@01c2b800 { i2c3: i2c@01c2b800 {
compatible = "allwinner,sun4i-i2c"; compatible = "allwinner,sun4i-i2c";
reg = <0x01c2b800 0x400>; reg = <0x01c2b800 0x400>;
interrupts = <0 88 1>; interrupts = <0 88 4>;
clocks = <&apb1_gates 3>; clocks = <&apb1_gates 3>;
clock-frequency = <100000>; clock-frequency = <100000>;
status = "disabled"; status = "disabled";
...@@ -389,7 +389,7 @@ i2c3: i2c@01c2b800 { ...@@ -389,7 +389,7 @@ i2c3: i2c@01c2b800 {
i2c4: i2c@01c2bc00 { i2c4: i2c@01c2bc00 {
compatible = "allwinner,sun4i-i2c"; compatible = "allwinner,sun4i-i2c";
reg = <0x01c2bc00 0x400>; reg = <0x01c2bc00 0x400>;
interrupts = <0 89 1>; interrupts = <0 89 4>;
clocks = <&apb1_gates 15>; clocks = <&apb1_gates 15>;
clock-frequency = <100000>; clock-frequency = <100000>;
status = "disabled"; status = "disabled";
......
...@@ -487,7 +487,7 @@ int __init da8xx_register_emac(void) ...@@ -487,7 +487,7 @@ int __init da8xx_register_emac(void)
static struct resource da830_mcasp1_resources[] = { static struct resource da830_mcasp1_resources[] = {
{ {
.name = "mcasp1", .name = "mpu",
.start = DAVINCI_DA830_MCASP1_REG_BASE, .start = DAVINCI_DA830_MCASP1_REG_BASE,
.end = DAVINCI_DA830_MCASP1_REG_BASE + (SZ_1K * 12) - 1, .end = DAVINCI_DA830_MCASP1_REG_BASE + (SZ_1K * 12) - 1,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
...@@ -515,7 +515,7 @@ static struct platform_device da830_mcasp1_device = { ...@@ -515,7 +515,7 @@ static struct platform_device da830_mcasp1_device = {
static struct resource da850_mcasp_resources[] = { static struct resource da850_mcasp_resources[] = {
{ {
.name = "mcasp", .name = "mpu",
.start = DAVINCI_DA8XX_MCASP0_REG_BASE, .start = DAVINCI_DA8XX_MCASP0_REG_BASE,
.end = DAVINCI_DA8XX_MCASP0_REG_BASE + (SZ_1K * 12) - 1, .end = DAVINCI_DA8XX_MCASP0_REG_BASE + (SZ_1K * 12) - 1,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
......
...@@ -641,6 +641,7 @@ static struct platform_device dm355_edma_device = { ...@@ -641,6 +641,7 @@ static struct platform_device dm355_edma_device = {
static struct resource dm355_asp1_resources[] = { static struct resource dm355_asp1_resources[] = {
{ {
.name = "mpu",
.start = DAVINCI_ASP1_BASE, .start = DAVINCI_ASP1_BASE,
.end = DAVINCI_ASP1_BASE + SZ_8K - 1, .end = DAVINCI_ASP1_BASE + SZ_8K - 1,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
...@@ -906,7 +907,7 @@ static struct davinci_gpio_platform_data dm355_gpio_platform_data = { ...@@ -906,7 +907,7 @@ static struct davinci_gpio_platform_data dm355_gpio_platform_data = {
int __init dm355_gpio_register(void) int __init dm355_gpio_register(void)
{ {
return davinci_gpio_register(dm355_gpio_resources, return davinci_gpio_register(dm355_gpio_resources,
sizeof(dm355_gpio_resources), ARRAY_SIZE(dm355_gpio_resources),
&dm355_gpio_platform_data); &dm355_gpio_platform_data);
} }
/*----------------------------------------------------------------------*/ /*----------------------------------------------------------------------*/
......
...@@ -720,7 +720,7 @@ static struct davinci_gpio_platform_data dm365_gpio_platform_data = { ...@@ -720,7 +720,7 @@ static struct davinci_gpio_platform_data dm365_gpio_platform_data = {
int __init dm365_gpio_register(void) int __init dm365_gpio_register(void)
{ {
return davinci_gpio_register(dm365_gpio_resources, return davinci_gpio_register(dm365_gpio_resources,
sizeof(dm365_gpio_resources), ARRAY_SIZE(dm365_gpio_resources),
&dm365_gpio_platform_data); &dm365_gpio_platform_data);
} }
...@@ -942,6 +942,7 @@ static struct platform_device dm365_edma_device = { ...@@ -942,6 +942,7 @@ static struct platform_device dm365_edma_device = {
static struct resource dm365_asp_resources[] = { static struct resource dm365_asp_resources[] = {
{ {
.name = "mpu",
.start = DAVINCI_DM365_ASP0_BASE, .start = DAVINCI_DM365_ASP0_BASE,
.end = DAVINCI_DM365_ASP0_BASE + SZ_8K - 1, .end = DAVINCI_DM365_ASP0_BASE + SZ_8K - 1,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
......
...@@ -572,6 +572,7 @@ static struct platform_device dm644x_edma_device = { ...@@ -572,6 +572,7 @@ static struct platform_device dm644x_edma_device = {
/* DM6446 EVM uses ASP0; line-out is a pair of RCA jacks */ /* DM6446 EVM uses ASP0; line-out is a pair of RCA jacks */
static struct resource dm644x_asp_resources[] = { static struct resource dm644x_asp_resources[] = {
{ {
.name = "mpu",
.start = DAVINCI_ASP0_BASE, .start = DAVINCI_ASP0_BASE,
.end = DAVINCI_ASP0_BASE + SZ_8K - 1, .end = DAVINCI_ASP0_BASE + SZ_8K - 1,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
...@@ -792,7 +793,7 @@ static struct davinci_gpio_platform_data dm644_gpio_platform_data = { ...@@ -792,7 +793,7 @@ static struct davinci_gpio_platform_data dm644_gpio_platform_data = {
int __init dm644x_gpio_register(void) int __init dm644x_gpio_register(void)
{ {
return davinci_gpio_register(dm644_gpio_resources, return davinci_gpio_register(dm644_gpio_resources,
sizeof(dm644_gpio_resources), ARRAY_SIZE(dm644_gpio_resources),
&dm644_gpio_platform_data); &dm644_gpio_platform_data);
} }
/*----------------------------------------------------------------------*/ /*----------------------------------------------------------------------*/
......
...@@ -621,7 +621,7 @@ static struct platform_device dm646x_edma_device = { ...@@ -621,7 +621,7 @@ static struct platform_device dm646x_edma_device = {
static struct resource dm646x_mcasp0_resources[] = { static struct resource dm646x_mcasp0_resources[] = {
{ {
.name = "mcasp0", .name = "mpu",
.start = DAVINCI_DM646X_MCASP0_REG_BASE, .start = DAVINCI_DM646X_MCASP0_REG_BASE,
.end = DAVINCI_DM646X_MCASP0_REG_BASE + (SZ_1K << 1) - 1, .end = DAVINCI_DM646X_MCASP0_REG_BASE + (SZ_1K << 1) - 1,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
...@@ -641,7 +641,7 @@ static struct resource dm646x_mcasp0_resources[] = { ...@@ -641,7 +641,7 @@ static struct resource dm646x_mcasp0_resources[] = {
static struct resource dm646x_mcasp1_resources[] = { static struct resource dm646x_mcasp1_resources[] = {
{ {
.name = "mcasp1", .name = "mpu",
.start = DAVINCI_DM646X_MCASP1_REG_BASE, .start = DAVINCI_DM646X_MCASP1_REG_BASE,
.end = DAVINCI_DM646X_MCASP1_REG_BASE + (SZ_1K << 1) - 1, .end = DAVINCI_DM646X_MCASP1_REG_BASE + (SZ_1K << 1) - 1,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
...@@ -769,7 +769,7 @@ static struct davinci_gpio_platform_data dm646x_gpio_platform_data = { ...@@ -769,7 +769,7 @@ static struct davinci_gpio_platform_data dm646x_gpio_platform_data = {
int __init dm646x_gpio_register(void) int __init dm646x_gpio_register(void)
{ {
return davinci_gpio_register(dm646x_gpio_resources, return davinci_gpio_register(dm646x_gpio_resources,
sizeof(dm646x_gpio_resources), ARRAY_SIZE(dm646x_gpio_resources),
&dm646x_gpio_platform_data); &dm646x_gpio_platform_data);
} }
/*----------------------------------------------------------------------*/ /*----------------------------------------------------------------------*/
......
...@@ -17,12 +17,15 @@ ...@@ -17,12 +17,15 @@
#include <linux/clkdev.h> #include <linux/clkdev.h>
#include <linux/clocksource.h> #include <linux/clocksource.h>
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <linux/input.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/irqchip.h> #include <linux/irqchip.h>
#include <linux/mailbox.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/of_irq.h> #include <linux/of_irq.h>
#include <linux/of_platform.h> #include <linux/of_platform.h>
#include <linux/of_address.h> #include <linux/of_address.h>
#include <linux/reboot.h>
#include <linux/amba/bus.h> #include <linux/amba/bus.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
...@@ -130,6 +133,24 @@ static struct platform_device highbank_cpuidle_device = { ...@@ -130,6 +133,24 @@ static struct platform_device highbank_cpuidle_device = {
.name = "cpuidle-calxeda", .name = "cpuidle-calxeda",
}; };
static int hb_keys_notifier(struct notifier_block *nb, unsigned long event, void *data)
{
u32 key = *(u32 *)data;
if (event != 0x1000)
return 0;
if (key == KEY_POWER)
orderly_poweroff(false);
else if (key == 0xffff)
ctrl_alt_del();
return 0;
}
static struct notifier_block hb_keys_nb = {
.notifier_call = hb_keys_notifier,
};
static void __init highbank_init(void) static void __init highbank_init(void)
{ {
struct device_node *np; struct device_node *np;
...@@ -145,6 +166,8 @@ static void __init highbank_init(void) ...@@ -145,6 +166,8 @@ static void __init highbank_init(void)
bus_register_notifier(&platform_bus_type, &highbank_platform_nb); bus_register_notifier(&platform_bus_type, &highbank_platform_nb);
bus_register_notifier(&amba_bustype, &highbank_amba_nb); bus_register_notifier(&amba_bustype, &highbank_amba_nb);
pl320_ipc_register_notifier(&hb_keys_nb);
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
if (psci_ops.cpu_suspend) if (psci_ops.cpu_suspend)
......
...@@ -131,6 +131,24 @@ DT_MACHINE_START(OMAP3_GP_DT, "Generic OMAP3-GP (Flattened Device Tree)") ...@@ -131,6 +131,24 @@ DT_MACHINE_START(OMAP3_GP_DT, "Generic OMAP3-GP (Flattened Device Tree)")
.dt_compat = omap3_gp_boards_compat, .dt_compat = omap3_gp_boards_compat,
.restart = omap3xxx_restart, .restart = omap3xxx_restart,
MACHINE_END MACHINE_END
static const char *am3517_boards_compat[] __initdata = {
"ti,am3517",
NULL,
};
DT_MACHINE_START(AM3517_DT, "Generic AM3517 (Flattened Device Tree)")
.reserve = omap_reserve,
.map_io = omap3_map_io,
.init_early = am35xx_init_early,
.init_irq = omap_intc_of_init,
.handle_irq = omap3_intc_handle_irq,
.init_machine = omap_generic_init,
.init_late = omap3_init_late,
.init_time = omap3_gptimer_timer_init,
.dt_compat = am3517_boards_compat,
.restart = omap3xxx_restart,
MACHINE_END
#endif #endif
#ifdef CONFIG_SOC_AM33XX #ifdef CONFIG_SOC_AM33XX
......
...@@ -183,6 +183,10 @@ static int omap_device_build_from_dt(struct platform_device *pdev) ...@@ -183,6 +183,10 @@ static int omap_device_build_from_dt(struct platform_device *pdev)
odbfd_exit1: odbfd_exit1:
kfree(hwmods); kfree(hwmods);
odbfd_exit: odbfd_exit:
/* if data/we are at fault.. load up a fail handler */
if (ret)
pdev->dev.pm_domain = &omap_device_fail_pm_domain;
return ret; return ret;
} }
...@@ -604,6 +608,19 @@ static int _od_runtime_resume(struct device *dev) ...@@ -604,6 +608,19 @@ static int _od_runtime_resume(struct device *dev)
return pm_generic_runtime_resume(dev); return pm_generic_runtime_resume(dev);
} }
static int _od_fail_runtime_suspend(struct device *dev)
{
dev_warn(dev, "%s: FIXME: missing hwmod/omap_dev info\n", __func__);
return -ENODEV;
}
static int _od_fail_runtime_resume(struct device *dev)
{
dev_warn(dev, "%s: FIXME: missing hwmod/omap_dev info\n", __func__);
return -ENODEV;
}
#endif #endif
#ifdef CONFIG_SUSPEND #ifdef CONFIG_SUSPEND
...@@ -657,6 +674,13 @@ static int _od_resume_noirq(struct device *dev) ...@@ -657,6 +674,13 @@ static int _od_resume_noirq(struct device *dev)
#define _od_resume_noirq NULL #define _od_resume_noirq NULL
#endif #endif
struct dev_pm_domain omap_device_fail_pm_domain = {
.ops = {
SET_RUNTIME_PM_OPS(_od_fail_runtime_suspend,
_od_fail_runtime_resume, NULL)
}
};
struct dev_pm_domain omap_device_pm_domain = { struct dev_pm_domain omap_device_pm_domain = {
.ops = { .ops = {
SET_RUNTIME_PM_OPS(_od_runtime_suspend, _od_runtime_resume, SET_RUNTIME_PM_OPS(_od_runtime_suspend, _od_runtime_resume,
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include "omap_hwmod.h" #include "omap_hwmod.h"
extern struct dev_pm_domain omap_device_pm_domain; extern struct dev_pm_domain omap_device_pm_domain;
extern struct dev_pm_domain omap_device_fail_pm_domain;
/* omap_device._state values */ /* omap_device._state values */
#define OMAP_DEVICE_STATE_UNKNOWN 0 #define OMAP_DEVICE_STATE_UNKNOWN 0
......
...@@ -399,7 +399,7 @@ static int _set_clockactivity(struct omap_hwmod *oh, u8 clockact, u32 *v) ...@@ -399,7 +399,7 @@ static int _set_clockactivity(struct omap_hwmod *oh, u8 clockact, u32 *v)
} }
/** /**
* _set_softreset: set OCP_SYSCONFIG.CLOCKACTIVITY bits in @v * _set_softreset: set OCP_SYSCONFIG.SOFTRESET bit in @v
* @oh: struct omap_hwmod * * @oh: struct omap_hwmod *
* @v: pointer to register contents to modify * @v: pointer to register contents to modify
* *
...@@ -426,6 +426,36 @@ static int _set_softreset(struct omap_hwmod *oh, u32 *v) ...@@ -426,6 +426,36 @@ static int _set_softreset(struct omap_hwmod *oh, u32 *v)
return 0; return 0;
} }
/**
* _clear_softreset: clear OCP_SYSCONFIG.SOFTRESET bit in @v
* @oh: struct omap_hwmod *
* @v: pointer to register contents to modify
*
* Clear the SOFTRESET bit in @v for hwmod @oh. Returns -EINVAL upon
* error or 0 upon success.
*/
static int _clear_softreset(struct omap_hwmod *oh, u32 *v)
{
u32 softrst_mask;
if (!oh->class->sysc ||
!(oh->class->sysc->sysc_flags & SYSC_HAS_SOFTRESET))
return -EINVAL;
if (!oh->class->sysc->sysc_fields) {
WARN(1,
"omap_hwmod: %s: sysc_fields absent for sysconfig class\n",
oh->name);
return -EINVAL;
}
softrst_mask = (0x1 << oh->class->sysc->sysc_fields->srst_shift);
*v &= ~softrst_mask;
return 0;
}
/** /**
* _wait_softreset_complete - wait for an OCP softreset to complete * _wait_softreset_complete - wait for an OCP softreset to complete
* @oh: struct omap_hwmod * to wait on * @oh: struct omap_hwmod * to wait on
...@@ -785,6 +815,7 @@ static int _init_interface_clks(struct omap_hwmod *oh) ...@@ -785,6 +815,7 @@ static int _init_interface_clks(struct omap_hwmod *oh)
pr_warning("omap_hwmod: %s: cannot clk_get interface_clk %s\n", pr_warning("omap_hwmod: %s: cannot clk_get interface_clk %s\n",
oh->name, os->clk); oh->name, os->clk);
ret = -EINVAL; ret = -EINVAL;
continue;
} }
os->_clk = c; os->_clk = c;
/* /*
...@@ -821,6 +852,7 @@ static int _init_opt_clks(struct omap_hwmod *oh) ...@@ -821,6 +852,7 @@ static int _init_opt_clks(struct omap_hwmod *oh)
pr_warning("omap_hwmod: %s: cannot clk_get opt_clk %s\n", pr_warning("omap_hwmod: %s: cannot clk_get opt_clk %s\n",
oh->name, oc->clk); oh->name, oc->clk);
ret = -EINVAL; ret = -EINVAL;
continue;
} }
oc->_clk = c; oc->_clk = c;
/* /*
...@@ -1911,6 +1943,12 @@ static int _ocp_softreset(struct omap_hwmod *oh) ...@@ -1911,6 +1943,12 @@ static int _ocp_softreset(struct omap_hwmod *oh)
ret = _set_softreset(oh, &v); ret = _set_softreset(oh, &v);
if (ret) if (ret)
goto dis_opt_clks; goto dis_opt_clks;
_write_sysconfig(v, oh);
ret = _clear_softreset(oh, &v);
if (ret)
goto dis_opt_clks;
_write_sysconfig(v, oh); _write_sysconfig(v, oh);
if (oh->class->sysc->srst_udelay) if (oh->class->sysc->srst_udelay)
...@@ -2326,38 +2364,80 @@ static int _shutdown(struct omap_hwmod *oh) ...@@ -2326,38 +2364,80 @@ static int _shutdown(struct omap_hwmod *oh)
return 0; return 0;
} }
static int of_dev_find_hwmod(struct device_node *np,
struct omap_hwmod *oh)
{
int count, i, res;
const char *p;
count = of_property_count_strings(np, "ti,hwmods");
if (count < 1)
return -ENODEV;
for (i = 0; i < count; i++) {
res = of_property_read_string_index(np, "ti,hwmods",
i, &p);
if (res)
continue;
if (!strcmp(p, oh->name)) {
pr_debug("omap_hwmod: dt %s[%i] uses hwmod %s\n",
np->name, i, oh->name);
return i;
}
}
return -ENODEV;
}
/** /**
* of_dev_hwmod_lookup - look up needed hwmod from dt blob * of_dev_hwmod_lookup - look up needed hwmod from dt blob
* @np: struct device_node * * @np: struct device_node *
* @oh: struct omap_hwmod * * @oh: struct omap_hwmod *
* @index: index of the entry found
* @found: struct device_node * found or NULL
* *
* Parse the dt blob and find out needed hwmod. Recursive function is * Parse the dt blob and find out needed hwmod. Recursive function is
* implemented to take care hierarchical dt blob parsing. * implemented to take care hierarchical dt blob parsing.
* Return: The device node on success or NULL on failure. * Return: Returns 0 on success, -ENODEV when not found.
*/ */
static struct device_node *of_dev_hwmod_lookup(struct device_node *np, static int of_dev_hwmod_lookup(struct device_node *np,
struct omap_hwmod *oh) struct omap_hwmod *oh,
int *index,
struct device_node **found)
{ {
struct device_node *np0 = NULL, *np1 = NULL; struct device_node *np0 = NULL;
const char *p; int res;
res = of_dev_find_hwmod(np, oh);
if (res >= 0) {
*found = np;
*index = res;
return 0;
}
for_each_child_of_node(np, np0) { for_each_child_of_node(np, np0) {
if (of_find_property(np0, "ti,hwmods", NULL)) { struct device_node *fc;
p = of_get_property(np0, "ti,hwmods", NULL); int i;
if (!strcmp(p, oh->name))
return np0; res = of_dev_hwmod_lookup(np0, oh, &i, &fc);
np1 = of_dev_hwmod_lookup(np0, oh); if (res == 0) {
if (np1) *found = fc;
return np1; *index = i;
return 0;
} }
} }
return NULL;
*found = NULL;
*index = 0;
return -ENODEV;
} }
/** /**
* _init_mpu_rt_base - populate the virtual address for a hwmod * _init_mpu_rt_base - populate the virtual address for a hwmod
* @oh: struct omap_hwmod * to locate the virtual address * @oh: struct omap_hwmod * to locate the virtual address
* @data: (unused, caller should pass NULL) * @data: (unused, caller should pass NULL)
* @index: index of the reg entry iospace in device tree
* @np: struct device_node * of the IP block's device node in the DT data * @np: struct device_node * of the IP block's device node in the DT data
* *
* Cache the virtual address used by the MPU to access this IP block's * Cache the virtual address used by the MPU to access this IP block's
...@@ -2368,7 +2448,7 @@ static struct device_node *of_dev_hwmod_lookup(struct device_node *np, ...@@ -2368,7 +2448,7 @@ static struct device_node *of_dev_hwmod_lookup(struct device_node *np,
* -ENXIO on absent or invalid register target address space. * -ENXIO on absent or invalid register target address space.
*/ */
static int __init _init_mpu_rt_base(struct omap_hwmod *oh, void *data, static int __init _init_mpu_rt_base(struct omap_hwmod *oh, void *data,
struct device_node *np) int index, struct device_node *np)
{ {
struct omap_hwmod_addr_space *mem; struct omap_hwmod_addr_space *mem;
void __iomem *va_start = NULL; void __iomem *va_start = NULL;
...@@ -2390,13 +2470,17 @@ static int __init _init_mpu_rt_base(struct omap_hwmod *oh, void *data, ...@@ -2390,13 +2470,17 @@ static int __init _init_mpu_rt_base(struct omap_hwmod *oh, void *data,
if (!np) if (!np)
return -ENXIO; return -ENXIO;
va_start = of_iomap(np, oh->mpu_rt_idx); va_start = of_iomap(np, index + oh->mpu_rt_idx);
} else { } else {
va_start = ioremap(mem->pa_start, mem->pa_end - mem->pa_start); va_start = ioremap(mem->pa_start, mem->pa_end - mem->pa_start);
} }
if (!va_start) { if (!va_start) {
pr_err("omap_hwmod: %s: Could not ioremap\n", oh->name); if (mem)
pr_err("omap_hwmod: %s: Could not ioremap\n", oh->name);
else
pr_err("omap_hwmod: %s: Missing dt reg%i for %s\n",
oh->name, index, np->full_name);
return -ENXIO; return -ENXIO;
} }
...@@ -2422,17 +2506,29 @@ static int __init _init_mpu_rt_base(struct omap_hwmod *oh, void *data, ...@@ -2422,17 +2506,29 @@ static int __init _init_mpu_rt_base(struct omap_hwmod *oh, void *data,
*/ */
static int __init _init(struct omap_hwmod *oh, void *data) static int __init _init(struct omap_hwmod *oh, void *data)
{ {
int r; int r, index;
struct device_node *np = NULL; struct device_node *np = NULL;
if (oh->_state != _HWMOD_STATE_REGISTERED) if (oh->_state != _HWMOD_STATE_REGISTERED)
return 0; return 0;
if (of_have_populated_dt()) if (of_have_populated_dt()) {
np = of_dev_hwmod_lookup(of_find_node_by_name(NULL, "ocp"), oh); struct device_node *bus;
bus = of_find_node_by_name(NULL, "ocp");
if (!bus)
return -ENODEV;
r = of_dev_hwmod_lookup(bus, oh, &index, &np);
if (r)
pr_debug("omap_hwmod: %s missing dt data\n", oh->name);
else if (np && index)
pr_warn("omap_hwmod: %s using broken dt data from %s\n",
oh->name, np->name);
}
if (oh->class->sysc) { if (oh->class->sysc) {
r = _init_mpu_rt_base(oh, NULL, np); r = _init_mpu_rt_base(oh, NULL, index, np);
if (r < 0) { if (r < 0) {
WARN(1, "omap_hwmod: %s: doesn't have mpu register target base\n", WARN(1, "omap_hwmod: %s: doesn't have mpu register target base\n",
oh->name); oh->name);
...@@ -3169,6 +3265,11 @@ int omap_hwmod_softreset(struct omap_hwmod *oh) ...@@ -3169,6 +3265,11 @@ int omap_hwmod_softreset(struct omap_hwmod *oh)
goto error; goto error;
_write_sysconfig(v, oh); _write_sysconfig(v, oh);
ret = _clear_softreset(oh, &v);
if (ret)
goto error;
_write_sysconfig(v, oh);
error: error:
return ret; return ret;
} }
......
...@@ -1943,7 +1943,8 @@ static struct omap_hwmod_class_sysconfig omap3xxx_usb_host_hs_sysc = { ...@@ -1943,7 +1943,8 @@ static struct omap_hwmod_class_sysconfig omap3xxx_usb_host_hs_sysc = {
.syss_offs = 0x0014, .syss_offs = 0x0014,
.sysc_flags = (SYSC_HAS_MIDLEMODE | SYSC_HAS_CLOCKACTIVITY | .sysc_flags = (SYSC_HAS_MIDLEMODE | SYSC_HAS_CLOCKACTIVITY |
SYSC_HAS_SIDLEMODE | SYSC_HAS_ENAWAKEUP | SYSC_HAS_SIDLEMODE | SYSC_HAS_ENAWAKEUP |
SYSC_HAS_SOFTRESET | SYSC_HAS_AUTOIDLE), SYSC_HAS_SOFTRESET | SYSC_HAS_AUTOIDLE |
SYSS_HAS_RESET_STATUS),
.idlemodes = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART | .idlemodes = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
MSTANDBY_FORCE | MSTANDBY_NO | MSTANDBY_SMART), MSTANDBY_FORCE | MSTANDBY_NO | MSTANDBY_SMART),
.sysc_fields = &omap_hwmod_sysc_type1, .sysc_fields = &omap_hwmod_sysc_type1,
...@@ -2021,15 +2022,7 @@ static struct omap_hwmod omap3xxx_usb_host_hs_hwmod = { ...@@ -2021,15 +2022,7 @@ static struct omap_hwmod omap3xxx_usb_host_hs_hwmod = {
* hence HWMOD_SWSUP_MSTANDBY * hence HWMOD_SWSUP_MSTANDBY
*/ */
/* .flags = HWMOD_SWSUP_SIDLE | HWMOD_SWSUP_MSTANDBY,
* During system boot; If the hwmod framework resets the module
* the module will have smart idle settings; which can lead to deadlock
* (above Errata Id:i660); so, dont reset the module during boot;
* Use HWMOD_INIT_NO_RESET.
*/
.flags = HWMOD_SWSUP_SIDLE | HWMOD_SWSUP_MSTANDBY |
HWMOD_INIT_NO_RESET,
}; };
/* /*
......
...@@ -2937,7 +2937,7 @@ static struct omap_hwmod_class_sysconfig omap44xx_usb_host_hs_sysc = { ...@@ -2937,7 +2937,7 @@ static struct omap_hwmod_class_sysconfig omap44xx_usb_host_hs_sysc = {
.sysc_offs = 0x0010, .sysc_offs = 0x0010,
.syss_offs = 0x0014, .syss_offs = 0x0014,
.sysc_flags = (SYSC_HAS_MIDLEMODE | SYSC_HAS_SIDLEMODE | .sysc_flags = (SYSC_HAS_MIDLEMODE | SYSC_HAS_SIDLEMODE |
SYSC_HAS_SOFTRESET), SYSC_HAS_SOFTRESET | SYSC_HAS_RESET_STATUS),
.idlemodes = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART | .idlemodes = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
SIDLE_SMART_WKUP | MSTANDBY_FORCE | MSTANDBY_NO | SIDLE_SMART_WKUP | MSTANDBY_FORCE | MSTANDBY_NO |
MSTANDBY_SMART | MSTANDBY_SMART_WKUP), MSTANDBY_SMART | MSTANDBY_SMART_WKUP),
...@@ -3001,15 +3001,7 @@ static struct omap_hwmod omap44xx_usb_host_hs_hwmod = { ...@@ -3001,15 +3001,7 @@ static struct omap_hwmod omap44xx_usb_host_hs_hwmod = {
* hence HWMOD_SWSUP_MSTANDBY * hence HWMOD_SWSUP_MSTANDBY
*/ */
/* .flags = HWMOD_SWSUP_SIDLE | HWMOD_SWSUP_MSTANDBY,
* During system boot; If the hwmod framework resets the module
* the module will have smart idle settings; which can lead to deadlock
* (above Errata Id:i660); so, dont reset the module during boot;
* Use HWMOD_INIT_NO_RESET.
*/
.flags = HWMOD_SWSUP_SIDLE | HWMOD_SWSUP_MSTANDBY |
HWMOD_INIT_NO_RESET,
}; };
/* /*
......
...@@ -1544,7 +1544,8 @@ static struct omap_hwmod_class_sysconfig omap54xx_usb_host_hs_sysc = { ...@@ -1544,7 +1544,8 @@ static struct omap_hwmod_class_sysconfig omap54xx_usb_host_hs_sysc = {
.rev_offs = 0x0000, .rev_offs = 0x0000,
.sysc_offs = 0x0010, .sysc_offs = 0x0010,
.sysc_flags = (SYSC_HAS_MIDLEMODE | SYSC_HAS_RESET_STATUS | .sysc_flags = (SYSC_HAS_MIDLEMODE | SYSC_HAS_RESET_STATUS |
SYSC_HAS_SIDLEMODE | SYSC_HAS_SOFTRESET), SYSC_HAS_SIDLEMODE | SYSC_HAS_SOFTRESET |
SYSC_HAS_RESET_STATUS),
.idlemodes = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART | .idlemodes = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
SIDLE_SMART_WKUP | MSTANDBY_FORCE | MSTANDBY_NO | SIDLE_SMART_WKUP | MSTANDBY_FORCE | MSTANDBY_NO |
MSTANDBY_SMART | MSTANDBY_SMART_WKUP), MSTANDBY_SMART | MSTANDBY_SMART_WKUP),
...@@ -1598,15 +1599,7 @@ static struct omap_hwmod omap54xx_usb_host_hs_hwmod = { ...@@ -1598,15 +1599,7 @@ static struct omap_hwmod omap54xx_usb_host_hs_hwmod = {
* hence HWMOD_SWSUP_MSTANDBY * hence HWMOD_SWSUP_MSTANDBY
*/ */
/* .flags = HWMOD_SWSUP_SIDLE | HWMOD_SWSUP_MSTANDBY,
* During system boot; If the hwmod framework resets the module
* the module will have smart idle settings; which can lead to deadlock
* (above Errata Id:i660); so, dont reset the module during boot;
* Use HWMOD_INIT_NO_RESET.
*/
.flags = HWMOD_SWSUP_SIDLE | HWMOD_SWSUP_MSTANDBY |
HWMOD_INIT_NO_RESET,
.main_clk = "l3init_60m_fclk", .main_clk = "l3init_60m_fclk",
.prcm = { .prcm = {
.omap4 = { .omap4 = {
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include <mach/regs-ost.h> #include <mach/regs-ost.h>
#include <mach/reset.h> #include <mach/reset.h>
#include <mach/smemc.h>
unsigned int reset_status; unsigned int reset_status;
EXPORT_SYMBOL(reset_status); EXPORT_SYMBOL(reset_status);
...@@ -81,6 +82,12 @@ static void do_hw_reset(void) ...@@ -81,6 +82,12 @@ static void do_hw_reset(void)
writel_relaxed(OSSR_M3, OSSR); writel_relaxed(OSSR_M3, OSSR);
/* ... in 100 ms */ /* ... in 100 ms */
writel_relaxed(readl_relaxed(OSCR) + 368640, OSMR3); writel_relaxed(readl_relaxed(OSCR) + 368640, OSMR3);
/*
* SDRAM hangs on watchdog reset on Marvell PXA270 (erratum 71)
* we put SDRAM into self-refresh to prevent that
*/
while (1)
writel_relaxed(MDREFR_SLFRSH, MDREFR);
} }
void pxa_restart(enum reboot_mode mode, const char *cmd) void pxa_restart(enum reboot_mode mode, const char *cmd)
...@@ -104,4 +111,3 @@ void pxa_restart(enum reboot_mode mode, const char *cmd) ...@@ -104,4 +111,3 @@ void pxa_restart(enum reboot_mode mode, const char *cmd)
break; break;
} }
} }
...@@ -425,57 +425,57 @@ static struct platform_device tosa_power_device = { ...@@ -425,57 +425,57 @@ static struct platform_device tosa_power_device = {
* Tosa Keyboard * Tosa Keyboard
*/ */
static const uint32_t tosakbd_keymap[] = { static const uint32_t tosakbd_keymap[] = {
KEY(0, 2, KEY_W), KEY(0, 1, KEY_W),
KEY(0, 6, KEY_K), KEY(0, 5, KEY_K),
KEY(0, 7, KEY_BACKSPACE), KEY(0, 6, KEY_BACKSPACE),
KEY(0, 8, KEY_P), KEY(0, 7, KEY_P),
KEY(1, 1, KEY_Q), KEY(1, 0, KEY_Q),
KEY(1, 2, KEY_E), KEY(1, 1, KEY_E),
KEY(1, 3, KEY_T), KEY(1, 2, KEY_T),
KEY(1, 4, KEY_Y), KEY(1, 3, KEY_Y),
KEY(1, 6, KEY_O), KEY(1, 5, KEY_O),
KEY(1, 7, KEY_I), KEY(1, 6, KEY_I),
KEY(1, 8, KEY_COMMA), KEY(1, 7, KEY_COMMA),
KEY(2, 1, KEY_A), KEY(2, 0, KEY_A),
KEY(2, 2, KEY_D), KEY(2, 1, KEY_D),
KEY(2, 3, KEY_G), KEY(2, 2, KEY_G),
KEY(2, 4, KEY_U), KEY(2, 3, KEY_U),
KEY(2, 6, KEY_L), KEY(2, 5, KEY_L),
KEY(2, 7, KEY_ENTER), KEY(2, 6, KEY_ENTER),
KEY(2, 8, KEY_DOT), KEY(2, 7, KEY_DOT),
KEY(3, 1, KEY_Z), KEY(3, 0, KEY_Z),
KEY(3, 2, KEY_C), KEY(3, 1, KEY_C),
KEY(3, 3, KEY_V), KEY(3, 2, KEY_V),
KEY(3, 4, KEY_J), KEY(3, 3, KEY_J),
KEY(3, 5, TOSA_KEY_ADDRESSBOOK), KEY(3, 4, TOSA_KEY_ADDRESSBOOK),
KEY(3, 6, TOSA_KEY_CANCEL), KEY(3, 5, TOSA_KEY_CANCEL),
KEY(3, 7, TOSA_KEY_CENTER), KEY(3, 6, TOSA_KEY_CENTER),
KEY(3, 8, TOSA_KEY_OK), KEY(3, 7, TOSA_KEY_OK),
KEY(3, 9, KEY_LEFTSHIFT), KEY(3, 8, KEY_LEFTSHIFT),
KEY(4, 1, KEY_S), KEY(4, 0, KEY_S),
KEY(4, 2, KEY_R), KEY(4, 1, KEY_R),
KEY(4, 3, KEY_B), KEY(4, 2, KEY_B),
KEY(4, 4, KEY_N), KEY(4, 3, KEY_N),
KEY(4, 5, TOSA_KEY_CALENDAR), KEY(4, 4, TOSA_KEY_CALENDAR),
KEY(4, 6, TOSA_KEY_HOMEPAGE), KEY(4, 5, TOSA_KEY_HOMEPAGE),
KEY(4, 7, KEY_LEFTCTRL), KEY(4, 6, KEY_LEFTCTRL),
KEY(4, 8, TOSA_KEY_LIGHT), KEY(4, 7, TOSA_KEY_LIGHT),
KEY(4, 10, KEY_RIGHTSHIFT), KEY(4, 9, KEY_RIGHTSHIFT),
KEY(5, 1, KEY_TAB), KEY(5, 0, KEY_TAB),
KEY(5, 2, KEY_SLASH), KEY(5, 1, KEY_SLASH),
KEY(5, 3, KEY_H), KEY(5, 2, KEY_H),
KEY(5, 4, KEY_M), KEY(5, 3, KEY_M),
KEY(5, 5, TOSA_KEY_MENU), KEY(5, 4, TOSA_KEY_MENU),
KEY(5, 7, KEY_UP), KEY(5, 6, KEY_UP),
KEY(5, 11, TOSA_KEY_FN), KEY(5, 10, TOSA_KEY_FN),
KEY(6, 1, KEY_X), KEY(6, 0, KEY_X),
KEY(6, 2, KEY_F), KEY(6, 1, KEY_F),
KEY(6, 3, KEY_SPACE), KEY(6, 2, KEY_SPACE),
KEY(6, 4, KEY_APOSTROPHE), KEY(6, 3, KEY_APOSTROPHE),
KEY(6, 5, TOSA_KEY_MAIL), KEY(6, 4, TOSA_KEY_MAIL),
KEY(6, 6, KEY_LEFT), KEY(6, 5, KEY_LEFT),
KEY(6, 7, KEY_DOWN), KEY(6, 6, KEY_DOWN),
KEY(6, 8, KEY_RIGHT), KEY(6, 7, KEY_RIGHT),
}; };
static struct matrix_keymap_data tosakbd_keymap_data = { static struct matrix_keymap_data tosakbd_keymap_data = {
......
...@@ -198,10 +198,12 @@ void __init tegra_init_fuse(void) ...@@ -198,10 +198,12 @@ void __init tegra_init_fuse(void)
switch (tegra_chip_id) { switch (tegra_chip_id) {
case TEGRA20: case TEGRA20:
tegra20_fuse_init_randomness(); tegra20_fuse_init_randomness();
break;
case TEGRA30: case TEGRA30:
case TEGRA114: case TEGRA114:
default: default:
tegra30_fuse_init_randomness(); tegra30_fuse_init_randomness();
break;
} }
pr_info("Tegra Revision: %s SKU: %d CPU Process: %d Core Process: %d\n", pr_info("Tegra Revision: %s SKU: %d CPU Process: %d Core Process: %d\n",
......
...@@ -327,7 +327,7 @@ static int gpio_to_irq_unbanked(struct gpio_chip *chip, unsigned offset) ...@@ -327,7 +327,7 @@ static int gpio_to_irq_unbanked(struct gpio_chip *chip, unsigned offset)
* NOTE: we assume for now that only irqs in the first gpio_chip * NOTE: we assume for now that only irqs in the first gpio_chip
* can provide direct-mapped IRQs to AINTC (up to 32 GPIOs). * can provide direct-mapped IRQs to AINTC (up to 32 GPIOs).
*/ */
if (offset < d->irq_base) if (offset < d->gpio_unbanked)
return d->gpio_irq + offset; return d->gpio_irq + offset;
else else
return -ENODEV; return -ENODEV;
...@@ -419,6 +419,8 @@ static int davinci_gpio_irq_setup(struct platform_device *pdev) ...@@ -419,6 +419,8 @@ static int davinci_gpio_irq_setup(struct platform_device *pdev)
/* pass "bank 0" GPIO IRQs to AINTC */ /* pass "bank 0" GPIO IRQs to AINTC */
chips[0].chip.to_irq = gpio_to_irq_unbanked; chips[0].chip.to_irq = gpio_to_irq_unbanked;
chips[0].gpio_irq = bank_irq;
chips[0].gpio_unbanked = pdata->gpio_unbanked;
binten = BIT(0); binten = BIT(0);
/* AINTC handles mask/unmask; GPIO handles triggering */ /* AINTC handles mask/unmask; GPIO handles triggering */
......
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