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

Commit d903bc9e authored by Jason Cooper's avatar Jason Cooper
Browse files

Merge branch 'mvebu/dt-fixes' into mvebu/fixes

parents b25bcf1b c2a3dd9d

arch/arm/boot/dts/armada-370-db.dts

+1 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ 
			i2c@11000 {

				pinctrl-0 = <&i2c0_pins>;

				pinctrl-names = "default";

				clock-frequency = <100000>;

				status = "okay";

				audio_codec: audio-codec@4a {

					compatible = "cirrus,cs42l51";

arch/arm/boot/dts/armada-375-db.dts

+5 −0
Original line number Diff line number Diff line
@@ -79,6 +79,11 @@ 
				};

			};



			sata@a0000 {

				status = "okay";

				nr-ports = <2>;

			};



			nand: nand@d0000 {

				pinctrl-0 = <&nand_pins>;

				pinctrl-names = "default";

arch/arm/boot/dts/armada-380.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ 
			pcie@3,0 {

				device_type = "pci";

				assigned-addresses = <0x82000800 0 0x44000 0 0x2000>;

				reg = <0x1000 0 0 0 0>;

				reg = <0x1800 0 0 0 0>;

				#address-cells = <3>;

				#size-cells = <2>;

				#interrupt-cells = <1>;

arch/arm/boot/dts/armada-385.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ 
			pcie@3,0 {

				device_type = "pci";

				assigned-addresses = <0x82000800 0 0x44000 0 0x2000>;

				reg = <0x1000 0 0 0 0>;

				reg = <0x1800 0 0 0 0>;

				#address-cells = <3>;

				#size-cells = <2>;

				#interrupt-cells = <1>;
@@ -131,7 +131,7 @@ 
			pcie@4,0 {

				device_type = "pci";

				assigned-addresses = <0x82000800 0 0x48000 0 0x2000>;

				reg = <0x1000 0 0 0 0>;

				reg = <0x2000 0 0 0 0>;

				#address-cells = <3>;

				#size-cells = <2>;

				#interrupt-cells = <1>;

arch/arm/boot/dts/armada-xp-db.dts

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 
			/* Device Bus parameters are required */



			/* Read parameters */

			devbus,bus-width    = <8>;

			devbus,bus-width    = <16>;

			devbus,turn-off-ps  = <60000>;

			devbus,badr-skew-ps = <0>;

			devbus,acc-first-ps = <124000>;