diff options
author | Arnd Bergmann <arnd@arndb.de> | 2015-05-07 18:25:38 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2015-05-07 18:25:38 +0200 |
commit | 443318e0b776562593f4d4fd770055a9d31add54 (patch) | |
tree | e6214026da3ae08401910003ffd253fce9281671 /arch/s390 | |
parent | Merge tag 'arm-soc/for-4.1/maintainers' of http://github.com/broadcom/stblinu... (diff) | |
parent | bus: omap_l3_noc: Fix master id address decoding for OMAP5 (diff) | |
download | linux-443318e0b776562593f4d4fd770055a9d31add54.tar.xz linux-443318e0b776562593f4d4fd770055a9d31add54.zip |
Merge tag 'omap-for-v4.1/fixes-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
Merge "omap fixes against v4.1-rc1" from Tony Lindgren:
Fixes for omaps, mostly a fix for power power consumption
creeping up during idle, and two l3-noc device fixes:
- Fix power consumption creeping up with I2C4 staying on
- Fix n900 microphone bias voltages
- Fix dra7 l3-noc for host clock
- Fix omap5 l3-noc id address decoding
The rest are all just minor dts fixes:
- Fix changed EXTCON_USB_GPIO_USB in defconfig
- Fix missing isp and iva #iommu-cells property
- Various beagle x15 dts fixes for pre-production changes
- Fix am437x-sk display dts entries
* tag 'omap-for-v4.1/fixes-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
bus: omap_l3_noc: Fix master id address decoding for OMAP5
bus: omap_l3_noc: Fix offset for DRA7 CLK1_HOST_CLK1_2 instance
ARM: dts: dra7: Fix efuse register size for ABB
ARM: dts: am57xx-beagle-x15: Switch GPIO fan number
ARM: dts: am57xx-beagle-x15: Switch UART mux pins
ARM: dts: am437x-sk: reduce col-scan-delay-us
ARM: dts: am437x-sk: fix for new newhaven display module revision
ARM: dts: am57xx-beagle-x15: Fix RTC aliases
ARM: dts: am57xx-beagle-x15: Fix IRQ type for mcp7941x
ARM: dts: omap3: Add #iommu-cells to isp and iva iommu
ARM: omap2plus_defconfig: Enable EXTCON_USB_GPIO
ARM: dts: OMAP3-N900: Add microphone bias voltages
ARM: OMAP2+: Fix omap off idle power consumption creeping up
Diffstat (limited to 'arch/s390')
0 files changed, 0 insertions, 0 deletions