diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-10 21:21:48 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-10 21:21:48 -0400 |
| commit | da06a8d7bed2f3bfc12979384b2d1247ec4873db (patch) | |
| tree | ed60bec05c7d69d94ad048d404321ce759a48868 /Documentation | |
| parent | 49999ab27eab6289a8e4f450e148bdab521361b2 (diff) | |
| parent | 6bd5dbda2adeabba69c969886511e501a65b6e3c (diff) | |
Merge tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC fixes from Olof Johansson:
"A series of fixes (and in some cases, some cleanups):
Via Tony Lindgren:
- A collection of OMAP regression fixes, in particular because
firmware no longer sets up all pin states before starting the
kernel.
- cpufreq fixes for OMAP (Rafael is on vacation and this was
pre-agreed).
- A longer series of misc regression fixes and cleanups, warning
removals, etc for OMAP
From Arnd Bergmann:
- A series of warning fixes for various platforms (defconfig builds)
Misc:
- A couple of tegra fixes, one for i.MX, some vt8500 fixes, etc."
* tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (73 commits)
ARM: pxa: armcore: fix PCI PIO warnings
ARM: integrator: use __iomem pointers for MMIO, part 2
ARM: assabet: fix bogus warning in get_assabet_scr (again)
ARM: shmobile: mark shmobile_init_late as __init
ARM: integrator_cp: fix build failure
ARM: OMAP4/AM335x: hwmod: fix disable_module regression in hardreset handling
ARM: OMAP3: fix workaround for EMU clockdomain
arm/omap: Replace board_ref_clock with enum values
ARM: OMAP2+: remove duplicated include from board-omap3stalker.c
arch/arm/plat-omap/omap-pm-noop.c: Remove unecessary semicolon
arch/arm/mach-omap2: Remove unecessary semicolon
arch/arm/mach-omap1/devices.c: Remove unecessary semicolon
ARM/dts: omap5-evm: pinmux configuration for audio
ARM/dts: Add pinctrl driver entries for omap5
ARM/dts: omap4-panda: pinmux configuration for audio
ARM/dts: omap4-sdp: pinmux configuration for audio
ARM/dts: omap5-evm: Disable unused McBSP3
ARM/dts: omap4-sdp: Disable unused McBSP3
ARM/dts: omap4-panda: Disable unused audio IPs
ARM: OMAP: board-omap4panda: Pin mux configuration for audio needs
...
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/interrupt-controller/brcm,bcm2835-armctrl-ic.txt | 2 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/timer/brcm,bcm2835-system-timer.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/interrupt-controller/brcm,bcm2835-armctrl-ic.txt b/Documentation/devicetree/bindings/interrupt-controller/brcm,bcm2835-armctrl-ic.txt index 548892c08c59..7da578d72123 100644 --- a/Documentation/devicetree/bindings/interrupt-controller/brcm,bcm2835-armctrl-ic.txt +++ b/Documentation/devicetree/bindings/interrupt-controller/brcm,bcm2835-armctrl-ic.txt | |||
| @@ -7,7 +7,7 @@ as "armctrl" in the SoC documentation, hence naming of this binding. | |||
| 7 | 7 | ||
| 8 | Required properties: | 8 | Required properties: |
| 9 | 9 | ||
| 10 | - compatible : should be "brcm,bcm2835-armctrl-ic.txt" | 10 | - compatible : should be "brcm,bcm2835-armctrl-ic" |
| 11 | - reg : Specifies base physical address and size of the registers. | 11 | - reg : Specifies base physical address and size of the registers. |
| 12 | - interrupt-controller : Identifies the node as an interrupt controller | 12 | - interrupt-controller : Identifies the node as an interrupt controller |
| 13 | - #interrupt-cells : Specifies the number of cells needed to encode an | 13 | - #interrupt-cells : Specifies the number of cells needed to encode an |
diff --git a/Documentation/devicetree/bindings/timer/brcm,bcm2835-system-timer.txt b/Documentation/devicetree/bindings/timer/brcm,bcm2835-system-timer.txt index 2de21c2acf55..844bd5fbd04c 100644 --- a/Documentation/devicetree/bindings/timer/brcm,bcm2835-system-timer.txt +++ b/Documentation/devicetree/bindings/timer/brcm,bcm2835-system-timer.txt | |||
| @@ -7,7 +7,7 @@ free running counter values, and generates an interrupt. | |||
| 7 | 7 | ||
| 8 | Required properties: | 8 | Required properties: |
| 9 | 9 | ||
| 10 | - compatible : should be "brcm,bcm2835-system-timer.txt" | 10 | - compatible : should be "brcm,bcm2835-system-timer" |
| 11 | - reg : Specifies base physical address and size of the registers. | 11 | - reg : Specifies base physical address and size of the registers. |
| 12 | - interrupts : A list of 4 interrupt sinks; one per timer channel. | 12 | - interrupts : A list of 4 interrupt sinks; one per timer channel. |
| 13 | - clock-frequency : The frequency of the clock that drives the counter, in Hz. | 13 | - clock-frequency : The frequency of the clock that drives the counter, in Hz. |