-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ker…
…nel/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
- Loading branch information
Showing
26 changed files
with
409 additions
and
158 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| /* | ||
| * 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>; | ||
| }; | ||
| }; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,7 +9,7 @@ | |
|
|
||
| /dts-v1/; | ||
|
|
||
| #include "omap34xx.dtsi" | ||
| #include "omap34xx-hs.dtsi" | ||
|
|
||
| / { | ||
| model = "Nokia N900"; | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| /* 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"; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| /* 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"; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.