* [GIT PULL 1/5] ARM: arm-soc platform updates for 3.10, part 2
2013-05-07 17:26 [GIT PULL 0/5] ARM: Third batch of arm-soc changes for 3.10, again Arnd Bergmann
@ 2013-05-07 17:26 ` Arnd Bergmann
2013-05-07 17:26 ` [GIT PULL 2/5] ARM: arm-soc platform updates for 3.10, part 3 Arnd Bergmann
` (4 subsequent siblings)
5 siblings, 0 replies; 13+ messages in thread
From: Arnd Bergmann @ 2013-05-07 17:26 UTC (permalink / raw)
To: linux-arm-kernel
These patches are all for Renesas shmobile, and depend on the earlier
pinctrl updates. Remarkably, this adds support for three new SoCs:
r8a73a4, r8a73a4 and r8a7778. The bulk of the code added for these is
for pinctrl (using the new subsystem) and for clocks (not yet using the
common clock subsystem). The latter will have to get converted in one
of the upcoming releases, but shmobile is not ready for that yet.
The series also contains Renesas shmobile board changes, adding one
board file for each of the three new SoCs. These boards are using a
mix of classic and device-tree based probing, as there is still a lot of
infrastructure in shmobile that has not been converted to DT yet. Once
those are resolved to the degree that no board specific setup code is
needed, they can get folded into the respective SoC setup files.
Conflicts:
- A line added in board-armadillo800eva.c conflicts with a
changed line.
-------------------------------------------------------------
The following changes since commit
150a8dc Merge tag 'boards-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
are available in the git repository at
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/soc-for-linus-2
you to fetch changes up to
9251c6c Merge tag 'renesas-boards-lager-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards2
-------------------------------------------------------------
Arnd Bergmann (3):
Merge tag 'renesas-defconfig-bockw-for-v3.10' of git://git.kernel.org/.../horms/renesas into next/boards2
Merge tag 'renesas-boards-bockw-for-v3.10' of git://git.kernel.org/.../horms/renesas into next/boards2
Merge tag 'soc-for-linus-2' into for-next
Bastian Hecht (1):
ARM: shmobile: r8a7740: Migrate from INTC to GIC
Guennadi Liakhovetski (9):
ARM: shmobile: sh73a0: wait for completion when kicking the clock
ARM: shmobile: sh73a0: add irqpin DT nodes
ARM: shmobile: sh73a0: add a TWD clock
ARM: shmobile: kzm9g-reference: add ethernet support
ARM: shmobile: mackerel: SDHI resources do not have to be numbered
ARM: shmobile: mackerel: remove OCR masks, where regulators are used
ARM: shmobile: mackerel: switch SDHI and MMCIF interfaces to slot-gpio
ARM: shmobile: mackerel: add interrupt names for SDHI0
ARM: shmobile: mackerel: clean up MMCIF vs. SDHI1 selection
Kuninori Morimoto (21):
ARM: shmobile: add R8A7778 basis support
ARM: shmobile: r8a7778 SCIF support
ARM: shmobile: r8a73a4: add thermal driver support
ARM: shmobile: sh73a0: remove DIV4_ZT* clocks
ARM: shmobile: sh7372: remove DIV4_ZT* clocks
ARM: shmobile: add struct clk_ratio and fixed ratio clock macro
ARM: shmobile: sh7372: use fixed ratio clock
ARM: shmobile: sh73a0: use fixed ratio clock
ARM: shmobile: r8a7740: tidyup comment/implementation mismatch
ARM: shmobile: r8a7740: use fixed ratio clock
ARM: shmobile: r8a7779: remove DIV4 clocks and use fixed ratio clock
ARM: shmobile: sh7372: move global functions to sh7372.h
ARM: shmobile: sh73a0: move global functions to sh73a0.h
ARM: shmobile: r8a7740: move global functions to r8a7740.h
ARM: shmobile: r8a7779: move global functions to r8a7779.h
ARM: shmobile: add R-Car M1A Bock-W platform support
ARM: shmobile: r8a7778: remove pointless PLATFORM_INFO()
ARM: shmobile: r8a7778: add r8a7778_init_irq_extpin()
ARM: shmobile: bockw: enable SMSC ethernet on defconfig
ARM: shmobile: bockw: add SMSC ethernet support
ARM: shmobile: bockw: enable network settings on bootargs
Laurent Pinchart (14):
sh-pfc: Fix compiler warning when BUG()
sh: sh7269: Fix compilation by adding missing includes
sh-pfc: r8a7779: Remove function GPIOs
sh-pfc: r8a7779: Don't use GPIO enum entries
ARM: shmobile: r8a7779: Remove all GPIOs
gpio-rcar: Add pinctrl support
ARM: shmobile: marzen: Add GPIO LEDs
sh-pfc: Make function GPIOs support optional
sh-pfc: Make GPIO support optional
sh-pfc: Skip gpiochip registration when no GPIO resource is found
sh-pfc: Configure pins as GPIOs at request time when handled externally
ARM: shmobile: r8a7779: Register GPIO devices
sh-pfc: r8a7779: Remove GPIO data
sh-pfc: r8a7779: Split DU input and output pixel clocks
Magnus Damm (30):
ARM: shmobile: Initial r8a73a4 SoC support V3
ARM: shmobile: r8a73a4 SCIF support V3
ARM: shmobile: r8a73a4 IRQC support V2
ARM: shmobile: r8a73a4 PFC support
ARM: shmobile: Disallow PINCTRL without GPIOLIB
ARM: shmobile: Initial r8a7790 SoC support
ARM: shmobile: r8a7790 SCIF support
ARM: shmobile: r8a7790 IRQC support
ARM: shmobile: r8a7790 PFC support
gpio: Renesas R-Car GPIO driver V3
sh-pfc: Add r8a73a4 pinmux support
sh-pfc: r8a73a4: Support sparse GPIO numbers
sh-pfc: r8a73a4: GPIO IRQ support
sh-pfc: r8a73a4: Add bias (pull-up/down) pinconf support
sh-pfc: r8a73a4: Add SCIF pin groups and functions
sh-pfc: r8a73a4: Add IRQC pin groups and functions
sh-pfc: r8a73a4: Remove SCIF function GPIOS
sh-pfc: r8a73a4: Remove IRQC function GPIOS
ARM: shmobile: r8a73a4: Remove SCIF function GPIOs
ARM: shmobile: r8a73a4: Remove IRQC function GPIOs
sh-pfc: r8a73a4: Remove function GPIOs
ARM: shmobile: r8a73a4: Remove all GPIO enums
sh-pfc: r8a73a4: Remove unused GPIO bias data
ARM: shmobile: APE6EVM base support
ARM: shmobile: APE6EVM PFC support
ARM: shmobile: APE6EVM LAN9220 support
ARM: shmobile: Initial r8a7790 Lager board support
ARM: shmobile: Add second I/O range for r8a7790 PFC
ARM: shmobile: force enable of r8a7790 arch timer
ARM: shmobile: use r8a7790 timer setup code on Lager
Olof Johansson (2):
Merge tag 'renesas-boards3-for-v3.10' of git://git.kernel.org/.../horms/renesas into next/boards2
Merge tag 'renesas-boards-lager-for-v3.10' of git://git.kernel.org/.../horms/renesas into next/boards2
Sergei Shtylyov (1):
ARM: shmobile: R8A7778: add Ether support
Simon Horman (5):
Merge tag 'renesas-intc-external-irq2-for-v3.10' into soc-base
Merge branch 'soc' into pinmux-base
Merge tag 'renesas-pinmux2-for-v3.10' into boards-base
Merge branch 'soc-r8a7778' into boards-bockw-base
Merge branch 'soc-r8a7790' into boards-lager
Takashi YOSHII (2):
ARM: shmobile: r8a73a4 SoC 64-bit DT support
ARM: shmobile: r8a7790 SoC 64-bit DT support
arch/arm/Kconfig | 2 +-
arch/arm/boot/dts/Makefile | 3 +
arch/arm/boot/dts/r8a73a4-ape6evm.dts | 52 +
arch/arm/boot/dts/r8a73a4.dtsi | 94 +
arch/arm/boot/dts/r8a7778-bockw.dts | 32 +
arch/arm/boot/dts/r8a7778.dtsi | 35 +
arch/arm/boot/dts/r8a7790-lager.dts | 31 +
arch/arm/boot/dts/r8a7790.dtsi | 63 +
arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 13 +
arch/arm/boot/dts/sh73a0.dtsi | 81 +
arch/arm/configs/bockw_defconfig | 94 +
arch/arm/mach-shmobile/Kconfig | 48 +-
arch/arm/mach-shmobile/Makefile | 6 +
arch/arm/mach-shmobile/board-ape6evm.c | 94 +
arch/arm/mach-shmobile/board-armadillo800eva.c | 35 +-
arch/arm/mach-shmobile/board-bockw.c | 81 +
arch/arm/mach-shmobile/board-lager.c | 46 +
arch/arm/mach-shmobile/board-mackerel.c | 111 +-
arch/arm/mach-shmobile/board-marzen.c | 32 +
arch/arm/mach-shmobile/clock-r8a73a4.c | 115 ++
arch/arm/mach-shmobile/clock-r8a7740.c | 114 +-
arch/arm/mach-shmobile/clock-r8a7778.c | 107 +
arch/arm/mach-shmobile/clock-r8a7779.c | 196 +-
arch/arm/mach-shmobile/clock-r8a7790.c | 93 +
arch/arm/mach-shmobile/clock-sh7372.c | 50 +-
arch/arm/mach-shmobile/clock-sh73a0.c | 115 +-
arch/arm/mach-shmobile/clock.c | 13 +
arch/arm/mach-shmobile/include/mach/clock.h | 39 +
arch/arm/mach-shmobile/include/mach/common.h | 54 -
arch/arm/mach-shmobile/include/mach/r8a73a4.h | 8 +
arch/arm/mach-shmobile/include/mach/r8a7740.h | 9 +
arch/arm/mach-shmobile/include/mach/r8a7778.h | 32 +
arch/arm/mach-shmobile/include/mach/r8a7779.h | 330 +--
arch/arm/mach-shmobile/include/mach/r8a7790.h | 9 +
arch/arm/mach-shmobile/include/mach/sh7372.h | 12 +
arch/arm/mach-shmobile/include/mach/sh73a0.h | 15 +
arch/arm/mach-shmobile/intc-r8a7740.c | 641 +-----
arch/arm/mach-shmobile/setup-r8a73a4.c | 202 ++
arch/arm/mach-shmobile/setup-r8a7740.c | 192 +-
arch/arm/mach-shmobile/setup-r8a7778.c | 244 +++
arch/arm/mach-shmobile/setup-r8a7779.c | 58 +-
arch/arm/mach-shmobile/setup-r8a7790.c | 150 ++
arch/sh/kernel/cpu/sh2a/pinmux-sh7269.c | 2 +
drivers/gpio/Kconfig | 6 +
drivers/gpio/Makefile | 1 +
drivers/gpio/gpio-rcar.c | 396 ++++
drivers/pinctrl/sh-pfc/Kconfig | 5 +
drivers/pinctrl/sh-pfc/Makefile | 1 +
drivers/pinctrl/sh-pfc/core.c | 41 +-
drivers/pinctrl/sh-pfc/core.h | 1 +
drivers/pinctrl/sh-pfc/gpio.c | 45 +-
drivers/pinctrl/sh-pfc/pfc-r8a73a4.c | 2587 ++++++++++++++++++++++++
drivers/pinctrl/sh-pfc/pfc-r8a7740.c | 64 +-
drivers/pinctrl/sh-pfc/pfc-r8a7779.c | 479 +----
drivers/pinctrl/sh-pfc/pinctrl.c | 11 +
include/linux/platform_data/gpio-rcar.h | 26 +
56 files changed, 5588 insertions(+), 1828 deletions(-)
^ permalink raw reply [flat|nested] 13+ messages in thread* [GIT PULL 2/5] ARM: arm-soc platform updates for 3.10, part 3
2013-05-07 17:26 [GIT PULL 0/5] ARM: Third batch of arm-soc changes for 3.10, again Arnd Bergmann
2013-05-07 17:26 ` [GIT PULL 1/5] ARM: arm-soc platform updates for 3.10, part 2 Arnd Bergmann
@ 2013-05-07 17:26 ` Arnd Bergmann
2013-05-07 17:26 ` [GIT PULL 3/5] ARM: arm-soc device tree changes, part 2 Arnd Bergmann
` (3 subsequent siblings)
5 siblings, 0 replies; 13+ messages in thread
From: Arnd Bergmann @ 2013-05-07 17:26 UTC (permalink / raw)
To: linux-arm-kernel
This is the third and smallest of the SoC specific updates.
Changes include:
* SMP support for the Xilinx zynq platform
* Smaller imx changes
* LPAE support for mvebu
* Moving the orion5x, kirkwood, dove and mvebu platforms
to a common "mbus" driver for their internal devices.
It would be good to get feedback on the location of the "mbus"
driver. Since this is used on multiple platforms may potentially
get shared with other architectures (powerpc and arm64), it
was moved to drivers/bus/. We expect other similar drivers to
get moved to the same place in order to avoid creating more
top-level directories under drivers/ or cluttering up the
messy drivers/misc/ even more.
Conflicts:
- drivers/gpio/gpio-pl061.c had a trivial add/add conflict that
got resolved in two different ways, both of which are ok.
-------------------------------------------------------------
The following changes since commit
48f934c Merge tag 'soc-for-linus-2' into for-next
are available in the git repository at
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/soc-for-linus-3
you to fetch changes up to
5c5f042 ARM: imx: reset_controller may be disabled
-------------------------------------------------------------
Anson Huang (3):
ARM: imx: enable anatop suspend/resume
ARM: imx: enable periphery well bias for suspend
ARM: imx: enable RBC to support anatop LPM mode
Arnd Bergmann (6):
Merge branch 'zynq/core-smp' of git://git.xilinx.com/linux-xlnx into next/soc2
Merge branch 'gic/cleanup' into next/soc2
Merge tag 'renesas-soc-r8a7779-for-v3.10' of git://git.kernel.org/.../horms/renesas into next/soc2
Merge tag 'renesas-soc-r8a7778-for-v3.10' of git://git.kernel.org/.../horms/renesas into next/soc2
ARM: imx: reset_controller may be disabled
Merge tag 'soc-for-linus-3' into for-next
Fabio Estevam (3):
ARM: mach-imx: anatop: Include "common.h"
ARM: imx_v6_v7_defconfig: Select CONFIG_PERF_EVENTS
ARM: imx_v4_v5_defconfig: Add CONFIG_GPIO_SYSFS
Gregory CLEMENT (1):
ARM: mvebu: Limit the DMA zone when LPAE is selected
Gwenhael Goavec-Merou (1):
ARM: imx1: mm: add call to mxc_device_init
Jason Cooper (2):
Merge tag 'tags/cleanup_for_v3.10' into mvebu/soc
Merge tag 'tags/drivers_for_v3.10' into mvebu/soc
Kuninori Morimoto (2):
ARM: shmobile: r8a7779: add each clocks ratio on comment area
sh-pfc: r8a7779: tidyup intc_irq3_b typo
Lior Amsalem (1):
ARM: mvebu: Align the internal registers virtual base to support LPAE
Markus Pargmann (1):
ARM: imx27, imx5: Add kconfig selects for cpufreq-cpu0
Martin Fuzzey (1):
ARM: i.MX53 Add the cko1, cko2 clock outputs.
Michal Simek (7):
arm: zynq: Load scu baseaddress at run time
arm: zynq: Move slcr initialization to separate file
arm: zynq: Add support for system reset
arm: zynq: Get rid of xilinx function prefix
arm: zynq: Add smp_twd timer
arm: zynq: Add smp support
arm: zynq: Add hotplug support
Neil Greatorex (1):
bus: mvebu-mbus: Restore checking for coherency fabric hardware
Olof Johansson (6):
Merge tag 'renesas-soc2-for-v3.10' of git://git.kernel.org/.../horms/renesas into next/soc2
Merge tag 'renesas-pinmux2-for-v3.10' of git://git.kernel.org/.../horms/renesas into next/soc2
Merge tag 'renesas-pinmux-fixes-for-v3.10' of git://git.kernel.org/.../horms/renesas into next/soc2
Merge tag 'renesas-soc-r8a7790-for-v3.10' of git://git.kernel.org/.../horms/renesas into next/soc2
Merge tag 'imx-soc-3.10' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/soc2
Merge tag 'soc_for_v3.10' of git://git.infradead.org/users/jcooper/linux into next/soc2
Philipp Zabel (14):
ARM i.MX53: Add GPU clocks to clock tree
ARM i.MX6q: export imx6q_revision
ARM i.MX: Add imx_clk_divider_flags and imx_clk_mux_flags
ARM i.MX53: fix ldb di divider and selector clocks
ARM i.MX6q: fix ldb di divider and selector clocks
ARM i.MX6q: Add audio/video PLL post dividers for i.MX6q rev 1.1
ARM i.MX6q: set the LDB serial clock parent to the video PLL
ARM i.MX6q: Add GPU, VPU, IPU, and OpenVG resets to System Reset Controller (SRC)
staging: drm/imx: Use SRC to reset IPU
ARM i.MX5: Remove tve_sel clock from i.MX53 clock tree
ARM i.MX53: Remove unused tve_gate clkdev entry
ARM i.MX53: make tve_ext_sel propagate rate change to PLL
ARM i.MX53: tve_di clock is not part of the CCM, but of TVE
ARM i.MX53: set CLK_SET_RATE_PARENT flag on the tve_ext_sel clock
Sascha Hauer (1):
ARM: i.MX5: Add PATA and SRTC clocks
Sergei Shtylyov (1):
ARM: shmobile: R8A7779: add Ether support
Shawn Guo (6):
Merge tag 'imx-fixes-3.9-5' into imx/soc
Merge tag 'imx-cleanup-3.10' into imx/soc
Merge remote-tracking branch 'pza/reset/for_v3.10' into imx/soc
ARM: imx: do not use regmap_read for ANADIG_DIGPROG
ARM: imx: add initial imx6dl support
ARM: imx: do not bring up unavailable cores
Simon Guinot (1):
ARM: Orion: add dbg_show function to gpio-orion driver
Thomas Petazzoni (8):
bus: introduce an Marvell EBU MBus driver
bus: mvebu: fix mistake in PCIe window target attribute for Kirkwood
arm: mach-mvebu: convert to use mvebu-mbus driver
arm: mach-kirkwood: convert to use mvebu-mbus driver
arm: mach-dove: convert to use mvebu-mbus driver
arm: mach-orion5x: convert to use mvebu-mbus driver
arm: mach-mv78xx0: convert to use the mvebu-mbus driver
arm: plat-orion: remove addr-map code
.../devicetree/bindings/clock/imx5-clock.txt | 14 +-
.../devicetree/bindings/clock/imx6q-clock.txt | 3 +
.../devicetree/bindings/reset/fsl,imx-src.txt | 49 ++
.../bindings/staging/imx-drm/fsl-imx-drm.txt | 3 +
arch/arm/Kconfig | 4 +
arch/arm/Kconfig.debug | 4 +-
arch/arm/boot/dts/armada-370-xp.dtsi | 5 -
arch/arm/boot/dts/zynq-7000.dtsi | 7 +
arch/arm/configs/imx_v4_v5_defconfig | 1 +
arch/arm/configs/imx_v6_v7_defconfig | 1 +
arch/arm/include/debug/mvebu.S | 2 +-
arch/arm/mach-dove/Makefile | 2 +-
arch/arm/mach-dove/addr-map.c | 125 ---
arch/arm/mach-dove/board-dt.c | 2 +-
arch/arm/mach-dove/common.c | 39 +-
arch/arm/mach-dove/common.h | 2 +-
arch/arm/mach-dove/include/mach/dove.h | 5 +
arch/arm/mach-imx/Kconfig | 10 +-
arch/arm/mach-imx/Makefile | 1 +
arch/arm/mach-imx/anatop.c | 103 +++
arch/arm/mach-imx/clk-imx51-imx53.c | 75 +-
arch/arm/mach-imx/clk-imx6q.c | 126 ++-
arch/arm/mach-imx/clk.h | 17 +
arch/arm/mach-imx/common.h | 10 +-
arch/arm/mach-imx/gpc.c | 23 +-
arch/arm/mach-imx/mach-imx6q.c | 74 +-
arch/arm/mach-imx/mm-imx1.c | 2 +
arch/arm/mach-imx/mxc.h | 11 +
arch/arm/mach-imx/platsmp.c | 4 +-
arch/arm/mach-imx/pm-imx6q.c | 4 +-
arch/arm/mach-imx/src.c | 66 ++
arch/arm/mach-kirkwood/Makefile | 2 +-
arch/arm/mach-kirkwood/addr-map.c | 91 ---
arch/arm/mach-kirkwood/board-dt.c | 2 +-
arch/arm/mach-kirkwood/common.c | 38 +-
arch/arm/mach-kirkwood/common.h | 2 +-
arch/arm/mach-kirkwood/include/mach/kirkwood.h | 7 +-
arch/arm/mach-kirkwood/pcie.c | 1 -
arch/arm/mach-mv78xx0/Makefile | 2 +-
arch/arm/mach-mv78xx0/addr-map.c | 93 ---
arch/arm/mach-mv78xx0/common.c | 10 +-
arch/arm/mach-mv78xx0/include/mach/mv78xx0.h | 9 +-
arch/arm/mach-mv78xx0/pcie.c | 21 +-
arch/arm/mach-mvebu/Kconfig | 2 +
arch/arm/mach-mvebu/Makefile | 2 +-
arch/arm/mach-mvebu/addr-map.c | 137 ----
arch/arm/mach-mvebu/armada-370-xp.c | 18 +
arch/arm/mach-mvebu/armada-370-xp.h | 8 +-
arch/arm/mach-mvebu/platsmp.c | 2 +
arch/arm/mach-orion5x/Makefile | 2 +-
arch/arm/mach-orion5x/addr-map.c | 155 ----
arch/arm/mach-orion5x/board-dt.c | 2 +-
arch/arm/mach-orion5x/common.c | 49 +-
arch/arm/mach-orion5x/common.h | 13 +-
arch/arm/mach-orion5x/d2net-setup.c | 4 +-
arch/arm/mach-orion5x/db88f5281-setup.c | 13 +-
arch/arm/mach-orion5x/dns323-setup.c | 3 +-
arch/arm/mach-orion5x/edmini_v2-setup.c | 4 +-
arch/arm/mach-orion5x/include/mach/orion5x.h | 6 +-
arch/arm/mach-orion5x/kurobox_pro-setup.c | 8 +-
arch/arm/mach-orion5x/ls-chl-setup.c | 4 +-
arch/arm/mach-orion5x/ls_hgl-setup.c | 4 +-
arch/arm/mach-orion5x/lsmini-setup.c | 4 +-
arch/arm/mach-orion5x/mss2-setup.c | 3 +-
arch/arm/mach-orion5x/mv2120-setup.c | 3 +-
arch/arm/mach-orion5x/net2big-setup.c | 4 +-
arch/arm/mach-orion5x/pci.c | 7 +-
arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c | 4 +-
arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | 4 +-
arch/arm/mach-orion5x/rd88f5182-setup.c | 7 +-
arch/arm/mach-orion5x/terastation_pro2-setup.c | 4 +-
arch/arm/mach-orion5x/ts209-setup.c | 4 +-
arch/arm/mach-orion5x/ts409-setup.c | 4 +-
arch/arm/mach-orion5x/wnr854t-setup.c | 4 +-
arch/arm/mach-orion5x/wrt350n-v2-setup.c | 4 +-
arch/arm/mach-shmobile/clock-r8a7779.c | 23 +-
arch/arm/mach-shmobile/include/mach/r8a7779.h | 2 +
arch/arm/mach-shmobile/setup-r8a7779.c | 23 +-
arch/arm/mach-zynq/Kconfig | 1 +
arch/arm/mach-zynq/Makefile | 6 +-
arch/arm/mach-zynq/common.c | 67 +-
arch/arm/mach-zynq/common.h | 20 +
arch/arm/mach-zynq/headsmp.S | 24 +
arch/arm/mach-zynq/hotplug.c | 104 +++
arch/arm/mach-zynq/platsmp.c | 136 ++++
arch/arm/mach-zynq/slcr.c | 125 +++
arch/arm/plat-orion/Makefile | 6 -
arch/arm/plat-orion/addr-map.c | 178 -----
arch/arm/plat-orion/gpio.c | 59 ++
drivers/bus/Kconfig | 7 +
drivers/bus/Makefile | 1 +
drivers/bus/mvebu-mbus.c | 870 +++++++++++++++++++++
drivers/gpio/gpio-pl061.c | 2 +-
drivers/pinctrl/sh-pfc/pfc-r8a7779.c | 2 +-
drivers/staging/imx-drm/ipu-v3/ipu-common.c | 12 +-
include/linux/mbus.h | 27 +-
96 files changed, 2257 insertions(+), 1002 deletions(-)
^ permalink raw reply [flat|nested] 13+ messages in thread* [GIT PULL 3/5] ARM: arm-soc device tree changes, part 2
2013-05-07 17:26 [GIT PULL 0/5] ARM: Third batch of arm-soc changes for 3.10, again Arnd Bergmann
2013-05-07 17:26 ` [GIT PULL 1/5] ARM: arm-soc platform updates for 3.10, part 2 Arnd Bergmann
2013-05-07 17:26 ` [GIT PULL 2/5] ARM: arm-soc platform updates for 3.10, part 3 Arnd Bergmann
@ 2013-05-07 17:26 ` Arnd Bergmann
2013-05-07 17:26 ` [GIT PULL 4/5] ARM: arm-soc: late cleanups Arnd Bergmann
` (2 subsequent siblings)
5 siblings, 0 replies; 13+ messages in thread
From: Arnd Bergmann @ 2013-05-07 17:26 UTC (permalink / raw)
To: linux-arm-kernel
These are mostly new device tree bindings for existing drivers, as well
as changes to the device tree source files to add support for those
devices, and a couple of new boards, most notably Samsung's Exynos5
based Chromebook.
The changes depend on earlier platform specific updates and touch
the usual platforms: omap, exynos, tegra, mxs, mvebu and davinci.
Conflicts:
Simple add/add conflicts in arch/arm/boot/dts/exynos5250.dtsi and
arch/arm/mach-omap2/omap_hwmod.c. In the former, be careful to
include the closing curly braces and semicolon.
-------------------------------------------------------------
The following changes since commit
9822346 Merge tag 'soc-for-linus-3' into for-next
are available in the git repository at
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/dt-for-linus-2
you to fetch changes up to
4183bef Merge branch 'late/dt' into next/dt2
-------------------------------------------------------------
Alexander Graf (2):
ARM: dts: Declare the gic as a15 compatible for exynos5250
ARM: dts: Add architected timer nodes for exynos5250
Alexandre Belloni (3):
ARM: cfa10036: add one wire bitbanging to the cfa10049
pinctrl: pinctrl-mxs: document the missing pull-ups
ARM: dts: cfa10036: Add touchscreen support to the CFA-10049
Alexandre Pereira da Silva (1):
ARM: dts: imx23-olinuxino: mark sdcard cd as broken
Amit Daniel Kachhap (2):
ARM: dts: Add PMIC node entry for Arndale board
ARM: dts: Add cpufreq controller node for Exynos5440 SoC
Andrew Chew (2):
ARM: tegra: fix the status of PWM DT nodes
ARM: tegra: add PWM nodes to Tegra114 DT
Anil Kumar (3):
ARM: dts: Add minimal DT support for DevKit8000
ARM: dts: omap3-devkit8000: Enable audio support
ARM: dts: omap3-devkit8000: Add NAND DT node
AnilKumar Ch (3):
ARM: dts: AM33XX: Rename I2C and GPIO nodes
ARM: dts: AM33XX: Add d_can instances to aliases
ARM: dts: AM33XX: Add memory resource to d_can node
Arnd Bergmann (6):
Merge branch 'mxs/cleanup' into next/dt2
Merge tag 'mxs-dt-3.10' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt2
Merge branch 'tegra/clk' into next/dt2
Merge tag 'tegra-for-3.10-dt' of git://git.kernel.org/.../swarren/linux-tegra into next/dt2
Merge branch 'late/dt' into next/dt2
Merge tag 'dt-for-linus-2' into for-next
Benoit Cousson (1):
Merge tag 'omap-devel-b-for-3.10' of git://git.kernel.org/.../pjw/omap-pending into for_3.10/dts_merged
Byungho An (1):
ARM: dts: Add node for GMAC for exynos5440
Christoph Fritz (1):
ARM/dts: OMAP3: fix pinctrl-single configuration
Doug Anderson (4):
ARM: dts: add usb 2.0 clock references to exynos5250 device tree
ARM: dts: Document usb clocks in samsung,exynos4210-ehci/ohci bindings
ARM: dts: Add i2c-arbitrator bus for exynos5250-snow
ARM: dts: Add sbs-battery for exynos5250-snow
Fabio Estevam (1):
video: mxsfb: Introduce regulator support
Felipe Balbi (1):
ARM: dts: OMAP5: Add SPI nodes
Florian Vaussard (3):
ARM: dts: omap3-overo: Add support for pwm-leds
ARM: dts: omap3-overo: Add audio support
ARM: dts: OMAP3: Add GPMC controller
Giridhar Maruthy (1):
ARM: dts: Add virtual GIC DT bindings for exynos5440
Gregory CLEMENT (3):
ARM: dts: mvebu: Convert all the mvebu files to use the range property
ARM: dts: mvebu: introduce internal-regs node
ARM: dts: mvebu: Convert mvebu device tree files to 64 bits
Jason Cooper (2):
Merge tag 'tags/mvebu_fixes_for_v3.9_round3' into mvebu/dt
Merge tag 'tags/soc_for_v3.10' into mvebu/dt
Javier Martinez Canillas (5):
ARM: dts: omap3: Add generic DT support for IGEP devices
ARM: dts: omap3: Add support for IGEPv2 board
ARM: dts: omap3: Add support for IGEP COM Module
ARM: dts: OMAP3: reduce GPMC mapped registers address space
Documentation: dt: gpio-omap: Move interrupt-controller from #interrupt-cells description
Jon Hunter (16):
ARM: OMAP2+: Prepare for device-tree PMU support
ARM: dts: OMAP2+: Add PMU nodes
ARM: dts: OMAP2+: Add SDMA controller bindings and nodes
ARM: dts: Add GPMC node for OMAP2, OMAP4 and OMAP5
ARM: dts: Add OMAP2 gpio bindings
ARM: dts: OMAP3+: Correct gpio #interrupts-cells property
ARM: dts: OMAP3: Add reg and interrupt properties for gpio
ARM: dts: OMAP3: Add support for OMAP3430 SDP board
ARM: OMAP: Force dmtimer restore if context loss is not detectable
ARM: OMAP: Add function to request timer by node
ARM: dts: OMAP2+: Update DMTIMER compatibility property
ARM: OMAP2+: Populate DMTIMER errata when using device-tree
ARM: dts: OMAP2+: Identify GPIO banks that are always powered
ARM: dts: Update OMAP3430 SDP NAND and ONENAND properties
ARM: dts: Add NOR flash bindings for OMAP2420 H4
ARM: dts: Add OMAP3430 SDP NOR flash memory binding
Joseph Lo (4):
ARM: tegra: add power gpio keys to DT
ARM: tegra: whistler: add wakeup source for KBC
ARM: tegra: add non-removable and keep-power-in-suspend property for MMC
ARM: dts: tegra: add the PM configurations of PMC
Kishon Vijay Abraham I (7):
ARM: dts: OMAP4: Add omap control usb data
ARM: dts: OMAP4: Add omap-usb2 data
ARM: dts: OMAP: Add usb_otg and glue data to OMAP3+ boards
ARM: dts: OMAP5: Add OMAP control usb data
ARM: dts: OMAP5: Add ocp2scp data
ARM: dts: OMAP5: Add omap-usb3 and omap-usb2 data
ARM: dts: OMAP5: add dwc3 omap and dwc3 core data
Kukjin Kim (1):
ARM: dts: add device tree file for SD5v1 board
Laxman Dewangan (9):
ARM: tegra: add APB DMA nodes to Tegra114 DT
ARM: tegra: add I2C nodes to Tegra114 DT
ARM: tegra: add aliases and DMA requestor for serial nodes of Tegra114
ARM: tegra: add KBC nodes to Tegra114 DT
ARM: tegra: add SPI nodes to Tegra114 DT
ARM: tegra: add DT binding for i2c-tegra
ARM: tegra: dalmore: add cpu regulator node
ARM: tegra: dalmore: add TPS65090 node
ARM: tegra: dalmore: add fixed regulator node
Leela Krishna Amudala (2):
ARM: dts: Add FIMD node to exynos5
ARM: dts: Add display timing node to exynos5250-smdk5250.dts
Lokesh Vutla (1):
ARM: dts: OMAP5: Add watchdog timer node
Manjunathappa, Prakash (4):
spi/davinci: no wildcards in DT compatible property
ARM: davinci: da850: add SPI1 DT node
ARM: davinci: da850: override SPI DT node device name
ARM: davinci: da850-evm: add SPI flash support
Matthias Brugger (1):
ARM: dts: omap3-igep: Add uart1 and uart2 to igep boards
Murali Karicheri (1):
spi/davinci: add DT binding documentation
NeilBrown (1):
ARM: OMAP: Simplify dmtimer context-loss handling
Nishanth Menon (6):
ARM: dts: OMAP34xx/35xx: Add CPU OPP table
ARM: dts: OMAP36xx: Add CPU OPP table
ARM: dts: OMAP3: use twl4030 vdd1 regulator for CPU
ARM: dts: OMAP443x: Add CPU OPP table
ARM: dts: omap4-panda: move generic sections to panda-common
ARM: dts: OMAP4460: Add CPU OPP table
Olof Johansson (10):
Merge branch 'omap/fixes-non-critical' into next/dt2
Merge branch 'omap/usb' into next/dt2
Merge tag 'omap-for-v3.10/dt-signed-v2' of git://git.kernel.org/.../tmlind/linux-omap into next/dt2
Merge tag 'dt-exynos-for-v3.10' of git://git.kernel.org/.../kgene/linux-samsung into next/dt2
Merge tag 'dt-3.10-4' of git://git.infradead.org/users/jcooper/linux into next/dt2
Merge tag 'davinci-for-v3.10/dt-2-v2' of git://git.kernel.org/.../nsekhar/linux-davinci into next/dt2
Merge branch 'samsung/pinctrl-exynos' into late/dt
Merge branch 'exynos/dt' into late/dt
ARM: exynos: dts: cros5250: add EC device
Merge tag 'late-exynos-v3-for-v3.10' of git://git.kernel.org/.../kgene/linux-samsung into late/dt
Peter Ujfalusi (5):
ARM: dts: twl4030: Add PWM support
ARM: dts: twl6030: Add PWM support
ARM: dts: omap3-beagle-xm: Use pwm-leds for pmu_stat LED
ARM: dts: omap4-sdp: Add support for pwm-leds (keypad and charging LED)
ARM: dts: omap4-sdp: Add support for pwm-backlight
Philip Avinash (2):
ARM: dts: AM33XX: Corrects typo in interrupt field in SPI node
ARM: davinci: da850: add EHRPWM & ECAP DT node
Prashant Gaikwad (1):
clk: tegra: Fix cdev1 and cdev2 IDs
Pritesh Raithatha (2):
ARM: tegra: add default pinctrl nodes for Dalmore
ARM: tegra: add SDHCI nodes with common properties
Rajendra Nayak (1):
ARM: dts: OMAP5: Specify nonsecure PPI IRQ for arch timer
Rhyland Klein (2):
ARM: tegra: add SDHCI support for Dalmore
ARM: tegra: Add sbs-battery node to Dalmore
Sachin Kamat (11):
ARM: dts: Add G2D node to exynos4210.dtsi
ARM: dts: Add G2D node to SMDKV310
ARM: dts: Add G2D node to exynos4210-origen
ARM: dts: Add G2D node to exynos4x12.dtsi
ARM: dts: Add G2D node to SMDK4412
ARM: dts: Add G2D node to exynos4412-origen
ARM: dts: Add Samsung G2D DT bindings documentation
ARM: dts: Add disable-wp for card slot on exynos5250-arndale
ARM: dts: Add vmmc regulator support for Arndale board
ARM: dts: Add MFC codec support for Arndale board
ARM: dts: Add HDMI HPD and regulator node for Arndale board
Santosh Shilimkar (9):
ARM: dts: omap5-evm: Update available memory to 2032 MB
ARM: dts: OMAP5: Align the local timer dt node as per the current binding code
ARM: dts: OMAP5: Move the gic node out of ocp space
ARM: dts: OMAP5: Update the timer and GIC nodes for HYP kernel support
ARM: dts: OMAP5: Update keypad reg property
Documentation: dt: OMAP: l3-noc: Add *reg* in required properties
ARM: dts: OMAP4/5: Update l3-noc DT nodes
ARM: OMAP2+: hwmod: extract module address space from DT blob
ARM: OMAP2+: hwmod: Don't call _init_mpu_rt_base if no sysc
Sebastien Guiriec (1):
ARM: dts: OMAP2+: Add SDMA Audio IPs bindings
Shawn Guo (16):
net: fec: handle optional clk_ptp more gracefully
ARM: mxs: remove unneeded enet_out clk initialization
video: mxsfb: use devm_* managed functions
video: mxsfb: remove fb_phys/fb_size from platform_data
video: mxsfb: remove dotclk_delay from platform_data
video: mxsfb: get display timings from device tree
ARM: mxs: move display timing configurations into device tree
video: mxsfb: remove mxsfb_platform_data
ARM: dts: add generic DMA device tree binding for mxs-dma
dma: mxs-dma: use devm_* managed functions
dma: mxs-dma: move to generic device tree binding
mmc: mxs-mmc: move to use generic DMA helper
spi: mxs-spi: move to use generic DMA helper
i2c: i2c-mxs: move to use generic DMA helper
mtd: gpmi: move to use generic DMA helper
serial: mxs-auart: move to use generic DMA helper
Sourav Poddar (4):
ARM: dts: omap4-sdp: Add I2c pinctrl data
ARM: dts: omap5-evm: Add I2c pinctrl data
ARM: dts: omap4-panda: Add I2c pinctrl data
ARM: dts: omap5-evm: Add mcspi data
Stephen Warren (5):
ARM: tegra: device tree whitespace cleanup
ARM: tegra: fix sort order of USB PHY nodes
ARM: tegra: add clocks property to sound nodes
ARM: tegra: add clocks property to AC'97 sound nodes
ARM: tegra: keep power on to SD slot on Dalmore
Subash Patel (3):
ARM: dts: add PMU support in exynos5440
ARM: dts: update bootargs to boot from sda2 for exynos5440-ssdk5440
ARM: dts: add PDMA0 changes for exynos5440
Sylwester Nawrocki (1):
ARM: dts: Add SYSREG block node for S5P/Exynos4 SoC series
Thomas Abraham (7):
ARM: dts: add pin state information in client nodes for Exynos4 platforms
ARM: dts: add pin state information in client nodes for Exynos5 platforms
ARM: dts: list the interrupts generated by pin-controller on Exynos5440
ARM: dts: Fix gmac clock ids due to changes in Exynos5440
ARM: EXYNOS: Create virtual I/O mapping for Chip-ID controller using device tree
ARM: dts: Add chip-id controller node on Exynos4/5 SoC
ARM: dts: add mshc controller node for Exynos4x12 SoCs
Thomas Petazzoni (2):
ARM: dts: mvebu: fix cpus section indentation
ARM: dts: mvebu: move all peripherals inside soc
Tony Lindgren (1):
Merge branch 'for_3.10/dts' of git://git.kernel.org/.../bcousson/linux-omap-dt into omap-for-v3.10/dt
Tushar Behera (2):
ARM: dts: Add pin-control related changes for Arndale board
ARM: dts: Add gpio-button entries for Arndale board
Vikas Sajjan (3):
ARM: dts: Add FIMD node to exynos4
ARM: dts: Add FIMD node and display timing node to exynos4412-origen.dts
ARM: dts: Add FIMD DT binding Documentation
Wolfram Sang (2):
net: freescale: fec: add support for optional enet_out clk
ARM: dts: mxs: add enet_out clock to devicetree
.../devicetree/bindings/arm/omap/l3-noc.txt | 1 +
.../devicetree/bindings/arm/omap/timer.txt | 17 +-
.../devicetree/bindings/arm/samsung/sysreg.txt | 7 +
.../devicetree/bindings/dma/fsl-mxs-dma.txt | 49 +-
Documentation/devicetree/bindings/fb/mxsfb.txt | 36 +-
.../devicetree/bindings/gpio/gpio-omap.txt | 8 +-
.../devicetree/bindings/gpu/samsung-g2d.txt | 20 +
Documentation/devicetree/bindings/i2c/i2c-mxs.txt | 12 +-
.../devicetree/bindings/i2c/nvidia,tegra20-i2c.txt | 60 ++
Documentation/devicetree/bindings/mmc/mxs-mmc.txt | 12 +-
.../devicetree/bindings/mtd/gpmi-nand.txt | 17 +-
.../bindings/pinctrl/fsl,mxs-pinctrl.txt | 4 +
.../bindings/sound/nvidia,tegra-audio-alc5632.txt | 8 +
.../sound/nvidia,tegra-audio-trimslice.txt | 7 +
.../bindings/sound/nvidia,tegra-audio-wm8753.txt | 8 +
.../bindings/sound/nvidia,tegra-audio-wm8903.txt | 8 +
.../bindings/sound/nvidia,tegra-audio-wm9712.txt | 8 +
Documentation/devicetree/bindings/spi/mxs-spi.txt | 12 +-
.../devicetree/bindings/spi/spi-davinci.txt | 51 ++
.../bindings/tty/serial/fsl-mxs-auart.txt | 16 +-
.../devicetree/bindings/usb/exynos-usb.txt | 10 +
Documentation/devicetree/bindings/usb/omap-usb.txt | 1 +
.../devicetree/bindings/video/samsung-fimd.txt | 65 ++
arch/arm/boot/dts/Makefile | 5 +
arch/arm/boot/dts/am335x-bone.dts | 10 +-
arch/arm/boot/dts/am335x-evm.dts | 18 +-
arch/arm/boot/dts/am335x-evmsk.dts | 18 +-
arch/arm/boot/dts/am33xx.dtsi | 40 +-
arch/arm/boot/dts/am3517-evm.dts | 2 +-
arch/arm/boot/dts/am3517_mt_ventoux.dts | 2 +-
arch/arm/boot/dts/armada-370-db.dts | 134 ++--
arch/arm/boot/dts/armada-370-mirabox.dts | 176 ++--
arch/arm/boot/dts/armada-370-rd.dts | 96 +--
arch/arm/boot/dts/armada-370-xp.dtsi | 336 ++++----
arch/arm/boot/dts/armada-370.dtsi | 330 ++++----
arch/arm/boot/dts/armada-xp-db.dts | 202 ++---
arch/arm/boot/dts/armada-xp-gp.dts | 222 ++---
arch/arm/boot/dts/armada-xp-mv78230.dtsi | 284 +++----
arch/arm/boot/dts/armada-xp-mv78260.dtsi | 342 ++++----
arch/arm/boot/dts/armada-xp-mv78460.dtsi | 484 +++++------
arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 262 +++---
arch/arm/boot/dts/armada-xp.dtsi | 202 ++---
arch/arm/boot/dts/cros5250-common.dtsi | 54 +-
arch/arm/boot/dts/da850-evm.dts | 40 +
arch/arm/boot/dts/da850.dtsi | 94 +++
arch/arm/boot/dts/exynos4.dtsi | 32 +
arch/arm/boot/dts/exynos4210-origen.dts | 4 +
arch/arm/boot/dts/exynos4210-smdkv310.dts | 57 +-
arch/arm/boot/dts/exynos4210.dtsi | 7 +
arch/arm/boot/dts/exynos4412-origen.dts | 21 +
arch/arm/boot/dts/exynos4412-smdk4412.dts | 8 +
arch/arm/boot/dts/exynos4412.dtsi | 8 +
arch/arm/boot/dts/exynos4x12.dtsi | 7 +
arch/arm/boot/dts/exynos5250-arndale.dts | 343 +++++++-
arch/arm/boot/dts/exynos5250-pinctrl.dtsi | 783 ++++++++++++++++++
arch/arm/boot/dts/exynos5250-smdk5250.dts | 49 +-
arch/arm/boot/dts/exynos5250-snow.dts | 149 +++-
arch/arm/boot/dts/exynos5250.dtsi | 348 +++-----
arch/arm/boot/dts/exynos5440-sd5v1.dts | 39 +
arch/arm/boot/dts/exynos5440-ssdk5440.dts | 6 +-
arch/arm/boot/dts/exynos5440.dtsi | 55 +-
arch/arm/boot/dts/imx23-evk.dts | 36 +-
arch/arm/boot/dts/imx23-olinuxino.dts | 1 +
arch/arm/boot/dts/imx23.dtsi | 42 +-
arch/arm/boot/dts/imx28-apf28dev.dts | 25 +
arch/arm/boot/dts/imx28-apx4devkit.dts | 25 +
arch/arm/boot/dts/imx28-cfa10049.dts | 50 +-
arch/arm/boot/dts/imx28-evk.dts | 36 +-
arch/arm/boot/dts/imx28-m28evk.dts | 27 +
arch/arm/boot/dts/imx28.dtsi | 62 +-
arch/arm/boot/dts/imx6qdl.dtsi | 8 +-
arch/arm/boot/dts/omap2.dtsi | 39 +-
arch/arm/boot/dts/omap2420-h4.dts | 46 ++
arch/arm/boot/dts/omap2420.dtsi | 67 +-
arch/arm/boot/dts/omap2430.dtsi | 87 +-
arch/arm/boot/dts/omap3-beagle-xm.dts | 26 +-
arch/arm/boot/dts/omap3-beagle.dts | 8 +-
arch/arm/boot/dts/omap3-devkit8000.dts | 169 ++++
arch/arm/boot/dts/omap3-evm.dts | 14 +-
arch/arm/boot/dts/omap3-igep.dtsi | 122 +++
arch/arm/boot/dts/omap3-igep0020.dts | 56 ++
arch/arm/boot/dts/omap3-igep0030.dts | 44 +
arch/arm/boot/dts/omap3-overo.dtsi | 31 +-
arch/arm/boot/dts/omap3.dtsi | 142 +++-
arch/arm/boot/dts/omap3430-sdp.dts | 190 +++++
arch/arm/boot/dts/omap34xx.dtsi | 28 +
arch/arm/boot/dts/omap36xx.dtsi | 13 +
arch/arm/boot/dts/omap4-panda-a4.dts | 5 +-
arch/arm/boot/dts/omap4-panda-common.dtsi | 251 ++++++
arch/arm/boot/dts/omap4-panda-es.dts | 5 +-
arch/arm/boot/dts/omap4-panda.dts | 201 +----
arch/arm/boot/dts/omap4-sdp.dts | 74 +-
arch/arm/boot/dts/omap4-var-som.dts | 2 +-
arch/arm/boot/dts/omap4.dtsi | 135 +++-
arch/arm/boot/dts/omap443x.dtsi | 27 +
arch/arm/boot/dts/omap4460.dtsi | 32 +
arch/arm/boot/dts/omap5-evm.dts | 110 ++-
arch/arm/boot/dts/omap5.dtsi | 245 +++++-
arch/arm/boot/dts/tegra114-dalmore.dts | 891 +++++++++++++++++++++
arch/arm/boot/dts/tegra114.dtsi | 240 +++++-
arch/arm/boot/dts/tegra20-colibri-512.dtsi | 12 +
arch/arm/boot/dts/tegra20-harmony.dts | 20 +
arch/arm/boot/dts/tegra20-medcom-wide.dts | 7 +
arch/arm/boot/dts/tegra20-paz00.dts | 10 +
arch/arm/boot/dts/tegra20-plutux.dts | 3 +
arch/arm/boot/dts/tegra20-seaboard.dts | 11 +
arch/arm/boot/dts/tegra20-tamonten.dtsi | 6 +
arch/arm/boot/dts/tegra20-tec.dts | 3 +
arch/arm/boot/dts/tegra20-trimslice.dts | 23 +
arch/arm/boot/dts/tegra20-ventana.dts | 22 +
arch/arm/boot/dts/tegra20-whistler.dts | 13 +
arch/arm/boot/dts/tegra20.dtsi | 53 +-
arch/arm/boot/dts/tegra30-beaver.dts | 8 +
arch/arm/boot/dts/tegra30-cardhu-a02.dts | 1 +
arch/arm/boot/dts/tegra30-cardhu-a04.dts | 1 +
arch/arm/boot/dts/tegra30-cardhu.dtsi | 11 +
arch/arm/boot/dts/tegra30.dtsi | 1 +
arch/arm/boot/dts/twl4030.dtsi | 18 +-
arch/arm/boot/dts/twl6030.dtsi | 12 +
arch/arm/mach-davinci/da8xx-dt.c | 6 +
arch/arm/mach-exynos/common.c | 53 +-
arch/arm/mach-exynos/include/mach/map.h | 1 -
arch/arm/mach-mxs/mach-mxs.c | 170 ----
arch/arm/mach-omap2/board-generic.c | 1 +
arch/arm/mach-omap2/omap_hwmod.c | 48 +-
arch/arm/mach-omap2/pmu.c | 14 +-
arch/arm/mach-omap2/timer.c | 7 +-
arch/arm/plat-omap/dmtimer.c | 241 +++---
arch/arm/plat-omap/include/plat/dmtimer.h | 1 +
drivers/dma/mxs-dma.c | 109 ++-
drivers/i2c/busses/i2c-mxs.c | 40 +-
drivers/mmc/host/mxs-mmc.c | 48 +-
drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 51 +-
drivers/mtd/nand/gpmi-nand/gpmi-nand.h | 3 +-
drivers/net/ethernet/freescale/fec.h | 1 +
drivers/net/ethernet/freescale/fec_main.c | 18 +-
drivers/spi/spi-davinci.c | 4 +-
drivers/spi/spi-mxs.c | 60 +-
drivers/tty/serial/mxs-auart.c | 52 +-
drivers/video/Kconfig | 2 +
drivers/video/mxsfb.c | 260 +++---
include/linux/mxsfb.h | 52 --
include/linux/spi/mxs-spi.h | 4 +-
143 files changed, 7751 insertions(+), 3048 deletions(-)
^ permalink raw reply [flat|nested] 13+ messages in thread* [GIT PULL 4/5] ARM: arm-soc: late cleanups
2013-05-07 17:26 [GIT PULL 0/5] ARM: Third batch of arm-soc changes for 3.10, again Arnd Bergmann
` (2 preceding siblings ...)
2013-05-07 17:26 ` [GIT PULL 3/5] ARM: arm-soc device tree changes, part 2 Arnd Bergmann
@ 2013-05-07 17:26 ` Arnd Bergmann
2013-05-07 23:19 ` Tony Lindgren
2013-05-07 17:26 ` [GIT PULL 5/5] ARM: arm-soc: late Exynos multiplatform changes Arnd Bergmann
2013-05-07 18:01 ` [GIT PULL 0/5] ARM: Third batch of arm-soc changes for 3.10, again Linus Torvalds
5 siblings, 1 reply; 13+ messages in thread
From: Arnd Bergmann @ 2013-05-07 17:26 UTC (permalink / raw)
To: linux-arm-kernel
These are cleanups and smaller changes that either depend on earlier
feature branches or came in late during the development cycle.
We normally try to get all cleanups early, so these are the exceptions:
- A follow-up on the clocksource reworks, hopefully the last time
we need to merge clocksource subsystem changes through arm-soc.
A first set of patches was part of the original 3.10 arm-soc cleanup
series because of interdependencies with timer drivers now moved out
of arch/arm.
- Migrating the SPEAr13xx platform away from using auxdata for DMA
channel descriptions towards using information in device tree,
based on the earlier SPEAr multiplatform series
- A few follow-ups on the Atmel SAMA5 support and other changes
for Atmel at91 based on the larger at91 reworks.
- Moving the armada irqchip implementation to drivers/irqchip
- Several OMAP cleanups following up on the larger series already
merged in 3.10.
There are a few more conflicts that we would like now:
Simple conflicts between unrelated add or del hunks:
- arch/arm/Kconfig
- arch/arm/mach-mvebu/Makefile
- arch/arm/mach-mvebu/armada-370-xp.c
- arch/arm/mach-spear/spear13xx.c
- drivers/irqchip/Makefile
And non-obvious ones:
- remove/modify conflict in arch/arm/mach-exynos/mach-exynos5-dt.c:
keep the modified line
- multiple changes to arch/arm/mach-vexpress/v2m.c:
keep of_clk_init(NULL), clocksource_of_init() and
versatile_sched_clock_init() calls
-------------------------------------------------------------
The following changes since commit
763e6b9 Merge tag 'dt-for-linus-2' into for-next
are available in the git repository at
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/cleanup-for-linus-2
you to fetch changes up to
0592c21 Merge tag 'omap-for-v3.10/fixes-for-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into late/cleanup
-------------------------------------------------------------
Archit Taneja (13):
arm: omap: board-2430: use generic dpi panel's gpio handling
arm: omap: board-devkit8000: use generic dpi panel's gpio handling
arm: omap: board-am3517: use generic dpi panel's gpio handling
arm: omap: board-ldp: use generic dpi panel's gpio handling
arm: omap: board-overo: use lb035q02 dpi panel's gpio handling
arm: omap: board-omap3evm: use sharp panel's gpio handling
arm: omap: board-sdp3430: use sharp panel's gpio handling
arm: omap: board-rx-51: use acx565akm panel's gpio handling
arm: omap: board-zoom: use NEC panel's gpio handling
arm: omap: board-omap3pandora: use tpo panel's gpio handling
arm: omap: dss-common: use picodlp panel's gpio handling
arm: omap boards: Remove unnecessary platform_enable/disable callbacks for VENC devices
arm: dss-common: don't use reset_gpio from omap4_panda_dvi_device
Arnd Bergmann (16):
spi: pl022: use generic DMA slave configuration if possible
serial: pl011: use generic DMA slave configuration if possible
Merge branch 'spear/multiplatform' into spear/dma
ARM: SPEAr13xx: Pass generic DW DMAC platform data from DT
ARM: make machine_desc->init_time default to clocksource_of_init
ARM: at91: suspend both memory controllers on at91sam9263
ata: arasan: remove the need for platform_data
Merge branch 'spear/multiplatform' into late/cleanup
Merge branch 'spear/dwdma' into late/cleanup
serial: amba-pl011: fix !CONFIG_DMA_ENGINE case
ARM: OMAP: remove unused variable
Merge tag 'at91-soc' of git://github.com/at91linux/linux-at91 into late/cleanup
ARM: SPEAr: conditionalize SMP code
Merge branch 'late/clksrc' into late/cleanup
Merge tag 'omap-for-v3.10/fixes-for-merge-window' of git://git.kernel.org/.../tmlind/linux-omap into late/cleanup
Merge tag 'cleanup-for-linus-2' into for-next
Haojian Zhuang (1):
devtree: add binding documentation for sp804
Kishon Vijay Abraham I (1):
ARM: OMAP4: change the device names in usb_bind_phy
Ludovic Desroches (3):
ARM: at91: dts: set #dma-cells to the correct value
ARM: at91: dts: add i2c dma support
ARM: at91: dts: add MCI DMA support
Nicolas Ferre (2):
ARM: at91: change "Unknown" qualifier SoC subtype handling
ARM: at91/sama5d34ek.dts: remove not needed compatibility string
Olof Johansson (7):
Merge tag 'clksrc-cleanup-for-3.10-part2' of git://sources.calxeda.com/kernel/linux into late/clksrc
Merge tag 'irqchip-3.10' of git://git.infradead.org/users/jcooper/linux into late/cleanup
Merge branch 'omap/fixes-non-critical' into late/cleanup
Merge branch 'omap/boards' into late/cleanup
Merge tag 'omap-for-v3.10/dss-signed' of git://git.kernel.org/.../tmlind/linux-omap into late/cleanup
Merge branch 'at91/soc' into late/cleanup
Merge tag 'at91-soc' of git://github.com/at91linux/linux-at91 into late/cleanup
Peter Ujfalusi (1):
ARM: OMAP: zoom: Use pwm stack for lcd and keyboard backlight
Rob Herring (13):
ARM: sched_clock: allow changing to higher frequency counter
ARM: make sched_clock just call a function pointer
ARM: arch_timer: use full 64-bit counter for sched_clock
ARM: convert arm/arm64 arch timer to use CLKSRC_OF init
OF: add empty of_device_is_available for !OF
ARM: timer-sp: convert to use CLKSRC_OF init
ARM: highbank: use OF init for sp804 timer
ARM: vexpress: remove sp804 OF init
ARM: dts: vexpress: disable CA9 core tile sp804 timer
ARM: vexpress: remove extra timer-sp control register clearing
ARM: versatile: add versatile dtbs to dtbs target
ARM: versatile: use OF init for sp804 timer
ARM: integrator-cp: convert use CLKSRC_OF for timer init
Stephen Boyd (1):
ARM: arch_timer: Silence debug preempt warnings
Thomas Petazzoni (4):
ARM: mvebu: move L2 cache initialization in init_early()
irqchip: move IRQ driver for Armada 370/XP
irqchip: armada-370-xp: move IRQ handler to avoid forward declaration
irqchip: armada-370-xp: slightly cleanup irq controller driver
Tomi Valkeinen (1):
arm: omap: board-cm-t35: use generic dpi panel's gpio handling
Tony Lindgren (1):
Merge branch '3.10-lo/board-cleanup' of git://gitorious.org/linux-omap-dss2/linux into omap-for-v3.10/dss
Vaibhav Hiremath (1):
ARM: OMAP2+: Fix mismerge for timer.c between ff931c82 and da4a686a
.../devicetree/bindings/arm/primecell.txt | 19 ++-
.../devicetree/bindings/ata/pata-arasan.txt | 22 ++++
Documentation/devicetree/bindings/serial/pl011.txt | 17 +++
.../devicetree/bindings/spi/spi_pl022.txt | 36 ++++++
.../devicetree/bindings/timer/arm,sp804.txt | 29 +++++
arch/arm/Kconfig | 1 +
arch/arm/boot/dts/Makefile | 2 +
arch/arm/boot/dts/at91sam9g45.dtsi | 5 +
arch/arm/boot/dts/at91sam9n12.dtsi | 9 ++
arch/arm/boot/dts/at91sam9x5.dtsi | 15 +++
arch/arm/boot/dts/integratorcp.dts | 6 +-
arch/arm/boot/dts/sama5d3.dtsi | 19 ++-
arch/arm/boot/dts/sama5d34ek.dts | 2 +-
arch/arm/boot/dts/spear1340.dtsi | 3 +
arch/arm/boot/dts/spear13xx.dtsi | 25 +++-
arch/arm/boot/dts/versatile-ab.dts | 12 ++
arch/arm/boot/dts/vexpress-v2p-ca9.dts | 1 +
arch/arm/common/timer-sp.c | 140 ++++++++++++++++++---
arch/arm/include/asm/arch_timer.h | 13 +-
arch/arm/include/asm/hardware/timer-sp.h | 16 ++-
arch/arm/include/asm/sched_clock.h | 2 +
arch/arm/kernel/arch_timer.c | 29 ++---
arch/arm/kernel/sched_clock.c | 15 ++-
arch/arm/kernel/time.c | 7 +-
arch/arm/mach-at91/cpuidle.c | 2 +
arch/arm/mach-at91/include/mach/cpu.h | 9 +-
arch/arm/mach-at91/pm.c | 2 +
arch/arm/mach-at91/pm.h | 30 ++++-
arch/arm/mach-at91/setup.c | 22 ++--
arch/arm/mach-highbank/highbank.c | 24 +---
arch/arm/mach-integrator/integrator_cp.c | 34 -----
arch/arm/mach-mvebu/Makefile | 2 +-
arch/arm/mach-mvebu/armada-370-xp.c | 9 +-
arch/arm/mach-omap2/board-2430sdp.c | 43 +------
arch/arm/mach-omap2/board-3430sdp.c | 53 +++-----
arch/arm/mach-omap2/board-4430sdp.c | 2 +-
arch/arm/mach-omap2/board-am3517evm.c | 74 +----------
arch/arm/mach-omap2/board-cm-t35.c | 60 ++-------
arch/arm/mach-omap2/board-devkit8000.c | 27 +---
arch/arm/mach-omap2/board-ldp.c | 61 ++-------
arch/arm/mach-omap2/board-omap3evm.c | 70 +++--------
arch/arm/mach-omap2/board-omap3pandora.c | 7 +-
arch/arm/mach-omap2/board-omap3stalker.c | 11 --
arch/arm/mach-omap2/board-omap4panda.c | 2 +-
arch/arm/mach-omap2/board-overo.c | 58 +++------
arch/arm/mach-omap2/board-rx51-video.c | 26 ++--
arch/arm/mach-omap2/board-zoom-display.c | 38 ++----
arch/arm/mach-omap2/dss-common.c | 54 +++-----
arch/arm/mach-omap2/timer.c | 7 +-
arch/arm/mach-shmobile/board-kzm9d.c | 1 -
arch/arm/mach-shmobile/setup-emev2.c | 1 -
arch/arm/mach-shmobile/setup-r8a7740.c | 1 -
arch/arm/mach-shmobile/setup-sh7372.c | 1 -
arch/arm/mach-shmobile/setup-sh73a0.c | 1 -
arch/arm/mach-shmobile/timer.c | 7 +-
arch/arm/mach-spear/Makefile | 6 +-
arch/arm/mach-spear/generic.h | 5 -
arch/arm/mach-spear/include/mach/spear.h | 2 -
arch/arm/mach-spear/spear1310.c | 30 +----
arch/arm/mach-spear/spear1340.c | 32 +----
arch/arm/mach-spear/spear13xx-dma.h | 128 -------------------
arch/arm/mach-spear/spear13xx.c | 60 +--------
arch/arm/mach-versatile/core.c | 26 ++--
arch/arm/mach-versatile/versatile_dt.c | 1 -
arch/arm/mach-vexpress/v2m.c | 25 +---
arch/arm/mach-virt/virt.c | 9 --
arch/arm64/include/asm/arch_timer.h | 5 +
arch/arm64/kernel/time.c | 6 +-
drivers/ata/pata_arasan_cf.c | 37 +++---
drivers/clocksource/Kconfig | 1 +
drivers/clocksource/arm_arch_timer.c | 33 +++--
drivers/clocksource/exynos_mct.c | 1 -
drivers/irqchip/Makefile | 1 +
.../irqchip}/irq-armada-370-xp.c | 106 ++++++++--------
drivers/spi/spi-pl022.c | 43 ++++++-
drivers/tty/serial/amba-pl011.c | 64 ++++++----
include/clocksource/arm_arch_timer.h | 6 -
include/linux/of.h | 5 +
include/linux/pata_arasan_cf_data.h | 2 -
79 files changed, 777 insertions(+), 1041 deletions(-)
^ permalink raw reply [flat|nested] 13+ messages in thread* [GIT PULL 4/5] ARM: arm-soc: late cleanups
2013-05-07 17:26 ` [GIT PULL 4/5] ARM: arm-soc: late cleanups Arnd Bergmann
@ 2013-05-07 23:19 ` Tony Lindgren
2013-05-08 0:59 ` Linus Torvalds
0 siblings, 1 reply; 13+ messages in thread
From: Tony Lindgren @ 2013-05-07 23:19 UTC (permalink / raw)
To: linux-arm-kernel
Linus,
* Arnd Bergmann <arnd@arndb.de> [130507 10:32]:
> The following changes since commit
>
> 763e6b9 Merge tag 'dt-for-linus-2' into for-next
>
> are available in the git repository at
>
> git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/cleanup-for-linus-2
...
> Vaibhav Hiremath (1):
> ARM: OMAP2+: Fix mismerge for timer.c between ff931c82 and da4a686a
Turns out this urgent boot fix got undone in the merge somehow.
Maybe just reapply it? The following should do it with some fuzz:
$ git show 626479696d2 | patch -p1
Or let me know if you want me to send you a patch.
Then in addition to the above, I'm also seeing a regression with commit
8a965b3b (mm, slab_common: Fix bootstrap creation of kmalloc caches),
but it seems to be related to some kconfig option. Seeing it on at least
omap and vexpress, I'll post more info on that once I've tracked it down:
[ 0.000000] Unable to handle kernel NULL pointer dereference at virtual address 00000054
[ 0.000000] pgd = c0004000
[ 0.000000] [00000054] *pgd=00000000
[ 0.000000] Internal error: Oops: 5 [#1] SMP ARM
[ 0.000000] Modules linked in:
[ 0.000000] CPU: 0 PID: 0 Comm: swapper/0 Not tainted 3.9.0-11485-gbb9055b #633
[ 0.000000] task: c078d7d0 ti: c0782000 task.ti: c0782000
[ 0.000000] PC is at kmem_cache_alloc_trace+0x50/0x178
[ 0.000000] LR is at kmem_cache_alloc_trace+0x38/0x178
[ 0.000000] pc : [<c010d058>] lr : [<c010d040>] psr: 600001d3
[ 0.000000] sp : c0783f70 ip : 600001d3 fp : 00000000
[ 0.000000] r10: 000000c0 r9 : c00a5444 r8 : 000080d0
[ 0.000000] r7 : 00000000 r6 : 600001d3 r5 : 00000000 r4 : 00008000
[ 0.000000] r3 : 00000050 r2 : c0782000 r1 : c078d7d0 r0 : c010d040
[ 0.000000] Flags: nZCv IRQs off FIQs off Mode SVC_32 ISA ARM Segment kernel
[ 0.000000] Control: 10c5387d Table: 80004019 DAC: 00000015
[ 0.000000] Process swapper/0 (pid: 0, stack limit = 0xc0782240)
[ 0.000000] Stack: (0xc0783f70 to 0xc0784000)
[ 0.000000] 3f60: 00002014 00000010 c07d6510 00000000
[ 0.000000] 3f80: 00000000 00000000 00000000 413fc082 c078a480 c00a5444 c07d6510 00000000
[ 0.000000] 3fa0: 00000010 c0766348 ffffffff c073cfb4 bfffffff c080d78c c080d780 c0720828
[ 0.000000] 3fc0: ffffffff ffffffff c0720478 00000000 00000000 c0766348 00000000 10c5387d
[ 0.000000] 3fe0: c078a4c8 c076674c c078ecb4 80004059 00000000 80008074 00000000 00000000
[ 0.000000] [<c010d058>] (kmem_cache_alloc_trace+0x50/0x178) from [<c00a5444>] (alloc_desc+0x24/0xb4)
[ 0.000000] [<c00a5444>] (alloc_desc+0x24/0xb4) from [<c073cfb4>] (early_irq_init+0x78/0xec)
[ 0.000000] [<c073cfb4>] (early_irq_init+0x78/0xec) from [<c0720828>] (start_kernel+0x17c/0x33c)
[ 0.000000] [<c0720828>] (start_kernel+0x17c/0x33c) from [<80008074>] (0x80008074)
[ 0.000000] Code: e5923014 e2833014 e1a03103 e0873003 (e5931004)
[ 0.000000] ---[ end trace 1b75b31a2719ed1c ]---
[ 0.000000] Kernel panic - not syncing: Attempted to kill the idle task!
Regards,
Tony
^ permalink raw reply [flat|nested] 13+ messages in thread
* [GIT PULL 4/5] ARM: arm-soc: late cleanups
2013-05-07 23:19 ` Tony Lindgren
@ 2013-05-08 0:59 ` Linus Torvalds
2013-05-08 3:17 ` Tony Lindgren
0 siblings, 1 reply; 13+ messages in thread
From: Linus Torvalds @ 2013-05-08 0:59 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, May 7, 2013 at 4:19 PM, Tony Lindgren <tony@atomide.com> wrote:
>
>> Vaibhav Hiremath (1):
>> ARM: OMAP2+: Fix mismerge for timer.c between ff931c82 and da4a686a
>
> Turns out this urgent boot fix got undone in the merge somehow.
Those lines actually disappeared already much earlier in my merge 6fa52ed33bea:
Merge tag 'drivers-for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
last Saturday.
And it's my bad. I even know how it happened: I ended up doing that
merge twice (because I had to go back and fix something else), and
then I "optimized" it the second time. With all the omap2 conflicts
from that tree came from duplicate commits from the ARM tree, and I
ended up just taking the drivers-for-linus side for
arch/arm/mach-omap2. Which was correct for the other two files in
there (gpmc.c and gpmc-onenand.c). but the timer.c file had changes
from the arm tree.
Sorry about that one.
Linus
^ permalink raw reply [flat|nested] 13+ messages in thread* [GIT PULL 4/5] ARM: arm-soc: late cleanups
2013-05-08 0:59 ` Linus Torvalds
@ 2013-05-08 3:17 ` Tony Lindgren
2013-05-08 3:48 ` Linus Torvalds
0 siblings, 1 reply; 13+ messages in thread
From: Tony Lindgren @ 2013-05-08 3:17 UTC (permalink / raw)
To: linux-arm-kernel
* Linus Torvalds <torvalds@linux-foundation.org> [130507 18:05]:
> On Tue, May 7, 2013 at 4:19 PM, Tony Lindgren <tony@atomide.com> wrote:
> >
> >> Vaibhav Hiremath (1):
> >> ARM: OMAP2+: Fix mismerge for timer.c between ff931c82 and da4a686a
> >
> > Turns out this urgent boot fix got undone in the merge somehow.
>
> Those lines actually disappeared already much earlier in my merge 6fa52ed33bea:
>
> Merge tag 'drivers-for-linus' of
> git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
>
> last Saturday.
Yes then we patched it on Sunday, and Arnd merged it into his branch.
But then hose lines disappeared again for the third time :)
> And it's my bad. I even know how it happened: I ended up doing that
> merge twice (because I had to go back and fix something else), and
> then I "optimized" it the second time. With all the omap2 conflicts
> from that tree came from duplicate commits from the ARM tree, and I
> ended up just taking the drivers-for-linus side for
> arch/arm/mach-omap2. Which was correct for the other two files in
> there (gpmc.c and gpmc-onenand.c). but the timer.c file had changes
> from the arm tree.
>
> Sorry about that one.
No problem, thanks for fixing it quickly.
Regards,
Tony
^ permalink raw reply [flat|nested] 13+ messages in thread
* [GIT PULL 4/5] ARM: arm-soc: late cleanups
2013-05-08 3:17 ` Tony Lindgren
@ 2013-05-08 3:48 ` Linus Torvalds
2013-05-08 4:27 ` Olof Johansson
0 siblings, 1 reply; 13+ messages in thread
From: Linus Torvalds @ 2013-05-08 3:48 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, May 7, 2013 at 8:17 PM, Tony Lindgren <tony@atomide.com> wrote:
>
> Yes then we patched it on Sunday, and Arnd merged it into his branch.
> But then hose lines disappeared again for the third time :)
Yes, but that's because it's entirely pointless to "fix" things in the
wrong branch, especially after a back-merge.
So what ended up happening is that when I then pulled the next time,
you had random back-merges in your ARM tree (well, not you personally,
but Arnd), and as a result the later merge didn't have just one merge
base, it actually had *five* separate merge bases: all independent
common ancestors of the two branches being merged (*).
And *some* of the common ancestors had the lines, some didn't. And my
mainline didn't. So git merge decides that "hey, those lines used to
exist in the common ancestor of this new merge, but they don't exist
in mainline, and they still exist in the thing getting merged"
What do you think happens? Think about it.
The only reasonable thing to do (and git always does reasonable
things) is to say "oh, mainline must have *removed* those lines".
Git goes "The branch I'm merging clearly didn't do anything at all to
the lines: they used to exist back in the shared history, and they
still exist in the exact same form in the branch I'm merging." So they
stay removed in mainline.
(Ok, so that's anthropomorphising git to a fairly extreme point, but
it's actually pretty close to being the technical truth. As far as the
merge was concerned, Arnd's branch didn't really add those lines at
all, because they already existed when his branch started. The fact
that they went away and came back again is totally immaterial).
And this, btw, is just one more reason why back-merges are not a good
idea. It makes it basically impossible to say "so did you add or
remove something"? When you have multiple independent points in
history that are common to both branches, it's fundamentally ambiguous
whether merging things adds something that went away and came back
again in that shared history.
Criss-crossing merges are a horrible horrible idea, and the only sane
way to not criss-cross is to say "avoid back-merging from upstream".
Side note: these kinds of issues are unusual. You really have to do
something special to trigger this, but this is not unique. We've had
similar things happen in the past, and you don't actually need a
mis-merge for it to happen. You do need criss-crossing merges, though,
because that's how you get "oh, we have N different commits that are
all shared points in history, but are not ancestors of each other" (ie
what git calls "merge bases").
And no, this kind of thing does not happen every time you have
multiple merge bases. But multiple merge bases, together with code
that has gone back and forth on some issue, really is a very very bad
idea. In this case, the mis-merge was just the thing that triggered
"code went back-and-forth", but similar things can happen when you
have code that gets reverted and then re-done, and you have multiple
merge bases (one of which has the revert, while one has the re-doing
of it..)
The good news is that this is very rarely a real problem. The bad news
is that it's such a rare problem that people aren't even aware of it
as a problem (and reasonably *shouldn't* be aware of it as a
problem!). So when it happens, people get confused, because they've
never seen it before, and they get even more confused when their
"solution" (back-merge from upstream, fix it there, ask upstream to
pull the fix) doesn't actually fix anything, because you just end up
in the same situation *again*..
Linus
(*) Why five merge bases? Look at what my merge of those late cleanups
actually had to contend with:
git merge-base --all 1bf25e78af31^ 1bf25e78af31^2
and notice how you get five different commits. They are all commits
that are common to *both* parents of that merge. You can try do
gitk 1bf25e78af31^...1bf25e78af31^2
and try to figure those kinds of things out by hand. You can't, unless
you're superhuman. Because the history is a f*cking mess due to all
the back-merges. Yeah, yeah, none of them are pulling from "me", but
all of them are pulling from random other branches that people had
asked me to pull earlier, so they were basically mixing up history.
The ARM history has gotten much much better, but it's full of these
kinds of incestuous merges. The pull requests I get are not truly
independent development, although especially the early pull requests
are much less tightly coupled than they used to be.
^ permalink raw reply [flat|nested] 13+ messages in thread* [GIT PULL 4/5] ARM: arm-soc: late cleanups
2013-05-08 3:48 ` Linus Torvalds
@ 2013-05-08 4:27 ` Olof Johansson
0 siblings, 0 replies; 13+ messages in thread
From: Olof Johansson @ 2013-05-08 4:27 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, May 7, 2013 at 8:48 PM, Linus Torvalds
<torvalds@linux-foundation.org> wrote:
> The ARM history has gotten much much better, but it's full of these
> kinds of incestuous merges. The pull requests I get are not truly
> independent development, although especially the early pull requests
> are much less tightly coupled than they used to be.
A lot of this comes from the way we structure the submaintainers
submissions to arm-soc: Cleanups on the bottom, then new SoC support,
then board and dt changes, etc. It means there are a lot of branches
that build on top of each other. It's not uncommon that a
submaintainer needs to build some new feature on top of both some
cleanup as well as some other new development, which is then what
causes some of these merges and backmerges.
While our splitting into categories (cleanup/soc/board/dt/drivers)
isn't 100% natural for each submaintainer, it does allow us to force
some thought into how it all fits together between vendors, and it
also allows us to split the code up into sets that make a bit more
sense (IMHO) when it's sent up to you.
Our lives (short-term) would be a lot easier if we just did one long
single branch and we sent that up, with mostly serial history. But I
also think it's been working reasonably well to expose a bit more
w.r.t. who's spending efforts on cleanup and refactoring old code
code, and who's pumping in new features and drivers.
I'm definitely open for suggestions on how to improve the way we do things.
-Olof
^ permalink raw reply [flat|nested] 13+ messages in thread
* [GIT PULL 5/5] ARM: arm-soc: late Exynos multiplatform changes
2013-05-07 17:26 [GIT PULL 0/5] ARM: Third batch of arm-soc changes for 3.10, again Arnd Bergmann
` (3 preceding siblings ...)
2013-05-07 17:26 ` [GIT PULL 4/5] ARM: arm-soc: late cleanups Arnd Bergmann
@ 2013-05-07 17:26 ` Arnd Bergmann
2013-05-07 18:01 ` [GIT PULL 0/5] ARM: Third batch of arm-soc changes for 3.10, again Linus Torvalds
5 siblings, 0 replies; 13+ messages in thread
From: Arnd Bergmann @ 2013-05-07 17:26 UTC (permalink / raw)
To: linux-arm-kernel
These continue the multiplatform support for exynos, adding support
for building most of the essential drivers (clocksource, clk, irqchip)
when combined with other platforms. As a result, it should become
really easy to add full multiplatform exynos support in 3.11, although
we don't yet enable it for 3.10.
The changes were not included in the earlier multiplatform series
in order to avoid clashes with the other Exynos updates.
This also includes work from Tomasz Figa to fix the pwm clocksource
code on Exynos, which is not strictly required for multiplatform,
but related to the other patches in this set and needed as a bug
fix for at least one board.
Conflicts:
- in arch/arm/mach-exynos/common.c, the irq_set_wake callback
gets added, while a call to s5p_init_irq() gets removed and
the prototype for combiner_init changes.
-------------------------------------------------------------
The following changes since commit
e8b1270 Merge tag 'cleanup-for-linus-2' into for-next
are available in the git repository at
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/multiplatform-for-linus-2
you to fetch changes up to
241a987 Merge branch 'exynos/pwm-clocksource' into late/multiplatform
-------------------------------------------------------------
Arnd Bergmann (12):
clk: exynos: prepare for multiplatform
clocksource: exynos_mct: remove platform header dependency
ARM: exynos: add missing properties for combiner IRQs
irqchip: exynos: pass max combiner number to combiner_init
irqchip: exynos: allocate combiner_data dynamically
irqchip: exynos: localize irq lookup for ATAGS
irqchip: exynos: pass irq_base from platform
irqchip: exynos: look up irq using irq_find_mapping
Merge branch 'next/drivers' into late/multiplatform
Merge branch 'samsung/exynos-multiplatform-drivers' into late/multiplatform
Merge branch 'exynos/pwm-clocksource' into late/multiplatform
Merge tag 'multiplatform-for-linus-2' into for-next
Olof Johansson (1):
ARM: dts: exynops4210: really add universal_c210 dts
Tomasz Figa (13):
clocksource: add samsung pwm timer driver
Documentation: Add device tree bindings for Samsung PWM timers
clocksource: samsung_pwm_timer: Let platforms select the driver
clocksource: samsung_pwm_timer: Make PWM spinlock global
clocksource: samsung_pwm_timer: Keep all driver data in a structure
clocksource: samsung_pwm_timer: Drop unused samsung_pwm struct
clocksource: samsung_pwm_timer: Add support for non-DT platforms
clocksource: samsung_pwm_timer: Use proper clockevents max_delta
clocksource: samsung_pwm_timer: Correct programming of clock events
clocksource: samsung_pwm_timer: Work around rounding errors in clockevents core
ARM: SAMSUNG: Do not register legacy timer interrupts on Exynos
ARM: dts: exynos4: Add node for PWM device
ARM: dts: exynos4210: Add basic dts file for universal_c210 board
.../devicetree/bindings/pwm/pwm-samsung.txt | 43 ++
arch/arm/boot/dts/Makefile | 1 +
arch/arm/boot/dts/exynos4.dtsi | 8 +
arch/arm/boot/dts/exynos4210-universal_c210.dts | 352 +++++++++++++++
arch/arm/boot/dts/exynos4210.dtsi | 1 +
arch/arm/boot/dts/exynos4212.dtsi | 9 +
arch/arm/boot/dts/exynos4412.dtsi | 9 +
arch/arm/mach-exynos/common.c | 35 +-
arch/arm/mach-exynos/common.h | 7 +-
arch/arm/plat-samsung/Kconfig | 4 +-
drivers/clk/samsung/clk-exynos4.c | 93 ++--
drivers/clk/samsung/clk-exynos5250.c | 1 -
drivers/clk/samsung/clk-exynos5440.c | 1 -
drivers/clk/samsung/clk.h | 2 -
drivers/clocksource/Kconfig | 9 +
drivers/clocksource/Makefile | 1 +
drivers/clocksource/exynos_mct.c | 21 +-
drivers/clocksource/samsung_pwm_timer.c | 494 +++++++++++++++++++++
drivers/irqchip/exynos-combiner.c | 125 +++---
include/clocksource/samsung_pwm.h | 36 ++
20 files changed, 1098 insertions(+), 154 deletions(-)
^ permalink raw reply [flat|nested] 13+ messages in thread* [GIT PULL 0/5] ARM: Third batch of arm-soc changes for 3.10, again
2013-05-07 17:26 [GIT PULL 0/5] ARM: Third batch of arm-soc changes for 3.10, again Arnd Bergmann
` (4 preceding siblings ...)
2013-05-07 17:26 ` [GIT PULL 5/5] ARM: arm-soc: late Exynos multiplatform changes Arnd Bergmann
@ 2013-05-07 18:01 ` Linus Torvalds
2013-05-07 18:41 ` Arnd Bergmann
5 siblings, 1 reply; 13+ messages in thread
From: Linus Torvalds @ 2013-05-07 18:01 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, May 7, 2013 at 10:26 AM, Arnd Bergmann <arnd@arndb.de> wrote:
>
> Here are the same pull requests as before, with numbers and distinct
> time stamps. I hope I didn't screw up in a different way this time.
Ok, I notice that you seem to have forgotten the "--summary" flag from
your diffstat in your new script.
Not a showstopper, but make sure that the diffstat flags are
"git diff -M --stat --summary"
(And yes, I prefer "-M", not "-C", because while copy information is
interesting, it tends to hide the fact that the copying added a lot of
lines, so the "-C" flag ends up not giving as good line add/del
information, even if the data that something looks like a copy of
another file is interesting).
Linus
^ permalink raw reply [flat|nested] 13+ messages in thread* [GIT PULL 0/5] ARM: Third batch of arm-soc changes for 3.10, again
2013-05-07 18:01 ` [GIT PULL 0/5] ARM: Third batch of arm-soc changes for 3.10, again Linus Torvalds
@ 2013-05-07 18:41 ` Arnd Bergmann
0 siblings, 0 replies; 13+ messages in thread
From: Arnd Bergmann @ 2013-05-07 18:41 UTC (permalink / raw)
To: linux-arm-kernel
On Tuesday 07 May 2013, Linus Torvalds wrote:
> On Tue, May 7, 2013 at 10:26 AM, Arnd Bergmann <arnd@arndb.de> wrote:
> >
> > Here are the same pull requests as before, with numbers and distinct
> > time stamps. I hope I didn't screw up in a different way this time.
>
> Ok, I notice that you seem to have forgotten the "--summary" flag from
> your diffstat in your new script.
>
> Not a showstopper, but make sure that the diffstat flags are
>
> "git diff -M --stat --summary"
>
> (And yes, I prefer "-M", not "-C", because while copy information is
> interesting, it tends to hide the fact that the copying added a lot of
> lines, so the "-C" flag ends up not giving as good line add/del
> information, even if the data that something looks like a copy of
> another file is interesting).
Right, another thing that I actually knew and then forgot to do. Olof
has just sent me the script he used the past few times, I'll use that
in the future.
Arnd
^ permalink raw reply [flat|nested] 13+ messages in thread