Эх сурвалжийг харах

ARM: shmobile: ape6evm-reference: Initialise SCIF device using DT

Initialise SCIF device using DT when booting ape6evm
using DT reference.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Simon Horman 11 жил өмнө
parent
commit
27bc82353a

+ 11 - 3
arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts

@@ -16,6 +16,10 @@
 	model = "APE6EVM";
 	model = "APE6EVM";
 	compatible = "renesas,ape6evm-reference", "renesas,r8a73a4";
 	compatible = "renesas,ape6evm-reference", "renesas,r8a73a4";
 
 
+	aliases {
+		serial0 = &scifa0;
+	};
+
 	chosen {
 	chosen {
 		bootargs = "console=ttySC0,115200 ignore_loglevel rw";
 		bootargs = "console=ttySC0,115200 ignore_loglevel rw";
 	};
 	};
@@ -90,9 +94,6 @@
 };
 };
 
 
 &pfc {
 &pfc {
-	pinctrl-0 = <&scifa0_pins>;
-	pinctrl-names = "default";
-
 	scifa0_pins: serial0 {
 	scifa0_pins: serial0 {
 		renesas,groups = "scifa0_data";
 		renesas,groups = "scifa0_data";
 		renesas,function = "scifa0";
 		renesas,function = "scifa0";
@@ -123,6 +124,13 @@
 	status = "okay";
 	status = "okay";
 };
 };
 
 
+&scifa0 {
+	pinctrl-0 = <&scifa0_pins>;
+	pinctrl-names = "default";
+
+	status = "okay";
+};
+
 &sdhi0 {
 &sdhi0 {
 	vmmc-supply = <&vcc_sdhi0>;
 	vmmc-supply = <&vcc_sdhi0>;
 	bus-width = <4>;
 	bus-width = <4>;

+ 6 - 6
arch/arm/mach-shmobile/setup-r8a73a4.c

@@ -187,12 +187,6 @@ static struct resource cmt1_resources[] = {
 
 
 void __init r8a73a4_add_dt_devices(void)
 void __init r8a73a4_add_dt_devices(void)
 {
 {
-	r8a73a4_register_scif(0);
-	r8a73a4_register_scif(1);
-	r8a73a4_register_scif(2);
-	r8a73a4_register_scif(3);
-	r8a73a4_register_scif(4);
-	r8a73a4_register_scif(5);
 	r8a7790_register_cmt(1);
 	r8a7790_register_cmt(1);
 }
 }
 
 
@@ -287,6 +281,12 @@ static struct resource dma_resources[] = {
 void __init r8a73a4_add_standard_devices(void)
 void __init r8a73a4_add_standard_devices(void)
 {
 {
 	r8a73a4_add_dt_devices();
 	r8a73a4_add_dt_devices();
+	r8a73a4_register_scif(0);
+	r8a73a4_register_scif(1);
+	r8a73a4_register_scif(2);
+	r8a73a4_register_scif(3);
+	r8a73a4_register_scif(4);
+	r8a73a4_register_scif(5);
 	r8a73a4_register_irqc(0);
 	r8a73a4_register_irqc(0);
 	r8a73a4_register_irqc(1);
 	r8a73a4_register_irqc(1);
 	r8a73a4_register_thermal();
 	r8a73a4_register_thermal();