diff options
| author | Olof Johansson <olof@lixom.net> | 2017-01-29 17:16:52 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-01-29 17:16:52 -0800 |
| commit | 7a38003b6907335bc253b134d70b05481e88bde9 (patch) | |
| tree | 2dc09eb73071dd55ee035a89725ba95b21a4d380 /arch/arm/boot/dts/omap3-n900.dts | |
| parent | 2e33f29400c38b70729c916da65b44294d956a03 (diff) | |
| parent | d8e166b4ad0e3626af0378cadb2d7ba41efa005a (diff) | |
| download | talos-op-linux-7a38003b6907335bc253b134d70b05481e88bde9.tar.gz talos-op-linux-7a38003b6907335bc253b134d70b05481e88bde9.zip | |
Merge tag 'omap-for-v4.11/dt-signed-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt
Device tree changes for omaps for v4.11 merge window. These
changes add earlycon stdout-path propety for the SoCs so far
tested with it. The other changes are addition of BeagleBone
green and making WLAN work on BeagleBone black wireless and
green wireless. The rest of the changes are the usual enabling
features on various devices:
- Enable devices on am335x-sl50
- Changes to dra7-evm boards to enable enable irqs for dp83867
eth phys, add pinmux configuration for mmc, remov erratum
i869 pinmux configurations, disable NAND support because of
pin conflict, add pcf8575 used for lcd
- Remove NAND partition table for omap3-igep
- Configure USB Ethernet MAC from device tree for beagleboard
xm, pandaboard, omap5-uevm and igepv5
- Configure am335x-chilisom to wake from RTC-only state
- Update Nanobone for external FRAM chip
- Clean up n900 dts
- Update am335x-phycore and am335x-wega for various devices
- Changes for am57xx-beagle-x15 to implement rgmii2 errata
* tag 'omap-for-v4.11/dt-signed-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (35 commits)
ARM: dts: dra72/1-evm: add pcf8575 used for lcd
ARM: dts: dra7xx: Add stdout-path property
ARM: dts: am57xx: Add stdout-path property
ARM: dts: am43xx: Add stdout-path property
ARM: dts: am33xx: Add stdout-path property
ARM: dts: am335x-sl50: Enable the Ambient Light Sensor.
ARM: dts: am335x-sl50: Enable the MCP23017 GPIO Expander.
ARM: dts: am335x-sl50: Enable BQ32000 Real Time Clock.
ARM: dts: am335x-sl50: Enable SPI0 interface and Flash Memory.
ARM: dts: am335x-sl50: Enable UART1.
ARM: dts: am335x-sl50: Remove I2C1 node.
ARM: dts: omap3-igep: Remove NAND partition table
ARM: dts: am57xx-beagle-x15: implement errata "Ethernet RGMII2 Limited to 10/100 Mbps"
ARM: dts: am335x-phycore-som: Remove partition tables
ARM: dts: dra72-evm-revc: enable irqs for dp83867 eth phys
ARM: dts: Configure BeagleBone peripheral USB VBUS irq
ARM: dts: omap5-igep0050: Allow bootloader to configure USB Ethernet MAC
ARM: dts: omap5-uevm: Allow bootloader to configure USB Ethernet MAC
ARM: dts: pandaboard: Allow bootloader to configure USB Ethernet MAC
ARM: omap3: beagleboard-xm: dt: Add ethernet to the device tree
...
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/omap3-n900.dts')
| -rw-r--r-- | arch/arm/boot/dts/omap3-n900.dts | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts index 4d448f145ed1..b64cfda8dbb7 100644 --- a/arch/arm/boot/dts/omap3-n900.dts +++ b/arch/arm/boot/dts/omap3-n900.dts @@ -47,7 +47,7 @@ compatible = "gpio-leds"; heartbeat { label = "debug::sleep"; - gpios = <&gpio6 2 GPIO_ACTIVE_HIGH>; /* gpio162 */ + gpios = <&gpio6 2 GPIO_ACTIVE_HIGH>; /* 162 */ linux,default-trigger = "default-on"; pinctrl-names = "default"; pinctrl-0 = <&debug_leds>; @@ -625,6 +625,7 @@ reg = <0x55>; }; + /* Stereo headphone amplifier */ tpa6130a2: tpa6130a2@60 { compatible = "ti,tpa6130a2"; reg = <0x60>; |
