Skip to content

L
linux
Commit fd117bba authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Alexandre Belloni
Browse files
Options

ARM: dts: at91: cosino: Style cleanup 

- newline between properties and sub-nodes
- use tags from included dtsi instead of duplicating the hierarchy
- status should be the last property

There are no differences in the generated .dtb
Signed-off-by: default avatarUwe Kleine-König <uwe@kleine-koenig.org>
Link: https://lore.kernel.org/r/20190812212757.23432-4-uwe@kleine-koenig.orgSigned-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
parent c756f614
Hide whitespace changes
Inline Side-by-side
Showing with 145 additions and 151 deletions
arch/arm/boot/dts/at91-cosino.dtsi
View file @ fd117bba
...@@ -33,122 +33,119 @@ main_xtal { ...@@ -33,122 +33,119 @@ main_xtal {
clock-frequency = <12000000>; clock-frequency = <12000000>;
}; };
}; };
};
ahb { &adc0 {
apb { atmel,adc-ts-wires = <4>;
tcb0: timer@f8008000 { atmel,adc-ts-pressure-threshold = <10000>;
timer@0 { status = "okay";
compatible = "atmel,tcb-timer"; };
reg = <0>;
}; &dbgu {
status = "okay";
};
timer@1 { &ebi {
compatible = "atmel,tcb-timer"; pinctrl-0 = <&pinctrl_ebi_addr_nand
reg = <1>; &pinctrl_ebi_data_0_7>;
pinctrl-names = "default";
status = "okay";
nand-controller {
pinctrl-0 = <&pinctrl_nand_oe_we
&pinctrl_nand_cs
&pinctrl_nand_rb>;
pinctrl-names = "default";
status = "okay";
nand@3 {
reg = <0x3 0x0 0x800000>;
rb-gpios = <&pioD 5 GPIO_ACTIVE_HIGH>;
cs-gpios = <&pioD 4 GPIO_ACTIVE_HIGH>;
nand-bus-width = <8>;
nand-ecc-mode = "hw";
nand-ecc-strength = <4>;
nand-ecc-step-size = <512>;
nand-on-flash-bbt;
label = "atmel_nand";
partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;
at91bootstrap@0 {
label = "at91bootstrap";
reg = <0x0 0x40000>;
}; };
};
mmc0: mmc@f0008000 { uboot@40000 {
pinctrl-0 = < label = "u-boot";
&pinctrl_board_mmc0 reg = <0x40000 0x80000>;
&pinctrl_mmc0_slot0_clk_cmd_dat0
&pinctrl_mmc0_slot0_dat1_3>;
status = "okay";
slot@0 {
reg = <0>;
bus-width = <4>;
cd-gpios = <&pioD 15 GPIO_ACTIVE_HIGH>;
}; };
};
dbgu: serial@fffff200 { ubootenv@c0000 {
status = "okay"; label = "U-Boot Env";
}; reg = <0xc0000 0x140000>;
};
usart0: serial@f801c000 { kernel@200000 {
status = "okay"; label = "kernel";
}; reg = <0x200000 0x600000>;
};
i2c0: i2c@f8010000 { rootfs@800000 {
status = "okay"; label = "rootfs";
reg = <0x800000 0x0f800000>;
};
}; };
};
};
};
adc0: adc@f804c000 { &i2c0 {
atmel,adc-ts-wires = <4>; status = "okay";
atmel,adc-ts-pressure-threshold = <10000>; };
status = "okay";
};
pinctrl@fffff400 { &mmc0 {
mmc0 { pinctrl-0 = <
pinctrl_board_mmc0: mmc0-board { &pinctrl_board_mmc0
atmel,pins = &pinctrl_mmc0_slot0_clk_cmd_dat0
<AT91_PIOD 15 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>; /* PD15 gpio CD pin pull up and deglitch */ &pinctrl_mmc0_slot0_dat1_3>;
}; status = "okay";
};
}; slot@0 {
reg = <0>;
bus-width = <4>;
cd-gpios = <&pioD 15 GPIO_ACTIVE_HIGH>;
};
};
watchdog@fffffe40 { &pinctrl {
status = "okay"; mmc0 {
}; pinctrl_board_mmc0: mmc0-board {
atmel,pins =
<AT91_PIOD 15 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>; /* PD15 gpio CD pin pull up and deglitch */
}; };
};
};
ebi: ebi@10000000 { &tcb0 {
pinctrl-0 = <&pinctrl_ebi_addr_nand timer@0 {
&pinctrl_ebi_data_0_7>; compatible = "atmel,tcb-timer";
pinctrl-names = "default"; reg = <0>;
status = "okay"; };
nand_controller: nand-controller { timer@1 {
status = "okay"; compatible = "atmel,tcb-timer";
pinctrl-0 = <&pinctrl_nand_oe_we reg = <1>;
&pinctrl_nand_cs
&pinctrl_nand_rb>;
pinctrl-names = "default";
nand@3 {
reg = <0x3 0x0 0x800000>;
rb-gpios = <&pioD 5 GPIO_ACTIVE_HIGH>;
cs-gpios = <&pioD 4 GPIO_ACTIVE_HIGH>;
nand-bus-width = <8>;
nand-ecc-mode = "hw";
nand-ecc-strength = <4>;
nand-ecc-step-size = <512>;
nand-on-flash-bbt;
label = "atmel_nand";
partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;
at91bootstrap@0 {
label = "at91bootstrap";
reg = <0x0 0x40000>;
};
uboot@40000 {
label = "u-boot";
reg = <0x40000 0x80000>;
};
ubootenv@c0000 {
label = "U-Boot Env";
reg = <0xc0000 0x140000>;
};
kernel@200000 {
label = "kernel";
reg = <0x200000 0x600000>;
};
rootfs@800000 {
label = "rootfs";
reg = <0x800000 0x0f800000>;
};
};
};
};
};
}; };
}; };
&usart0 {
status = "okay";
};
&watchdog {
status = "okay";
};
arch/arm/boot/dts/at91-cosino_mega2560.dts
View file @ fd117bba
...@@ -17,61 +17,58 @@ ...@@ -17,61 +17,58 @@
/ { / {
model = "HCE Cosino Mega 2560"; model = "HCE Cosino Mega 2560";
compatible = "hce,cosino_mega2560", "atmel,at91sam9x5", "atmel,at91sam9"; compatible = "hce,cosino_mega2560", "atmel,at91sam9x5", "atmel,at91sam9";
};
&adc0 {
atmel,adc-ts-wires = <4>;
atmel,adc-ts-pressure-threshold = <10000>;
status = "okay";
};
ahb { &macb0 {
apb { phy-mode = "rmii";
macb0: ethernet@f802c000 { status = "okay";
phy-mode = "rmii"; };
status = "okay";
};
adc0: adc@f804c000 { &mmc1 {
atmel,adc-ts-wires = <4>; pinctrl-0 = <
atmel,adc-ts-pressure-threshold = <10000>; &pinctrl_mmc1_slot0_clk_cmd_dat0
status = "okay"; &pinctrl_mmc1_slot0_dat1_3>;
}; status = "okay";
rtc@fffffeb0 { slot@0 {
status = "okay"; reg = <0>;
}; bus-width = <4>;
non-removable;
};
};
usart1: serial@f8020000 { &rtc {
status = "okay"; status = "okay";
}; };
usart2: serial@f8024000 { &usart1 {
status = "okay"; status = "okay";
}; };
usb2: gadget@f803c000 { &usart2 {
atmel,vbus-gpio = <&pioB 16 GPIO_ACTIVE_HIGH>; status = "okay";
status = "okay"; };
};
mmc1: mmc@f000c000 { &usb0 {
pinctrl-0 = < num-ports = <3>;
&pinctrl_mmc1_slot0_clk_cmd_dat0 atmel,vbus-gpio = <0 /* &pioD 18 GPIO_ACTIVE_LOW */
&pinctrl_mmc1_slot0_dat1_3>; &pioD 19 GPIO_ACTIVE_LOW
status = "okay"; &pioD 20 GPIO_ACTIVE_LOW
slot@0 { >;
reg = <0>; status = "okay";
bus-width = <4>; };
non-removable;
};
};
};
usb0: ohci@600000 { &usb1 {
status = "okay"; status = "okay";
num-ports = <3>; };
atmel,vbus-gpio = <0 /* &pioD 18 GPIO_ACTIVE_LOW */
&pioD 19 GPIO_ACTIVE_LOW
&pioD 20 GPIO_ACTIVE_LOW
>;
};
usb1: ehci@700000 { &usb2 {
status = "okay"; atmel,vbus-gpio = <&pioB 16 GPIO_ACTIVE_HIGH>;
}; 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