Commit c22ae32d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v5.1-rockchip-dts32-2' of... 

Merge tag 'v5.1-rockchip-dts32-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/dt

A number of improvements for rv1108 boards, removal of an obsolete property
from the Edison tablet and a chosen node for veyron devices.

* tag 'v5.1-rockchip-dts32-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip

:
  ARM: dts: rockchip: add chosen node on veyron devices
  ARM: dts: rockchip: remove cap-mmc-highspeed from rk3188-bqedison2qc mmc1 node
  ARM: dts: rockchip: Use the correct regulator properties on rv1108-evb
  ARM: dts: rockchip: Use the correct regulator properties on rv1108-elgin
  ARM: dts: rockchip: Fix vcc5/6-supply representation on rv1108-elgin

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents bf5db21c 5aed37a5

arch/arm/boot/dts/rk3188-bqedison2qc.dts

+0 −1
Original line number Diff line number Diff line
@@ -460,7 +460,6 @@ 
&mmc1 {

	bus-width = <4>;

	cap-sd-highspeed;

	cap-mmc-highspeed;

	keep-power-in-suspend;

	mmc-pwrseq = <&sdio_pwrseq>;

	non-removable;

arch/arm/boot/dts/rk3288-veyron.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -10,6 +10,10 @@ 
#include "rk3288.dtsi"



/ {

	chosen {

		stdout-path = "serial2:115200n8";

	};



	/*

	 * The default coreboot on veyron devices ignores memory@0 nodes

	 * and would instead create another memory node.

arch/arm/boot/dts/rv1108-elgin-r1.dts

+18 −16
Original line number Diff line number Diff line
@@ -74,8 +74,8 @@ 
		vcc2-supply = <&vcc_sys>;

		vcc3-supply = <&vcc_sys>;

		vcc4-supply = <&vcc_sys>;

		vcc5-supply = <&vcc_sys>;

		vcc6-supply = <&vcc_sys>;

		vcc5-supply = <&vdd_buck2>;

		vcc6-supply = <&vdd_buck2>;



		regulators {

			vdd_core: DCDC_REG1 {
@@ -85,17 +85,19 @@ 
				regulator-always-on;

				regulator-boot-on;

				regulator-state-mem {

					regulator-state-enabled;

					regulator-state-uv = <900000>;

					regulator-on-in-suspend;

					regulator-suspend-microvolt = <900000>;

				};

			};



			vdd_cam: DCDC_REG2 {

				regulator-name= "vdd_cam";

				regulator-min-microvolt = <700000>;

				regulator-max-microvolt = <2000000>;

			vdd_buck2: DCDC_REG2 {

				regulator-name= "vdd_buck2";

				regulator-min-microvolt = <2200000>;

				regulator-max-microvolt = <2200000>;

				regulator-always-on;

				regulator-boot-on;

				regulator-state-mem {

					regulator-state-disabled;

					regulator-off-in-suspend;

				};

			};
@@ -104,7 +106,7 @@ 
				regulator-always-on;

				regulator-boot-on;

				regulator-state-mem {

					regulator-state-enabled;

					regulator-on-in-suspend;

				};

			};
@@ -115,8 +117,8 @@ 
				regulator-always-on;

				regulator-boot-on;

				regulator-state-mem {

					regulator-state-enabled;

					regulator-state-uv = <3300000>;

					regulator-on-in-suspend;

					regulator-suspend-microvolt = <3300000>;

				};

			};
@@ -127,7 +129,7 @@ 
				regulator-always-on;

				regulator-boot-on;

				regulator-state-mem {

					regulator-state-disabled;

					regulator-off-in-suspend;

				};

			};
@@ -138,7 +140,7 @@ 
				regulator-always-on;

				regulator-boot-on;

				regulator-state-mem {

					regulator-state-disabled;

					regulator-off-in-suspend;

				};

			};
@@ -149,8 +151,8 @@ 
				regulator-always-on;

				regulator-boot-on;

				regulator-state-mem {

					regulator-state-enabled;

					regulator-state-uv = <1000000>;

					regulator-on-in-suspend;

					regulator-suspend-microvolt = <1000000>;

				};

			};

		};

arch/arm/boot/dts/rv1108-evb.dts

+10 −10
Original line number Diff line number Diff line
@@ -97,8 +97,8 @@ 
				regulator-always-on;

				regulator-boot-on;

				regulator-state-mem {

					regulator-state-enabled;

					regulator-state-uv = <900000>;

					regulator-on-in-suspend;

					regulator-suspend-microvolt = <900000>;

				};

			};
@@ -107,7 +107,7 @@ 
				regulator-min-microvolt = <700000>;

				regulator-max-microvolt = <2000000>;

				regulator-state-mem {

					regulator-state-disabled;

					regulator-off-in-suspend;

				};

			};
@@ -116,7 +116,7 @@ 
				regulator-always-on;

				regulator-boot-on;

				regulator-state-mem {

					regulator-state-enabled;

					regulator-on-in-suspend;

				};

			};
@@ -127,8 +127,8 @@ 
				regulator-always-on;

				regulator-boot-on;

				regulator-state-mem {

					regulator-state-enabled;

					regulator-state-uv = <3300000>;

					regulator-on-in-suspend;

					regulator-suspend-microvolt = <3300000>;

				};

			};
@@ -139,7 +139,7 @@ 
				regulator-always-on;

				regulator-boot-on;

				regulator-state-mem {

					regulator-state-disabled;

					regulator-off-in-suspend;

				};

			};
@@ -150,7 +150,7 @@ 
				regulator-always-on;

				regulator-boot-on;

				regulator-state-mem {

					regulator-state-disabled;

					regulator-off-in-suspend;

				};

			};
@@ -161,8 +161,8 @@ 
				regulator-always-on;

				regulator-boot-on;

				regulator-state-mem {

					regulator-state-enabled;

					regulator-state-uv = <1000000>;

					regulator-on-in-suspend;

					regulator-suspend-microvolt = <1000000>;

				};

			};

		};

CRA Git | Maintained and supported by SUSTech CRA and CCSE