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

Commit b04061e6 authored by Chris Zhong's avatar Chris Zhong Committed by Heiko Stuebner
Browse files

ARM: dts: rockchip: move the public part to rk3288-evb common 



Rk3288-evb-act8846 and rk3288-evb-rk808 are the power boards of
rk3288-evb, they provide the same power supply interface to the
motherboard. Sort out them, put the public part to rk3288-evb.dtsi,
such as gmac and cpu-supply, leaving only the power section.

Signed-off-by: default avatarChris Zhong <zyw@rock-chips.com>
Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
parent 662513a1

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

+0 −4
Original line number Diff line number Diff line
@@ -65,10 +65,6 @@ 
	};

};



&cpu0 {

	cpu0-supply = <&vdd_cpu>;

};



&i2c0 {

	clock-frequency = <400000>;

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

+0 −27
Original line number Diff line number Diff line
@@ -43,17 +43,6 @@ 


/ {

	compatible = "rockchip,rk3288-evb-rk808", "rockchip,rk3288";



	ext_gmac: external-gmac-clock {

		compatible = "fixed-clock";

		clock-frequency = <125000000>;

		clock-output-names = "ext_gmac";

		#clock-cells = <0>;

	};

};



&cpu0 {

	cpu0-supply = <&vdd_cpu>;

};



&i2c0 {
@@ -244,19 +233,3 @@ 
		};

	};

};
 


&gmac {

	phy-supply = <&vcc_phy>;

	phy-mode = "rgmii";

	clock_in_out = "input";

	snps,reset-gpio = <&gpio4 7 0>;

	snps,reset-active-low;

	snps,reset-delays-us = <0 10000 1000000>;

	assigned-clocks = <&cru SCLK_MAC>;

	assigned-clock-parents = <&ext_gmac>;

	pinctrl-names = "default";

	pinctrl-0 = <&rgmii_pins>;

	tx_delay = <0x30>;

	rx_delay = <0x10>;

	status = "ok";

};

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

+32 −5
Original line number Diff line number Diff line
@@ -89,6 +89,13 @@ 
		pwms = <&pwm0 0 1000000 PWM_POLARITY_INVERTED>;

	};



	ext_gmac: external-gmac-clock {

		compatible = "fixed-clock";

		clock-frequency = <125000000>;

		clock-output-names = "ext_gmac";

		#clock-cells = <0>;

	};



	gpio-keys {

		compatible = "gpio-keys";

		#address-cells = <1>;
@@ -160,6 +167,10 @@ 
	};

};



&cpu0 {

	cpu0-supply = <&vdd_cpu>;

};



&emmc {

	broken-cd;

	bus-width = <8>;
@@ -172,11 +183,6 @@ 
	status = "okay";

};



&hdmi {

	ddc-i2c-bus = <&i2c5>;

	status = "okay";

};



&sdmmc {

	bus-width = <4>;

	cap-mmc-highspeed;
@@ -191,6 +197,27 @@ 
	vqmmc-supply = <&vccio_sd>;

};



&gmac {

	phy-supply = <&vcc_phy>;

	phy-mode = "rgmii";

	clock_in_out = "input";

	snps,reset-gpio = <&gpio4 7 0>;

	snps,reset-active-low;

	snps,reset-delays-us = <0 10000 1000000>;

	assigned-clocks = <&cru SCLK_MAC>;

	assigned-clock-parents = <&ext_gmac>;

	pinctrl-names = "default";

	pinctrl-0 = <&rgmii_pins>;

	tx_delay = <0x30>;

	rx_delay = <0x10>;

	status = "ok";

};



&hdmi {

	ddc-i2c-bus = <&i2c5>;

	status = "okay";

};



&i2c0 {

	status = "okay";

};