forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 131
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel…
…/git/arm/arm-soc Pull ARM SoC fixes from Olof Johansson: "The first real batch of fixes for this release cycle, so there are a few more than usual. Most of these are fixes and tweaks to board support (DT bugfixes, etc). I've also picked up a couple of small cleanups that seemed innocent enough that there was little reason to wait (const/ __initconst and Kconfig deps). Quite a bit of the changes on OMAP were due to fixes to no longer write to rodata from assembly when ARM_KERNMEM_PERMS was enabled, but there were also other fixes. Kirkwood had a bunch of gpio fixes for some boards. OMAP had RTC fixes on OMAP5, and Nomadik had changes to MMC parameters in DT. All in all, mostly the usual mix of various fixes" * tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (46 commits) ARM: multi_v7_defconfig: enable DW_WATCHDOG ARM: nomadik: fix up SD/MMC DT settings ARM64: tegra: Add chosen node for tegra132 norrin ARM: realview: use "depends on" instead of "if" after prompt ARM: tango: use "depends on" instead of "if" after prompt ARM: tango: use const and __initconst for smp_operations ARM: realview: use const and __initconst for smp_operations bus: uniphier-system-bus: revive tristate prompt arm64: dts: Add missing DMA Abort interrupt to Juno bus: vexpress-config: Add missing of_node_put ARM: dts: am57xx: sbc-am57x: correct Eth PHY settings ARM: dts: am57xx: cl-som-am57x: fix CPSW EMAC pinmux ARM: dts: am57xx: sbc-am57x: fix UART3 pinmux ARM: dts: am57xx: cl-som-am57x: update SPI Flash frequency ARM: dts: am57xx: cl-som-am57x: set HOST mode for USB2 ARM: dts: am57xx: sbc-am57x: fix SB-SOM EEPROM I2C address ARM: dts: LogicPD Torpedo: Revert Duplicative Entries ARM: dts: am437x: pixcir_tangoc: use correct flags for irq types ARM: dts: am4372: fix irq type for arm twd and global timer ARM: dts: at91: sama5d4 xplained: fix phy0 IRQ type ...
- Loading branch information
Showing
33 changed files
with
230 additions
and
149 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
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
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
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 |
|---|---|---|
| @@ -1,7 +1,8 @@ | ||
| /* | ||
| * Device Tree file for Buffalo Linkstation LS-WVL/VL | ||
| * | ||
| * Copyright (C) 2015, [email protected] | ||
| * Copyright (C) 2015, 2016 | ||
| * Roger Shimizu <[email protected]> | ||
| * | ||
| * This program is free software; you can redistribute it and/or | ||
| * modify it under the terms of the GNU General Public License | ||
|
|
@@ -156,21 +157,21 @@ | |
| button@1 { | ||
| label = "Function Button"; | ||
| linux,code = <KEY_OPTION>; | ||
| gpios = <&gpio0 45 GPIO_ACTIVE_LOW>; | ||
| gpios = <&gpio1 13 GPIO_ACTIVE_LOW>; | ||
| }; | ||
|
|
||
| button@2 { | ||
| label = "Power-on Switch"; | ||
| linux,code = <KEY_RESERVED>; | ||
| linux,input-type = <5>; | ||
| gpios = <&gpio0 46 GPIO_ACTIVE_LOW>; | ||
| gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; | ||
| }; | ||
|
|
||
| button@3 { | ||
| label = "Power-auto Switch"; | ||
| linux,code = <KEY_ESC>; | ||
| linux,input-type = <5>; | ||
| gpios = <&gpio0 47 GPIO_ACTIVE_LOW>; | ||
| gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; | ||
| }; | ||
| }; | ||
|
|
||
|
|
@@ -185,38 +186,38 @@ | |
|
|
||
| led@1 { | ||
| label = "lswvl:red:alarm"; | ||
| gpios = <&gpio0 36 GPIO_ACTIVE_LOW>; | ||
| gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>; | ||
| }; | ||
|
|
||
| led@2 { | ||
| label = "lswvl:red:func"; | ||
| gpios = <&gpio0 37 GPIO_ACTIVE_LOW>; | ||
| gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>; | ||
| }; | ||
|
|
||
| led@3 { | ||
| label = "lswvl:amber:info"; | ||
| gpios = <&gpio0 38 GPIO_ACTIVE_LOW>; | ||
| gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>; | ||
| }; | ||
|
|
||
| led@4 { | ||
| label = "lswvl:blue:func"; | ||
| gpios = <&gpio0 39 GPIO_ACTIVE_LOW>; | ||
| gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>; | ||
| }; | ||
|
|
||
| led@5 { | ||
| label = "lswvl:blue:power"; | ||
| gpios = <&gpio0 40 GPIO_ACTIVE_LOW>; | ||
| gpios = <&gpio1 8 GPIO_ACTIVE_LOW>; | ||
| default-state = "keep"; | ||
| }; | ||
|
|
||
| led@6 { | ||
| label = "lswvl:red:hdderr0"; | ||
| gpios = <&gpio0 34 GPIO_ACTIVE_LOW>; | ||
| gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>; | ||
| }; | ||
|
|
||
| led@7 { | ||
| label = "lswvl:red:hdderr1"; | ||
| gpios = <&gpio0 35 GPIO_ACTIVE_LOW>; | ||
| gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>; | ||
| }; | ||
| }; | ||
|
|
||
|
|
@@ -233,7 +234,7 @@ | |
| 3250 1 | ||
| 5000 0>; | ||
|
|
||
| alarm-gpios = <&gpio0 43 GPIO_ACTIVE_HIGH>; | ||
| alarm-gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>; | ||
| }; | ||
|
|
||
| restart_poweroff { | ||
|
|
||
Oops, something went wrong.