ipq806x: move common pinmux nodes to SoC DTSI

As almost same pinmux nodes are repeated in each device dts,
let's define them once in the ipq8064 dtsi and remove the rest.

* uart0_pins : Did not touch.
* i2c4_pins  : This node seems to be not used at all in dts.
               Added the most common form in the dtsi. Did not touch rpm_pins.
* spi_pins   : The common mux node is already present in the dtsi.
               Removed the duplicate nodes from dts.
* nand_pins  : Moved the entire node.
* mdio0_pins : Moved the common mux node.
* rgmii2_pins: Moved the common mux node. "pins" property is overrided in ap161.

Signed-off-by: Sungbo Eo <mans0n@gorani.run>
This commit is contained in:
Sungbo Eo 2020-07-03 01:38:09 +09:00 committed by Adrian Schmutzler
parent 014d3f593a
commit 19c8f11d92
15 changed files with 61 additions and 603 deletions

View File

@ -29,59 +29,6 @@
}; };
}; };
&qcom_pinmux {
i2c4_pins: i2c4_pinmux {
pins = "gpio12", "gpio13";
function = "gsbi4";
bias-disable;
};
nand_pins: nand_pins {
disable {
pins = "gpio34", "gpio35", "gpio36",
"gpio37", "gpio38";
function = "nand";
drive-strength = <10>;
bias-disable;
};
pullups {
pins = "gpio39";
function = "nand";
drive-strength = <10>;
bias-pull-up;
};
hold {
pins = "gpio40", "gpio41", "gpio42",
"gpio43", "gpio44", "gpio45",
"gpio46", "gpio47";
function = "nand";
drive-strength = <10>;
bias-bus-hold;
};
};
mdio0_pins: mdio0_pins {
mux {
pins = "gpio0", "gpio1";
function = "mdio";
drive-strength = <8>;
bias-disable;
};
};
rgmii2_pins: rgmii2_pins {
mux {
pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32",
"gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62" ;
function = "rgmii2";
drive-strength = <8>;
bias-disable;
};
};
};
&adm_dma { &adm_dma {
status = "okay"; status = "okay";
}; };

View File

@ -30,65 +30,13 @@
}; };
&qcom_pinmux { &qcom_pinmux {
i2c4_pins: i2c4_pinmux {
pins = "gpio12", "gpio13";
function = "gsbi4";
bias-disable;
};
spi_pins: spi_pins {
mux {
pins = "gpio18", "gpio19", "gpio21";
function = "gsbi5";
drive-strength = <10>;
bias-none;
};
};
nand_pins: nand_pins {
disable {
pins = "gpio34", "gpio35", "gpio36",
"gpio37", "gpio38";
function = "nand";
drive-strength = <10>;
bias-disable;
};
pullups {
pins = "gpio39";
function = "nand";
drive-strength = <10>;
bias-pull-up;
};
hold {
pins = "gpio40", "gpio41", "gpio42",
"gpio43", "gpio44", "gpio45",
"gpio46", "gpio47";
function = "nand";
drive-strength = <10>;
bias-bus-hold;
};
};
mdio0_pins: mdio0_pins {
mux {
pins = "gpio0", "gpio1";
function = "mdio";
drive-strength = <8>;
bias-disable;
};
};
rgmii2_pins: rgmii2_pins { rgmii2_pins: rgmii2_pins {
mux { mux {
pins = "gpio2", "gpio27", "gpio28", pins = "gpio27", "gpio28", "gpio29",
"gpio29", "gpio30", "gpio31", "gpio30", "gpio31", "gpio32",
"gpio32", "gpio51", "gpio52", "gpio51", "gpio52", "gpio59",
"gpio59", "gpio60", "gpio61", "gpio60", "gpio61", "gpio62",
"gpio62" , "gpio66"; "gpio2", "gpio66";
function = "rgmii2";
drive-strength = <8>;
bias-disable;
}; };
}; };
}; };

View File

@ -124,15 +124,6 @@
}; };
}; };
i2c4_pins: i2c4_pinmux {
mux {
pins = "gpio12", "gpio13";
function = "gsbi4";
drive-strength = <12>;
bias-disable;
};
};
led_pins: led_pins { led_pins: led_pins {
mux { mux {
pins = "gpio6", "gpio7", "gpio8", "gpio9", "gpio26", "gpio33", pins = "gpio6", "gpio7", "gpio8", "gpio9", "gpio26", "gpio33",
@ -168,25 +159,6 @@
}; };
}; };
mdio0_pins: mdio0_pins {
mux {
pins = "gpio0", "gpio1";
function = "mdio";
drive-strength = <8>;
bias-disable;
};
};
rgmii2_pins: rgmii2_pins {
mux {
pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32",
"gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62" ;
function = "rgmii2";
drive-strength = <8>;
bias-disable;
};
};
usb0_pwr_en_pin: usb0_pwr_en_pin { usb0_pwr_en_pin: usb0_pwr_en_pin {
mux { mux {
pins = "gpio25"; pins = "gpio25";

View File

@ -123,15 +123,6 @@
}; };
}; };
i2c4_pins: i2c4_pinmux {
mux {
pins = "gpio12", "gpio13";
function = "gsbi4";
drive-strength = <12>;
bias-disable;
};
};
led_pins: led_pins { led_pins: led_pins {
mux { mux {
pins = "gpio7", "gpio8", "gpio9", "gpio22", "gpio23", pins = "gpio7", "gpio8", "gpio9", "gpio22", "gpio23",
@ -142,51 +133,6 @@
}; };
}; };
mdio0_pins: mdio0_pins {
mux {
pins = "gpio0", "gpio1";
function = "mdio";
drive-strength = <8>;
bias-disable;
};
};
nand_pins: nand_pins {
disable {
pins = "gpio34", "gpio35", "gpio36",
"gpio37", "gpio38";
function = "nand";
drive-strength = <10>;
bias-disable;
};
pullups {
pins = "gpio39";
function = "nand";
drive-strength = <10>;
bias-pull-up;
};
hold {
pins = "gpio40", "gpio41", "gpio42",
"gpio43", "gpio44", "gpio45",
"gpio46", "gpio47";
function = "nand";
drive-strength = <10>;
bias-bus-hold;
};
};
rgmii2_pins: rgmii2_pins {
mux {
pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32",
"gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62" ;
function = "rgmii2";
drive-strength = <8>;
bias-disable;
};
};
usb0_pwr_en_pins: usb0_pwr_en_pins { usb0_pwr_en_pins: usb0_pwr_en_pins {
mux { mux {
pins = "gpio15"; pins = "gpio15";

View File

@ -25,30 +25,6 @@
}; };
&qcom_pinmux { &qcom_pinmux {
i2c4_pins: i2c4_pinmux {
pins = "gpio12", "gpio13";
function = "gsbi4";
bias-disable;
};
spi_pins: spi_pins {
mux {
pins = "gpio18", "gpio19", "gpio21";
function = "gsbi5";
drive-strength = <10>;
bias-none;
};
};
mdio0_pins: mdio0_pins {
mux {
pins = "gpio0", "gpio1";
function = "mdio";
drive-strength = <8>;
bias-disable;
};
};
rgmii0_pins: rgmii0_pins { rgmii0_pins: rgmii0_pins {
mux { mux {
pins = "gpio2", "gpio66"; pins = "gpio2", "gpio66";

View File

@ -94,15 +94,6 @@
}; };
}; };
i2c4_pins: i2c4_pinmux {
mux {
pins = "gpio12", "gpio13";
function = "gsbi4";
drive-strength = <12>;
bias-disable;
};
};
led_pins: led_pins { led_pins: led_pins {
mux { mux {
pins = "gpio6", "gpio53", "gpio54"; pins = "gpio6", "gpio53", "gpio54";
@ -111,51 +102,6 @@
bias-pull-up; bias-pull-up;
}; };
}; };
mdio0_pins: mdio0_pins {
mux {
pins = "gpio0", "gpio1";
function = "mdio";
drive-strength = <8>;
bias-disable;
};
};
nand_pins: nand_pins {
disable {
pins = "gpio34", "gpio35", "gpio36",
"gpio37", "gpio38";
function = "nand";
drive-strength = <10>;
bias-disable;
};
pullups {
pins = "gpio39";
function = "nand";
drive-strength = <10>;
bias-pull-up;
};
hold {
pins = "gpio40", "gpio41", "gpio42",
"gpio43", "gpio44", "gpio45",
"gpio46", "gpio47";
function = "nand";
drive-strength = <10>;
bias-bus-hold;
};
};
rgmii2_pins: rgmii2_pins {
mux {
pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32",
"gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62" ;
function = "rgmii2";
drive-strength = <8>;
bias-disable;
};
};
}; };
&gsbi4 { &gsbi4 {

View File

@ -124,15 +124,6 @@
}; };
}; };
i2c4_pins: i2c4_pinmux {
mux {
pins = "gpio12", "gpio13";
function = "gsbi4";
drive-strength = <12>;
bias-disable;
};
};
led_pins: led_pins { led_pins: led_pins {
mux { mux {
pins = "gpio7", "gpio8", "gpio9", "gpio22", "gpio23", pins = "gpio7", "gpio8", "gpio9", "gpio22", "gpio23",
@ -142,51 +133,6 @@
bias-pull-up; bias-pull-up;
}; };
}; };
mdio0_pins: mdio0_pins {
mux {
pins = "gpio0", "gpio1";
function = "mdio";
drive-strength = <8>;
bias-disable;
};
};
nand_pins: nand_pins {
disable {
pins = "gpio34", "gpio35", "gpio36",
"gpio37", "gpio38";
function = "nand";
drive-strength = <10>;
bias-disable;
};
pullups {
pins = "gpio39";
function = "nand";
drive-strength = <10>;
bias-pull-up;
};
hold {
pins = "gpio40", "gpio41", "gpio42",
"gpio43", "gpio44", "gpio45",
"gpio46", "gpio47";
function = "nand";
drive-strength = <10>;
bias-bus-hold;
};
};
rgmii2_pins: rgmii2_pins {
mux {
pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32",
"gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62" ;
function = "rgmii2";
drive-strength = <8>;
bias-disable;
};
};
}; };
&gsbi4 { &gsbi4 {

View File

@ -132,15 +132,6 @@
}; };
}; };
i2c4_pins: i2c4_pinmux {
mux {
pins = "gpio12", "gpio13";
function = "gsbi4";
drive-strength = <12>;
bias-disable;
};
};
led_pins: led_pins { led_pins: led_pins {
mux { mux {
pins = "gpio7", "gpio8", "gpio9", "gpio22", "gpio23", pins = "gpio7", "gpio8", "gpio9", "gpio22", "gpio23",
@ -151,51 +142,6 @@
}; };
}; };
mdio0_pins: mdio0_pins {
mux {
pins = "gpio0", "gpio1";
function = "mdio";
drive-strength = <8>;
bias-disable;
};
};
nand_pins: nand_pins {
disable {
pins = "gpio34", "gpio35", "gpio36",
"gpio37", "gpio38";
function = "nand";
drive-strength = <10>;
bias-disable;
};
pullups {
pins = "gpio39";
function = "nand";
drive-strength = <10>;
bias-pull-up;
};
hold {
pins = "gpio40", "gpio41", "gpio42",
"gpio43", "gpio44", "gpio45",
"gpio46", "gpio47";
function = "nand";
drive-strength = <10>;
bias-bus-hold;
};
};
rgmii2_pins: rgmii2_pins {
mux {
pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32",
"gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62" ;
function = "rgmii2";
drive-strength = <8>;
bias-disable;
};
};
usb0_pwr_en_pins: usb0_pwr_en_pins { usb0_pwr_en_pins: usb0_pwr_en_pins {
mux { mux {
pins = "gpio15"; pins = "gpio15";

View File

@ -135,15 +135,6 @@
}; };
}; };
i2c4_pins: i2c4_pinmux {
mux {
pins = "gpio12", "gpio13";
function = "gsbi4";
drive-strength = <12>;
bias-disable;
};
};
button_pins: button_pins { button_pins: button_pins {
mux { mux {
pins = "gpio54", "gpio64", "gpio65", "gpio67", "gpio68"; pins = "gpio54", "gpio64", "gpio65", "gpio67", "gpio68";
@ -176,25 +167,6 @@
drive-strength = <12>; drive-strength = <12>;
}; };
}; };
mdio0_pins: mdio0_pins {
mux {
pins = "gpio0", "gpio1";
function = "mdio";
drive-strength = <8>;
bias-disable;
};
};
rgmii2_pins: rgmii2_pins {
mux {
pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32",
"gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62" ;
function = "rgmii2";
drive-strength = <8>;
bias-disable;
};
};
}; };
&gsbi4 { &gsbi4 {

View File

@ -347,15 +347,6 @@
}; };
}; };
i2c4_pins: i2c4_pinmux {
mux {
pins = "gpio12", "gpio13";
function = "gsbi4";
drive-strength = <12>;
bias-disable;
};
};
led_pins: led_pins { led_pins: led_pins {
mux { mux {
pins = "gpio6", "gpio7", "gpio8", "gpio9", "gpio14", pins = "gpio6", "gpio7", "gpio8", "gpio9", "gpio14",
@ -391,25 +382,6 @@
}; };
}; };
mdio0_pins: mdio0_pins {
mux {
pins = "gpio0", "gpio1";
function = "mdio";
drive-strength = <8>;
bias-disable;
};
};
rgmii2_pins: rgmii2_pins {
mux {
pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32",
"gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62" ;
function = "rgmii2";
drive-strength = <8>;
bias-disable;
};
};
usb_pwr_en_pins: usb_pwr_en_pins { usb_pwr_en_pins: usb_pwr_en_pins {
mux { mux {
pins = "gpio22"; pins = "gpio22";

View File

@ -494,51 +494,6 @@
bias-pull-up; bias-pull-up;
}; };
}; };
nand_pins: nand_pins {
disable {
pins = "gpio34", "gpio35", "gpio36", "gpio37",
"gpio38";
function = "nand";
drive-strength = <10>;
bias-disable;
};
pullups {
pins = "gpio39";
function = "nand";
drive-strength = <10>;
bias-pull-up;
};
hold {
pins = "gpio40", "gpio41", "gpio42", "gpio43",
"gpio44", "gpio45", "gpio46", "gpio47";
function = "nand";
drive-strength = <10>;
bias-bus-hold;
};
};
mdio0_pins: mdio0_pins {
mux {
pins = "gpio0", "gpio1";
function = "mdio";
drive-strength = <8>;
bias-disable;
};
};
rgmii2_pins: rgmii2_pins {
mux {
pins = "gpio27", "gpio28", "gpio29", "gpio30",
"gpio31", "gpio32", "gpio51", "gpio52",
"gpio59", "gpio60", "gpio61", "gpio62";
function = "rgmii2";
drive-strength = <8>;
bias-disable;
};
};
}; };
&usb3_0 { &usb3_0 {

View File

@ -458,51 +458,6 @@
}; };
}; };
mdio0_pins: mdio0_pins {
mux {
pins = "gpio0", "gpio1";
function = "mdio";
drive-strength = <8>;
bias-disable;
};
};
nand_pins: nand_pins {
disable {
pins = "gpio34", "gpio35", "gpio36",
"gpio37", "gpio38";
function = "nand";
drive-strength = <10>;
bias-disable;
};
pullups {
pins = "gpio39";
function = "nand";
drive-strength = <10>;
bias-pull-up;
};
hold {
pins = "gpio40", "gpio41", "gpio42",
"gpio43", "gpio44", "gpio45",
"gpio46", "gpio47";
function = "nand";
drive-strength = <10>;
bias-bus-hold;
};
};
rgmii2_pins: rgmii2_pins {
mux {
pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32",
"gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62" ;
function = "rgmii2";
drive-strength = <8>;
bias-disable;
};
};
usb_pwr_en_pins: usb_pwr_en_pins { usb_pwr_en_pins: usb_pwr_en_pins {
mux{ mux{
pins = "gpio68"; pins = "gpio68";

View File

@ -704,6 +704,15 @@
}; };
}; };
i2c4_pins: i2c4_pinmux {
mux {
pins = "gpio12", "gpio13";
function = "gsbi4";
drive-strength = <12>;
bias-disable;
};
};
spi_pins: spi_pins { spi_pins: spi_pins {
mux { mux {
pins = "gpio18", "gpio19", "gpio21"; pins = "gpio18", "gpio19", "gpio21";
@ -713,6 +722,53 @@
}; };
}; };
nand_pins: nand_pins {
disable {
pins = "gpio34", "gpio35", "gpio36",
"gpio37", "gpio38";
function = "nand";
drive-strength = <10>;
bias-disable;
};
pullups {
pins = "gpio39";
function = "nand";
drive-strength = <10>;
bias-pull-up;
};
hold {
pins = "gpio40", "gpio41", "gpio42",
"gpio43", "gpio44", "gpio45",
"gpio46", "gpio47";
function = "nand";
drive-strength = <10>;
bias-bus-hold;
};
};
mdio0_pins: mdio0_pins {
mux {
pins = "gpio0", "gpio1";
function = "mdio";
drive-strength = <8>;
bias-disable;
};
};
rgmii2_pins: rgmii2_pins {
mux {
pins = "gpio27", "gpio28", "gpio29",
"gpio30", "gpio31", "gpio32",
"gpio51", "gpio52", "gpio59",
"gpio60", "gpio61", "gpio62";
function = "rgmii2";
drive-strength = <8>;
bias-disable;
};
};
leds_pins: leds_pins { leds_pins: leds_pins {
mux { mux {
pins = "gpio7", "gpio8", "gpio9", pins = "gpio7", "gpio8", "gpio9",

View File

@ -105,15 +105,6 @@
}; };
}; };
i2c4_pins: i2c4_pinmux {
mux {
pins = "gpio12", "gpio13";
function = "gsbi4";
drive-strength = <12>;
bias-disable;
};
};
led_pins: led_pins { led_pins: led_pins {
mux { mux {
pins = "gpio9", "gpio26", "gpio33", "gpio64"; pins = "gpio9", "gpio26", "gpio33", "gpio64";
@ -124,13 +115,6 @@
}; };
mdio0_pins: mdio0_pins { mdio0_pins: mdio0_pins {
mux {
pins = "gpio0", "gpio1";
function = "mdio";
drive-strength = <8>;
bias-disable;
};
clk { clk {
pins = "gpio1"; pins = "gpio1";
input-disable; input-disable;
@ -138,14 +122,6 @@
}; };
rgmii2_pins: rgmii2_pins { rgmii2_pins: rgmii2_pins {
mux {
pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32",
"gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62" ;
function = "rgmii2";
drive-strength = <8>;
bias-disable;
};
tx { tx {
pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32" ; pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32" ;
input-disable; input-disable;
@ -153,13 +129,6 @@
}; };
spi_pins: spi_pins { spi_pins: spi_pins {
mux {
pins = "gpio18", "gpio19", "gpio21";
function = "gsbi5";
drive-strength = <10>;
bias-none;
};
cs { cs {
pins = "gpio20"; pins = "gpio20";
drive-strength = <12>; drive-strength = <12>;

View File

@ -134,15 +134,6 @@
}; };
}; };
i2c4_pins: i2c4_pinmux {
mux {
pins = "gpio12", "gpio13";
function = "gsbi4";
drive-strength = <12>;
bias-disable;
};
};
led_pins: led_pins { led_pins: led_pins {
mux { mux {
pins = "gpio7", "gpio8", "gpio9", "gpio22", "gpio23", pins = "gpio7", "gpio8", "gpio9", "gpio22", "gpio23",
@ -153,38 +144,7 @@
}; };
}; };
nand_pins: nand_pins {
disable {
pins = "gpio34", "gpio35", "gpio36",
"gpio37", "gpio38";
function = "nand";
drive-strength = <10>;
bias-disable;
};
pullups {
pins = "gpio39";
function = "nand";
drive-strength = <10>;
bias-pull-up;
};
hold {
pins = "gpio40", "gpio41", "gpio42",
"gpio43", "gpio44", "gpio45",
"gpio46", "gpio47";
function = "nand";
drive-strength = <10>;
bias-bus-hold;
};
};
mdio0_pins: mdio0_pins { mdio0_pins: mdio0_pins {
mux {
pins = "gpio0", "gpio1";
function = "mdio";
drive-strength = <8>;
bias-disable;
};
clk { clk {
pins = "gpio1"; pins = "gpio1";
input-disable; input-disable;
@ -192,14 +152,6 @@
}; };
rgmii2_pins: rgmii2_pins { rgmii2_pins: rgmii2_pins {
mux {
pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32",
"gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62" ;
function = "rgmii2";
drive-strength = <8>;
bias-disable;
};
tx { tx {
pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32" ; pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32" ;
input-disable; input-disable;