Skip to content

L
linux
Commit 469a22e6 authored by Marcus Cooper's avatar Marcus Cooper Committed by Maxime Ripard
Browse files
Options

ARM: sunxi: dts: split IR pins for A10 and A20 

Currently none of the target boards nor the driver supports
IR TX. However this pin is used in a few instances as a GPIO.
Split the pin ctrl descriptions so that only the IR RX is
configured to be used.
Signed-off-by: default avatarMarcus Cooper <codekipper@gmail.com>
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
parent 94a3e0c4
Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 26 deletions
arch/arm/boot/dts/sun4i-a10-a1000.dts
View file @ 469a22e6
...@@ -130,7 +130,7 @@ axp209: pmic@34 { ...@@ -130,7 +130,7 @@ axp209: pmic@34 {
&ir0 { &ir0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ir0_pins_a>; pinctrl-0 = <&ir0_rx_pins_a>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts
View file @ 469a22e6
...@@ -96,7 +96,7 @@ axp209: pmic@34 { ...@@ -96,7 +96,7 @@ axp209: pmic@34 {
&ir0 { &ir0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ir0_pins_a>; pinctrl-0 = <&ir0_rx_pins_a>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun4i-a10-cubieboard.dts
View file @ 469a22e6
...@@ -126,7 +126,7 @@ &i2c1 { ...@@ -126,7 +126,7 @@ &i2c1 {
&ir0 { &ir0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ir0_pins_a>; pinctrl-0 = <&ir0_rx_pins_a>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun4i-a10-hackberry.dts
View file @ 469a22e6
...@@ -93,7 +93,7 @@ &emac { ...@@ -93,7 +93,7 @@ &emac {
&ir0 { &ir0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ir0_pins_a>; pinctrl-0 = <&ir0_rx_pins_a>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts
View file @ 469a22e6
...@@ -126,7 +126,7 @@ axp209: pmic@34 { ...@@ -126,7 +126,7 @@ axp209: pmic@34 {
&ir0 { &ir0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ir0_pins_a>; pinctrl-0 = <&ir0_rx_pins_a>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun4i-a10-mini-xplus.dts
View file @ 469a22e6
...@@ -92,11 +92,11 @@ axp209: pmic@34 { ...@@ -92,11 +92,11 @@ axp209: pmic@34 {
&ir0 { &ir0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ir0_pins_a>; pinctrl-0 = <&ir0_rx_pins_a>;
status = "okay"; status = "okay";
}; };
&ir0_pins_a { &ir0_rx_pins_a {
/* The ir receiver is not always populated */ /* The ir receiver is not always populated */
allwinner,pull = <SUN4I_PINCTRL_PULL_UP>; allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
}; };
......
arch/arm/boot/dts/sun4i-a10.dtsi
View file @ 469a22e6
...@@ -797,15 +797,29 @@ mmc0_cd_pin_reference_design: mmc0_cd_pin@0 { ...@@ -797,15 +797,29 @@ mmc0_cd_pin_reference_design: mmc0_cd_pin@0 {
allwinner,pull = <SUN4I_PINCTRL_PULL_UP>; allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
}; };
ir0_pins_a: ir0@0 { ir0_rx_pins_a: ir0@0 {
allwinner,pins = "PB3","PB4"; allwinner,pins = "PB4";
allwinner,function = "ir0"; allwinner,function = "ir0";
allwinner,drive = <SUN4I_PINCTRL_10_MA>; allwinner,drive = <SUN4I_PINCTRL_10_MA>;
allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
}; };
ir1_pins_a: ir1@0 { ir0_tx_pins_a: ir0@1 {
allwinner,pins = "PB22","PB23"; allwinner,pins = "PB3";
allwinner,function = "ir0";
allwinner,drive = <SUN4I_PINCTRL_10_MA>;
allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
};
ir1_rx_pins_a: ir1@0 {
allwinner,pins = "PB23";
allwinner,function = "ir1";
allwinner,drive = <SUN4I_PINCTRL_10_MA>;
allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
};
ir1_tx_pins_a: ir1@1 {
allwinner,pins = "PB22";
allwinner,function = "ir1"; allwinner,function = "ir1";
allwinner,drive = <SUN4I_PINCTRL_10_MA>; allwinner,drive = <SUN4I_PINCTRL_10_MA>;
allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
......
arch/arm/boot/dts/sun7i-a20-bananapi.dts
View file @ 469a22e6
...@@ -142,7 +142,7 @@ &i2c2 { ...@@ -142,7 +142,7 @@ &i2c2 {
&ir0 { &ir0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ir0_pins_a>; pinctrl-0 = <&ir0_rx_pins_a>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun7i-a20-bananapro.dts
View file @ 469a22e6
...@@ -154,7 +154,7 @@ &i2c2 { ...@@ -154,7 +154,7 @@ &i2c2 {
&ir0 { &ir0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ir0_pins_a>; pinctrl-0 = <&ir0_rx_pins_a>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
View file @ 469a22e6
...@@ -133,7 +133,7 @@ &i2c1 { ...@@ -133,7 +133,7 @@ &i2c1 {
&ir0 { &ir0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ir0_pins_a>; pinctrl-0 = <&ir0_rx_pins_a>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun7i-a20-cubietruck.dts
View file @ 469a22e6
...@@ -160,7 +160,7 @@ &i2c2 { ...@@ -160,7 +160,7 @@ &i2c2 {
&ir0 { &ir0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ir0_pins_a>; pinctrl-0 = <&ir0_rx_pins_a>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun7i-a20-hummingbird.dts
View file @ 469a22e6
...@@ -160,7 +160,7 @@ &i2c3 { ...@@ -160,7 +160,7 @@ &i2c3 {
&ir0 { &ir0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ir0_pins_a>; pinctrl-0 = <&ir0_rx_pins_a>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts
View file @ 469a22e6
...@@ -157,7 +157,7 @@ axp209: pmic@34 { ...@@ -157,7 +157,7 @@ axp209: pmic@34 {
&ir0 { &ir0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ir0_pins_a>; pinctrl-0 = <&ir0_rx_pins_a>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun7i-a20-m3.dts
View file @ 469a22e6
...@@ -117,7 +117,7 @@ axp209: pmic@34 { ...@@ -117,7 +117,7 @@ axp209: pmic@34 {
&ir0 { &ir0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ir0_pins_a>; pinctrl-0 = <&ir0_rx_pins_a>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts
View file @ 469a22e6
...@@ -137,7 +137,7 @@ axp209: pmic@34 { ...@@ -137,7 +137,7 @@ axp209: pmic@34 {
&ir0 { &ir0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ir0_pins_a>; pinctrl-0 = <&ir0_rx_pins_a>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun7i-a20-orangepi.dts
View file @ 469a22e6
...@@ -132,7 +132,7 @@ axp209: pmic@34 { ...@@ -132,7 +132,7 @@ axp209: pmic@34 {
&ir0 { &ir0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ir0_pins_a>; pinctrl-0 = <&ir0_rx_pins_a>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts
View file @ 469a22e6
...@@ -125,7 +125,7 @@ axp209: pmic@34 { ...@@ -125,7 +125,7 @@ axp209: pmic@34 {
&ir0 { &ir0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ir0_pins_a>; pinctrl-0 = <&ir0_rx_pins_a>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun7i-a20-pcduino3.dts
View file @ 469a22e6
...@@ -154,7 +154,7 @@ axp209: pmic@34 { ...@@ -154,7 +154,7 @@ axp209: pmic@34 {
&ir0 { &ir0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ir0_pins_a>; pinctrl-0 = <&ir0_rx_pins_a>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun7i-a20.dtsi
View file @ 469a22e6
...@@ -1000,15 +1000,29 @@ mmc3_pins_a: mmc3@0 { ...@@ -1000,15 +1000,29 @@ mmc3_pins_a: mmc3@0 {
allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
}; };
ir0_pins_a: ir0@0 { ir0_rx_pins_a: ir0@0 {
allwinner,pins = "PB3","PB4"; allwinner,pins = "PB4";
allwinner,function = "ir0"; allwinner,function = "ir0";
allwinner,drive = <SUN4I_PINCTRL_10_MA>; allwinner,drive = <SUN4I_PINCTRL_10_MA>;
allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
}; };
ir1_pins_a: ir1@0 { ir0_tx_pins_a: ir0@1 {
allwinner,pins = "PB22","PB23"; allwinner,pins = "PB3";
allwinner,function = "ir0";
allwinner,drive = <SUN4I_PINCTRL_10_MA>;
allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
};
ir1_rx_pins_a: ir1@0 {
allwinner,pins = "PB23";
allwinner,function = "ir1";
allwinner,drive = <SUN4I_PINCTRL_10_MA>;
allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
};
ir1_tx_pins_a: ir1@1 {
allwinner,pins = "PB22";
allwinner,function = "ir1"; allwinner,function = "ir1";
allwinner,drive = <SUN4I_PINCTRL_10_MA>; allwinner,drive = <SUN4I_PINCTRL_10_MA>;
allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7