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

Commit 54137bf6 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'berlin-dt-for-v4.10-1' of... 

Merge tag 'berlin-dt-for-v4.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jszhang/linux-berlin into next/dt

Pull "Berlin DT changes for v4.10" from Jisheng Zhang:

- fix DTC compiler warning
- fix typo in chosen node

* tag 'berlin-dt-for-v4.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jszhang/linux-berlin:
  ARM: dts: berlin2q-marvell-dmp: fix typo in chosen node
  ARM: dts: berlin2q-marvell-dmp: fix regulators' name
parents bb2d8507 0248994d

arch/arm/boot/dts/berlin2q-marvell-dmp.dts

+6 −6
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ 
		reg = <0x00000000 0x80000000>;

	};



	choosen {

	chosen {

		bootargs = "earlyprintk";

		stdout-path = "serial0:115200n8";

	};
@@ -58,7 +58,7 @@ 
		#address-cells = <1>;

		#size-cells = <0>;



		reg_usb0_vbus: regulator@0 {

		reg_usb0_vbus: regulator_usb0 {

			compatible = "regulator-fixed";

			regulator-name = "usb0_vbus";

			regulator-min-microvolt = <5000000>;
@@ -67,7 +67,7 @@ 
			enable-active-high;

		};



		reg_usb1_vbus: regulator@1 {

		reg_usb1_vbus: regulator_usb1 {

			compatible = "regulator-fixed";

			regulator-name = "usb1_vbus";

			regulator-min-microvolt = <5000000>;
@@ -76,7 +76,7 @@ 
			enable-active-high;

		};



		reg_usb2_vbus: regulator@2 {

		reg_usb2_vbus: regulator_usb2 {

			compatible = "regulator-fixed";

			regulator-name = "usb2_vbus";

			regulator-min-microvolt = <5000000>;
@@ -85,7 +85,7 @@ 
			enable-active-high;

		};



		reg_sdio1_vmmc: regulator@3 {

		reg_sdio1_vmmc: regulator_sdio1_vmmc {

			compatible = "regulator-fixed";

			regulator-min-microvolt = <3300000>;

			regulator-max-microvolt = <3300000>;
@@ -95,7 +95,7 @@ 
			gpio = <&portb 21 GPIO_ACTIVE_HIGH>;

		};



		reg_sdio1_vqmmc: regulator@4 {

		reg_sdio1_vqmmc: regulator_sido1_vqmmc {

			compatible = "regulator-gpio";

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <3300000>;