Skip to content

Commit 18dd125

Browse files
Mihai Sainclaudiubeznea
authored andcommitted
ARM: dts: microchip: sam9x7: Move i2c address/size to dtsi
Since these properties are common for all i2c subnodes, move them to SoC dtsi from board dts. Signed-off-by: Mihai Sain <[email protected]> Reviewed-by: Claudiu Beznea <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Claudiu Beznea <[email protected]>
1 parent 40384c8 commit 18dd125

File tree

2 files changed

+26
-2
lines changed

2 files changed

+26
-2
lines changed

arch/arm/boot/dts/microchip/at91-sam9x75_curiosity.dts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,6 @@
8888
};
8989

9090
&i2c6 {
91-
#address-cells = <1>;
92-
#size-cells = <0>;
9391
pinctrl-names = "default";
9492
pinctrl-0 = <&pinctrl_flx6_default>;
9593
i2c-analog-filter;

arch/arm/boot/dts/microchip/sam9x7.dtsi

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,8 @@
151151
compatible = "microchip,sam9x7-i2c", "microchip,sam9x60-i2c";
152152
reg = <0x600 0x200>;
153153
interrupts = <13 IRQ_TYPE_LEVEL_HIGH 7>;
154+
#address-cells = <1>;
155+
#size-cells = <0>;
154156
clocks = <&pmc PMC_TYPE_PERIPHERAL 13>;
155157
dmas = <&dma0
156158
(AT91_XDMAC_DT_MEM_IF(0) |
@@ -220,6 +222,8 @@
220222
compatible = "microchip,sam9x7-i2c", "microchip,sam9x60-i2c";
221223
reg = <0x600 0x200>;
222224
interrupts = <14 IRQ_TYPE_LEVEL_HIGH 7>;
225+
#address-cells = <1>;
226+
#size-cells = <0>;
223227
clocks = <&pmc PMC_TYPE_PERIPHERAL 14>;
224228
dmas = <&dma0
225229
(AT91_XDMAC_DT_MEM_IF(0) |
@@ -312,6 +316,8 @@
312316
compatible = "microchip,sam9x7-i2c", "microchip,sam9x60-i2c";
313317
reg = <0x600 0x200>;
314318
interrupts = <32 IRQ_TYPE_LEVEL_HIGH 7>;
319+
#address-cells = <1>;
320+
#size-cells = <0>;
315321
clocks = <&pmc PMC_TYPE_PERIPHERAL 32>;
316322
dmas = <&dma0
317323
(AT91_XDMAC_DT_MEM_IF(0) |
@@ -362,6 +368,8 @@
362368
compatible = "microchip,sam9x7-i2c", "microchip,sam9x60-i2c";
363369
reg = <0x600 0x200>;
364370
interrupts = <33 IRQ_TYPE_LEVEL_HIGH 7>;
371+
#address-cells = <1>;
372+
#size-cells = <0>;
365373
clocks = <&pmc PMC_TYPE_PERIPHERAL 33>;
366374
dmas = <&dma0
367375
(AT91_XDMAC_DT_MEM_IF(0) |
@@ -533,6 +541,8 @@
533541
compatible = "microchip,sam9x7-i2c", "microchip,sam9x60-i2c";
534542
reg = <0x600 0x200>;
535543
interrupts = <9 IRQ_TYPE_LEVEL_HIGH 7>;
544+
#address-cells = <1>;
545+
#size-cells = <0>;
536546
clocks = <&pmc PMC_TYPE_PERIPHERAL 9>;
537547
dmas = <&dma0
538548
(AT91_XDMAC_DT_MEM_IF(0) |
@@ -583,6 +593,8 @@
583593
compatible = "microchip,sam9x7-i2c", "microchip,sam9x60-i2c";
584594
reg = <0x600 0x200>;
585595
interrupts = <10 IRQ_TYPE_LEVEL_HIGH 7>;
596+
#address-cells = <1>;
597+
#size-cells = <0>;
586598
clocks = <&pmc PMC_TYPE_PERIPHERAL 10>;
587599
dmas = <&dma0
588600
(AT91_XDMAC_DT_MEM_IF(0) |
@@ -633,6 +645,8 @@
633645
compatible = "microchip,sam9x7-i2c", "microchip,sam9x60-i2c";
634646
reg = <0x600 0x200>;
635647
interrupts = <11 IRQ_TYPE_LEVEL_HIGH 7>;
648+
#address-cells = <1>;
649+
#size-cells = <0>;
636650
clocks = <&pmc PMC_TYPE_PERIPHERAL 11>;
637651
dmas = <&dma0
638652
(AT91_XDMAC_DT_MEM_IF(0) |
@@ -702,6 +716,8 @@
702716
compatible = "microchip,sam9x7-i2c", "microchip,sam9x60-i2c";
703717
reg = <0x600 0x200>;
704718
interrupts = <5 IRQ_TYPE_LEVEL_HIGH 7>;
719+
#address-cells = <1>;
720+
#size-cells = <0>;
705721
clocks = <&pmc PMC_TYPE_PERIPHERAL 5>;
706722
dmas = <&dma0
707723
(AT91_XDMAC_DT_MEM_IF(0) |
@@ -771,6 +787,8 @@
771787
compatible = "microchip,sam9x7-i2c", "microchip,sam9x60-i2c";
772788
reg = <0x600 0x200>;
773789
interrupts = <6 IRQ_TYPE_LEVEL_HIGH 7>;
790+
#address-cells = <1>;
791+
#size-cells = <0>;
774792
clocks = <&pmc PMC_TYPE_PERIPHERAL 6>;
775793
dmas = <&dma0
776794
(AT91_XDMAC_DT_MEM_IF(0) |
@@ -840,6 +858,8 @@
840858
compatible = "microchip,sam9x7-i2c", "microchip,sam9x60-i2c";
841859
reg = <0x600 0x200>;
842860
interrupts = <7 IRQ_TYPE_LEVEL_HIGH 7>;
861+
#address-cells = <1>;
862+
#size-cells = <0>;
843863
clocks = <&pmc PMC_TYPE_PERIPHERAL 7>;
844864
dmas = <&dma0
845865
(AT91_XDMAC_DT_MEM_IF(0) |
@@ -909,6 +929,8 @@
909929
compatible = "microchip,sam9x7-i2c", "microchip,sam9x60-i2c";
910930
reg = <0x600 0x200>;
911931
interrupts = <8 IRQ_TYPE_LEVEL_HIGH 7>;
932+
#address-cells = <1>;
933+
#size-cells = <0>;
912934
clocks = <&pmc PMC_TYPE_PERIPHERAL 8>;
913935
dmas = <&dma0
914936
(AT91_XDMAC_DT_MEM_IF(0) |
@@ -984,6 +1006,8 @@
9841006
compatible = "microchip,sam9x7-i2c", "microchip,sam9x60-i2c";
9851007
reg = <0x600 0x200>;
9861008
interrupts = <15 IRQ_TYPE_LEVEL_HIGH 7>;
1009+
#address-cells = <1>;
1010+
#size-cells = <0>;
9871011
clocks = <&pmc PMC_TYPE_PERIPHERAL 15>;
9881012
dmas = <&dma0
9891013
(AT91_XDMAC_DT_MEM_IF(0) |
@@ -1034,6 +1058,8 @@
10341058
compatible = "microchip,sam9x7-i2c", "microchip,sam9x60-i2c";
10351059
reg = <0x600 0x200>;
10361060
interrupts = <16 IRQ_TYPE_LEVEL_HIGH 7>;
1061+
#address-cells = <1>;
1062+
#size-cells = <0>;
10371063
clocks = <&pmc PMC_TYPE_PERIPHERAL 16>;
10381064
dmas = <&dma0
10391065
(AT91_XDMAC_DT_MEM_IF(0) |

0 commit comments

Comments
 (0)