Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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.org


Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
parent c756f614

arch/arm/boot/dts/at91-cosino.dtsi

+100 −103
Original line number Diff line number Diff line
@@ -33,78 +33,30 @@ 
			clock-frequency = <12000000>;

		};

	};



	ahb {

		apb {

			tcb0: timer@f8008000 {

				timer@0 {

					compatible = "atmel,tcb-timer";

					reg = <0>;

};



				timer@1 {

					compatible = "atmel,tcb-timer";

					reg = <1>;

				};

			};



			mmc0: mmc@f0008000 {

				pinctrl-0 = <

					&pinctrl_board_mmc0

					&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 {

				status = "okay";

			};



			usart0: serial@f801c000 {

				status = "okay";

			};



			i2c0: i2c@f8010000 {

				status = "okay";

			};



			adc0: adc@f804c000 {

&adc0 {

	atmel,adc-ts-wires = <4>;

	atmel,adc-ts-pressure-threshold = <10000>;

	status = "okay";

};



			pinctrl@fffff400 {

				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 */

					};

				};

			};



			watchdog@fffffe40 {

&dbgu {

	status = "okay";

};

		};



		ebi: ebi@10000000 {

&ebi {

	pinctrl-0 = <&pinctrl_ebi_addr_nand

		     &pinctrl_ebi_data_0_7>;

	pinctrl-names = "default";

	status = "okay";



			nand_controller: nand-controller {

				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>;
@@ -150,5 +102,50 @@ 
		};

	};

};



&i2c0 {

	status = "okay";

};



&mmc0 {

	pinctrl-0 = <

		&pinctrl_board_mmc0

		&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>;

	};

};



&pinctrl {

	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 */

		};

	};

};



&tcb0 {

	timer@0 {

		compatible = "atmel,tcb-timer";

		reg = <0>;

	};



	timer@1 {

		compatible = "atmel,tcb-timer";

		reg = <1>;

	};

};



&usart0 {

	status = "okay";

};



&watchdog {

	status = "okay";

};

arch/arm/boot/dts/at91-cosino_mega2560.dts

+45 −48
Original line number Diff line number Diff line
@@ -17,61 +17,58 @@ 
/ {

	model = "HCE Cosino Mega 2560";

	compatible = "hce,cosino_mega2560", "atmel,at91sam9x5", "atmel,at91sam9";



	ahb {

		apb {

			macb0: ethernet@f802c000 {

				phy-mode = "rmii";

				status = "okay";

};



			adc0: adc@f804c000 {

&adc0 {

	atmel,adc-ts-wires = <4>;

	atmel,adc-ts-pressure-threshold = <10000>;

	status = "okay";

};



			rtc@fffffeb0 {

				status = "okay";

			};



			usart1: serial@f8020000 {

				status = "okay";

			};



			usart2: serial@f8024000 {

				status = "okay";

			};



			usb2: gadget@f803c000 {

				atmel,vbus-gpio = <&pioB 16 GPIO_ACTIVE_HIGH>;

&macb0 {

	phy-mode = "rmii";

	status = "okay";

};



			mmc1: mmc@f000c000 {

&mmc1 {

	pinctrl-0 = <

		&pinctrl_mmc1_slot0_clk_cmd_dat0

		&pinctrl_mmc1_slot0_dat1_3>;

	status = "okay";



	slot@0 {

		reg = <0>;

		bus-width = <4>;

		non-removable;

	};

};



&rtc {

	status = "okay";

};



		usb0: ohci@600000 {

&usart1 {

	status = "okay";

};



&usart2 {

	status = "okay";

};



&usb0 {

	num-ports = <3>;

	atmel,vbus-gpio = <0 /* &pioD 18 GPIO_ACTIVE_LOW */

			   &pioD 19 GPIO_ACTIVE_LOW

			   &pioD 20 GPIO_ACTIVE_LOW

			  >;

	status = "okay";

};



		usb1: ehci@700000 {

&usb1 {

	status = "okay";

};

	};



&usb2 {

	atmel,vbus-gpio = <&pioB 16 GPIO_ACTIVE_HIGH>;

	status = "okay";

};