Commit a66bd94d authored by Jagan Teki's avatar Jagan Teki Committed by Heiko Stuebner
Browse files

arm64: dts: rk3399pro: vmarc-som: Move common properties into Carrier 



Some of gmac, sdmmc node properties are common across rk3288 and
rk3399pro SOM's so move them into Carrier dtsi.

Chosen node is specific to rk3399pro configure SBC, so move it into
RockPI N10 dts.

Signed-off-by: default avatarJagan Teki <jagan@amarulasolutions.com>
Link: https://lore.kernel.org/r/20200715083418.112003-5-jagan@amarulasolutions.com


Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
parent 4a3ca113

arch/arm/boot/dts/rockchip-radxa-dalang-carrier.dtsi

+14 −4
Original line number Diff line number Diff line
@@ -8,8 +8,11 @@ 
#include <dt-bindings/pwm/pwm.h>



/ {

	chosen {

		stdout-path = "serial2:1500000n8";

	clkin_gmac: external-gmac-clock {

		compatible = "fixed-clock";

		clock-frequency = <125000000>;

		clock-output-names = "clkin_gmac";

		#clock-cells = <0>;

	};



	vcc12v_dcin: vcc12v-dcin-regulator {
@@ -33,6 +36,15 @@ 
};



&gmac {

	assigned-clock-parents = <&clkin_gmac>;

	clock_in_out = "input";

	phy-mode = "rgmii";

	pinctrl-names = "default";

	pinctrl-0 = <&rgmii_pins>;

	snps,reset-active-low;

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

	tx_delay = <0x28>;

	rx_delay = <0x11>;

	status = "okay";

};
@@ -48,10 +60,8 @@ 
	bus-width = <4>;

	cap-mmc-highspeed;

	cap-sd-highspeed;

	cd-gpios = <&gpio0 RK_PA7 GPIO_ACTIVE_LOW>;

	disable-wp;

	vqmmc-supply = <&vccio_sd>;

	max-frequency = <150000000>;

	pinctrl-names = "default";

	pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>;

	status = "okay";

arch/arm64/boot/dts/rockchip/rk3399pro-rock-pi-n10.dts

+4 −0
Original line number Diff line number Diff line
@@ -15,4 +15,8 @@ 
	model = "Radxa ROCK Pi N10";

	compatible = "radxa,rockpi-n10", "vamrs,rk3399pro-vmarc-som",

		     "rockchip,rk3399pro";



	chosen {

		stdout-path = "serial2:1500000n8";

	};

};

arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi

+5 −16
Original line number Diff line number Diff line
@@ -11,13 +11,6 @@ 


/ {

	compatible = "vamrs,rk3399pro-vmarc-som", "rockchip,rk3399pro";



	clkin_gmac: external-gmac-clock {

		compatible = "fixed-clock";

		clock-frequency = <125000000>;

		clock-output-names = "clkin_gmac";

		#clock-cells = <0>;

	};

};



&cpu_l0 {
@@ -42,17 +35,8 @@ 


&gmac {

	assigned-clocks = <&cru SCLK_RMII_SRC>;

	assigned-clock-parents = <&clkin_gmac>;

	clock_in_out = "input";

	phy-supply = <&vcc_lan>;

	phy-mode = "rgmii";

	pinctrl-names = "default";

	pinctrl-0 = <&rgmii_pins>;

	snps,reset-gpio = <&gpio3 RK_PB7 GPIO_ACTIVE_LOW>;

	snps,reset-active-low;

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

	tx_delay = <0x28>;

	rx_delay = <0x11>;

};



&i2c0 {
@@ -335,6 +319,11 @@ 
	status = "okay";

};



&sdmmc {

	cd-gpios = <&gpio0 RK_PA7 GPIO_ACTIVE_LOW>;

	max-frequency = <150000000>;

};



&tsadc {

	rockchip,hw-tshut-mode = <1>;

	rockchip,hw-tshut-polarity = <1>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE