omap1 soc changes for v4.19

From: "Tony Lindgren" <[email protected]>

The following changes since commit ce397d215ccd07b8ae3f71db689aedb85d56ab40:

Linux 4.18-rc1 (2018-06-17 08:04:49 +0900)

are available in the Git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v4.19/omap1-v2-signed

for you to fetch changes up to d08605a64e67944eaecfb0e6340f633e01376951:

ARM: OMAP1: ams-delta: move late devices back to init_machine (2018-07-02 23:07:54 -0700)

----------------------------------------------------------------
SoC updates for omap1 for v4.19 merge window

Mostly a series by Janusz Krzysztofik to clean up the GPIO and input handling for ams-delta. Because of the platform data changes, we decided that it's best to merge the related input changes also via the arm-soc tree so Dmitry Torokhov has acked the input changes.

Also included is a change to constify gpio_leds from Arvind Yadav.

----------------------------------------------------------------
Arvind Yadav (1):
ARM: OMAP1: constify gpio_led

Janusz Krzysztofik (13):
ARM: OMAP1: ams-delta: refactor late_init()
ARM: OMAP1: ams-delta: assign LED GPIO numbers from descriptors
ARM: OMAP1: ams-delta: drop GPIO lookup table for serio device
Input: ams_delta_serio: convert to platform driver
Input: ams_delta_serio: use private structure
Input: ams_delta_serio: Replace power GPIO with regulator
ARM: OMAP1: ams-delta: Hog "keybrd_dataout" GPIO pin
ARM: OMAP1: ams-delta FIQ: don't use static GPIO numbers
ARM: OMAP1: ams-delta FIQ: Keep serio input GPIOs requested
ARM: OMAP1: Get rid of <mach/ams-delta-fiq.h>
Input: ams_delta_serio: use IRQ resource
Input: ams_delta_serio: Get FIQ buffer from platform_data
ARM: OMAP1: ams-delta: move late devices back to init_machine

 MAINTAINERS                                        |   1 +
 arch/arm/mach-omap1/ams-delta-fiq-handler.S        |   5 +-
 arch/arm/mach-omap1/ams-delta-fiq.c                | 113 ++++++--
 arch/arm/mach-omap1/ams-delta-fiq.h                |  42 +++
 arch/arm/mach-omap1/board-ams-delta.c              | 301 +++++++++++++++++----
 arch/arm/mach-omap1/board-h2.c                     |   2 +-
 arch/arm/mach-omap1/board-h3.c                     |   2 +-
 arch/arm/mach-omap1/board-htcherald.c              |   2 +-
 arch/arm/mach-omap1/board-osk.c                    |   4 +-
 drivers/input/serio/ams_delta_serio.c              | 198 +++++++-------
 .../linux/platform_data}/ams-delta-fiq.h           |  31 +--
 11 files changed, 494 insertions(+), 207 deletions(-)
 create mode 100644 arch/arm/mach-omap1/ams-delta-fiq.h
 rename {arch/arm/mach-omap1/include/mach => include/linux/platform_data}/ams-delta-fiq.h (68%)

From: "Tony Lindgren" <[email protected]>

The following changes since commit ce397d215ccd07b8ae3f71db689aedb85d56ab40:

Linux 4.18-rc1 (2018-06-17 08:04:49 +0900)

are available in the Git repository at:

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

for you to fetch changes up to 8c5a916f4c8815196cc8a86b9582ca89422aac25:

ARM: OMAP2+: sleep33/43xx: Add RTC-Mode support (2018-07-09 23:01:34 -0700)

----------------------------------------------------------------
SoC updates for omaps for v4.19 merge window

These changes are mostly PM related changes for am335x and am437x to support RTC only suspend mode. Some of the clock and driver related chances are still pending so it's not yet fully functional.

Also included is a change for PM debug sysfs entry to use DEFINE_SHOW_ATTRIBUTE.

----------------------------------------------------------------
Andy Shevchenko (1):
ARM: OMAP2+: reuse DEFINE_SHOW_ATTRIBUTE() macro

Dave Gerlach (2):
ARM: hwmod: RTC: Don't assume lock/unlock will be called with irq enabled
ARM: OMAP2+: sleep33/43xx: Make sleep actions configurable

Keerthy (1):
ARM: OMAP2+: sleep33/43xx: Add RTC-Mode support

 arch/arm/mach-omap2/omap_hwmod_reset.c |  12 ++--
 arch/arm/mach-omap2/pm-asm-offsets.c   |   2 +
 arch/arm/mach-omap2/pm-debug.c         |  37 ++---------
 arch/arm/mach-omap2/pm33xx-core.c      |  20 ++++--
 arch/arm/mach-omap2/sleep33xx.S        |  52 +++++++++++++++-
 arch/arm/mach-omap2/sleep43xx.S        | 110 +++++++++++++++++++++++++++++++--
 drivers/soc/ti/pm33xx.c                |  16 ++++-
 include/linux/platform_data/pm33xx.h   |  29 ++++++++-
 8 files changed, 229 insertions(+), 49 deletions(-)

Thanks, merged.

-Olof

From: "Tony Lindgren" <[email protected]>

The following changes since commit ce397d215ccd07b8ae3f71db689aedb85d56ab40:

Linux 4.18-rc1 (2018-06-17 08:04:49 +0900)

are available in the Git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v4.19/ti-sysc-v2-signed

for you to fetch changes up to 596e7955692b5d8b042fca500b7a83c25dfcf936:

bus: ti-sysc: Add support for software reset (2018-07-09 22:31:38 -0700)

----------------------------------------------------------------
ti-sysc driver changes for v4.19 merge window

These changes add support for mcan controller found on dra7 to probe it with only dts changes with no need for legacy hwmod platform data. As it depends on the related clock change, the clock change is included here and acked by Stephen Boyd.

----------------------------------------------------------------
Faiz Abbas (3):
clk: ti: dra7: Add clkctrl clock data for the mcan clocks
bus: ti-sysc: Add support for using ti-sysc for MCAN on dra76x
bus: ti-sysc: Add support for software reset

Kees Cook (1):
bus: ti-sysc: Use 2-factor allocator arguments

 Documentation/devicetree/bindings/bus/ti-sysc.txt |  1 +
 drivers/bus/ti-sysc.c                             | 72 +++++++++++++++++++++--
 drivers/clk/ti/clk-7xx.c                          |  1 +
 include/dt-bindings/bus/ti-sysc.h                 |  2 +
 include/dt-bindings/clock/dra7.h                  |  1 +
 include/linux/platform_data/ti-sysc.h             |  1 +
 6 files changed, 74 insertions(+), 4 deletions(-)

Merged, thanks!

-Olof

From: "Tony Lindgren" <[email protected]>

The following changes since commit ce397d215ccd07b8ae3f71db689aedb85d56ab40:

Linux 4.18-rc1 (2018-06-17 08:04:49 +0900)

are available in the Git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v4.19/dt-signed-v2

for you to fetch changes up to 792f98677d7f777a4f58e567b5b0578191cb986a:

Merge commit '949bdcc8a97c' into omap-for-v4.19/dt (2018-07-11 05:54:32 -0700)

----------------------------------------------------------------
dts changes for omaps for v4.19 merge window

Mostly updates to configure and improve the devices found on various SoCs and boards:

- several patches to update support for am3517-evm to replace bogus fixed regulators with proper regulators and configure various devices such as wlan, bluetooth and usb1

- add missing cooling devices for omap5 and dra7

- configure dual role for usb ports for am57xx
and dra7

- PM updates for omap4 devices to allow retention
idle for minimal configurations

- am335x-sl50 updates for various devices

- update d-can alias names to not use undescore

- configure pandaboard gpio button

- a non-urgent change to fix dcan node address that i forgot to send a pull request for earlier

----------------------------------------------------------------
Adam Ford (4):
ARM: dts: am3517-evm: Remove unnessary PMIC parameters
ARM: dts: am3517-som: Add WL127x Wifi
ARM: dts: am3517-som: Add builtin Bluetooth
ARM: dts: am3517-evm: Enable USB1 Host

Derald D. Woods (1):
ARM: dts: am3517-evm: Add 'vdd_io_reg' regulator references

Enric Balletbo i Serra (8):
ARM: dts: am335x-sl50: update backlight nodes
ARM: dts: am335x-sl50: use phy-phandle declarations
ARM: dts: am335x-sl50: add a node for the LCD controller
ARM: dts: am335x-sl50: set dr_mode to otg
ARM: dts: am335x-sl50: add support for DS1339 Real Time Clock
ARM: dts: am335x-sl50: use audio-graph-card for sound
ARM: dts: am335x-sl50: fix label names for all LEDs
ARM: dts: am335x-sl50: enable tsadc on SL50 board

Felix Brack (1):
ARM: dts: am33xx: Fix syntax of alias names

Kevin Hilman (1):
ARM: dts: dra7: fix DCAN node addresses

Peter Robinson (1):
ARM: dts: pandaboard: add gpio user button

Roger Quadros (4):
ARM: dts: am57xx-idk: Enable dual role for USB2 port
ARM: dts: dra7-evm: Add extcon to USB2 port
ARM: dts: dra71-evm: Add VBUS GPIO to USB1/USB2 extcon
ARM: dts: dra76-evm: Add VBUS GPIO to USB1/USB2 extcon

Tony Lindgren (4):
ARM: dts: Improve omap l4per idling with wlcore edge sensitive interrupt
ARM: dts: Configure duovero for to allow core retention during idle
ARM: dts: omap4-droid4: Use software debounce for gpio-keys Merge commit '949bdcc8a97c' into omap-for-v4.19/dt

Viresh Kumar (2):
ARM: dts: dra74x: Add missing cooling device properties for CPUs
ARM: dts: omap5: Add missing cooling device properties for CPUs

 arch/arm/boot/dts/am335x-baltos.dtsi              |   2 +-
 arch/arm/boot/dts/am335x-evm.dts                  |   2 +-
 arch/arm/boot/dts/am335x-evmsk.dts                |   2 +-
 arch/arm/boot/dts/am335x-sl50.dts                 | 297 ++++++++++++++++++----
 arch/arm/boot/dts/am33xx.dtsi                     |   4 +-
 arch/arm/boot/dts/am3517-evm.dts                  |  50 +++-
 arch/arm/boot/dts/am3517-som.dtsi                 | 105 +++++++-
 arch/arm/boot/dts/am437x-gp-evm.dts               |   2 +-
 arch/arm/boot/dts/am571x-idk.dts                  |   4 -
 arch/arm/boot/dts/am572x-idk-common.dtsi          |   4 -
 arch/arm/boot/dts/am57xx-idk-common.dtsi          |   7 +-
 arch/arm/boot/dts/dra7-evm-common.dtsi            |  10 +
 arch/arm/boot/dts/dra7-evm.dts                    |   9 -
 arch/arm/boot/dts/dra7.dtsi                       |   4 +-
 arch/arm/boot/dts/dra71-evm.dts                   |   8 +
 arch/arm/boot/dts/dra72-evm-common.dtsi           |   1 +
 arch/arm/boot/dts/dra74x.dtsi                     |  10 +
 arch/arm/boot/dts/dra76-evm.dts                   |   8 +
 arch/arm/boot/dts/logicpd-som-lv.dtsi             |   2 +-
 arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts |   2 +-
 arch/arm/boot/dts/omap3-cm-t3517.dts              |   2 +-
 arch/arm/boot/dts/omap3-cm-t3730.dts              |   2 +-
 arch/arm/boot/dts/omap3-evm-common.dtsi           |   2 +-
 arch/arm/boot/dts/omap3-igep0020-rev-f.dts        |   2 +-
 arch/arm/boot/dts/omap3-igep0030-rev-g.dts        |   2 +-
 arch/arm/boot/dts/omap3-zoom3.dts                 |   2 +-
 arch/arm/boot/dts/omap4-droid4-xt894.dts          |   7 +-
 arch/arm/boot/dts/omap4-duovero-parlor.dts        |   4 +-
 arch/arm/boot/dts/omap4-duovero.dtsi              |   1 +
 arch/arm/boot/dts/omap4-panda-common.dtsi         |  24 +-
 arch/arm/boot/dts/omap4-panda-es.dts              |  12 +
 arch/arm/boot/dts/omap4-sdp.dts                   |   2 +-
 arch/arm/boot/dts/omap4-var-som-om44-wlan.dtsi    |   2 +-
 arch/arm/boot/dts/omap5-board-common.dtsi         |   2 +-
 arch/arm/boot/dts/omap5.dtsi                      |  14 +
 35 files changed, 512 insertions(+), 101 deletions(-)

Merged, thanks.

-Olof

From: "Tony Lindgren" <[email protected]>

The following changes since commit 596e7955692b5d8b042fca500b7a83c25dfcf936:

bus: ti-sysc: Add support for software reset (2018-07-09 22:31:38 -0700)

are available in the Git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v4.19/dt-mcan-v2-signed-v2

for you to fetch changes up to 0adbe832f21ac8478f33aa64627c92fd3225b944:

ARM: dts: dra76x: Add MCAN node (2018-07-10 04:05:30 -0700)

----------------------------------------------------------------
dts changes for mcan for omaps for v4.19 merge window

These changes configure the mcan clock, interconnect target module and mcan device. These changes depend on the ti-sysc related driver changes and are based on those.

Notably this is the first new driver that probes with ti-sysc driver with no legacy hwmod platform data for the interconnect target module.

----------------------------------------------------------------
Faiz Abbas (2):
ARM: dts: Add generic interconnect target module node for MCAN
ARM: dts: dra76x: Add MCAN node

Lokesh Vutla (1):
ARM: dts: dra762: Add MCAN clock support

 arch/arm/boot/dts/dra76-evm.dts |  6 ++++
 arch/arm/boot/dts/dra76x.dtsi   | 64 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+)

Hi Tony,

I'm not entirely sure why you sent this as a separate pull request, but it also conflicts with your first DT branch (add/add conflict at the end of the file).

Fixed up by keeping both sides, merged.

-Olof

I put them into a separate branch because they were based on the pending ti-sysc driver changes so you could merge them to a branch you prefer. But I forgot the merge conflict again.. The resolution is almost always in Linux next for the branches I send pull requests for for. But I added some notes to check those next time.

OK thanks!

Tony

Great, thanks for the heads up on the acks. Merged!

-Olof