Skip to content

L
linux
Commit dfff569a authored by Ryder Lee's avatar Ryder Lee Committed by Matthias Brugger
Browse files
Options

arm: dts: mt7623: cleanup binding file 

Dummy patch to sort nodes alphabetically and add some blank lines
for consistency.
Signed-off-by: default avatarRyder Lee <ryder.lee@mediatek.com>
Signed-off-by: default avatarMatthias Brugger <matthias.bgg@gmail.com>
parent 0eed8d09
Hide whitespace changes
Inline Side-by-side
Showing with 120 additions and 106 deletions
arch/arm/boot/dts/mt7623.dtsi
View file @ dfff569a
...@@ -91,6 +91,7 @@ cpu0: cpu@0 { ...@@ -91,6 +91,7 @@ cpu0: cpu@0 {
cooling-max-level = <7>; cooling-max-level = <7>;
clock-frequency = <1300000000>; clock-frequency = <1300000000>;
}; };
cpu1: cpu@1 { cpu1: cpu@1 {
device_type = "cpu"; device_type = "cpu";
compatible = "arm,cortex-a7"; compatible = "arm,cortex-a7";
...@@ -98,6 +99,7 @@ cpu1: cpu@1 { ...@@ -98,6 +99,7 @@ cpu1: cpu@1 {
operating-points-v2 = <&cpu_opp_table>; operating-points-v2 = <&cpu_opp_table>;
clock-frequency = <1300000000>; clock-frequency = <1300000000>;
}; };
cpu2: cpu@2 { cpu2: cpu@2 {
device_type = "cpu"; device_type = "cpu";
compatible = "arm,cortex-a7"; compatible = "arm,cortex-a7";
...@@ -105,6 +107,7 @@ cpu2: cpu@2 { ...@@ -105,6 +107,7 @@ cpu2: cpu@2 {
operating-points-v2 = <&cpu_opp_table>; operating-points-v2 = <&cpu_opp_table>;
clock-frequency = <1300000000>; clock-frequency = <1300000000>;
}; };
cpu3: cpu@3 { cpu3: cpu@3 {
device_type = "cpu"; device_type = "cpu";
compatible = "arm,cortex-a7"; compatible = "arm,cortex-a7";
...@@ -172,10 +175,12 @@ map0 { ...@@ -172,10 +175,12 @@ map0 {
trip = <&cpu_passive>; trip = <&cpu_passive>;
cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
}; };
map1 { map1 {
trip = <&cpu_active>; trip = <&cpu_active>;
cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
}; };
map2 { map2 {
trip = <&cpu_hot>; trip = <&cpu_hot>;
cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
...@@ -481,6 +486,31 @@ thermal: thermal@1100b000 { ...@@ -481,6 +486,31 @@ thermal: thermal@1100b000 {
nvmem-cell-names = "calibration-data"; nvmem-cell-names = "calibration-data";
}; };
nandc: nfi@1100d000 {
compatible = "mediatek,mt7623-nfc",
"mediatek,mt2701-nfc";
reg = <0 0x1100d000 0 0x1000>;
interrupts = <GIC_SPI 56 IRQ_TYPE_LEVEL_LOW>;
power-domains = <&scpsys MT2701_POWER_DOMAIN_IFR_MSC>;
clocks = <&pericfg CLK_PERI_NFI>,
<&pericfg CLK_PERI_NFI_PAD>;
clock-names = "nfi_clk", "pad_clk";
status = "disabled";
ecc-engine = <&bch>;
#address-cells = <1>;
#size-cells = <0>;
};
bch: ecc@1100e000 {
compatible = "mediatek,mt7623-ecc",
"mediatek,mt2701-ecc";
reg = <0 0x1100e000 0 0x1000>;
interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_LOW>;
clocks = <&pericfg CLK_PERI_NFI_ECC>;
clock-names = "nfiecc_clk";
status = "disabled";
};
spi1: spi@11016000 { spi1: spi@11016000 {
compatible = "mediatek,mt7623-spi", compatible = "mediatek,mt7623-spi",
"mediatek,mt2701-spi"; "mediatek,mt2701-spi";
...@@ -509,31 +539,6 @@ spi2: spi@11017000 { ...@@ -509,31 +539,6 @@ spi2: spi@11017000 {
status = "disabled"; status = "disabled";
}; };
nandc: nfi@1100d000 {
compatible = "mediatek,mt7623-nfc",
"mediatek,mt2701-nfc";
reg = <0 0x1100d000 0 0x1000>;
interrupts = <GIC_SPI 56 IRQ_TYPE_LEVEL_LOW>;
power-domains = <&scpsys MT2701_POWER_DOMAIN_IFR_MSC>;
clocks = <&pericfg CLK_PERI_NFI>,
<&pericfg CLK_PERI_NFI_PAD>;
clock-names = "nfi_clk", "pad_clk";
status = "disabled";
ecc-engine = <&bch>;
#address-cells = <1>;
#size-cells = <0>;
};
bch: ecc@1100e000 {
compatible = "mediatek,mt7623-ecc",
"mediatek,mt2701-ecc";
reg = <0 0x1100e000 0 0x1000>;
interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_LOW>;
clocks = <&pericfg CLK_PERI_NFI_ECC>;
clock-names = "nfiecc_clk";
status = "disabled";
};
afe: audio-controller@11220000 { afe: audio-controller@11220000 {
compatible = "mediatek,mt7623-audio", compatible = "mediatek,mt7623-audio",
"mediatek,mt2701-audio"; "mediatek,mt2701-audio";
...@@ -655,6 +660,15 @@ mmc1: mmc@11240000 { ...@@ -655,6 +660,15 @@ mmc1: mmc@11240000 {
status = "disabled"; status = "disabled";
}; };
hifsys: syscon@1a000000 {
compatible = "mediatek,mt7623-hifsys",
"mediatek,mt2701-hifsys",
"syscon";
reg = <0 0x1a000000 0 0x1000>;
#clock-cells = <1>;
#reset-cells = <1>;
};
usb1: usb@1a1c0000 { usb1: usb@1a1c0000 {
compatible = "mediatek,mt7623-xhci", compatible = "mediatek,mt7623-xhci",
"mediatek,mt8173-xhci"; "mediatek,mt8173-xhci";
...@@ -733,15 +747,6 @@ u3port1: usb-phy@1a244900 { ...@@ -733,15 +747,6 @@ u3port1: usb-phy@1a244900 {
}; };
}; };
hifsys: syscon@1a000000 {
compatible = "mediatek,mt7623-hifsys",
"mediatek,mt2701-hifsys",
"syscon";
reg = <0 0x1a000000 0 0x1000>;
#clock-cells = <1>;
#reset-cells = <1>;
};
ethsys: syscon@1b000000 { ethsys: syscon@1b000000 {
compatible = "mediatek,mt7623-ethsys", compatible = "mediatek,mt7623-ethsys",
"mediatek,mt2701-ethsys", "mediatek,mt2701-ethsys",
......
arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts
View file @ dfff569a
...@@ -62,9 +62,9 @@ leds { ...@@ -62,9 +62,9 @@ leds {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&led_pins_a>; pinctrl-0 = <&led_pins_a>;
red { blue {
label = "bpi-r2:pio:red"; label = "bpi-r2:pio:blue";
gpios = <&pio 239 GPIO_ACTIVE_HIGH>; gpios = <&pio 241 GPIO_ACTIVE_HIGH>;
default-state = "off"; default-state = "off";
}; };
...@@ -74,9 +74,9 @@ green { ...@@ -74,9 +74,9 @@ green {
default-state = "off"; default-state = "off";
}; };
blue { red {
label = "bpi-r2:pio:blue"; label = "bpi-r2:pio:red";
gpios = <&pio 241 GPIO_ACTIVE_HIGH>; gpios = <&pio 239 GPIO_ACTIVE_HIGH>;
default-state = "off"; default-state = "off";
}; };
}; };
...@@ -98,10 +98,12 @@ &crypto { ...@@ -98,10 +98,12 @@ &crypto {
&eth { &eth {
status = "okay"; status = "okay";
gmac0: mac@0 { gmac0: mac@0 {
compatible = "mediatek,eth-mac"; compatible = "mediatek,eth-mac";
reg = <0>; reg = <0>;
phy-mode = "trgmii"; phy-mode = "trgmii";
fixed-link { fixed-link {
speed = <1000>; speed = <1000>;
full-duplex; full-duplex;
...@@ -112,12 +114,12 @@ fixed-link { ...@@ -112,12 +114,12 @@ fixed-link {
mdio: mdio-bus { mdio: mdio-bus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
switch@0 { switch@0 {
compatible = "mediatek,mt7530"; compatible = "mediatek,mt7530";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
reg = <0>; reg = <0>;
pinctrl-names = "default"; pinctrl-names = "default";
reset-gpios = <&pio 33 0>; reset-gpios = <&pio 33 0>;
core-supply = <&mt6323_vpa_reg>; core-supply = <&mt6323_vpa_reg>;
...@@ -127,6 +129,7 @@ ports { ...@@ -127,6 +129,7 @@ ports {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
reg = <0>; reg = <0>;
port@0 { port@0 {
reg = <0>; reg = <0>;
label = "wan"; label = "wan";
...@@ -157,6 +160,7 @@ port@6 { ...@@ -157,6 +160,7 @@ port@6 {
label = "cpu"; label = "cpu";
ethernet = <&gmac0>; ethernet = <&gmac0>;
phy-mode = "trgmii"; phy-mode = "trgmii";
fixed-link { fixed-link {
speed = <1000>; speed = <1000>;
full-duplex; full-duplex;
...@@ -372,16 +376,6 @@ pins_clk { ...@@ -372,16 +376,6 @@ pins_clk {
}; };
}; };
spi0_pins_a: spi@0 {
pins_spi {
pinmux = <MT7623_PIN_53_SPI0_CSN_FUNC_SPI0_CS>,
<MT7623_PIN_54_SPI0_CK_FUNC_SPI0_CK>,
<MT7623_PIN_55_SPI0_MI_FUNC_SPI0_MI>,
<MT7623_PIN_56_SPI0_MO_FUNC_SPI0_MO>;
bias-disable;
};
};
pwm_pins_a: pwm@0 { pwm_pins_a: pwm@0 {
pins_pwm { pins_pwm {
pinmux = <MT7623_PIN_203_PWM0_FUNC_PWM0>, pinmux = <MT7623_PIN_203_PWM0_FUNC_PWM0>,
...@@ -392,6 +386,16 @@ pins_pwm { ...@@ -392,6 +386,16 @@ pins_pwm {
}; };
}; };
spi0_pins_a: spi@0 {
pins_spi {
pinmux = <MT7623_PIN_53_SPI0_CSN_FUNC_SPI0_CS>,
<MT7623_PIN_54_SPI0_CK_FUNC_SPI0_CK>,
<MT7623_PIN_55_SPI0_MI_FUNC_SPI0_MI>,
<MT7623_PIN_56_SPI0_MO_FUNC_SPI0_MO>;
bias-disable;
};
};
uart0_pins_a: uart@0 { uart0_pins_a: uart@0 {
pins_dat { pins_dat {
pinmux = <MT7623_PIN_79_URXD0_FUNC_URXD0>, pinmux = <MT7623_PIN_79_URXD0_FUNC_URXD0>,
...@@ -425,11 +429,13 @@ led@0 { ...@@ -425,11 +429,13 @@ led@0 {
label = "bpi-r2:isink:green"; label = "bpi-r2:isink:green";
default-state = "off"; default-state = "off";
}; };
led@1 { led@1 {
reg = <1>; reg = <1>;
label = "bpi-r2:isink:red"; label = "bpi-r2:isink:red";
default-state = "off"; default-state = "off";
}; };
led@2 { led@2 {
reg = <2>; reg = <2>;
label = "bpi-r2:isink:blue"; label = "bpi-r2:isink:blue";
...@@ -451,14 +457,6 @@ &uart0 { ...@@ -451,14 +457,6 @@ &uart0 {
status = "disabled"; status = "disabled";
}; };
&u3phy1 {
status = "okay";
};
&u3phy2 {
status = "okay";
};
&uart1 { &uart1 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart1_pins_a>; pinctrl-0 = <&uart1_pins_a>;
...@@ -478,3 +476,12 @@ &usb2 { ...@@ -478,3 +476,12 @@ &usb2 {
vusb33-supply = <&mt6323_vusb_reg>; vusb33-supply = <&mt6323_vusb_reg>;
status = "okay"; status = "okay";
}; };
&u3phy1 {
status = "okay";
};
&u3phy2 {
status = "okay";
};
arch/arm/boot/dts/mt7623n-rfb-nand.dts
View file @ dfff569a
...@@ -20,47 +20,22 @@ / { ...@@ -20,47 +20,22 @@ / {
compatible = "mediatek,mt7623n-rfb-nand", "mediatek,mt7623"; compatible = "mediatek,mt7623n-rfb-nand", "mediatek,mt7623";
}; };
&pio { &bch {
nand_pins_default: nanddefault { status = "okay";
pins_dat {
pinmux = <MT7623_PIN_111_MSDC0_DAT7_FUNC_NLD7>,
<MT7623_PIN_112_MSDC0_DAT6_FUNC_NLD6>,
<MT7623_PIN_114_MSDC0_DAT4_FUNC_NLD4>,
<MT7623_PIN_118_MSDC0_DAT3_FUNC_NLD3>,
<MT7623_PIN_121_MSDC0_DAT0_FUNC_NLD0>,
<MT7623_PIN_120_MSDC0_DAT1_FUNC_NLD1>,
<MT7623_PIN_113_MSDC0_DAT5_FUNC_NLD5>,
<MT7623_PIN_115_MSDC0_RSTB_FUNC_NLD8>,
<MT7623_PIN_119_MSDC0_DAT2_FUNC_NLD2>;
input-enable;
drive-strength = <MTK_DRIVE_8mA>;
bias-pull-up;
};
pins_we {
pinmux = <MT7623_PIN_117_MSDC0_CLK_FUNC_NWEB>;
drive-strength = <MTK_DRIVE_8mA>;
bias-pull-up = <MTK_PUPD_SET_R1R0_10>;
};
pins_ale {
pinmux = <MT7623_PIN_116_MSDC0_CMD_FUNC_NALE>;
drive-strength = <MTK_DRIVE_8mA>;
bias-pull-down = <MTK_PUPD_SET_R1R0_10>;
};
};
}; };
&nandc { &nandc {
status = "okay"; status = "okay";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&nand_pins_default>; pinctrl-0 = <&nand_pins_default>;
nand@0 { nand@0 {
reg = <0>; reg = <0>;
spare_per_sector = <64>; spare_per_sector = <64>;
nand-ecc-mode = "hw"; nand-ecc-mode = "hw";
nand-ecc-strength = <12>; nand-ecc-strength = <12>;
nand-ecc-step-size = <1024>; nand-ecc-step-size = <1024>;
partitions { partitions {
compatible = "fixed-partitions"; compatible = "fixed-partitions";
#address-cells = <1>; #address-cells = <1>;
...@@ -104,6 +79,33 @@ partition@5140000 { ...@@ -104,6 +79,33 @@ partition@5140000 {
}; };
}; };
&bch { &pio {
status = "okay"; nand_pins_default: nanddefault {
pins_ale {
pinmux = <MT7623_PIN_116_MSDC0_CMD_FUNC_NALE>;
drive-strength = <MTK_DRIVE_8mA>;
bias-pull-down = <MTK_PUPD_SET_R1R0_10>;
};
pins_dat {
pinmux = <MT7623_PIN_111_MSDC0_DAT7_FUNC_NLD7>,
<MT7623_PIN_112_MSDC0_DAT6_FUNC_NLD6>,
<MT7623_PIN_114_MSDC0_DAT4_FUNC_NLD4>,
<MT7623_PIN_118_MSDC0_DAT3_FUNC_NLD3>,
<MT7623_PIN_121_MSDC0_DAT0_FUNC_NLD0>,
<MT7623_PIN_120_MSDC0_DAT1_FUNC_NLD1>,
<MT7623_PIN_113_MSDC0_DAT5_FUNC_NLD5>,
<MT7623_PIN_115_MSDC0_RSTB_FUNC_NLD8>,
<MT7623_PIN_119_MSDC0_DAT2_FUNC_NLD2>;
input-enable;
drive-strength = <MTK_DRIVE_8mA>;
bias-pull-up;
};
pins_we {
pinmux = <MT7623_PIN_117_MSDC0_CLK_FUNC_NWEB>;
drive-strength = <MTK_DRIVE_8mA>;
bias-pull-up = <MTK_PUPD_SET_R1R0_10>;
};
};
}; };
arch/arm/boot/dts/mt7623n-rfb.dtsi
View file @ dfff569a
...@@ -18,6 +18,12 @@ ...@@ -18,6 +18,12 @@
#include "mt6323.dtsi" #include "mt6323.dtsi"
/ { / {
aliases {
serial0 = &uart0;
serial1 = &uart1;
serial2 = &uart2;
};
chosen { chosen {
stdout-path = "serial2:115200n8"; stdout-path = "serial2:115200n8";
}; };
...@@ -44,12 +50,6 @@ memory@80000000 { ...@@ -44,12 +50,6 @@ memory@80000000 {
reg = <0 0x80000000 0 0x40000000>; reg = <0 0x80000000 0 0x40000000>;
}; };
aliases {
serial0 = &uart0;
serial1 = &uart1;
serial2 = &uart2;
};
usb_p1_vbus: regulator@0 { usb_p1_vbus: regulator@0 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "usb_vbus"; regulator-name = "usb_vbus";
...@@ -60,6 +60,16 @@ usb_p1_vbus: regulator@0 { ...@@ -60,6 +60,16 @@ usb_p1_vbus: regulator@0 {
}; };
}; };
&mmc0 {
vmmc-supply = <&mt6323_vemc3v3_reg>;
vqmmc-supply = <&mt6323_vio18_reg>;
};
&mmc1 {
vmmc-supply = <&mt6323_vmch_reg>;
vqmmc-supply = <&mt6323_vmc_reg>;
};
&uart0 { &uart0 {
status = "okay"; status = "okay";
}; };
...@@ -72,16 +82,6 @@ &uart2 { ...@@ -72,16 +82,6 @@ &uart2 {
status = "okay"; status = "okay";
}; };
&mmc0 {
vmmc-supply = <&mt6323_vemc3v3_reg>;
vqmmc-supply = <&mt6323_vio18_reg>;
};
&mmc1 {
vmmc-supply = <&mt6323_vmch_reg>;
vqmmc-supply = <&mt6323_vmc_reg>;
};
&usb1 { &usb1 {
vbus-supply = <&usb_p1_vbus>; vbus-supply = <&usb_p1_vbus>;
status = "okay"; status = "okay";
......
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