02 Oct, 2012
2 commits
-
This fixes a local merge conflict resolution done wrong locally in
arm-soc for-next. soc.h was added on a cleanup branch, but the driver
was moved and the header no longer needed.Signed-off-by: Olof Johansson
[ .. and I did the same wrong merge, since git automatically does the
whole rename detection etc, so applying this patch from Olof - Linus ]
Signed-off-by: Linus Torvalds -
Pull ARM soc driver specific changes from Olof Johansson:
- A long-coming conversion of various platforms to a common LED
infrastructure
- AT91 is moved over to use the newer MCI driver for MMC
- Pincontrol conversions for samsung platforms
- DT bindings for gscaler on samsung
- i2c driver fixes for tegra, acked by i2c maintainerFix up conflicts as per Olof.
* tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (48 commits)
drivers: bus: omap_l3: use resources instead of hardcoded irqs
pinctrl: exynos: Fix wakeup IRQ domain registration check
pinctrl: samsung: Uninline samsung_pinctrl_get_soc_data
pinctrl: exynos: Correct the detection of wakeup-eint node
pinctrl: exynos: Mark exynos_irq_demux_eint as inline
pinctrl: exynos: Handle only unmasked wakeup interrupts
pinctrl: exynos: Fix typos in gpio/wkup _irq_mask
pinctrl: exynos: Set pin function to EINT in irq_set_type of GPIO EINTa
drivers: bus: Move the OMAP interconnect driver to drivers/bus/
i2c: tegra: dynamically control fast clk
i2c: tegra: I2_M_NOSTART functionality not supported in Tegra20
ARM: tegra: clock: remove unused clock entry for i2c
ARM: tegra: clock: add connection name in i2c clock entry
i2c: tegra: pass proper name for getting clock
ARM: tegra: clock: add i2c fast clock entry in clock table
ARM: EXYNOS: Adds G-Scaler device from Device Tree
ARM: EXYNOS: Add clock support for G-Scaler
ARM: EXYNOS: Enable pinctrl driver support for EXYNOS4 device tree enabled platform
ARM: dts: Add pinctrl node entries for SAMSUNG EXYNOS4210 SoC
ARM: EXYNOS: skip wakeup interrupt setup if pinctrl driver is used
...
21 Sep, 2012
1 commit
-
This fixes up a merge conflict due to the move of the driver and cleanups of
platform data around the same time. Moving to the resource is what we want
anyway, so do it in this branch.Signed-off-by: Arnd Bergmann
[olof: rewrote with this branch as base, same end result]
Signed-off-by: Olof Johansson
Acked-by: Tony Lindgren
Acked-by: Santosh Shilimkar
19 Sep, 2012
1 commit
-
OMAP interconnect drivers are used for the interconnect error handling.
Since they are bus driver, lets move it to newly created drivers/bus.Tested-by: Lokesh Vutla
Signed-off-by: Santosh Shilimkar
Acked-by: Tony Lindgren
Signed-off-by: Arnd Bergmann
05 Sep, 2012
1 commit
-
Fixes:
CC [M] drivers/bus/omap-ocp2scp.o
drivers/bus/omap-ocp2scp.c:70:1: error: '__mod_of_device_table' aliased to
undefined symbol 'omap_usb2_id_table'Signed-off-by: Kishon Vijay Abraham I
Acked-by: Randy Dunlap
Signed-off-by: Olof Johansson
22 Aug, 2012
1 commit
-
Adds a new driver *omap-ocp2scp*. This driver takes the responsibility of
creating all the devices that is connected to OCP2SCP. In the case of OMAP4,
USB2PHY is connected to ocp2scp.This also includes device tree support for ocp2scp driver and
the documentation with device tree binding information is updated.Acked-by: Felipe Balbi
Acked-by: Arnd Bergmann
Signed-off-by: Kishon Vijay Abraham I
Signed-off-by: Arnd Bergmann