Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: dts: at91: rearrange kizbox dts using aliases nodes

Use aliases nodes to easy kizbox dts readability.

Signed-off-by: Kamel Bouhara <kamel.bouhara@bootlin.com>
Link: https://lore.kernel.org/r/20191205223021.1370083-1-kamel.bouhara@bootlin.com
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>

authored by

Kamel Bouhara and committed by
Alexandre Belloni
2bb04022 eb41690c

+86 -90
+84 -88
arch/arm/boot/dts/at91-kizbox.dts
··· 28 28 }; 29 29 }; 30 30 31 - ahb { 32 - apb { 33 - tcb0: timer@fffa0000 { 34 - timer@0 { 35 - compatible = "atmel,tcb-timer"; 36 - reg = <0>, <1>; 37 - }; 38 - 39 - timer@2 { 40 - compatible = "atmel,tcb-timer"; 41 - reg = <2>; 42 - }; 43 - }; 44 - 45 - macb0: ethernet@fffc4000 { 46 - phy-mode = "mii"; 47 - pinctrl-0 = <&pinctrl_macb_rmii 48 - &pinctrl_macb_rmii_mii_alt>; 49 - status = "okay"; 50 - }; 51 - 52 - usart3: serial@fffd0000 { 53 - status = "okay"; 54 - }; 55 - 56 - dbgu: serial@fffff200 { 57 - status = "okay"; 58 - }; 59 - 60 - watchdog@fffffd40 { 61 - timeout-sec = <15>; 62 - atmel,max-heartbeat-sec = <16>; 63 - atmel,min-heartbeat-sec = <0>; 64 - status = "okay"; 65 - }; 66 - }; 67 - 68 - usb0: ohci@500000 { 69 - num-ports = <1>; 70 - status = "okay"; 71 - }; 72 - 73 - ebi: ebi@10000000 { 74 - status = "okay"; 75 - 76 - nand_controller: nand-controller { 77 - status = "okay"; 78 - pinctrl-0 = <&pinctrl_nand_cs &pinctrl_nand_rb>; 79 - pinctrl-names = "default"; 80 - 81 - nand@3 { 82 - reg = <0x3 0x0 0x800000>; 83 - rb-gpios = <&pioC 13 GPIO_ACTIVE_HIGH>; 84 - cs-gpios = <&pioC 14 GPIO_ACTIVE_HIGH>; 85 - nand-bus-width = <8>; 86 - nand-ecc-mode = "soft"; 87 - nand-on-flash-bbt; 88 - label = "atmel_nand"; 89 - 90 - partitions { 91 - compatible = "fixed-partitions"; 92 - #address-cells = <1>; 93 - #size-cells = <1>; 94 - 95 - bootstrap@0 { 96 - label = "bootstrap"; 97 - reg = <0x0 0x20000>; 98 - }; 99 - 100 - ubi@20000 { 101 - label = "ubi"; 102 - reg = <0x20000 0x7fe0000>; 103 - }; 104 - }; 105 - }; 106 - }; 107 - }; 108 - }; 109 - 110 31 gpio_keys { 111 32 compatible = "gpio-keys"; 112 33 #address-cells = <1>; ··· 45 124 gpios = <&pioB 31 GPIO_ACTIVE_HIGH>; 46 125 linux,code = <0x101>; 47 126 wakeup-source; 48 - }; 49 - }; 50 - 51 - i2c-gpio-0 { 52 - status = "okay"; 53 - 54 - rtc: pcf8563@51 { 55 - compatible = "nxp,pcf8563"; 56 - reg = <0x51>; 57 127 }; 58 128 }; 59 129 ··· 89 177 &pinctrl_tcb1_tioa1 90 178 &pinctrl_tcb1_tioa2 91 179 &pinctrl_tcb1_tiob0>; 180 + }; 181 + }; 182 + 183 + &tcb0 { 184 + timer@0 { 185 + compatible = "atmel,tcb-timer"; 186 + reg = <0>, <1>; 187 + }; 188 + 189 + timer@2 { 190 + compatible = "atmel,tcb-timer"; 191 + reg = <2>; 192 + }; 193 + }; 194 + 195 + &ebi { 196 + status = "okay"; 197 + }; 198 + 199 + &nand_controller { 200 + status = "okay"; 201 + pinctrl-0 = <&pinctrl_nand_cs &pinctrl_nand_rb>; 202 + pinctrl-names = "default"; 203 + 204 + nand@3 { 205 + reg = <0x3 0x0 0x800000>; 206 + rb-gpios = <&pioC 13 GPIO_ACTIVE_HIGH>; 207 + cs-gpios = <&pioC 14 GPIO_ACTIVE_HIGH>; 208 + nand-bus-width = <8>; 209 + nand-ecc-mode = "soft"; 210 + nand-on-flash-bbt; 211 + label = "atmel_nand"; 212 + 213 + partitions { 214 + compatible = "fixed-partitions"; 215 + #address-cells = <1>; 216 + #size-cells = <1>; 217 + 218 + bootstrap@0 { 219 + label = "bootstrap"; 220 + reg = <0x0 0x20000>; 221 + }; 222 + 223 + ubi@20000 { 224 + label = "ubi"; 225 + reg = <0x20000 0x7fe0000>; 226 + }; 227 + }; 228 + }; 229 + }; 230 + 231 + &macb0 { 232 + phy-mode = "mii"; 233 + pinctrl-0 = <&pinctrl_macb_rmii 234 + &pinctrl_macb_rmii_mii_alt>; 235 + status = "okay"; 236 + }; 237 + 238 + &usart3 { 239 + status = "okay"; 240 + }; 241 + 242 + &dbgu { 243 + status = "okay"; 244 + }; 245 + 246 + &watchdog { 247 + timeout-sec = <15>; 248 + atmel,max-heartbeat-sec = <16>; 249 + atmel,min-heartbeat-sec = <0>; 250 + status = "okay"; 251 + }; 252 + 253 + &usb0 { 254 + num-ports = <1>; 255 + status = "okay"; 256 + }; 257 + 258 + &i2c_gpio0 { 259 + status = "okay"; 260 + 261 + rtc: pcf8563@51 { 262 + compatible = "nxp,pcf8563"; 263 + reg = <0x51>; 92 264 }; 93 265 };
+2 -2
arch/arm/boot/dts/at91sam9260.dtsi
··· 738 738 status = "disabled"; 739 739 }; 740 740 741 - watchdog@fffffd40 { 741 + watchdog: watchdog@fffffd40 { 742 742 compatible = "atmel,at91sam9260-wdt"; 743 743 reg = <0xfffffd40 0x10>; 744 744 interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>; ··· 793 793 }; 794 794 }; 795 795 796 - i2c-gpio-0 { 796 + i2c_gpio0: i2c-gpio-0 { 797 797 compatible = "i2c-gpio"; 798 798 gpios = <&pioA 23 GPIO_ACTIVE_HIGH /* sda */ 799 799 &pioA 24 GPIO_ACTIVE_HIGH /* scl */