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

Commit cdf77d76 authored Apr 01, 2015 by Olof Johansson

Merge tag 'v4.1-rockchip-dts1' of...

Merge tag 'v4.1-rockchip-dts1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt

Merge "ARM: rockchip: dts changes for 4.1" from Heiko Stuebner:

This adds and enables the usbphy nodes on the rk3288 boards and enables
the gmac on the firefly board. A new board the Popmetal-rk3288 is also
added. And finally the pmic supplies for act8846 based boards are added,
as the act8865/act8846 driver gained supply handling in the regulator tree.

* tag 'v4.1-rockchip-dts1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip

:
  ARM: dts: rockchip: complete rk3288-evb pmic supplies
  ARM: dts: rockchip: add input supplies for the act8846 on Radxa Rock
  ARM: dts: add rk3288 PopMetal board
  dt-bindings: add root compatible property for PopMetal board
  ARM: dts: rockchip: enable gmac on rk3288-firefly
  ARM: dts: rockchip: enable usbphy on rk3288-firefly
  ARM: dts: rockchip: Enable usb PHY on rk3288-evb board
  ARM: dts: rockchip: add rk3288 usb PHY

Signed-off-by: Olof Johansson <olof@lixom.net>

parents d24363a5 91d5cb73

Documentation/devicetree/bindings/arm/rockchip.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -22,3 +22,7 @@ Rockchip platforms device tree bindings
		- compatible = "firefly,firefly-rk3288", "rockchip,rk3288";
		or
		- compatible = "firefly,firefly-rk3288-beta", "rockchip,rk3288";

		- ChipSPARK PopMetal-RK3288 board:
		Required root node properties:
		- compatible = "chipspark,popmetal-rk3288", "rockchip,rk3288";

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

+16 −0

Original line number	Diff line number	Diff line
		@@ -103,6 +103,14 @@
		regulator-always-on;
		regulator-boot-on;
		};

		vsys: vsys-regulator {
		compatible = "regulator-fixed";
		regulator-name = "vsys";
		regulator-min-microvolt = <5000000>;
		regulator-max-microvolt = <5000000>;
		regulator-boot-on;
		};
		};

		&emac {
		@@ -148,6 +156,14 @@
		pinctrl-names = "default";
		pinctrl-0 = <&act8846_dvs0_ctl>;

		vp1-supply = <&vsys>;
		vp2-supply = <&vsys>;
		vp3-supply = <&vsys>;
		vp4-supply = <&vsys>;
		inl1-supply = <&vcc_io>;
		inl2-supply = <&vsys>;
		inl3-supply = <&vsys>;

		regulators {
		vcc_ddr: REG1 {
		regulator-name = "VCC_DDR";

arch/arm/boot/dts/rk3288-evb-act8846.dts

+10 −0

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@
		regulator-max-microvolt = <1350000>;
		regulator-always-on;
		regulator-boot-on;
		vin-supply = <&vcc_sys>;
		};

		vdd_gpu: syr828@41 {
		@@ -43,6 +44,7 @@
		regulator-min-microvolt = <850000>;
		regulator-max-microvolt = <1350000>;
		regulator-always-on;
		vin-supply = <&vcc_sys>;
		};

		hym8563@51 {
		@@ -64,6 +66,14 @@
		reg = <0x5a>;
		status = "okay";

		vp1-supply = <&vcc_sys>;
		vp2-supply = <&vcc_sys>;
		vp3-supply = <&vcc_sys>;
		vp4-supply = <&vcc_sys>;
		inl1-supply = <&vcc_io>;
		inl2-supply = <&vcc_sys>;
		inl3-supply = <&vcc_20>;

		regulators {
		vcc_ddr: REG1 {
		regulator-name = "VCC_DDR";

arch/arm/boot/dts/rk3288-evb-rk808.dts

+7 −0

Original line number	Diff line number	Diff line
		@@ -43,9 +43,16 @@
		#clock-cells = <1>;
		clock-output-names = "xin32k", "rk808-clkout2";

		vcc1-supply = <&vcc_sys>;
		vcc2-supply = <&vcc_sys>;
		vcc3-supply = <&vcc_sys>;
		vcc4-supply = <&vcc_sys>;
		vcc6-supply = <&vcc_sys>;
		vcc7-supply = <&vcc_sys>;
		vcc8-supply = <&vcc_18>;
		vcc9-supply = <&vcc_io>;
		vcc10-supply = <&vcc_io>;
		vcc11-supply = <&vcc_sys>;
		vcc12-supply = <&vcc_io>;
		vddio-supply = <&vccio_pmu>;

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

+13 −0

Original line number	Diff line number	Diff line
		@@ -103,6 +103,15 @@
		regulator-always-on;
		regulator-boot-on;
		};

		vcc_sys: vsys-regulator {
		compatible = "regulator-fixed";
		regulator-name = "vcc_sys";
		regulator-min-microvolt = <5000000>;
		regulator-max-microvolt = <5000000>;
		regulator-always-on;
		regulator-boot-on;
		};
		};

		&emmc {
		@@ -238,6 +247,10 @@
		};
		};

		&usbphy {
		status = "okay";
		};

		&usb_host0_ehci {
		status = "okay";
		};