Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1266205 > unrolled thread

[GIT PULL 0/6] ARM: SoC branches for v4.4

Started byOlof Johansson <olof@lixom.net>
First post2015-11-10 04:40 +0100
Last post2015-11-10 04:40 +0100
Articles 9 — 3 participants

Back to article view | Back to linux.kernel


Contents

  [GIT PULL 0/6] ARM: SoC branches for v4.4 Olof Johansson <olof@lixom.net> - 2015-11-10 04:40 +0100
    [GIT PULL 2/6] ARM: SoC cleanups for v4.4 Olof Johansson <olof@lixom.net> - 2015-11-10 04:40 +0100
      Re: [GIT PULL 2/6] ARM: SoC cleanups for v4.4 Linus Torvalds <torvalds@linux-foundation.org> - 2015-11-11 00:00 +0100
        Re: [GIT PULL 2/6] ARM: SoC cleanups for v4.4 Felipe Balbi <balbi@ti.com> - 2015-11-11 00:00 +0100
        Re: [GIT PULL 2/6] ARM: SoC cleanups for v4.4 Olof Johansson <olof@lixom.net> - 2015-11-11 00:30 +0100
    [GIT PULL 4/6] ARM: SoC driver updates for v4.4 Olof Johansson <olof@lixom.net> - 2015-11-10 04:40 +0100
    [GIT PULL 3/6] ARM: SoC platform updates for v4.4 Olof Johansson <olof@lixom.net> - 2015-11-10 04:40 +0100
    [GIT PULL 1/6] ARM: SoC non-urgent fixes for v4.4 Olof Johansson <olof@lixom.net> - 2015-11-10 04:40 +0100
    [GIT PULL 6/6] ARM: SoC defconfig updates for v4.4 Olof Johansson <olof@lixom.net> - 2015-11-10 04:40 +0100

#1266205 — [GIT PULL 0/6] ARM: SoC branches for v4.4

FromOlof Johansson <olof@lixom.net>
Date2015-11-10 04:40 +0100
Subject[GIT PULL 0/6] ARM: SoC branches for v4.4
Message-ID<qt7WN-84G-1@gated-at.bofh.it>
Hi Linus,

Here are our branches from arm-soc for v4.4.

Nothing too crazy this time around, we've documented each branch as usual.

Yet again the DT branch is by far the biggest, and it's not a trend we mind
to continue. This is the first time we're mixing arm64/arm contents in that
branch as well, a likely mode we'll continue going forward.

Also, see the reminder in the soc branch (3/6) about touching up one of
the clocksource init calls from the newly added mediatek code.


Please merge!

Thanks,

-Olof

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [next] | [standalone]


#1266208 — [GIT PULL 2/6] ARM: SoC cleanups for v4.4

FromOlof Johansson <olof@lixom.net>
Date2015-11-10 04:40 +0100
Subject[GIT PULL 2/6] ARM: SoC cleanups for v4.4
Message-ID<qt7WO-84G-9@gated-at.bofh.it>
In reply to#1266205
Again we have a sizable (but not huge) cleanup branch with a net delta of about
-3k lines.

Main contents here is:

- A bunch of development/cleanup of a few PXA boards
- Removal of bockw platforms on shmobile, since the platform has now gone
  completely multiplatform. Whee!
- move of the 32kHz timer on OMAP to a proper timesource
- Misc cleanup of older OMAP material (incl removal of one board file)
- Switch over to new common PWM lookup support for several platforms

There's also a handful of other cleanups across the tree, but the above are
the major pieces.



Conflicts:

OMAP timer code has a treewide fix vs code deletion conflict. Delete
the code in HEAD, go with contents from branch.

----------------------------------------------------------------

The following changes since commit 97f0fe6cec0cac661e1fc89ed2071fc5ab646c76:

  Merge tag 'armsoc-fixes-nc' into HEAD

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/armsoc-cleanup

for you to fetch changes up to d3dc3df6330e4b4d799bef4aac6f934b5e726b1c:

  Merge tag 'omap-for-v4.4/soc-clean-up' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup

----------------------------------------------------------------

Andrzej Hajda (1):
      ARM: shmobile: apmu: correct type of CPU id

Arnd Bergmann (5):
      Merge tag 'renesas-cleanup-for-v4.4' of git://git.kernel.org/.../horms/renesas into next/cleanup
      Merge tag 'efm32-for-4.4-rc1' of git://git.pengutronix.de/git/ukl/linux into next/cleanup
      Merge tag 'mvebu-cleanup-4.4-1' of git://git.infradead.org/linux-mvebu into next/cleanup
      Merge tag 'omap-for-v4.4/cleanup-pt1' of git://git.kernel.org/.../tmlind/linux-omap into next/cleanup
      ARM: pxa: remove incorrect __init annotation on pxa27x_set_pwrmode

Felipe Balbi (13):
      arm: omap2: timer: always define omap4_local_timer_init
      arm: omap2: timer: get rid of obfuscating macros
      arm: omap2: timer: add a gptimer argument to sync32k_timer_init()
      arm: omap2: timer: remove __omap_gptimer_init()
      arm: omap2: timer: provide generic sync32k_timer_init function
      arm: omap2: timer: move realtime_counter_init() around
      arm: omap2: timer: always call clocksource_of_init() when DT
      arm: omap2: timer: rename omap_sync32k_timer_init()
      clocksource: add TI 32.768 Hz counter driver
      arm: omap2+: select 32k clocksource driver
      arm: omap2: timer: limit hwmod usage to non-DT boots
      clocksource: ti-32k: make it depend on GENERIC_CLOCKSOURCE
      arm: omap2: board-generic: use omap4_local_timer_init for AM437x

Franklin S Cooper Jr (2):
      ARM: DRA7/AM335x/AM437x: hwmod: Remove elm address space from hwmod data
      ARM: DRA7/AM335x/AM437x: hwmod: Remove gpmc address space from hwmod data

Geert Uytterhoeven (10):
      ARM: shmobile: Remove unused declaration of r8a7778_add_standard_devices_dt()
      ARM: shmobile: Remove obsolete sh-gpio.h
      ARM: shmobile: Remove obsolete custom earlyprintk code
      ARM: shmobile: Remove obsolete intc.h
      ARM: shmobile: Remove obsolete legacy PM Domain leftovers
      ARM: shmobile: Remove obsolete earlytimer registration
      ARM: shmobile: Remove obsolete twd_local_timer declaration
      ARM: shmobile: smp: Make shmobile_smp_apmu_cpu_shutdown() static
      ARM: shmobile: r8a7778: Make r8a7778_init_irq_dt() static
      ARM: shmobile: r8a7779: Remove legacy PM Domain remainings

Gregory CLEMENT (1):
      ARM: mvebu: Use a CR_C constant instead of a hard-coded one

Jarkko Nikula (1):
      ARM: pxa: Remove unused clock_enable field from struct pxa2xx_spi_master

Javier Martinez Canillas (3):
      ARM: OMAP3: vc: Remove unused macros
      ARM: OMAP2+: Remove unneeded semicolons
      ARM: OMAP: Remove duplicated operand in OR operation

Julia Lawall (1):
      ARM: shmobile: R-Mobile: add missing of_node_put

Keerthy (1):
      ARM: OMAP: Change all cpu_is_* occurences to soc_is_* for id.c

Ladislav Michl (1):
      ARM: OMAP1: Remove board support for VoiceBlue board

Laurent Pinchart (2):
      ARM: shmobile: Remove legacy clock support leftovers
      ARM: OMAP2+: Remove legacy OMAP3 ISP instantiation

Lee Jones (1):
      ARM: shmobile: dt: Rename incorrect interrupt related binding

Lucas Stach (1):
      ARM: mvebu: remove the workaround imprecise abort fault handler

Marc Zyngier (1):
      ARM: Remove open-coded version of IRQCHIP_DECLARE

Olof Johansson (4):
      Merge tag 'renesas-cleanup2-for-v4.4' of git://git.kernel.org/.../horms/renesas into next/cleanup
      Merge tag 'mvebu-cleanup-4.4-2' of git://git.infradead.org/linux-mvebu into next/cleanup
      Merge tag 'pxa-for-4.4' of https://github.com/rjarzmik/linux into next/cleanup
      Merge tag 'omap-for-v4.4/soc-clean-up' of git://git.kernel.org/.../tmlind/linux-omap into next/cleanup

Petr Cvek (22):
      ARM: pxa: magician: Fix indentation in machine files
      ARM: pxa: magician: Print more specific error message for global GPIOs
      ARM: pxa: magician: Optimize debug messages for LCD power
      ARM: pxa: magician: Change description of LCD power GPIO
      ARM: pxa: magician: Add new discovered EGPIO pins
      ARM: pxa: magician: Rename abstract LCD GPIOs
      ARM: pxa: magician: Optimize powerup delays for Samsung LCD
      ARM: pxa: magician: Rename charger cable detection EGPIOs
      ARM: pxa: magician: Optimize Samsung LCD refresh to 50Hz
      ARM: pxa: magician: Fix and add charging detection functions
      ARM: pxa: magician: Fix platform data for both PXA27x I2C controllers
      ARM: pxa: magician: Fix redundant GPIO request for pxaficp_ir
      ARM: pxa: magician: Fix support for Intel Strata NOR Flash
      ARM: pxa: magician: Fix wrongly enabled USB host ports
      ARM: pxa: magician: Remove definition of the STUART port
      ARM: pxa: magician: Add debug message for backlight brightness function
      ARM: pxa: magician: Add missing regulator for PWM backlight
      ARM: pxa: magician: Move platform_add_devices() to the end of magician_init()
      ARM: pxa: magician: Change comments to be more informative
      ARM: pxa: magician: Add support for MAX1587A Vcore regulator
      ARM: pxa: magician: Add support for PXA27x UDC
      ARM: pxa: magician: Remove pdata for pasic3-leds

Robert Jarzmik (2):
      ARM: pxa: add resources to pxaficp_ir
      ARM: pxa: mioa701: add wm9713 codec

Simon Horman (1):
      ARM: shmobile: remove Makefile.boot

Stephen Boyd (1):
      ARM: Remove __ref on hotplug cpu die path

Suman Anna (3):
      ARM: OMAP4: hwmod data: Remove spinlock hwmod addrs
      ARM: DRA7: hwmod data: Remove spinlock hwmod addrs
      ARM: OMAP3: hwmod data: Remove legacy mailbox data and addrs

Tero Kristo (1):
      ARM: OMAP3: clock: remove un-used core dpll re-program code

Thierry Reding (17):
      ARM: pxa: colibri-pxa270-income: Use PWM lookup table
      ARM: pxa: ezx: Use PWM lookup table
      ARM: pxa: hx4700: Remove unused field initializers
      ARM: pxa: lpd270: Use PWM lookup table
      ARM: pxa: magician: Use PWM lookup table
      ARM: pxa: mainstone: Use PWM lookup table
      ARM: pxa: mioa701: Use PWM lookup table
      ARM: pxa: palm27x: Use PWM lookup table
      ARM: pxa: palmte2: Use PWM lookup table
      ARM: pxa: pcm990: Use PWM lookup table
      ARM: pxa: raumfeld: Use PWM lookup table
      ARM: pxa: viper: Use PWM lookup table
      ARM: pxa: palmtc: Use PWM lookup table
      ARM: pxa: cm-x300: Use PWM lookup table
      ARM: pxa: tavorevb: Use PWM lookup table
      ARM: pxa: z2: Use PWM lookup table
      ARM: pxa: zylonite: Use PWM lookup table

Tony Lindgren (3):
      ARM: OMAP2+: Rename cpu_is macros to soc_is
      Merge branch 'for-tony' of git://git.kernel.org/.../balbi/usb into omap-for-v4.4/soc
      Merge tag 'for-v4.4/omap-hwmod-cleanup-a' of git://git.kernel.org/.../pjw/omap-pending into omap-for-v4.4/soc

Ulrich Hecht (12):
      ARM: shmobile: bockw: remove "reference" device tree
      ARM: shmobile: bockw: remove "reference" board file and config
      ARM: shmobile: remove paragraph on DT reference platforms
      ARM: shmobile: bockw: remove legacy board file and config
      ARM: shmobile: r8a7778: remove obsolete setup code
      ARM: shmobile: Kconfig: remove obsolete option ARCH_R8A7778
      ARM: shmobile: r8a7778: remove legacy clock implementation
      ARM: shmobile: remove ARCH_SHMOBILE_LEGACY option
      ARM: shmobile: bockw: remove legacy defconfig
      MAINTAINERS: remove references to dropped marzen and bockw defconfigs
      ARM: shmobile: bockw: remove legacy DTB build target
      ARM: shmobile: Kconfig: remove unused SHMOBILE_TIMER_HZ section

Uwe Kleine-König (3):
      ARM: efm32: switch to properly namespaced location property
      ARM: efm32: switch to vendor,device compatible strings
      ARM: pxa: raumfeld: make some variables static


 .../devicetree/bindings/arm/shmobile.txt        |   6 -
 .../renesas-memory-controllers.txt              |   6 +-
 Documentation/spi/pxa2xx                        |   6 -
 MAINTAINERS                                     |   2 -
 arch/arm/Kconfig                                |  26 +-
 arch/arm/Kconfig.debug                          |   3 +-
 arch/arm/boot/dts/Makefile                      |   3 -
 arch/arm/boot/dts/efm32gg-dk3750.dts            |   8 +-
 arch/arm/boot/dts/efm32gg.dtsi                  |  32 +-
 arch/arm/boot/dts/r8a7778-bockw-reference.dts   | 139 ----
 arch/arm/configs/bockw_defconfig                | 133 ----
 arch/arm/kernel/psci_smp.c                      |   4 +-
 arch/arm/mach-exynos/suspend.c                  |   3 +-
 arch/arm/mach-imx/gpc.c                         |   8 +-
 arch/arm/mach-mvebu/board-v7.c                  |  35 -
 arch/arm/mach-mvebu/pmsu.c                      |   4 +-
 arch/arm/mach-omap1/Kconfig                     |   7 -
 arch/arm/mach-omap1/Makefile                    |   1 -
 arch/arm/mach-omap1/board-voiceblue.c           | 296 --------
 .../mach-omap1/include/mach/board-voiceblue.h   |  19 -
 arch/arm/mach-omap2/Kconfig                     |   1 +
 arch/arm/mach-omap2/Makefile                    |   3 -
 arch/arm/mach-omap2/board-generic.c             |  12 +-
 arch/arm/mach-omap2/board-ldp.c                 |   2 +-
 arch/arm/mach-omap2/board-rx51.c                |   2 +-
 arch/arm/mach-omap2/clkt34xx_dpll3m2.c          | 122 ---
 arch/arm/mach-omap2/common.h                    |   3 +-
 arch/arm/mach-omap2/devices.c                   |  53 --
 arch/arm/mach-omap2/devices.h                   |  19 -
 arch/arm/mach-omap2/id.c                        |  30 +-
 arch/arm/mach-omap2/omap-hotplug.c              |   2 +-
 arch/arm/mach-omap2/omap-wakeupgen.c            |  10 +-
 .../omap_hwmod_33xx_43xx_interconnect_data.c    |  20 -
 arch/arm/mach-omap2/omap_hwmod_3xxx_data.c      |  29 -
 arch/arm/mach-omap2/omap_hwmod_44xx_data.c      |  10 -
 arch/arm/mach-omap2/omap_hwmod_54xx_data.c      |   3 +-
 arch/arm/mach-omap2/omap_hwmod_7xx_data.c       |  30 -
 arch/arm/mach-omap2/pm44xx.c                    |   2 +-
 arch/arm/mach-omap2/powerdomains3xxx_data.c     |   2 +-
 arch/arm/mach-omap2/soc.h                       | 195 ++---
 arch/arm/mach-omap2/sram.c                      |  25 -
 arch/arm/mach-omap2/sram.h                      |  14 -
 arch/arm/mach-omap2/sram34xx.S                  | 346 ---------
 arch/arm/mach-omap2/timer.c                     | 162 ++--
 arch/arm/mach-omap2/vc.c                        |   4 -
 arch/arm/mach-prima2/hotplug.c                  |   2 +-
 arch/arm/mach-pxa/cm-x300.c                     |   9 +-
 arch/arm/mach-pxa/colibri-pxa270-income.c       |   9 +-
 arch/arm/mach-pxa/devices.c                     |  20 +
 arch/arm/mach-pxa/ezx.c                         |   9 +-
 arch/arm/mach-pxa/hx4700.c                      |   3 -
 arch/arm/mach-pxa/icontrol.c                    |   2 -
 arch/arm/mach-pxa/include/mach/magician.h       |  70 +-
 arch/arm/mach-pxa/include/mach/pxa27x.h         |   2 +-
 arch/arm/mach-pxa/lpd270.c                      |   9 +-
 arch/arm/mach-pxa/magician.c                    | 680 ++++++++++-------
 arch/arm/mach-pxa/mainstone.c                   |  19 +-
 arch/arm/mach-pxa/mioa701.c                     |  11 +-
 arch/arm/mach-pxa/palm27x.c                     |   9 +-
 arch/arm/mach-pxa/palmtc.c                      |   9 +-
 arch/arm/mach-pxa/palmte2.c                     |   9 +-
 arch/arm/mach-pxa/pcm990-baseboard.c            |   9 +-
 arch/arm/mach-pxa/pxa27x.c                      |   2 +-
 arch/arm/mach-pxa/raumfeld.c                    |  21 +-
 arch/arm/mach-pxa/tavorevb.c                    |  13 +-
 arch/arm/mach-pxa/viper.c                       |   9 +-
 arch/arm/mach-pxa/z2.c                          |  15 +-
 arch/arm/mach-pxa/zylonite.c                    |   9 +-
 arch/arm/mach-qcom/platsmp.c                    |   2 +-
 arch/arm/mach-realview/hotplug.c                |   2 +-
 arch/arm/mach-shmobile/Kconfig                  |  73 --
 arch/arm/mach-shmobile/Makefile                 |  14 +-
 arch/arm/mach-shmobile/Makefile.boot            |  12 -
 arch/arm/mach-shmobile/board-bockw-reference.c  |  86 ---
 arch/arm/mach-shmobile/board-bockw.c            | 737 -------------------
 arch/arm/mach-shmobile/clock-r8a7778.c          | 342 ---------
 arch/arm/mach-shmobile/clock.c                  |  47 --
 arch/arm/mach-shmobile/clock.h                  |  42 --
 arch/arm/mach-shmobile/common.h                 |   5 -
 arch/arm/mach-shmobile/console.c                |  27 -
 arch/arm/mach-shmobile/intc.h                   | 295 --------
 arch/arm/mach-shmobile/platsmp-apmu.c           |   4 +-
 arch/arm/mach-shmobile/pm-r8a7779.c             |  99 ---
 arch/arm/mach-shmobile/pm-rmobile.c             |   4 +-
 arch/arm/mach-shmobile/pm-rmobile.h             |   9 -
 arch/arm/mach-shmobile/r8a7778.h                |  78 --
 arch/arm/mach-shmobile/r8a7779.h                |   8 -
 arch/arm/mach-shmobile/setup-r8a7778.c          | 563 +-------------
 arch/arm/mach-shmobile/sh-gpio.h                |  29 -
 arch/arm/mach-shmobile/timer.c                  |  21 -
 arch/arm/mach-spear/hotplug.c                   |   2 +-
 arch/arm/mach-tegra/hotplug.c                   |   2 +-
 arch/arm/mach-ux500/hotplug.c                   |   2 +-
 arch/arm/mach-vexpress/hotplug.c                |   2 +-
 drivers/clocksource/Kconfig                     |   8 +
 drivers/clocksource/Makefile                    |   1 +
 drivers/clocksource/timer-ti-32k.c              | 126 ++++
 include/linux/spi/pxa2xx_spi.h                  |   1 -
 98 files changed, 1002 insertions(+), 4433 deletions(-)
 delete mode 100644 arch/arm/boot/dts/r8a7778-bockw-reference.dts
 delete mode 100644 arch/arm/configs/bockw_defconfig
 delete mode 100644 arch/arm/mach-omap1/board-voiceblue.c
 delete mode 100644 arch/arm/mach-omap1/include/mach/board-voiceblue.h
 delete mode 100644 arch/arm/mach-omap2/clkt34xx_dpll3m2.c
 delete mode 100644 arch/arm/mach-omap2/devices.h
 delete mode 100644 arch/arm/mach-omap2/sram34xx.S
 delete mode 100644 arch/arm/mach-shmobile/Makefile.boot
 delete mode 100644 arch/arm/mach-shmobile/board-bockw-reference.c
 delete mode 100644 arch/arm/mach-shmobile/board-bockw.c
 delete mode 100644 arch/arm/mach-shmobile/clock-r8a7778.c
 delete mode 100644 arch/arm/mach-shmobile/clock.c
 delete mode 100644 arch/arm/mach-shmobile/clock.h
 delete mode 100644 arch/arm/mach-shmobile/console.c
 delete mode 100644 arch/arm/mach-shmobile/intc.h
 delete mode 100644 arch/arm/mach-shmobile/r8a7778.h
 delete mode 100644 arch/arm/mach-shmobile/sh-gpio.h
 create mode 100644 drivers/clocksource/timer-ti-32k.c
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]


#1266838 — Re: [GIT PULL 2/6] ARM: SoC cleanups for v4.4

FromLinus Torvalds <torvalds@linux-foundation.org>
Date2015-11-11 00:00 +0100
SubjectRe: [GIT PULL 2/6] ARM: SoC cleanups for v4.4
Message-ID<qtq3o-2NW-9@gated-at.bofh.it>
In reply to#1266208
On Mon, Nov 9, 2015 at 7:33 PM, Olof Johansson <olof@lixom.net> wrote:
>
> Conflicts:
>
> OMAP timer code has a treewide fix vs code deletion conflict. Delete
> the code in HEAD, go with contents from branch.

That doesn't look right. It also needs the clocksource_of_init ->
clocksource_probe changes. The code was moved around rather than
deleted.

               Linus
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]


#1266840 — Re: [GIT PULL 2/6] ARM: SoC cleanups for v4.4

FromFelipe Balbi <balbi@ti.com>
Date2015-11-11 00:00 +0100
SubjectRe: [GIT PULL 2/6] ARM: SoC cleanups for v4.4
Message-ID<qtq3o-2NW-23@gated-at.bofh.it>
In reply to#1266838

[Multipart message — attachments visible in raw view] — view raw

Hi,

Linus Torvalds <torvalds@linux-foundation.org> writes:
> On Mon, Nov 9, 2015 at 7:33 PM, Olof Johansson <olof@lixom.net> wrote:
>>
>> Conflicts:
>>
>> OMAP timer code has a treewide fix vs code deletion conflict. Delete
>> the code in HEAD, go with contents from branch.
>
> That doesn't look right. It also needs the clocksource_of_init ->
> clocksource_probe changes. The code was moved around rather than
> deleted.

correct. Moved from arch/arm/mach-omap2/ to drivers/clocksource/. We're
trying to get all our timer code to drivers/clocksource and make it
DT-only (when all other platforms switch away from legacy boot).

-- 
balbi

[toc] | [prev] | [next] | [standalone]


#1266848 — Re: [GIT PULL 2/6] ARM: SoC cleanups for v4.4

FromOlof Johansson <olof@lixom.net>
Date2015-11-11 00:30 +0100
SubjectRe: [GIT PULL 2/6] ARM: SoC cleanups for v4.4
Message-ID<qtqwq-3dt-17@gated-at.bofh.it>
In reply to#1266838
On Tue, Nov 10, 2015 at 2:52 PM, Linus Torvalds
<torvalds@linux-foundation.org> wrote:
> On Mon, Nov 9, 2015 at 7:33 PM, Olof Johansson <olof@lixom.net> wrote:
>>
>> Conflicts:
>>
>> OMAP timer code has a treewide fix vs code deletion conflict. Delete
>> the code in HEAD, go with contents from branch.
>
> That doesn't look right. It also needs the clocksource_of_init ->
> clocksource_probe changes. The code was moved around rather than
> deleted.

Argh, yes, of course. I usually build a local copy of the merged
contents on top of your latest tree before sending the pull requests,
but didn't this time.

Thanks for catching this.


-Olof
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]


#1266209 — [GIT PULL 4/6] ARM: SoC driver updates for v4.4

FromOlof Johansson <olof@lixom.net>
Date2015-11-10 04:40 +0100
Subject[GIT PULL 4/6] ARM: SoC driver updates for v4.4
Message-ID<qt7WO-84G-13@gated-at.bofh.it>
In reply to#1266205
As we've enabled multiplatform kernels on ARM, and greatly done away with
the contents under arch/arm/mach-*, there's still need for SoC-related
drivers to go somewhere.

Many of them go in through other driver trees, but we still have
drivers/soc to hold some of the "doesn't fit anywhere" lowlevel code
that might be shared between ARM and ARM64 (or just in general makes
sense to not have under the architecture directory).

This branch contains mostly such code:

- Drivers for qualcomm SoCs for SMEM, SMD and SMD-RPM, used to communicate
with power management blocks on these SoCs for use by clock, regulator and
bus frequency drivers.
- Allwinner Reduced Serial Bus driver, again used to communicate with PMICs.
- Drivers for ARM's SCPI (System Control Processor). Not to be confused with
PSCI (Power State Coordination Interface). SCPI is used to communicate with
the assistant embedded cores doing power management, and we have yet to see
how many of them will implement this for their hardware vs abstracting in
other ways (or not at all like in the past).
- To make confusion between SCPI and PSCI more likely, this release also
includes an update of PSCI to interface version 1.0.
- Rockchip support for power domains.
- A driver to talk to the firmware on Raspberry Pi.



Conflicts:

None

----------------------------------------------------------------

The following changes since commit 13102660efc5d7b4bf0ef6915e43d8c6b5084b68:

  Merge tag 'armsoc-soc' into HEAD

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/armsoc-drivers

for you to fetch changes up to d13a5c8c4c3dbe299659bcff805f79a2c83e2bbc:

  soc: qcom: smd-rpm: Correct size of outgoing message

----------------------------------------------------------------

Alexander Aring (1):
      ARM: bcm2835: add mutual inclusion protection

Alexandre Belloni (1):
      clocksource: atmel-st: get and use slow clock

Andy Gross (1):
      Merge tag 'qcom-fixes-for-4.3-rc1' into base-for-4.4

Antoine Tenart (1):
      clk: berlin: add cpuclk

Arnd Bergmann (9):
      Merge tag 'renesas-clk-for-v4.4' of git://git.kernel.org/.../horms/renesas into next/drivers
      Merge tag 'at91-cleanup-4.4' of git://git.kernel.org/.../abelloni/linux into next/drivers
      Merge tag 'v4.4-rockchip-drivers1' of git://git.kernel.org/.../mmind/linux-rockchip into next/drivers
      Merge tag 'arm-scpi-for-v4.4' of git://git.kernel.org/.../sudeep.holla/linux into next/drivers
      firmware: qcom-scm: build for correct architecture level
      Merge tag 'drivers_pl172_for_4.4' of https://github.com/manabian/linux-lpc into next/drivers
      Merge tag 'berlin-new-cpuclk-for-4.4-1' of git://git.infradead.org/users/hesselba/linux-berlin into next/drivers
      Merge tag 'qcom-soc-for-4.4' of git://codeaurora.org/quic/kernel/agross-msm into next/drivers
      soc: qcom/smem: add HWSPINLOCK dependency

Bjorn Andersson (5):
      soc: qcom: smd: Implement id_table driver matching
      soc: qcom: smd: Reject send of too big packets
      soc: qcom: smd: Correct SMEM items for upper channels
      soc: qcom: smd-rpm: Correct the active vs sleep state flagging
      soc: qcom: smd-rpm: Correct size of outgoing message

Boris Brezillon (2):
      clocksource: tcb_clksrc: fix setup_clkevents error path
      misc: atmel_tclib: get and use slow clock

Caesar Wang (3):
      dt-bindings: add power-domain header for RK3288 SoCs
      dt-bindings: add document of Rockchip power domains
      soc: rockchip: power-domain: Add power domain driver

Chen-Yu Tsai (2):
      bus: sunxi-rsb: Add Allwinner Reduced Serial Bus (RSB) controller bindings
      bus: sunxi-rsb: Add driver for Allwinner Reduced Serial Bus

Eric Anholt (1):
      ARM: bcm2835: Add the Raspberry Pi firmware driver

Geert Uytterhoeven (1):
      dt-bindings: Correct paths in Rockchip power domains binding document

Heiko Stuebner (2):
      Merge branch 'v4.4-armsoc/pd-headers' into v4.4-armsoc/drivers
      soc: rockchip: power-domain: don't try to print the clock name in error case

Julia Lawall (1):
      soc: qcom: smd: delete unneeded of_node_put

Lorenzo Pieralisi (6):
      drivers: firmware: psci: add INVALID_ADDRESS return value
      drivers: firmware: psci: move power_state handling to generic code
      drivers: firmware: psci: add PSCI_FEATURES call
      drivers: firmware: psci: add extended stateid power_state support
      drivers: firmware: psci: add PSCI v1.0 DT bindings
      drivers: psci: make PSCI 1.0 functions initialization version dependent

Olof Johansson (4):
      Merge tag 'firmware/psci-1.0' of git://git.kernel.org/.../lpieralisi/linux into next/drivers
      Merge branch 'drivers/psci2' into next/drivers
      Merge tag 'v4.4-rockchip-drivers2' of git://git.kernel.org/.../mmind/linux-rockchip into next/drivers
      Merge tag 'arm/soc/for-4.4/rpi-drivers' of https://github.com/Broadcom/stblinux into next/drivers

Punit Agrawal (4):
      Documentation: add DT bindings for ARM SCPI sensors
      firmware: arm_scpi: Extend to support sensors
      hwmon: Support sensors exported via ARM SCP interface
      hwmon: Support thermal zones registration for SCP temperature sensors

Rob Clark (2):
      qcom-scm: fix endianess issue in __qcom_scm_is_call_available
      qcom-scm: add missing prototype for qcom_scm_is_available()

Sebastian Hesselbarth (2):
      ARM: berlin: dts: add CLKID_CPU for BG2Q
      Merge tag 'berlin-dt-cpuclk-for-4.4-1' into berlin/cpuclk

Stephen Boyd (11):
      PM / clk: Do not __clk_get passed in clock-references
      soc: qcom: smem: Avoid NULL pointer exception on remove
      soc: qcom: Reorder SMEM/SMD configs
      soc: qcom: Make qcom_smem_get() return a pointer
      soc: qcom: smem: Handle big endian CPUs
      soc: qcom: smd: Represent channel layout in structures
      soc: qcom: smd: Use __iowrite32_copy() instead of open-coding it
      soc: qcom: smd: Remove use of VLAIS
      soc: qcom: smd_rpm: Handle big endian CPUs
      soc: qcom: smd: Handle big endian CPUs
      soc: qcom: smem: Move RPM message ram out of smem DT node

Sudeep Holla (7):
      Documentation: add DT binding for ARM System Control and Power Interface(SCPI) protocol
      firmware: add support for ARM System Control and Power Interface(SCPI) protocol
      clk: add support for clocks provided by SCP(System Control Processor)
      clk: scpi: add support for cpufreq virtual device
      cpufreq: arm_big_little: add SCPI interface driver
      drivers: firmware: psci: define more generic PSCI_FN_NATIVE macro
      drivers: firmware: psci: add system suspend support

Thierry Reding (1):
      soc: rockchip: Restrict to ARCH_ROCKCHIP

Vladimir Zapolskiy (4):
      memory: pl172: correct MPMC peripheral ID register bits
      memory: pl172: add ARM PrimeCell PL175 MPMC support
      memory: pl172: add ARM PrimeCell PL176 MPMC support
      doc: dt: arm,pl172: add description of PL175 and PL176 controllers


 .../devicetree/bindings/arm/arm,scpi.txt        | 188 +++++
 Documentation/devicetree/bindings/arm/psci.txt  |   6 +
 .../devicetree/bindings/bus/sunxi-rsb.txt       |  47 ++
 .../bindings/memory-controllers/arm,pl172.txt   |   8 +-
 .../bindings/soc/rockchip/power_domain.txt      |  46 ++
 Documentation/hwmon/scpi-hwmon                  |  33 +
 MAINTAINERS                                     |  10 +
 arch/arm/boot/dts/qcom-msm8974.dtsi             |  17 +-
 arch/arm64/kernel/psci.c                        |  14 -
 drivers/base/power/clock_ops.c                  |   6 +-
 drivers/bus/Kconfig                             |  11 +
 drivers/bus/Makefile                            |   1 +
 drivers/bus/sunxi-rsb.c                         | 783 +++++++++++++++++++
 drivers/clk/Kconfig                             |  10 +
 drivers/clk/Makefile                            |   1 +
 drivers/clk/berlin/bg2q.c                       |  14 +-
 drivers/clk/clk-scpi.c                          | 325 ++++++++
 drivers/clocksource/tcb_clksrc.c                |  12 +-
 drivers/clocksource/timer-atmel-st.c            |  31 +-
 drivers/cpufreq/Kconfig.arm                     |  10 +
 drivers/cpufreq/Makefile                        |   1 +
 drivers/cpufreq/scpi-cpufreq.c                  | 124 +++
 drivers/firmware/Kconfig                        |  26 +
 drivers/firmware/Makefile                       |   4 +-
 drivers/firmware/arm_scpi.c                     | 771 ++++++++++++++++++
 drivers/firmware/psci.c                         | 108 ++-
 drivers/firmware/qcom_scm-32.c                  |   6 +-
 drivers/firmware/raspberrypi.c                  | 260 ++++++
 drivers/hwmon/Kconfig                           |   8 +
 drivers/hwmon/Makefile                          |   1 +
 drivers/hwmon/scpi-hwmon.c                      | 288 +++++++
 drivers/memory/pl172.c                          |  26 +-
 drivers/misc/atmel_tclib.c                      |   4 +
 drivers/pwm/pwm-atmel-tcb.c                     |  26 +-
 drivers/soc/Kconfig                             |   1 +
 drivers/soc/Makefile                            |   1 +
 drivers/soc/qcom/Kconfig                        |  17 +-
 drivers/soc/qcom/smd-rpm.c                      |  68 +-
 drivers/soc/qcom/smd.c                          | 296 ++++---
 drivers/soc/qcom/smem.c                         | 368 +++++----
 drivers/soc/rockchip/Kconfig                    |  18 +
 drivers/soc/rockchip/Makefile                   |   4 +
 drivers/soc/rockchip/pm_domains.c               | 490 ++++++++++++
 include/dt-bindings/clock/berlin2q.h            |   1 +
 include/dt-bindings/power/rk3288-power.h        |  31 +
 include/linux/atmel_tc.h                        |   1 +
 include/linux/psci.h                            |   2 +
 include/linux/qcom_scm.h                        |   2 +
 include/linux/scpi_protocol.h                   |  78 ++
 include/linux/soc/qcom/smd.h                    |  11 +
 include/linux/soc/qcom/smem.h                   |   2 +-
 include/linux/sunxi-rsb.h                       | 105 +++
 include/soc/bcm2835/raspberrypi-firmware.h      | 120 +++
 include/uapi/linux/psci.h                       |  18 +
 54 files changed, 4467 insertions(+), 393 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/arm/arm,scpi.txt
 create mode 100644 Documentation/devicetree/bindings/bus/sunxi-rsb.txt
 create mode 100644 Documentation/devicetree/bindings/soc/rockchip/power_domain.txt
 create mode 100644 Documentation/hwmon/scpi-hwmon
 create mode 100644 drivers/bus/sunxi-rsb.c
 create mode 100644 drivers/clk/clk-scpi.c
 create mode 100644 drivers/cpufreq/scpi-cpufreq.c
 create mode 100644 drivers/firmware/arm_scpi.c
 create mode 100644 drivers/firmware/raspberrypi.c
 create mode 100644 drivers/hwmon/scpi-hwmon.c
 create mode 100644 drivers/soc/rockchip/Kconfig
 create mode 100644 drivers/soc/rockchip/Makefile
 create mode 100644 drivers/soc/rockchip/pm_domains.c
 create mode 100644 include/dt-bindings/power/rk3288-power.h
 create mode 100644 include/linux/scpi_protocol.h
 create mode 100644 include/linux/sunxi-rsb.h
 create mode 100644 include/soc/bcm2835/raspberrypi-firmware.h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]


#1266210 — [GIT PULL 3/6] ARM: SoC platform updates for v4.4

FromOlof Johansson <olof@lixom.net>
Date2015-11-10 04:40 +0100
Subject[GIT PULL 3/6] ARM: SoC platform updates for v4.4
Message-ID<qt7WO-84G-15@gated-at.bofh.it>
In reply to#1266205
New and/or improved SoC support for this release:

- Marvell Berlin:
* Enable standard DT-based cpufreq
* Add CPU hotplug support
- Freescale:
* Ethernet init for i.MX7D
* Suspend/resume support for i.MX6UL
- Allwinner:
* Support for R8 chipset (used on NTC's $9 C.H.I.P board)
- Mediatek:
* SMP support for some platforms
- Uniphier:
* L2 support
* Cleaned up SMP support, etc.

+ A handful of other patches around above functionality, and a few other
smaller changes.


Conflicts:

None, however this is the one where we're supposed to remind you to:

In arch/arm/mach-mediatek/mediatek.c:

> -    clocksource_of_init();
> +    clocksource_probe();

----------------------------------------------------------------

The following changes since commit 4568c7498a97a7b6df66bc6f9268e627929b5d70:

  Merge tag 'armsoc-cleanup' into HEAD

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/armsoc-soc

for you to fetch changes up to b1e4006aeda8c8784029de17d47987c21ea75f6d:

  ARM: uniphier: rework SMP operations to use trampoline code

----------------------------------------------------------------

Alexandre Belloni (3):
      MAINTAINERS: explicitly add Atmel SAMA5
      ARM: at91: remove useless includes in platform_data/atmel.h
      ARM: at91: debug: use DEBUG_UART_PHYS

Andy Shevchenko (1):
      ARM: orion5x: use mac_pton() helper

Anson Huang (1):
      ARM: imx: add suspend/resume support for i.mx6ul

Antoine Tenart (1):
      ARM: berlin: register cpufreq-dt

Arnd Bergmann (8):
      Merge tag 'renesas-soc-for-v4.4' of git://git.kernel.org/.../horms/renesas into next/soc
      Merge tag 'at91-soc' of git://git.kernel.org/.../nferre/linux-at91 into next/soc
      Merge tag 'mvebu-soc-4.4-1' of git://git.infradead.org/linux-mvebu into next/soc
      Merge tag 'berlin64-soc-for-4.4-1' of git://git.infradead.org/users/hesselba/linux-berlin into next/soc
      Merge tag 'berlin-soc-for-4.4-1' of git://git.infradead.org/users/hesselba/linux-berlin into next/soc
      Merge tag 'arm-soc/for-4.4/soc' of http://github.com/Broadcom/stblinux into next/soc
      Merge tag 'keystone-driver-soc_v2' of git://git.kernel.org/.../ssantosh/linux-keystone into next/soc
      Merge tag 'berlin-soc-for-4.4-2' of git://git.infradead.org/users/hesselba/linux-berlin into next/soc

Bai Ping (1):
      ARM: imx: add cpufreq device for imx6ul

Baruch Siach (1):
      ARM: digicolor: select pinctrl/gpio driver

Brian Norris (1):
      soc: add stubs for brcmstb SoC's

Carlo Caione (1):
      ARM: meson: Enable Meson8b SoCs

Dmitry Osipenko (1):
      ARM: tegra: paz00: use con_id's to refer GPIO's in gpiod_lookup table

Eddie Huang (1):
      soc: mediatek: add scpsys support active_wakeup

Florian Fainelli (2):
      soc: brcmstb: Add Bus Interface Unit control setup
      ARM: brcmstb: Setup BIU control registers during boot

Fugang Duan (2):
      ARM: imx7d: add imx7d iomux-gpr field define
      ARM: imx: add enet init for i.MX7D platform

Geert Uytterhoeven (2):
      clk: shmobile: mstp: Consider "zb_clk" suitable for power management
      ARM: shmobile: R-Mobile: Use CPG/MSTP Clock Domain attach/detach helpers

Henry Chen (1):
      soc: mediatek: Move the initial setting of pmic wrap interrupt before requesting irq.

James Liao (1):
      soc: mediatek: Fix random hang up issue while kernel init

Jisheng Zhang (3):
      arm64: berlin: enable ARCH_REQUIRE_GPIOLIB
      arm: berlin: use non-self-cleared reset register to reset cpu
      arm: berlin: add CPU hotplug support

Jon Mason (1):
      ARM: NSP: Add basic support for Broadcom Northstar Plus SoC

Krzysztof Kozlowski (1):
      Documentation: EXYNOS: Update bootloader interface on exynos542x

Masahiro Yamada (2):
      ARM: uniphier: add outer cache support
      ARM: uniphier: rework SMP operations to use trampoline code

Matthias Brugger (1):
      ARM: mediatek: enable gpt6 on boot up to make arch timer working

Maxime Ripard (1):
      ARM: sunxi: Add R8 support

Murali Karicheri (3):
      Documentation: dt: soc: Add description for knav qmss driver
      soc: ti: add firmware file name as part of the driver
      soc: ti: qmss: make acc queue support optional in the driver

Olof Johansson (7):
      Merge tag 'sunxi-core-for-4.4' of https://git.kernel.org/.../mripard/linux into next/soc
      Merge tag 'v4.3-next-soc' of https://github.com/mbgg/linux-mediatek into next/soc
      Merge tag 'imx-soc-4.4' of git://git.kernel.org/.../shawnguo/linux into next/soc
      Merge tag 'at91-ab-soc2' of git://git.kernel.org/.../abelloni/linux into next/soc
      Merge tag 'tegra-for-4.4-soc' of git://git.kernel.org/.../tegra/linux into next/soc
      Merge tag 'mvebu-soc-4.4-2' of git://git.infradead.org/linux-mvebu into next/soc
      Merge tag 'samsung-soc' of git://git.kernel.org/.../kgene/linux-samsung into next/soc

Patrick Doyle (1):
      ARM: at91: pm: at91_pm_suspend_in_sram() must be 8-byte aligned

Thierry Reding (6):
      ARM: S3C24XX: Use PWM lookup table for mach-h1940
      ARM: S3C24XX: Use PWM lookup table for mach-rx1950
      ARM: S3C64XX: Use PWM lookup table for smdk6410
      ARM: S3C64XX: Use PWM lookup table for mach-crag6410
      ARM: S3C64XX: Use PWM lookup table for mach-hmt
      ARM: S3C64XX: Use PWM lookup table for mach-smartq

Thomas Petazzoni (1):
      ARM: mvebu: add support to clear shared L2 bit on Armada XP

Vincent Donnefort (1):
      ARM: mvebu: add broken-idle option

Yingjoe Chen (1):
      ARM: mediatek: add smp bringup code


 .../arm/Samsung/Bootloader-interface.txt        |   5 +-
 Documentation/arm/keystone/knav-qmss.txt        |  56 ++
 Documentation/arm/sunxi/README                  |   2 +-
 .../bindings/arm/coherency-fabric.txt           |   5 +
 .../bindings/arm/mvebu-cpu-config.txt           |  20 +
 Documentation/devicetree/bindings/arm/sunxi.txt |   1 +
 .../bindings/arm/uniphier/cache-uniphier.txt    |  60 ++
 .../bindings/soc/ti/keystone-navigator-qmss.txt |   1 -
 MAINTAINERS                                     |   4 +-
 arch/arm/Kconfig.debug                          |  41 +-
 arch/arm/include/asm/hardware/cache-uniphier.h  |  46 ++
 arch/arm/include/debug/at91.S                   |  18 +-
 arch/arm/kernel/irq.c                           |   3 +
 arch/arm/mach-at91/pm_suspend.S                 |   2 +
 arch/arm/mach-bcm/Kconfig                       |  15 +
 arch/arm/mach-bcm/Makefile                      |   5 +-
 arch/arm/mach-bcm/bcm_nsp.c                     |  25 +
 arch/arm/mach-bcm/brcmstb.c                     |   9 +
 arch/arm/mach-berlin/berlin.c                   |   6 +
 arch/arm/mach-berlin/platsmp.c                  |  38 +-
 arch/arm/mach-digicolor/Kconfig                 |   3 +
 arch/arm/mach-imx/common.h                      |   1 +
 arch/arm/mach-imx/mach-imx6ul.c                 |   9 +
 arch/arm/mach-imx/mach-imx7d.c                  |  74 +++
 arch/arm/mach-imx/pm-imx6.c                     |  46 +-
 arch/arm/mach-imx/suspend-imx6.S                |   3 +
 arch/arm/mach-mediatek/Makefile                 |   3 +
 arch/arm/mach-mediatek/mediatek.c               |  27 +
 arch/arm/mach-mediatek/platsmp.c                | 141 +++++
 arch/arm/mach-meson/Kconfig                     |   5 +
 arch/arm/mach-meson/meson.c                     |   1 +
 arch/arm/mach-mvebu/coherency.c                 |  60 ++
 arch/arm/mach-mvebu/pmsu.c                      |  29 +-
 arch/arm/mach-orion5x/Kconfig                   |   3 +
 arch/arm/mach-orion5x/dns323-setup.c            |  53 +-
 arch/arm/mach-orion5x/tsx09-common.c            |  49 +-
 arch/arm/mach-s3c24xx/mach-h1940.c              |  10 +-
 arch/arm/mach-s3c24xx/mach-rx1950.c             |   8 +-
 arch/arm/mach-s3c64xx/dev-backlight.c           |   4 -
 arch/arm/mach-s3c64xx/mach-crag6410.c           |   9 +-
 arch/arm/mach-s3c64xx/mach-hmt.c                |   9 +-
 arch/arm/mach-s3c64xx/mach-smartq.c             |   9 +-
 arch/arm/mach-s3c64xx/mach-smdk6410.c           |   8 +-
 arch/arm/mach-shmobile/pm-rmobile.c             |  35 +-
 arch/arm/mach-sunxi/sunxi.c                     |   3 +-
 arch/arm/mach-tegra/board-paz00.c               |   4 +-
 arch/arm/mach-uniphier/Makefile                 |   2 +-
 arch/arm/mach-uniphier/headsmp.S                |  43 ++
 arch/arm/mach-uniphier/platsmp.c                | 185 ++++++-
 arch/arm/mm/Kconfig                             |  10 +
 arch/arm/mm/Makefile                            |   1 +
 arch/arm/mm/cache-uniphier.c                    | 555 +++++++++++++++++++
 arch/arm64/Kconfig.platforms                    |   1 +
 drivers/clk/shmobile/clk-mstp.c                 |   4 +
 drivers/clk/sunxi/clk-sunxi.c                   |   1 +
 drivers/soc/Kconfig                             |   1 +
 drivers/soc/Makefile                            |   1 +
 drivers/soc/brcmstb/Kconfig                     |   9 +
 drivers/soc/brcmstb/Makefile                    |   1 +
 drivers/soc/brcmstb/biuctrl.c                   | 116 ++++
 drivers/soc/brcmstb/common.c                    |  33 ++
 drivers/soc/mediatek/mtk-pmic-wrap.c            |  10 +-
 drivers/soc/mediatek/mtk-scpsys.c               |  83 ++-
 drivers/soc/ti/knav_qmss.h                      |   3 +-
 drivers/soc/ti/knav_qmss_acc.c                  |  10 +-
 drivers/soc/ti/knav_qmss_queue.c                |  67 ++-
 include/linux/mfd/syscon/imx7-iomuxc-gpr.h      |  47 ++
 include/linux/platform_data/atmel.h             |   8 -
 include/linux/soc/brcmstb/brcmstb.h             |  10 +
 include/soc/brcmstb/common.h                    |  15 +
 70 files changed, 1888 insertions(+), 296 deletions(-)
 create mode 100644 Documentation/arm/keystone/knav-qmss.txt
 create mode 100644 Documentation/devicetree/bindings/arm/mvebu-cpu-config.txt
 create mode 100644 Documentation/devicetree/bindings/arm/uniphier/cache-uniphier.txt
 create mode 100644 arch/arm/include/asm/hardware/cache-uniphier.h
 create mode 100644 arch/arm/mach-bcm/bcm_nsp.c
 create mode 100644 arch/arm/mach-mediatek/platsmp.c
 create mode 100644 arch/arm/mach-uniphier/headsmp.S
 create mode 100644 arch/arm/mm/cache-uniphier.c
 create mode 100644 drivers/soc/brcmstb/Kconfig
 create mode 100644 drivers/soc/brcmstb/Makefile
 create mode 100644 drivers/soc/brcmstb/biuctrl.c
 create mode 100644 drivers/soc/brcmstb/common.c
 create mode 100644 include/linux/mfd/syscon/imx7-iomuxc-gpr.h
 create mode 100644 include/linux/soc/brcmstb/brcmstb.h
 create mode 100644 include/soc/brcmstb/common.h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]


#1266211 — [GIT PULL 1/6] ARM: SoC non-urgent fixes for v4.4

FromOlof Johansson <olof@lixom.net>
Date2015-11-10 04:40 +0100
Subject[GIT PULL 1/6] ARM: SoC non-urgent fixes for v4.4
Message-ID<qt7WO-84G-17@gated-at.bofh.it>
In reply to#1266205
A handful of fixes that came in and didn't seem warranted to go in through
the 4.3-rc cycle.

- MAINTAINERS updates for one of the Broadcom platforms and lpc18xx
- A couple of non-critical Davinci bugfixes
- A fix to reset irq affinity for TI platforms (silences a warning at reboot)



Conflicts:

None

----------------------------------------------------------------

The following changes since commit ce5c2d2c256a4c8b523036537cd6be2d6af8f69d:

  arm64: fixup for mm renames

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/armsoc-fixes-nc

for you to fetch changes up to 19c1c32c66514fabeffa029507cdd808b3ee854c:

  MAINTAINERS: update lpc18xx entry with more drivers

----------------------------------------------------------------

Andy Shevchenko (1):
      ARM: davinci: re-use %*ph specifier

Arnd Bergmann (3):
      ARM: cns3xxx: pci: avoid potential stack overflow
      Merge tag 'davinci-for-v4.4/fixes' of git://git.kernel.org/.../nsekhar/linux-davinci into next/fixes-non-critical
      Merge tag 'arm-soc/for-4.4/maintainers' of http://github.com/Broadcom/stblinux into next/fixes-non-critical

Joachim Eastwood (1):
      MAINTAINERS: update lpc18xx entry with more drivers

Jon Mason (1):
      MAINTAINERS: add entry for the Broadcom Northstar Plus SoCs

Murali Karicheri (1):
      soc: ti: reset irq affinity before freeing irq

Peter Ujfalusi (1):
      ARM: davinci: clock: Correct return values for API functions


 MAINTAINERS                              | 19 ++++++-
 arch/arm/mach-cns3xxx/pcie.c             | 71 +++++++++++----------------
 arch/arm/mach-davinci/board-dm644x-evm.c |  4 +-
 arch/arm/mach-davinci/clock.c            | 16 ++++--
 drivers/soc/ti/knav_qmss_acc.c           |  4 ++
 5 files changed, 63 insertions(+), 51 deletions(-)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]


#1266212 — [GIT PULL 6/6] ARM: SoC defconfig updates for v4.4

FromOlof Johansson <olof@lixom.net>
Date2015-11-10 04:40 +0100
Subject[GIT PULL 6/6] ARM: SoC defconfig updates for v4.4
Message-ID<qt7WO-84G-21@gated-at.bofh.it>
In reply to#1266205
Defconfig updates are kept separate from other branches mostly to avoid
conflicts between the different categories (driver branch enabling something
that has context conflict with SoC options, etc).

A lot of this again is scattered across the various hardware platforms.
multi_v7_defconfig, our "generic" config for most 32-bit platforms has
been gone through by Marvell Berlin maintainers and added most options
they need to run on their hardware. Broadcom NSP is also added there,
and the new Atmel SAMA5D2 (added last release). Rockchip also has display
and other devices supported in that config.

In addition to that, the usual small churn of new options being added
here and there.



Conflicts:

None

----------------------------------------------------------------

The following changes since commit 44f3e3191cc45643e19a3ac86eb6b4420bd48f33:

  Merge tag 'armsoc-dt' into HEAD

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/armsoc-defconfig

for you to fetch changes up to 7c9730c5684d8ffd69ee0b9e1739484cc6a35b23:

  ARM: multi_v7_defconfig: enable UniPhier I2C drivers

----------------------------------------------------------------

Alan Tull (1):
      ARM: socfpga_defconfig: enable fpga manager

Anand Moon (3):
      ARM: exynos_defconfig: Enable LEDS for Odroid-XU3/XU4
      ARM: exynos_defconfig: Enable rtl8152 ethernet driver for Odroid-XU4
      ARM: multi_v7_defconfig: Enable rtl8152 ethernet driver for Odroid-XU4

Andy Gross (3):
      ARM: qcom_defconfig: Enable SMD-RPM regulators
      ARM: multi_v7_defconfig: Enable QCOM SMD/RPM
      arm64: defconfig: Enable devices for MSM8916

Antoine Tenart (1):
      ARM: multi_v7_defconfig: improve multi_v7_defconfig support for Berlin

Arnd Bergmann (3):
      Merge tag 'renesas-defconfig-for-v4.4' of git://git.kernel.org/.../horms/renesas into next/defconfig
      Merge tag 'arm-soc/for-4.4/defconfig' of http://github.com/Broadcom/stblinux into next/defconfig
      Merge tag 'keystone-config' of git://git.kernel.org/.../ssantosh/linux-keystone into next/defconfig

Fabio Estevam (1):
      ARM: imx_v6_v7_defconfig: Remove CONFIG_VMSPLIT_2G

Gerhard Bertelsmann (2):
      can: Allwinner A10/A20 CAN Controller support - Defconfig
      can: Allwinner A10/A20 CAN Controller support - Defconfig

Haibo Chen (1):
      ARM: imx_v6_v7_defconfig: enable imx6ul_tsc

Javier Martinez Canillas (3):
      ARM: exynos_defconfig: Enable USB Video Class support
      ARM: exynos_defconfig: Disable simplefb support
      ARM: exynos_defconfig: Enable WiFi-Ex as a module instead built-in

Joachim Eastwood (1):
      ARM: configs: update lpc18xx defconfig

Jon Mason (1):
      ARM: multi_v7_defconfig: Add NSP to defconfig

Jonathan Liu (1):
      ARM: sunxi_defconfig: enable MODULE_UNLOAD

Ludovic Desroches (6):
      ARM: at91/defconfig: update sama5 defconfig
      ARM: at91/defconfig: update at91_dt defconfig
      ARM: at91/defconfig: add sama5d2 and its new devices to sama5 defconfig
      ARM: multi_v7_defconfig: Add Atmel SAMA5D2 SoC
      ARM: multi_v7_defconfig: Add Atmel Flexcom device
      ARM: multi_v7_defconfig: Add Atmel SDHCI device

Magnus Damm (1):
      ARM: shmobile: Remove Marzen from shmobile_defconfig

Marcel Ziswiler (1):
      ARM: tegra: Update default configuration

Marek Szyprowski (2):
      ARM: exynos_defconfig: Enable DWC2 USB driver and USB ethernet gadget
      ARM: multi_v7_defconfig: Enable DWC2 USB driver and USB ethernet gadget

Masahiro Yamada (1):
      ARM: multi_v7_defconfig: enable UniPhier I2C drivers

Maxime Coquelin (1):
      ARM: configs: Enable FIXED_PHY in multi_v7 defconfig

Nishanth Menon (2):
      ARM: configs: keystone: sync to savedefconfig
      ARM: configs: keystone: Add basic systemd related options

Olof Johansson (9):
      Merge tag 'qcom-defconfig-for-4.4' of git://codeaurora.org/quic/kernel/agross-msm into next/defconfig
      Merge tag 'renesas-defconfig2-for-v4.4' of git://git.kernel.org/.../horms/renesas into next/defconfig
      Merge tag 'socfpga_defconfig_for_v4.4' of git://git.kernel.org/.../dinguyen/linux into next/defconfig
      Merge tag 'mvebu-config-4.4-1' of git://git.infradead.org/linux-mvebu into next/defconfig
      Merge tag 'sunxi-defconfig-for-4.4' of https://git.kernel.org/.../mripard/linux into next/defconfig
      Merge tag 'imx-defconfig-4.4' of git://git.kernel.org/.../shawnguo/linux into next/defconfig
      Merge tag 'at91-ab-defconfig' of git://git.kernel.org/.../abelloni/linux into next/defconfig
      Merge tag 'tegra-for-4.4-defconfig' of git://git.kernel.org/.../tegra/linux into next/defconfig
      Merge tag 'samsung-defconfig' of git://git.kernel.org/.../kgene/linux-samsung into next/defconfig

Priit Laes (1):
      ARM: sunxi_defconfig: Enable LRADC keys (KEYBOARD_SUN4I_LRADC)

Simon Guinot (1):
      ARM: mvebu: enable options for Seagate NAS in mvebu_v7_defconfig

Simon Horman (1):
      ARM: multi_v7_defconfig: Remove Marzen

Sjoerd Simons (5):
      ARM: multi_v7_defconfig: Enable common Rockchip devices/busses
      ARM: multi_v7_defconfig: Enable common regulators for rockchip boards
      ARM: multi_v7_defconfig: Enable Rockchip display support
      ARM: multi_v7_defconfig: Enable the Rockchip USB 2.0 phy
      ARM: multi_v7_defconfig: Support RTC devices commonly used on Rockchip boards

Srinivas Kandagatla (1):
      ARM: multi_v7_defconfig: Add missing QCOM APQ8064 configs

Thierry Reding (2):
      ARM: tegra: Rebuild default configuration on v4.3-rc1
      ARM: tegra: Update multi_v7_defconfig

Wolfram Sang (2):
      ARM: shmobile: defconfig: enable HDMI output for RCar
      ARM: multi_v7_defconfig: enable HDMI output for Renesas RCar


 arch/arm/configs/at91_dt_defconfig   | 15 ---------
 arch/arm/configs/exynos_defconfig    | 18 +++++++++--
 arch/arm/configs/imx_v6_v7_defconfig |  2 +-
 arch/arm/configs/keystone_defconfig  | 54 +++++++++++++++----------------
 arch/arm/configs/lpc18xx_defconfig   | 26 ++++++++++++---
 arch/arm/configs/multi_v7_defconfig  | 48 ++++++++++++++++++++++++++-
 arch/arm/configs/mvebu_v7_defconfig  |  9 +++++-
 arch/arm/configs/qcom_defconfig      |  8 +++--
 arch/arm/configs/sama5_defconfig     | 16 ++++-----
 arch/arm/configs/shmobile_defconfig  |  4 ++-
 arch/arm/configs/socfpga_defconfig   |  2 ++
 arch/arm/configs/sunxi_defconfig     |  4 +++
 arch/arm/configs/tegra_defconfig     | 10 ++++--
 arch/arm64/configs/defconfig         | 10 ++++++
 14 files changed, 157 insertions(+), 69 deletions(-)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web