diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2014-04-22 23:26:28 +0200 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2014-04-26 21:45:09 +0200 |
| commit | 4e7bb110d73f1100d95c23c5a33c79fa17031dff (patch) | |
| tree | 53ce2788eb5c43450aa4f370925772d9559fe710 | |
| parent | ARM: orion5x: switch to DT interrupts and timer (diff) | |
| download | linux-4e7bb110d73f1100d95c23c5a33c79fa17031dff.tar.xz linux-4e7bb110d73f1100d95c23c5a33c79fa17031dff.zip | |
ARM: orion5x: enable pinctrl driver at SoC level
This commit declares the pinctrl device in the Orion5x 5182 Device
Tree files, and ensures that the Orion pinctrl driver is compiled.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Link: https://lkml.kernel.org/r/1398202002-28530-25-git-send-email-thomas.petazzoni@free-electrons.com
Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
| -rw-r--r-- | arch/arm/boot/dts/orion5x-mv88f5182.dtsi | 5 | ||||
| -rw-r--r-- | arch/arm/mach-orion5x/Kconfig | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/orion5x-mv88f5182.dtsi b/arch/arm/boot/dts/orion5x-mv88f5182.dtsi index a56f9c88efd0..8c71b6b9ec29 100644 --- a/arch/arm/boot/dts/orion5x-mv88f5182.dtsi +++ b/arch/arm/boot/dts/orion5x-mv88f5182.dtsi @@ -15,6 +15,11 @@ compatible = "marvell,orion5x-88f5182-mbus", "simple-bus"; internal-regs { + pinctrl: pinctrl@10000 { + compatible = "marvell,88f5182-pinctrl"; + reg = <0x10000 0x8>, <0x10050 0x4>; + }; + core_clk: core-clocks@10030 { compatible = "marvell,mv88f5182-core-clock"; reg = <0x10010 0x4>; diff --git a/arch/arm/mach-orion5x/Kconfig b/arch/arm/mach-orion5x/Kconfig index bd65872f5e04..3c69a3c0ab46 100644 --- a/arch/arm/mach-orion5x/Kconfig +++ b/arch/arm/mach-orion5x/Kconfig @@ -8,6 +8,8 @@ config ARCH_ORION5X_DT select ORION_CLK select ORION_IRQCHIP select ORION_TIMER + select PINCTRL + select PINCTRL_ORION help Say 'Y' here if you want your kernel to support the Marvell Orion5x using flattened device tree. |