Skip to content
  1. Dec 11, 2013
  3. Dec 09, 2013
  5. Dec 05, 2013
    • Olof Johansson's avatar
      Merge tag 'DT-for-v3.14-part-1' of http://git.stlinux.com/devel/kernel/linux-sti into next/dt · 64bf54f7
      Olof Johansson authored 
      From Srinivas Handagatla, DT updates for STi platforms.

* tag 'DT-for-v3.14-part-1' of http://git.stlinux.com/devel/kernel/linux-sti

:
  ARM: STi: Add I2C config to B2000 and B2020 boards
  ARM: STi: Supply I2C configuration to STiH415 SoC
  ARM: STi: Supply I2C configuration to STiH416 SoC
  ARM: STi: OF: Fix a typo in pincfg header

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      64bf54f7
    • Olof Johansson's avatar
      Merge tag 'at91-cleanup' of git://github.com/at91linux/linux-at91 into next/cleanup · 94c5216e
      Olof Johansson authored 
      From Nicolas Ferre:
AT91: Move to Common Clock Framework and sama5d3 implementation
This is the first step to move AT91 to the CCF.
- core CCF and drivers for most of the clocks
- use of CCF for sama5d3 (100% DT-based)

* tag 'at91-cleanup' of git://github.com/at91linux/linux-at91

: (22 commits)
  ARM: at91/dt: remove old clk material
  ARM: at91: move sama5d3 SoC to common clk
  ARM: at91/dt: define sama5d3xek's main clk frequency
  ARM: at91/dt: define sama5d3 clocks
  ARM: at91: prepare common clk transition for sama5d3 SoC
  ARM: at91: prepare sama5 dt boards transition to common clk
  ARM: at91: add new compatible strings for pmc driver
  ARM: at91: move pit timer to common clk framework
  dt: binding: add at91 clks dt bindings documentation
  clk: at91: add PMC smd clock
  clk: at91: add PMC usb clock
  clk: at91: add PMC utmi clock
  clk: at91: add PMC programmable clocks
  clk: at91: add PMC peripheral clocks
  clk: at91: add PMC system clocks
  clk: at91: add PMC master clock
  clk: at91: add PMC pll clocks
  clk: at91: add PMC main clock
  clk: at91: add PMC macro file for dt definitions
  clk: at91: add PMC base support
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      94c5216e
    • Olof Johansson's avatar
      Merge commit 'fixes' into next/cleanup · 330641ce
      Olof Johansson authored 
      

Merging in post-rc1 fixes that have gone into rc2/3 to avoid later conflicts.

* commit 'fixes': (39 commits)
  arm: dts: socfpga: Change some clocks of gate-clk type to perip-clk
  arm: socfpga: Enable ARM_TWD for socfpga
  ARM: multi_v7_defconfig: enable SDHCI_BCM_KONA and MMC_BLOCK_MINORS=16
  ARM: sunxi_defconfig: enable NFS, TMPFS, PRINTK_TIME and nfsroot support
  ARM: multi_v7_defconfig: enable network for BeagleBone Black
  ARM: dts: Fix the name of supplies for smsc911x shared by OMAP
  ARM: OMAP2+: Powerdomain: Fix unchecked dereference of arch_pwrdm
  ARM: dts: omap3-beagle: Add omap-twl4030 audio support
  ARM: dts: omap4-sdp: Fix pin muxing for wl12xx
  ARM: dts: omap4-panda-common: Fix pin muxing for wl12xx
  ARM: at91: fixed unresolved symbol "at91_pm_set_standby" when built without CONFIG_PM
  ARM: at91: add usart3 alias to dtsi
  ARM: at91: sama5d3: reduce TWI internal clock frequency
  mmc: omap: Fix I2C dependency and make driver usable with device tree
  mmc: omap: Fix DMA configuration to not rely on device id
  ARM: dts: omap3-beagle: Fix USB host on beagle boards (for 3.13)
  ARM: dts: omap3-igep0020: name twl4030 VPLL2 regulator as vdds_dsi
  ARM: dts: AM33XX IGEP0033: add USB support
  ARM: dts: AM33XX BASE0033: add 32KBit EEPROM support
  ARM: dts: AM33XX BASE0033: add pinmux and user led support
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      330641ce
  7. Dec 04, 2013
    • Linus Walleij's avatar
      ARM: integrator: move EBI to the device tree · 307b9667
      Linus Walleij authored 
      

This moves the External Bus Interface (EBI) over to a device
tree node and deletes the static mappings from the platform.

Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
      307b9667
    • Linus Walleij's avatar
      ARM: integrator: delete static core module mappings · 78d16321
      Linus Walleij authored 
      

Now that the core module base is taken from the device tree
both for platform initialization and cpufreq, let's delete
the static mappings.

Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
      78d16321
    • Maxime COQUELIN's avatar
      ARM: STi: Add I2C config to B2000 and B2020 boards · c6fddbd4
      Maxime COQUELIN authored 
      

This patch supplies I2C configuration to B2000 and B2020
based on either STiH415 or STiH416 SoCs.

Signed-off-by: default avatarMaxime Coquelin <maxime.coquelin@st.com>
Acked-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@st.com>
      c6fddbd4
    • Maxime COQUELIN's avatar
      ARM: STi: Supply I2C configuration to STiH415 SoC · 5bbb7527
      Maxime COQUELIN authored 
      

This patch supplies I2C configuration to STiH415 SoC.

Signed-off-by: default avatarMaxime Coquelin <maxime.coquelin@st.com>
Acked-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@st.com>
      5bbb7527
    • Maxime COQUELIN's avatar
      ARM: STi: Supply I2C configuration to STiH416 SoC · f53e99a9
      Maxime COQUELIN authored 
      

This patch supplies I2C configuration to STiH416 SoC.

Signed-off-by: default avatarMaxime Coquelin <maxime.coquelin@st.com>
Acked-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@st.com>
      f53e99a9
    • Srinivas Kandagatla's avatar
      ARM: STi: OF: Fix a typo in pincfg header · 1bf17b82
      Srinivas Kandagatla authored 
      

This patch fixes a typo for OD define in st-pincfg header file.

Reported-by: default avatarMaxime Coquelin <maxime.coquelin@st.com>
Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@st.com>
      1bf17b82
    • Olof Johansson's avatar
      Merge tag 'mvebu-dt-3.14' of git://git.infradead.org/linux-mvebu into next/dt · 25e9cd46
      Olof Johansson authored 
      From Jason Cooper:
mvebu DT changes for v3.14

 - mvebu:
    - remove unneeded OS-specific properties from led nodes
    - add NAND controller to Armada boards
    - add sata leds to readynas 104
    - add gpio-poweroff to readynas duo v2

 - kirkwood:
    - comment cleanup in sheevaplug files
    - default pinctrl for sdio
    - sdio in guruplug is non-removable

 - orion5x:
    - typo fix

 - dove:
    - typo fix
    - add PMU interrupt controller and RTC interrupt via same

* tag 'mvebu-dt-3.14' of git://git.infradead.org/linux-mvebu

:
  ARM: Dove: Add RTC interrupt via PMU interrupt controller.
  ARM: Dove: Add DT node for PMU interrupt controller.
  ARM: mvebu: Add DT entry for ReadyNAS Duo v2 to use gpio-poweroff driver
  ARM: mvebu: Add RN104 SATA LEDs driven via NXP PCA9554 I2C to GPIO muxer
  ARM: kirkwood: mark guruplug sdio as non-removable
  ARM: kirkwood: provide pinctrl default to sdio nodes
  ARM: dove: Fix typo in device_type property of phy node
  ARM: orion5x: Fix typo in device_type property of phy node
  ARM: mvebu: Enable NAND controller in Armada 370 Mirabox
  ARM: mvebu: Enable NAND controller in Armada XP GP board
  ARM: mvebu: Add support for NAND controller in Armada 370/XP
  ARM: kirkwood: Cleanup comments in Sheevaplug dts files
  ARM: mvebu: dts: remove unneeded linux,default-state from led nodes

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      25e9cd46
    • Olof Johansson's avatar
      Merge tag 'mvebu-soc-3.14' of git://git.infradead.org/linux-mvebu into next/cleanup · 63167569
      Olof Johansson authored 
      From Jason Cooper:
mvebu soc changes for v3.14

 - orion:
    - remove IRQF_DISABLED
    - directly include some .h files

 - mvebu:
    - remove some sparse warnings

 - orion5x:
    - include cleanup
    - warning removal for C=1

 - kirkwood:
    - remove legacy clock workarounds
    - stop rpinting a TCLK value of 0 for DT boards

 - dove:
    - warning removal for C=1

* tag 'mvebu-soc-3.14' of git://git.infradead.org/linux-mvebu

:
  ARM: mvebu: fix some sparse warnings
  ARM: kirkwood: stop printk TCLK value at boot for DT boards
  ARM: orion5x: drop unused include from common.c
  ARM: Dove: Fix compiler warnings with C=1 builds
  ARM: Orion5x: Fix warnings when using C=1.
  ARM: Orion: Add missing includes
  ARM: kirkwood: remove lagacy clk workarounds
  arm: plat-orion: remove deprecated IRQF_DISABLED

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      63167569
    • Olof Johansson's avatar
      Merge tag 'renesas-cleanup-for-v3.14' of... · 6ecf49bc
      Olof Johansson authored 
      Merge tag 'renesas-cleanup-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/cleanup

From Simon Horman:

Renesas ARM based SoC cleanups for v3.14

* Tidy up clock table order for r7s72100, r8a7779, r8a7779, r8a7790,
  sh7372 and sh73a0 SoCs.
* Tidy up camera-rcar header for r8a7779 SoC
* Tidy up registration of VIN on r8a7779 SoC
* Tidy up PFC registration on r8a7790 SoC
* Correct typo in clocks for r8a7790 SoC
* Don't use named resources for IPMMU, I2C and TMU on sh73a0 SoC
* Don't use named resources for MMCIF and SDHI on ape6evm board
* Don't use named resources for MMCIF on lager board
* Tidy up device registration on lager board
* Tidy up headers for bockw board

* tag 'renesas-cleanup-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

:
  ARM: shmobile: sh7372: tidyup clock table order
  ARM: shmobile: r7s72100: tidyup clock table order
  ARM: shmobile: sh73a0: tidyup clock table order
  ARM: shmobile: r8a7779: cleanup registration of sh_eth
  ARM: shmobile: r8a7790: Correct typo in clocks
  ARM: shmobile: r8a7779: camera-rcar header cleanup
  ARM: shmobile: Add r8a7790_register_pfc() function
  ARM: shmobile: Cosmetic update of Lager DT Reference
  ARM: shmobile: r8a7779: cleanup registration of VIN
  ARM: shmobile: bockw: header cleanup
  ARM: shmobile: sh73a0: don't use named resource for IPMMU
  ARM: shmobile: sh73a0: don't use named resource for I2C
  ARM: shmobile: sh73a0: don't use named resource for TMU
  ARM: shmobile: lager: don't use named resource for MMCIF
  ARM: shmobile: ape6evm: don't use named resource for SDHI
  ARM: shmobile: ape6evm: don't use named resource for MMCIF

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      6ecf49bc
    • Olof Johansson's avatar
      Merge tag 'ux500-devicetree-v3.14-1' of... · dab71939
      Olof Johansson authored 
      Merge tag 'ux500-devicetree-v3.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/dt

From Linus Walleij:

Ux500 device tree patches for v3.14, take one:

- Fix up tc3589x bindings so this chip works again.

- Remove SSP platform devices, as we now boot from device tree
  exclusively.

- Delete surplus AB8500/DB8500 platform data, not obtained from
  the device tree.

- Add DMA config for the MSP devices.

- A series of 21 patches moving pin control config for the
  on-chip Nomadik pin controller from the board file
  to the device tree, step by step.

- Two patches to the STE DMA40 driver regarding the high-prio
  DMA channel so this can be moved to the device tree. Both have
  Vinod's ACK.

- Decommission of the non-device tree boot path for the timer
  initialization code.

- Deletion of the non-devicetree probe path from the MTU timer
  driver, as all platforms using it are now using device tree.
  This has Daniel Lezcano's ACK.

* tag 'ux500-devicetree-v3.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson

: (39 commits)
  ARM: ux500: decomission custom SMP TWD timer init
  clksrc: delete nomadik MTU non-DT boot path
  ARM: ux500: decomission the non-DT MTU init sequence
  dma: ste_dma40: Parse flags property for new 'high priority channel' request
  dma: ste_dma40: Expand DT binding to accept 'high-priority channel' flag
  ARM: ux500: Remove checking for DT during timer init
  ARM: ux500: Clean-up legacy extern prototype
  ARM: ux500: Remove unused call to register AMBA devices
  ARM: ux500: Clean-up non-DT IRQ initialisation
  pinctrl: nomadik: decomission non-DT boot path
  pinctrl: nomadik: move platform data handling into driver
  ARM: ux500: get rid of unused header
  ARM: ux500: delete Nomadik pinctrl AUXDATA
  ARM: ux500: delete remnant pin config macros
  ARM: ux500: move snowball pin configs to device tree
  ARM: ux500: move snowball LED pin control to device tree
  ARM: ux500: convert Snowball SPI pin reference
  ARM: ux500: move snowball ethernet config to device tree
  ARM: ux500: move HREFv60plus pin configs to device tree
  ARM: ux500: move final HREFv60 LCD pins to device tree
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      dab71939
    • Dinh Nguyen's avatar
      arm: dts: socfpga: Change some clocks of gate-clk type to perip-clk · a5c6e87a
      Dinh Nguyen authored 
      

Some of the clocks that were designated gate-clk do not have a gate, so
change those clocks to be of periph-clk type.

Signed-off-by: default avatarDinh Nguyen <dinguyen@altera.com>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      a5c6e87a