diff options
| author | Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> | 2014-04-30 16:56:40 +0400 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2014-05-05 04:53:24 +0400 |
| commit | d7e1c07630ed67942357c44dc975a5ce50f5966a (patch) | |
| tree | aa0e43c962de8c131008d1b49d425610949ac8c8 /arch/arm/boot | |
| parent | ce55b1f423b8a53e118593c2da2a2f246ff7c445 (diff) | |
| download | linux-d7e1c07630ed67942357c44dc975a5ce50f5966a.tar.xz | |
ARM: dts: kirkwood: set default pinctrl for I2C1 on 6282
Currently, the only 6282-based Kirkwood boards that use I2C1 are Openblocks
A6/A7. Both use the same default I2C1 pinctrl setting from kirkwood-6282.dtsi.
Move the pinctrl setting to the I2C1 node directly and put a note in front of
the corresponding pinctrl node to overwrite the setting on board level.
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Link: https://lkml.kernel.org/r/1398862602-29595-14-git-send-email-sebastian.hesselbarth@gmail.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/kirkwood-6282.dtsi | 6 | ||||
| -rw-r--r-- | arch/arm/boot/dts/kirkwood-openblocks_a6.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/kirkwood-openblocks_a7.dts | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/kirkwood-6282.dtsi b/arch/arm/boot/dts/kirkwood-6282.dtsi index b869f48cac02..4680eec990f0 100644 --- a/arch/arm/boot/dts/kirkwood-6282.dtsi +++ b/arch/arm/boot/dts/kirkwood-6282.dtsi @@ -68,6 +68,10 @@ marvell,function = "sata1"; }; + /* + * Default I2C1 pinctrl setting on mpp36/mpp37, + * overwrite marvell,pins on board level if required. + */ pmx_twsi1: pmx-twsi1 { marvell,pins = "mpp36", "mpp37"; marvell,function = "twsi1"; @@ -101,6 +105,8 @@ interrupts = <32>; clock-frequency = <100000>; clocks = <&gate_clk 7>; + pinctrl-0 = <&pmx_twsi1>; + pinctrl-names = "default"; status = "disabled"; }; diff --git a/arch/arm/boot/dts/kirkwood-openblocks_a6.dts b/arch/arm/boot/dts/kirkwood-openblocks_a6.dts index 00c2e5a9d863..3dcb5c26b78b 100644 --- a/arch/arm/boot/dts/kirkwood-openblocks_a6.dts +++ b/arch/arm/boot/dts/kirkwood-openblocks_a6.dts @@ -33,8 +33,6 @@ i2c@11100 { status = "okay"; - pinctrl-0 = <&pmx_twsi1>; - pinctrl-names = "default"; s35390a: s35390a@30 { compatible = "s35390a"; diff --git a/arch/arm/boot/dts/kirkwood-openblocks_a7.dts b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts index bc07aa5e6698..4e10e92b7822 100644 --- a/arch/arm/boot/dts/kirkwood-openblocks_a7.dts +++ b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts @@ -45,8 +45,6 @@ i2c@11100 { status = "okay"; - pinctrl-0 = <&pmx_twsi1>; - pinctrl-names = "default"; s24c02: s24c02@50 { compatible = "24c02"; |