Skip to contentSkip to conversation

omap non-urgent fixes for v4.6 merge window

GIT PULL Tony Lindgren 1 participant 7 messages Mar 1, 2016

lore
Share & tools
lore
#0 lore raw

The following changes since commit 92e963f50fc74041b5e9e744c330dca48e04f08d:

Linux 4.5-rc1 (2016-01-24 13:06:47 -0800)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v4.6/fixes-not-urgent-signed

for you to fetch changes up to 4f5395f0d1a5b7c8921331ef81081da00302a37c:

ARM: OMAP2+: Fix hwmod clock for l4_ls (2016-02-26 11:03:07 -0800)

----------------------------------------------------------------
Fixes for omaps for v4.6 merge window that are not urgent for the v4.5-rc cycle:

- Add back optimized cpuidle parameters for 34xx that were incorrecly removed earlier with cpuidle cleanup

- Fix SSI for omap36xx to get modem working on N950/N9

- A series of omap hwmod fixes via Paul Walmsley <[email protected]> to fix SSI for omap36xx for modem on N950/N9, fix for OCP2SCP sysconfig idle mode, and reset data for PCIe on dra7

- Fix out of range register access for omap3 control module if syscon max_register is initialized like v4.6 will be doing

- Fix l4_ls interconnect clocks for 81xx, it should always be sysclk6_ck

----------------------------------------------------------------
Kishon Vijay Abraham I (2):
ARM: DRA7: hwmod: Fix OCP2SCP sysconfig
ARM: DRA7: hwmod: Add reset data for PCIe

Pali Roh?r (1):
ARM: OMAP3: Add cpuidle parameters table for omap3430

Sebastian Reichel (1):
ARM: OMAP2+: hwmod data: Add SSI data for omap36xx

Tony Lindgren (3):
Merge tag 'for-v4.6/omap-hwmod-a' of git://git.kernel.org/.../pjw/omap-pending into omap-for-v4.6/fixes-not-urgent
ARM: OMAP2+: Fix out of range register access with syscon_config.max_register
ARM: OMAP2+: Fix hwmod clock for l4_ls

 arch/arm/mach-omap2/control.c              | 21 +--------
 arch/arm/mach-omap2/cpuidle34xx.c          | 69 +++++++++++++++++++++++++++++-
 arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 13 +++---
 arch/arm/mach-omap2/omap_hwmod_7xx_data.c  | 18 +++++++-
 arch/arm/mach-omap2/omap_hwmod_81xx_data.c |  9 +++-
 arch/arm/mach-omap2/prm7xx.h               |  1 +
 6 files changed, 101 insertions(+), 30 deletions(-)
#1 lore raw

[GIT PULL 2/4] omap soc changes for v4.6 merge window

The following changes since commit 8fe097a3d99e22355fb8e3bcee59542bf3f46b2d:

ARM: DRA7: hwmod: Add reset data for PCIe (2016-02-09 02:18:52 -0700)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v4.6/soc-signed

for you to fetch changes up to e80499190db2fd752a60468f0fa462f87f993d49:

Merge tag 'for-v4.6/omap-hwmod-b' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v4.6/soc (2016-03-01 09:59:38 -0800)

----------------------------------------------------------------
SoC related changes for omaps for v4.6 merge window:

- Enable runtime revision detection for dra7 to avoid multiple dts files for various variants

- Add dma_slave_map for omap1/2/3 legacy mode booting

- Add RTC interconnect target data for ti81xx and am43x

- Add custom reset handler for PCIeSS

- Add eDMA interconnect target data for dra7

----------------------------------------------------------------
Keerthy (2):
ARM: AM43XX: hwmod: Add rtc hwmod
ARM: OMAP: DRA7: Make use of omap_revision information for soc_is* calls

Peter Ujfalusi (3):
ARM: OMAP1: DMA: Provide dma_slave_map to omap-dma
ARM: OMAP2+: DMA: Provide dma_slave_map to omap-dma for legacy boot
ARM: DRA7: hwmod: Add data for eDMA tpcc, tptc0, tptc1

Sekhar Nori (1):
ARM: DRA7: hwmod: Add custom reset handler for PCIeSS

Tony Lindgren (2):
ARM: OMAP2+: Add rtc hwmod configuration for ti81xx
Merge tag 'for-v4.6/omap-hwmod-b' of git://git.kernel.org/.../pjw/omap-pending into omap-for-v4.6/soc

 arch/arm/mach-omap1/dma.c                  |  45 +++++++++++
 arch/arm/mach-omap2/dma.c                  | 117 +++++++++++++++++++++++++++++
 arch/arm/mach-omap2/omap_hwmod_43xx_data.c |  14 +++-
 arch/arm/mach-omap2/omap_hwmod_7xx_data.c  | 111 +++++++++++++++++++++++++++
 arch/arm/mach-omap2/omap_hwmod_81xx_data.c |  38 ++++++++++
 arch/arm/mach-omap2/soc.h                  |  23 +++++-
 6 files changed, 344 insertions(+), 4 deletions(-)
#2 lore raw

[GIT PULL 2/4] omap soc changes for v4.6 merge window

In reply to Tony Lindgren

The following changes since commit 8fe097a3d99e22355fb8e3bcee59542bf3f46b2d:

ARM: DRA7: hwmod: Add reset data for PCIe (2016-02-09 02:18:52 -0700)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v4.6/soc-signed

for you to fetch changes up to e80499190db2fd752a60468f0fa462f87f993d49:

Merge tag 'for-v4.6/omap-hwmod-b' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v4.6/soc (2016-03-01 09:59:38 -0800)

----------------------------------------------------------------
SoC related changes for omaps for v4.6 merge window:

- Enable runtime revision detection for dra7 to avoid multiple dts files for various variants

- Add dma_slave_map for omap1/2/3 legacy mode booting

- Add RTC interconnect target data for ti81xx and am43x

- Add custom reset handler for PCIeSS

- Add eDMA interconnect target data for dra7

----------------------------------------------------------------
Keerthy (2):
ARM: AM43XX: hwmod: Add rtc hwmod
ARM: OMAP: DRA7: Make use of omap_revision information for soc_is* calls

Peter Ujfalusi (3):
ARM: OMAP1: DMA: Provide dma_slave_map to omap-dma
ARM: OMAP2+: DMA: Provide dma_slave_map to omap-dma for legacy boot
ARM: DRA7: hwmod: Add data for eDMA tpcc, tptc0, tptc1

Sekhar Nori (1):
ARM: DRA7: hwmod: Add custom reset handler for PCIeSS

Tony Lindgren (2):
ARM: OMAP2+: Add rtc hwmod configuration for ti81xx
Merge tag 'for-v4.6/omap-hwmod-b' of git://git.kernel.org/.../pjw/omap-pending into omap-for-v4.6/soc

 arch/arm/mach-omap1/dma.c                  |  45 +++++++++++
 arch/arm/mach-omap2/dma.c                  | 117 +++++++++++++++++++++++++++++
 arch/arm/mach-omap2/omap_hwmod_43xx_data.c |  14 +++-
 arch/arm/mach-omap2/omap_hwmod_7xx_data.c  | 111 +++++++++++++++++++++++++++
 arch/arm/mach-omap2/omap_hwmod_81xx_data.c |  38 ++++++++++
 arch/arm/mach-omap2/soc.h                  |  23 +++++-
 6 files changed, 344 insertions(+), 4 deletions(-)
#3 lore raw

[GIT PULL 3/4] omap defconfig changes for v4.6 merge window

In reply to Tony Lindgren

The following changes since commit 92e963f50fc74041b5e9e744c330dca48e04f08d:

Linux 4.5-rc1 (2016-01-24 13:06:47 -0800)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v4.6/defconfig-signed

for you to fetch changes up to 4e550018df068f6b14d36c72c723a507240f6456:

ARM: multi_v7_defconfig: Enable LP872x regulator support (2016-02-29 14:58:01 -0800)

----------------------------------------------------------------
Defconfig changes for omap2plus_defconfig and multi_v7_defconfig for v4.6 merge window:

- Enable IOMMU and omap3isp so we can enable TVP5150/1 video decoder

- Enable at24 eeprom for revision detection on beagle-x15

- Enable LP872x regulator for both omap2plus_defconfig and multi_v7_defconfig as it's needed at least by LG Optimus Black

----------------------------------------------------------------
Javier Martinez Canillas (3):
ARM: omap2plus_defconfig: Enable OMAP IOMMU support
ARM: omap2plus_defconfig: Enable ISP support and dependencies
ARM: omap2plus_defconfig: Enable TI TVP5150 video decoder support

Nishanth Menon (1):
ARM: omap2plus_defconfig: Enable AT24 eeprom

Paul Kocialkowski (2):
ARM: omap2plus_defconfig: Enable LP872x regulator support
ARM: multi_v7_defconfig: Enable LP872x regulator support

 arch/arm/configs/multi_v7_defconfig  |  1 +
 arch/arm/configs/omap2plus_defconfig | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)
#4 lore raw

[GIT PULL 3/4] omap defconfig changes for v4.6 merge window

In reply to Tony Lindgren

The following changes since commit 92e963f50fc74041b5e9e744c330dca48e04f08d:

Linux 4.5-rc1 (2016-01-24 13:06:47 -0800)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v4.6/defconfig-signed

for you to fetch changes up to 4e550018df068f6b14d36c72c723a507240f6456:

ARM: multi_v7_defconfig: Enable LP872x regulator support (2016-02-29 14:58:01 -0800)

----------------------------------------------------------------
Defconfig changes for omap2plus_defconfig and multi_v7_defconfig for v4.6 merge window:

- Enable IOMMU and omap3isp so we can enable TVP5150/1 video decoder

- Enable at24 eeprom for revision detection on beagle-x15

- Enable LP872x regulator for both omap2plus_defconfig and multi_v7_defconfig as it's needed at least by LG Optimus Black

----------------------------------------------------------------
Javier Martinez Canillas (3):
ARM: omap2plus_defconfig: Enable OMAP IOMMU support
ARM: omap2plus_defconfig: Enable ISP support and dependencies
ARM: omap2plus_defconfig: Enable TI TVP5150 video decoder support

Nishanth Menon (1):
ARM: omap2plus_defconfig: Enable AT24 eeprom

Paul Kocialkowski (2):
ARM: omap2plus_defconfig: Enable LP872x regulator support
ARM: multi_v7_defconfig: Enable LP872x regulator support

 arch/arm/configs/multi_v7_defconfig  |  1 +
 arch/arm/configs/omap2plus_defconfig | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)
#5 lore raw

[GIT PULL 4/4] omap device tree changes for v4.6 merge window, part 2

In reply to Tony Lindgren

The following changes since commit b9d3ec1d98c658226606e66e55c940491447e617:

ARM: dts: am57xx-beagle-x15: Add eeprom information (2016-02-22 11:18:40 -0800)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v4.6/dt-pt2

for you to fetch changes up to 5193523ba644d60283986495d410659922660b5b:

ARM: dts: omap3-sniper: TWL4030 keypad support (2016-03-01 12:57:06 -0800)

----------------------------------------------------------------
Part 2 of device tree changes for omaps for v4.6 merge window:

- A series of GPMC related interrupt changes from Rogeq Quadros <[email protected]> to prepare adding interrupt support to the NAND driver

- Add RTC support for ti81xx

- Correct LogicPD Torpedo mode description

- Add basic support for LG Optimus Black phone in several patches by Paul Kocialkowski <[email protected]>

- Change address-cells for dra7 for LPAE

- Add TBCLK for PWMSS on dra7

----------------------------------------------------------------
Adam Ford (1):
ARM: dts: dm3730-torpedo-devkit: Add "Wireless" to model

Lokesh Vutla (1):
ARM: dts: DRA7: change address-cells and size-cells

Paul Kocialkowski (3):
ARM: dts: LG Optimus Black codename sniper basic support
ARM: dts: omap3-sniper: USB OTG support
ARM: dts: omap3-sniper: TWL4030 keypad support

Roger Quadros (11):
ARM: dts: dra7: Fix NAND device nodes
ARM: dts: dra7: Remove redundant nand property
ARM: dts: am437x: Fix NAND device nodes
ARM: dts: am437x: Disable wait pin monitoring for NAND
ARM: dts: am335x: Fix NAND device nodes
ARM: dts: am335x: Disable wait pin monitoring for NAND
ARM: dts: dm816x: Fix NAND device nodes
ARM: dts: dm8168-evm: ARM: dts: Disable wait pin monitoring for NAND
ARM: dts: omap3: Fix NAND device nodes
ARM: dts: dm814x: dra62x: Fix NAND device nodes
ARM: dts: dm814x: dra62x: Disable wait pin monitoring for NAND

Tony Lindgren (4):
Merge branch 'omap-for-v4.6/dt-gpmc' into omap-for-v4.6/dt
ARM: dts: Add RTC entry for dm814x and dra62x
ARM: dts: Add RTC entry for dm816x
Revert "ARM: dts: DRA7: Add dt nodes for PWMSS"

Vignesh R (2):
ARM: dts: DRA7: Add TBCLK for PWMSS
ARM: dts: DRA7: Add dt nodes for PWMSS

 arch/arm/boot/dts/Makefile                        |   1 +
 arch/arm/boot/dts/am335x-baltos-ir5221.dts        |   9 +-
 arch/arm/boot/dts/am335x-chilisom.dtsi            |   8 +-
 arch/arm/boot/dts/am335x-cm-t335.dts              |   9 +-
 arch/arm/boot/dts/am335x-evm.dts                  |   7 +-
 arch/arm/boot/dts/am335x-igep0033.dtsi            |   8 +-
 arch/arm/boot/dts/am335x-phycore-som.dtsi         |   8 +-
 arch/arm/boot/dts/am33xx.dtsi                     |   2 +
 arch/arm/boot/dts/am4372.dtsi                     |   2 +
 arch/arm/boot/dts/am437x-cm-t43.dts               |  11 +-
 arch/arm/boot/dts/am437x-gp-evm.dts               |   8 +-
 arch/arm/boot/dts/am43x-epos-evm.dts              |   8 +-
 arch/arm/boot/dts/am57xx-beagle-x15.dts           |   2 +-
 arch/arm/boot/dts/am57xx-cl-som-am57x.dts         |   2 +-
 arch/arm/boot/dts/dm8148-evm.dts                  |  10 +-
 arch/arm/boot/dts/dm814x.dtsi                     |   9 +
 arch/arm/boot/dts/dm8168-evm.dts                  |   8 +-
 arch/arm/boot/dts/dm816x.dtsi                     |   9 +
 arch/arm/boot/dts/dra62x-j5eco-evm.dts            |  10 +-
 arch/arm/boot/dts/dra7-evm.dts                    |   9 +-
 arch/arm/boot/dts/dra7.dtsi                       |  22 +-
 arch/arm/boot/dts/dra72-evm.dts                   |   9 +-
 arch/arm/boot/dts/dra7xx-clocks.dtsi              |  24 ++
 arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts |   5 +-
 arch/arm/boot/dts/logicpd-torpedo-som.dtsi        |   8 +-
 arch/arm/boot/dts/omap3-beagle.dts                |   5 +-
 arch/arm/boot/dts/omap3-cm-t3x.dtsi               |   6 +-
 arch/arm/boot/dts/omap3-devkit8000-common.dtsi    |   4 +
 arch/arm/boot/dts/omap3-evm-37xx.dts              |   8 +-
 arch/arm/boot/dts/omap3-gta04.dtsi                |   4 +
 arch/arm/boot/dts/omap3-igep.dtsi                 |   6 +-
 arch/arm/boot/dts/omap3-igep0020-common.dtsi      |   4 +-
 arch/arm/boot/dts/omap3-igep0030-common.dtsi      |   4 +
 arch/arm/boot/dts/omap3-ldp.dts                   |  10 +-
 arch/arm/boot/dts/omap3-lilly-a83x.dtsi           |   6 +-
 arch/arm/boot/dts/omap3-overo-base.dtsi           |   6 +-
 arch/arm/boot/dts/omap3-pandora-common.dtsi       |   4 +
 arch/arm/boot/dts/omap3-sniper.dts                | 254 ++++++++++++++++++++++
 arch/arm/boot/dts/omap3-tao3530.dtsi              |   6 +-
 arch/arm/boot/dts/omap3.dtsi                      |   2 +
 arch/arm/boot/dts/omap3430-sdp.dts                |   6 +-
 41 files changed, 464 insertions(+), 79 deletions(-)
 create mode 100644 arch/arm/boot/dts/omap3-sniper.dts
#6 lore raw

[GIT PULL 4/4] omap device tree changes for v4.6 merge window, part 2

In reply to Tony Lindgren

The following changes since commit b9d3ec1d98c658226606e66e55c940491447e617:

ARM: dts: am57xx-beagle-x15: Add eeprom information (2016-02-22 11:18:40 -0800)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v4.6/dt-pt2

for you to fetch changes up to 5193523ba644d60283986495d410659922660b5b:

ARM: dts: omap3-sniper: TWL4030 keypad support (2016-03-01 12:57:06 -0800)

----------------------------------------------------------------
Part 2 of device tree changes for omaps for v4.6 merge window:

- A series of GPMC related interrupt changes from Rogeq Quadros <[email protected]> to prepare adding interrupt support to the NAND driver

- Add RTC support for ti81xx

- Correct LogicPD Torpedo mode description

- Add basic support for LG Optimus Black phone in several patches by Paul Kocialkowski <[email protected]>

- Change address-cells for dra7 for LPAE

- Add TBCLK for PWMSS on dra7

----------------------------------------------------------------
Adam Ford (1):
ARM: dts: dm3730-torpedo-devkit: Add "Wireless" to model

Lokesh Vutla (1):
ARM: dts: DRA7: change address-cells and size-cells

Paul Kocialkowski (3):
ARM: dts: LG Optimus Black codename sniper basic support
ARM: dts: omap3-sniper: USB OTG support
ARM: dts: omap3-sniper: TWL4030 keypad support

Roger Quadros (11):
ARM: dts: dra7: Fix NAND device nodes
ARM: dts: dra7: Remove redundant nand property
ARM: dts: am437x: Fix NAND device nodes
ARM: dts: am437x: Disable wait pin monitoring for NAND
ARM: dts: am335x: Fix NAND device nodes
ARM: dts: am335x: Disable wait pin monitoring for NAND
ARM: dts: dm816x: Fix NAND device nodes
ARM: dts: dm8168-evm: ARM: dts: Disable wait pin monitoring for NAND
ARM: dts: omap3: Fix NAND device nodes
ARM: dts: dm814x: dra62x: Fix NAND device nodes
ARM: dts: dm814x: dra62x: Disable wait pin monitoring for NAND

Tony Lindgren (4):
Merge branch 'omap-for-v4.6/dt-gpmc' into omap-for-v4.6/dt
ARM: dts: Add RTC entry for dm814x and dra62x
ARM: dts: Add RTC entry for dm816x
Revert "ARM: dts: DRA7: Add dt nodes for PWMSS"

Vignesh R (2):
ARM: dts: DRA7: Add TBCLK for PWMSS
ARM: dts: DRA7: Add dt nodes for PWMSS

 arch/arm/boot/dts/Makefile                        |   1 +
 arch/arm/boot/dts/am335x-baltos-ir5221.dts        |   9 +-
 arch/arm/boot/dts/am335x-chilisom.dtsi            |   8 +-
 arch/arm/boot/dts/am335x-cm-t335.dts              |   9 +-
 arch/arm/boot/dts/am335x-evm.dts                  |   7 +-
 arch/arm/boot/dts/am335x-igep0033.dtsi            |   8 +-
 arch/arm/boot/dts/am335x-phycore-som.dtsi         |   8 +-
 arch/arm/boot/dts/am33xx.dtsi                     |   2 +
 arch/arm/boot/dts/am4372.dtsi                     |   2 +
 arch/arm/boot/dts/am437x-cm-t43.dts               |  11 +-
 arch/arm/boot/dts/am437x-gp-evm.dts               |   8 +-
 arch/arm/boot/dts/am43x-epos-evm.dts              |   8 +-
 arch/arm/boot/dts/am57xx-beagle-x15.dts           |   2 +-
 arch/arm/boot/dts/am57xx-cl-som-am57x.dts         |   2 +-
 arch/arm/boot/dts/dm8148-evm.dts                  |  10 +-
 arch/arm/boot/dts/dm814x.dtsi                     |   9 +
 arch/arm/boot/dts/dm8168-evm.dts                  |   8 +-
 arch/arm/boot/dts/dm816x.dtsi                     |   9 +
 arch/arm/boot/dts/dra62x-j5eco-evm.dts            |  10 +-
 arch/arm/boot/dts/dra7-evm.dts                    |   9 +-
 arch/arm/boot/dts/dra7.dtsi                       |  22 +-
 arch/arm/boot/dts/dra72-evm.dts                   |   9 +-
 arch/arm/boot/dts/dra7xx-clocks.dtsi              |  24 ++
 arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts |   5 +-
 arch/arm/boot/dts/logicpd-torpedo-som.dtsi        |   8 +-
 arch/arm/boot/dts/omap3-beagle.dts                |   5 +-
 arch/arm/boot/dts/omap3-cm-t3x.dtsi               |   6 +-
 arch/arm/boot/dts/omap3-devkit8000-common.dtsi    |   4 +
 arch/arm/boot/dts/omap3-evm-37xx.dts              |   8 +-
 arch/arm/boot/dts/omap3-gta04.dtsi                |   4 +
 arch/arm/boot/dts/omap3-igep.dtsi                 |   6 +-
 arch/arm/boot/dts/omap3-igep0020-common.dtsi      |   4 +-
 arch/arm/boot/dts/omap3-igep0030-common.dtsi      |   4 +
 arch/arm/boot/dts/omap3-ldp.dts                   |  10 +-
 arch/arm/boot/dts/omap3-lilly-a83x.dtsi           |   6 +-
 arch/arm/boot/dts/omap3-overo-base.dtsi           |   6 +-
 arch/arm/boot/dts/omap3-pandora-common.dtsi       |   4 +
 arch/arm/boot/dts/omap3-sniper.dts                | 254 ++++++++++++++++++++++
 arch/arm/boot/dts/omap3-tao3530.dtsi              |   6 +-
 arch/arm/boot/dts/omap3.dtsi                      |   2 +
 arch/arm/boot/dts/omap3430-sdp.dts                |   6 +-
 41 files changed, 464 insertions(+), 79 deletions(-)
 create mode 100644 arch/arm/boot/dts/omap3-sniper.dts