diff options
| author | Fabio Baltieri <fabio.baltieri@linaro.org> | 2012-12-18 04:12:12 -0500 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2012-12-25 19:59:54 -0500 |
| commit | 9fcb4cc2d7dd192ae718f0e7484c6f5c08b8af23 (patch) | |
| tree | 0f7bf78fb92910cdce1b6f9bd1c1de39e110e701 | |
| parent | 4ca075decc2bffc36ecacc59f2d943a037b46543 (diff) | |
ARM: ux500: add pinctrl address resources
Current nmk_pinctrl driver is not PRCMU dependent anymore, so it needs
its own DT address resources to work properly, as done for
platform_device in:
f482833 ARM: ux500: add PRCM register base for pinctrl
Signed-off-by: Fabio Baltieri <fabio.baltieri@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
| -rw-r--r-- | arch/arm/boot/dts/dbx5x0.dtsi | 4 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/cpu-db8500.c | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/dbx5x0.dtsi b/arch/arm/boot/dts/dbx5x0.dtsi index 2efd9c891bc9..63f2fbcfe819 100644 --- a/arch/arm/boot/dts/dbx5x0.dtsi +++ b/arch/arm/boot/dts/dbx5x0.dtsi | |||
| @@ -170,7 +170,9 @@ | |||
| 170 | gpio-bank = <8>; | 170 | gpio-bank = <8>; |
| 171 | }; | 171 | }; |
| 172 | 172 | ||
| 173 | pinctrl { | 173 | pinctrl@80157000 { |
| 174 | // This is actually the PRCMU base address | ||
| 175 | reg = <0x80157000 0x2000>; | ||
| 174 | compatible = "stericsson,nmk_pinctrl"; | 176 | compatible = "stericsson,nmk_pinctrl"; |
| 175 | }; | 177 | }; |
| 176 | 178 | ||
diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c index db0bb75e2c76..5b286e06474c 100644 --- a/arch/arm/mach-ux500/cpu-db8500.c +++ b/arch/arm/mach-ux500/cpu-db8500.c | |||
| @@ -285,7 +285,8 @@ static struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = { | |||
| 285 | OF_DEV_AUXDATA("st,nomadik-i2c", 0x80110000, "nmk-i2c.3", NULL), | 285 | OF_DEV_AUXDATA("st,nomadik-i2c", 0x80110000, "nmk-i2c.3", NULL), |
| 286 | OF_DEV_AUXDATA("st,nomadik-i2c", 0x8012a000, "nmk-i2c.4", NULL), | 286 | OF_DEV_AUXDATA("st,nomadik-i2c", 0x8012a000, "nmk-i2c.4", NULL), |
| 287 | /* Requires device name bindings. */ | 287 | /* Requires device name bindings. */ |
| 288 | OF_DEV_AUXDATA("stericsson,nmk_pinctrl", 0, "pinctrl-db8500", NULL), | 288 | OF_DEV_AUXDATA("stericsson,nmk_pinctrl", U8500_PRCMU_BASE, |
| 289 | "pinctrl-db8500", NULL), | ||
| 289 | /* Requires clock name and DMA bindings. */ | 290 | /* Requires clock name and DMA bindings. */ |
| 290 | OF_DEV_AUXDATA("stericsson,ux500-msp-i2s", 0x80123000, | 291 | OF_DEV_AUXDATA("stericsson,ux500-msp-i2s", 0x80123000, |
| 291 | "ux500-msp-i2s.0", &msp0_platform_data), | 292 | "ux500-msp-i2s.0", &msp0_platform_data), |
