diff options
| author | Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> | 2014-03-04 19:03:08 -0500 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2014-03-06 15:20:33 -0500 |
| commit | df76299fecb3d921e4762ae540e33d8b9b1c3c1e (patch) | |
| tree | 007c636cafa029e66e42ee459da09bce8a1fd5e9 /arch/arm/boot/dts/dove.dtsi | |
| parent | a8a921dd22778bd0b093700957eff4fd1649eb28 (diff) | |
ARM: dove: drop pinctrl PMU reg property
Marvell Dove's pinctrl does require some PMU regs for muxing PMU
functions to MPP pins. Recently, a discussion started about consolidating
Power Management Unit (PMU) into a single DT node. As we don't want
anymore DT ABI in the way, drop the corresponding reg property from
pinctrl node now. The driver will derive the registers from existing
reg properties.
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch/arm/boot/dts/dove.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/dove.dtsi | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi index b6fc27f8ed66..3b891dd20993 100644 --- a/arch/arm/boot/dts/dove.dtsi +++ b/arch/arm/boot/dts/dove.dtsi | |||
| @@ -395,8 +395,7 @@ | |||
| 395 | pinctrl: pin-ctrl@d0200 { | 395 | pinctrl: pin-ctrl@d0200 { |
| 396 | compatible = "marvell,dove-pinctrl"; | 396 | compatible = "marvell,dove-pinctrl"; |
| 397 | reg = <0xd0200 0x14>, | 397 | reg = <0xd0200 0x14>, |
| 398 | <0xd0440 0x04>, | 398 | <0xd0440 0x04>; |
| 399 | <0xd802c 0x08>; | ||
| 400 | clocks = <&gate_clk 22>; | 399 | clocks = <&gate_clk 22>; |
| 401 | 400 | ||
| 402 | pmx_gpio_0: pmx-gpio-0 { | 401 | pmx_gpio_0: pmx-gpio-0 { |