diff options
author | Geert Uytterhoeven <geert+renesas@glider.be> | 2016-05-20 03:10:13 -0400 |
---|---|---|
committer | Simon Horman <horms+renesas@verge.net.au> | 2016-05-29 20:34:50 -0400 |
commit | 6f7bf82cc912441f5824f0b1a6497164e5ebe079 (patch) | |
tree | 994815f4987dfd2e97f79920af06f6e7cdd94ff3 | |
parent | b186fbb6cc5550756a29bc1d0bf259a7aa632c11 (diff) |
arm64: dts: r8a7795: Fix W=1 dtc warnings
Warning (unit_address_vs_reg): Node /cache-controller@0 has a unit name, but no reg property
Warning (unit_address_vs_reg): Node /cache-controller@1 has a unit name, but no reg property
Warning (unit_address_vs_reg): Node /soc/sound@ec500000/rcar_sound,dvc/dvc@0 has a unit name, but no reg property
Warning (unit_address_vs_reg): Node /soc/sound@ec500000/rcar_sound,dvc/dvc@1 has a unit name, but no reg property
Warning (unit_address_vs_reg): Node /soc/sound@ec500000/rcar_sound,src/src@0 has a unit name, but no reg property
Warning (unit_address_vs_reg): Node /soc/sound@ec500000/rcar_sound,src/src@1 has a unit name, but no reg property
Warning (unit_address_vs_reg): Node /soc/sound@ec500000/rcar_sound,src/src@2 has a unit name, but no reg property
Warning (unit_address_vs_reg): Node /soc/sound@ec500000/rcar_sound,src/src@3 has a unit name, but no reg property
Warning (unit_address_vs_reg): Node /soc/sound@ec500000/rcar_sound,src/src@4 has a unit name, but no reg property
Warning (unit_address_vs_reg): Node /soc/sound@ec500000/rcar_sound,src/src@5 has a unit name, but no reg property
Warning (unit_address_vs_reg): Node /soc/sound@ec500000/rcar_sound,src/src@6 has a unit name, but no reg property
Warning (unit_address_vs_reg): Node /soc/sound@ec500000/rcar_sound,src/src@7 has a unit name, but no reg property
Warning (unit_address_vs_reg): Node /soc/sound@ec500000/rcar_sound,src/src@8 has a unit name, but no reg property
Warning (unit_address_vs_reg): Node /soc/sound@ec500000/rcar_sound,src/src@9 has a unit name, but no reg property
Warning (unit_address_vs_reg): Node /soc/sound@ec500000/rcar_sound,ssi/ssi@0 has a unit name, but no reg property
Warning (unit_address_vs_reg): Node /soc/sound@ec500000/rcar_sound,ssi/ssi@1 has a unit name, but no reg property
Warning (unit_address_vs_reg): Node /soc/sound@ec500000/rcar_sound,ssi/ssi@2 has a unit name, but no reg property
Warning (unit_address_vs_reg): Node /soc/sound@ec500000/rcar_sound,ssi/ssi@3 has a unit name, but no reg property
Warning (unit_address_vs_reg): Node /soc/sound@ec500000/rcar_sound,ssi/ssi@4 has a unit name, but no reg property
Warning (unit_address_vs_reg): Node /soc/sound@ec500000/rcar_sound,ssi/ssi@5 has a unit name, but no reg property
Warning (unit_address_vs_reg): Node /soc/sound@ec500000/rcar_sound,ssi/ssi@6 has a unit name, but no reg property
Warning (unit_address_vs_reg): Node /soc/sound@ec500000/rcar_sound,ssi/ssi@7 has a unit name, but no reg property
Warning (unit_address_vs_reg): Node /soc/sound@ec500000/rcar_sound,ssi/ssi@8 has a unit name, but no reg property
Warning (unit_address_vs_reg): Node /soc/sound@ec500000/rcar_sound,ssi/ssi@9 has a unit name, but no reg property
Move the cache-controller nodes under the cpus node, and make their unit
names and reg properties match the MPIDR values.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
-rw-r--r-- | arch/arm64/boot/dts/renesas/r8a7795.dtsi | 70 |
1 files changed, 36 insertions, 34 deletions
diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi index bf38df355006..a4f4ec8daa21 100644 --- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi | |||
@@ -69,20 +69,22 @@ | |||
69 | next-level-cache = <&L2_CA57>; | 69 | next-level-cache = <&L2_CA57>; |
70 | enable-method = "psci"; | 70 | enable-method = "psci"; |
71 | }; | 71 | }; |
72 | }; | ||
73 | 72 | ||
74 | L2_CA57: cache-controller@0 { | 73 | L2_CA57: cache-controller@0 { |
75 | compatible = "cache"; | 74 | compatible = "cache"; |
76 | power-domains = <&sysc R8A7795_PD_CA57_SCU>; | 75 | reg = <0>; |
77 | cache-unified; | 76 | power-domains = <&sysc R8A7795_PD_CA57_SCU>; |
78 | cache-level = <2>; | 77 | cache-unified; |
79 | }; | 78 | cache-level = <2>; |
79 | }; | ||
80 | 80 | ||
81 | L2_CA53: cache-controller@1 { | 81 | L2_CA53: cache-controller@100 { |
82 | compatible = "cache"; | 82 | compatible = "cache"; |
83 | power-domains = <&sysc R8A7795_PD_CA53_SCU>; | 83 | reg = <0x100>; |
84 | cache-unified; | 84 | power-domains = <&sysc R8A7795_PD_CA53_SCU>; |
85 | cache-level = <2>; | 85 | cache-unified; |
86 | cache-level = <2>; | ||
87 | }; | ||
86 | }; | 88 | }; |
87 | 89 | ||
88 | extal_clk: extal { | 90 | extal_clk: extal { |
@@ -896,63 +898,63 @@ | |||
896 | status = "disabled"; | 898 | status = "disabled"; |
897 | 899 | ||
898 | rcar_sound,dvc { | 900 | rcar_sound,dvc { |
899 | dvc0: dvc@0 { | 901 | dvc0: dvc-0 { |
900 | dmas = <&audma0 0xbc>; | 902 | dmas = <&audma0 0xbc>; |
901 | dma-names = "tx"; | 903 | dma-names = "tx"; |
902 | }; | 904 | }; |
903 | dvc1: dvc@1 { | 905 | dvc1: dvc-1 { |
904 | dmas = <&audma0 0xbe>; | 906 | dmas = <&audma0 0xbe>; |
905 | dma-names = "tx"; | 907 | dma-names = "tx"; |
906 | }; | 908 | }; |
907 | }; | 909 | }; |
908 | 910 | ||
909 | rcar_sound,src { | 911 | rcar_sound,src { |
910 | src0: src@0 { | 912 | src0: src-0 { |
911 | interrupts = <GIC_SPI 352 IRQ_TYPE_LEVEL_HIGH>; | 913 | interrupts = <GIC_SPI 352 IRQ_TYPE_LEVEL_HIGH>; |
912 | dmas = <&audma0 0x85>, <&audma1 0x9a>; | 914 | dmas = <&audma0 0x85>, <&audma1 0x9a>; |
913 | dma-names = "rx", "tx"; | 915 | dma-names = "rx", "tx"; |
914 | }; | 916 | }; |
915 | src1: src@1 { | 917 | src1: src-1 { |
916 | interrupts = <GIC_SPI 353 IRQ_TYPE_LEVEL_HIGH>; | 918 | interrupts = <GIC_SPI 353 IRQ_TYPE_LEVEL_HIGH>; |
917 | dmas = <&audma0 0x87>, <&audma1 0x9c>; | 919 | dmas = <&audma0 0x87>, <&audma1 0x9c>; |
918 | dma-names = "rx", "tx"; | 920 | dma-names = "rx", "tx"; |
919 | }; | 921 | }; |
920 | src2: src@2 { | 922 | src2: src-2 { |
921 | interrupts = <GIC_SPI 354 IRQ_TYPE_LEVEL_HIGH>; | 923 | interrupts = <GIC_SPI 354 IRQ_TYPE_LEVEL_HIGH>; |
922 | dmas = <&audma0 0x89>, <&audma1 0x9e>; | 924 | dmas = <&audma0 0x89>, <&audma1 0x9e>; |
923 | dma-names = "rx", "tx"; | 925 | dma-names = "rx", "tx"; |
924 | }; | 926 | }; |
925 | src3: src@3 { | 927 | src3: src-3 { |
926 | interrupts = <GIC_SPI 355 IRQ_TYPE_LEVEL_HIGH>; | 928 | interrupts = <GIC_SPI 355 IRQ_TYPE_LEVEL_HIGH>; |
927 | dmas = <&audma0 0x8b>, <&audma1 0xa0>; | 929 | dmas = <&audma0 0x8b>, <&audma1 0xa0>; |
928 | dma-names = "rx", "tx"; | 930 | dma-names = "rx", "tx"; |
929 | }; | 931 | }; |
930 | src4: src@4 { | 932 | src4: src-4 { |
931 | interrupts = <GIC_SPI 356 IRQ_TYPE_LEVEL_HIGH>; | 933 | interrupts = <GIC_SPI 356 IRQ_TYPE_LEVEL_HIGH>; |
932 | dmas = <&audma0 0x8d>, <&audma1 0xb0>; | 934 | dmas = <&audma0 0x8d>, <&audma1 0xb0>; |
933 | dma-names = "rx", "tx"; | 935 | dma-names = "rx", "tx"; |
934 | }; | 936 | }; |
935 | src5: src@5 { | 937 | src5: src-5 { |
936 | interrupts = <GIC_SPI 357 IRQ_TYPE_LEVEL_HIGH>; | 938 | interrupts = <GIC_SPI 357 IRQ_TYPE_LEVEL_HIGH>; |
937 | dmas = <&audma0 0x8f>, <&audma1 0xb2>; | 939 | dmas = <&audma0 0x8f>, <&audma1 0xb2>; |
938 | dma-names = "rx", "tx"; | 940 | dma-names = "rx", "tx"; |
939 | }; | 941 | }; |
940 | src6: src@6 { | 942 | src6: src-6 { |
941 | interrupts = <GIC_SPI 358 IRQ_TYPE_LEVEL_HIGH>; | 943 | interrupts = <GIC_SPI 358 IRQ_TYPE_LEVEL_HIGH>; |
942 | dmas = <&audma0 0x91>, <&audma1 0xb4>; | 944 | dmas = <&audma0 0x91>, <&audma1 0xb4>; |
943 | dma-names = "rx", "tx"; | 945 | dma-names = "rx", "tx"; |
944 | }; | 946 | }; |
945 | src7: src@7 { | 947 | src7: src-7 { |
946 | interrupts = <GIC_SPI 359 IRQ_TYPE_LEVEL_HIGH>; | 948 | interrupts = <GIC_SPI 359 IRQ_TYPE_LEVEL_HIGH>; |
947 | dmas = <&audma0 0x93>, <&audma1 0xb6>; | 949 | dmas = <&audma0 0x93>, <&audma1 0xb6>; |
948 | dma-names = "rx", "tx"; | 950 | dma-names = "rx", "tx"; |
949 | }; | 951 | }; |
950 | src8: src@8 { | 952 | src8: src-8 { |
951 | interrupts = <GIC_SPI 360 IRQ_TYPE_LEVEL_HIGH>; | 953 | interrupts = <GIC_SPI 360 IRQ_TYPE_LEVEL_HIGH>; |
952 | dmas = <&audma0 0x95>, <&audma1 0xb8>; | 954 | dmas = <&audma0 0x95>, <&audma1 0xb8>; |
953 | dma-names = "rx", "tx"; | 955 | dma-names = "rx", "tx"; |
954 | }; | 956 | }; |
955 | src9: src@9 { | 957 | src9: src-9 { |
956 | interrupts = <GIC_SPI 361 IRQ_TYPE_LEVEL_HIGH>; | 958 | interrupts = <GIC_SPI 361 IRQ_TYPE_LEVEL_HIGH>; |
957 | dmas = <&audma0 0x97>, <&audma1 0xba>; | 959 | dmas = <&audma0 0x97>, <&audma1 0xba>; |
958 | dma-names = "rx", "tx"; | 960 | dma-names = "rx", "tx"; |
@@ -960,52 +962,52 @@ | |||
960 | }; | 962 | }; |
961 | 963 | ||
962 | rcar_sound,ssi { | 964 | rcar_sound,ssi { |
963 | ssi0: ssi@0 { | 965 | ssi0: ssi-0 { |
964 | interrupts = <GIC_SPI 370 IRQ_TYPE_LEVEL_HIGH>; | 966 | interrupts = <GIC_SPI 370 IRQ_TYPE_LEVEL_HIGH>; |
965 | dmas = <&audma0 0x01>, <&audma1 0x02>, <&audma0 0x15>, <&audma1 0x16>; | 967 | dmas = <&audma0 0x01>, <&audma1 0x02>, <&audma0 0x15>, <&audma1 0x16>; |
966 | dma-names = "rx", "tx", "rxu", "txu"; | 968 | dma-names = "rx", "tx", "rxu", "txu"; |
967 | }; | 969 | }; |
968 | ssi1: ssi@1 { | 970 | ssi1: ssi-1 { |
969 | interrupts = <GIC_SPI 371 IRQ_TYPE_LEVEL_HIGH>; | 971 | interrupts = <GIC_SPI 371 IRQ_TYPE_LEVEL_HIGH>; |
970 | dmas = <&audma0 0x03>, <&audma1 0x04>, <&audma0 0x49>, <&audma1 0x4a>; | 972 | dmas = <&audma0 0x03>, <&audma1 0x04>, <&audma0 0x49>, <&audma1 0x4a>; |
971 | dma-names = "rx", "tx", "rxu", "txu"; | 973 | dma-names = "rx", "tx", "rxu", "txu"; |
972 | }; | 974 | }; |
973 | ssi2: ssi@2 { | 975 | ssi2: ssi-2 { |
974 | interrupts = <GIC_SPI 372 IRQ_TYPE_LEVEL_HIGH>; | 976 | interrupts = <GIC_SPI 372 IRQ_TYPE_LEVEL_HIGH>; |
975 | dmas = <&audma0 0x05>, <&audma1 0x06>, <&audma0 0x63>, <&audma1 0x64>; | 977 | dmas = <&audma0 0x05>, <&audma1 0x06>, <&audma0 0x63>, <&audma1 0x64>; |
976 | dma-names = "rx", "tx", "rxu", "txu"; | 978 | dma-names = "rx", "tx", "rxu", "txu"; |
977 | }; | 979 | }; |
978 | ssi3: ssi@3 { | 980 | ssi3: ssi-3 { |
979 | interrupts = <GIC_SPI 373 IRQ_TYPE_LEVEL_HIGH>; | 981 | interrupts = <GIC_SPI 373 IRQ_TYPE_LEVEL_HIGH>; |
980 | dmas = <&audma0 0x07>, <&audma1 0x08>, <&audma0 0x6f>, <&audma1 0x70>; | 982 | dmas = <&audma0 0x07>, <&audma1 0x08>, <&audma0 0x6f>, <&audma1 0x70>; |
981 | dma-names = "rx", "tx", "rxu", "txu"; | 983 | dma-names = "rx", "tx", "rxu", "txu"; |
982 | }; | 984 | }; |
983 | ssi4: ssi@4 { | 985 | ssi4: ssi-4 { |
984 | interrupts = <GIC_SPI 374 IRQ_TYPE_LEVEL_HIGH>; | 986 | interrupts = <GIC_SPI 374 IRQ_TYPE_LEVEL_HIGH>; |
985 | dmas = <&audma0 0x09>, <&audma1 0x0a>, <&audma0 0x71>, <&audma1 0x72>; | 987 | dmas = <&audma0 0x09>, <&audma1 0x0a>, <&audma0 0x71>, <&audma1 0x72>; |
986 | dma-names = "rx", "tx", "rxu", "txu"; | 988 | dma-names = "rx", "tx", "rxu", "txu"; |
987 | }; | 989 | }; |
988 | ssi5: ssi@5 { | 990 | ssi5: ssi-5 { |
989 | interrupts = <GIC_SPI 375 IRQ_TYPE_LEVEL_HIGH>; | 991 | interrupts = <GIC_SPI 375 IRQ_TYPE_LEVEL_HIGH>; |
990 | dmas = <&audma0 0x0b>, <&audma1 0x0c>, <&audma0 0x73>, <&audma1 0x74>; | 992 | dmas = <&audma0 0x0b>, <&audma1 0x0c>, <&audma0 0x73>, <&audma1 0x74>; |
991 | dma-names = "rx", "tx", "rxu", "txu"; | 993 | dma-names = "rx", "tx", "rxu", "txu"; |
992 | }; | 994 | }; |
993 | ssi6: ssi@6 { | 995 | ssi6: ssi-6 { |
994 | interrupts = <GIC_SPI 376 IRQ_TYPE_LEVEL_HIGH>; | 996 | interrupts = <GIC_SPI 376 IRQ_TYPE_LEVEL_HIGH>; |
995 | dmas = <&audma0 0x0d>, <&audma1 0x0e>, <&audma0 0x75>, <&audma1 0x76>; | 997 | dmas = <&audma0 0x0d>, <&audma1 0x0e>, <&audma0 0x75>, <&audma1 0x76>; |
996 | dma-names = "rx", "tx", "rxu", "txu"; | 998 | dma-names = "rx", "tx", "rxu", "txu"; |
997 | }; | 999 | }; |
998 | ssi7: ssi@7 { | 1000 | ssi7: ssi-7 { |
999 | interrupts = <GIC_SPI 377 IRQ_TYPE_LEVEL_HIGH>; | 1001 | interrupts = <GIC_SPI 377 IRQ_TYPE_LEVEL_HIGH>; |
1000 | dmas = <&audma0 0x0f>, <&audma1 0x10>, <&audma0 0x79>, <&audma1 0x7a>; | 1002 | dmas = <&audma0 0x0f>, <&audma1 0x10>, <&audma0 0x79>, <&audma1 0x7a>; |
1001 | dma-names = "rx", "tx", "rxu", "txu"; | 1003 | dma-names = "rx", "tx", "rxu", "txu"; |
1002 | }; | 1004 | }; |
1003 | ssi8: ssi@8 { | 1005 | ssi8: ssi-8 { |
1004 | interrupts = <GIC_SPI 378 IRQ_TYPE_LEVEL_HIGH>; | 1006 | interrupts = <GIC_SPI 378 IRQ_TYPE_LEVEL_HIGH>; |
1005 | dmas = <&audma0 0x11>, <&audma1 0x12>, <&audma0 0x7b>, <&audma1 0x7c>; | 1007 | dmas = <&audma0 0x11>, <&audma1 0x12>, <&audma0 0x7b>, <&audma1 0x7c>; |
1006 | dma-names = "rx", "tx", "rxu", "txu"; | 1008 | dma-names = "rx", "tx", "rxu", "txu"; |
1007 | }; | 1009 | }; |
1008 | ssi9: ssi@9 { | 1010 | ssi9: ssi-9 { |
1009 | interrupts = <GIC_SPI 379 IRQ_TYPE_LEVEL_HIGH>; | 1011 | interrupts = <GIC_SPI 379 IRQ_TYPE_LEVEL_HIGH>; |
1010 | dmas = <&audma0 0x13>, <&audma1 0x14>, <&audma0 0x7d>, <&audma1 0x7e>; | 1012 | dmas = <&audma0 0x13>, <&audma1 0x14>, <&audma0 0x7d>, <&audma1 0x7e>; |
1011 | dma-names = "rx", "tx", "rxu", "txu"; | 1013 | dma-names = "rx", "tx", "rxu", "txu"; |