ARM: dts: microchip: Rename node, sub-node, and clean up spacing
Subsystems (3)
PATCH 1/1 ARM: dts: microchip: Rename node, sub-node, and clean up spacing
Cosmetic work:
Rename the eeprom node according to device tree specification. Rename the usb node according to device tree specification. Rename the led sub nodes according to device tree specification. Rename the pmic node according to the device tree specification. Clean up spacing and indentation.
---
Modifications Based On:
https://lore.kernel.org/linux-arm-kernel/[email protected]/
--- arch/arm/boot/dts/microchip/aks-cdu.dts | 12 +++++----- arch/arm/boot/dts/microchip/animeo_ip.dts | 10 ++++---- .../dts/microchip/at91-cosino_mega2560.dts | 2 +- arch/arm/boot/dts/microchip/at91-foxg20.dts | 4 ++-- .../arm/boot/dts/microchip/at91-qil_a9260.dts | 4 ++-- .../boot/dts/microchip/at91-sam9_l9260.dts | 2 +- .../arm/boot/dts/microchip/at91-sam9x60ek.dts | 6 ++--- .../dts/microchip/at91-sama5d27_som1.dtsi | 2 +- .../dts/microchip/at91-sama5d27_som1_ek.dts | 14 +++++------ .../dts/microchip/at91-sama5d27_wlsom1.dtsi | 2 +- .../dts/microchip/at91-sama5d29_curiosity.dts | 2 +- .../boot/dts/microchip/at91-sama5d2_icp.dts | 10 ++++---- .../dts/microchip/at91-sama5d2_ptc_ek.dts | 8 +++---- .../dts/microchip/at91-sama5d2_xplained.dts | 8 +++---- .../dts/microchip/at91-sama5d3_xplained.dts | 6 ++--- .../dts/microchip/at91-sama5d4_ma5d4evk.dts | 6 ++--- .../dts/microchip/at91-sama5d4_xplained.dts | 6 ++--- .../arm/boot/dts/microchip/at91-sama5d4ek.dts | 6 ++--- .../arm/boot/dts/microchip/at91-sama7g5ek.dts | 2 +- arch/arm/boot/dts/microchip/at91-vinco.dts | 6 ++--- arch/arm/boot/dts/microchip/at91rm9200.dtsi | 4 ++-- arch/arm/boot/dts/microchip/at91rm9200ek.dts | 10 ++++---- arch/arm/boot/dts/microchip/at91sam9260.dtsi | 4 ++-- arch/arm/boot/dts/microchip/at91sam9260ek.dts | 10 ++++---- arch/arm/boot/dts/microchip/at91sam9261.dtsi | 4 ++-- arch/arm/boot/dts/microchip/at91sam9261ek.dts | 10 ++++---- arch/arm/boot/dts/microchip/at91sam9263.dtsi | 4 ++-- arch/arm/boot/dts/microchip/at91sam9263ek.dts | 12 +++++----- arch/arm/boot/dts/microchip/at91sam9g20ek.dts | 4 ++-- .../boot/dts/microchip/at91sam9g20ek_2mmc.dts | 4 ++-- .../dts/microchip/at91sam9g20ek_common.dtsi | 6 ++--- .../at91sam9g25-gardena-smart-gateway.dts | 24 +++++++++---------- arch/arm/boot/dts/microchip/at91sam9g45.dtsi | 6 ++--- .../boot/dts/microchip/at91sam9m10g45ek.dts | 6 ++--- arch/arm/boot/dts/microchip/at91sam9n12.dtsi | 4 ++-- arch/arm/boot/dts/microchip/at91sam9n12ek.dts | 10 ++++---- arch/arm/boot/dts/microchip/at91sam9rl.dtsi | 2 +- arch/arm/boot/dts/microchip/at91sam9rlek.dts | 2 +- arch/arm/boot/dts/microchip/at91sam9x5.dtsi | 6 ++--- arch/arm/boot/dts/microchip/at91sam9x5cm.dtsi | 4 ++-- arch/arm/boot/dts/microchip/ethernut5.dts | 4 ++-- arch/arm/boot/dts/microchip/evk-pro3.dts | 4 ++-- arch/arm/boot/dts/microchip/mpa1600.dts | 2 +- arch/arm/boot/dts/microchip/pm9g45.dts | 4 ++-- arch/arm/boot/dts/microchip/sam9x60.dtsi | 6 ++--- arch/arm/boot/dts/microchip/sama5d2.dtsi | 6 ++--- arch/arm/boot/dts/microchip/sama5d3.dtsi | 6 ++--- arch/arm/boot/dts/microchip/sama5d34ek.dts | 2 +- arch/arm/boot/dts/microchip/sama5d3xmb.dtsi | 6 ++--- .../boot/dts/microchip/sama5d3xmb_cmp.dtsi | 2 +- arch/arm/boot/dts/microchip/sama5d4.dtsi | 6 ++--- arch/arm/boot/dts/microchip/tny_a9263.dts | 2 +- .../boot/dts/microchip/usb_a9260_common.dtsi | 4 ++-- arch/arm/boot/dts/microchip/usb_a9263.dts | 4 ++-- 54 files changed, 156 insertions(+), 156 deletions(-)
arch/arm/boot/dts/microchip/aks-cdu.dts +6 -6
@@ -50,13 +50,13 @@ macb0: ethernet@fffc4000 { status = "okay"; }; - usb1: gadget@fffa4000 { + usb1: usb@fffa4000 { atmel,vbus-gpio = <&pioC 15 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; - usb0: ohci@500000 { + usb0: usb@500000 { num-ports = <2>; status = "okay"; };
@@ -98,23 +98,23 @@ rootfs@500000 { leds { compatible = "gpio-leds"; - red { + led-0 { gpios = <&pioC 10 GPIO_ACTIVE_HIGH>; linux,default-trigger = "none"; }; - green { + led-1 { gpios = <&pioA 5 GPIO_ACTIVE_LOW>; linux,default-trigger = "none"; default-state = "on"; }; - yellow { + led-2 { gpios = <&pioB 20 GPIO_ACTIVE_LOW>; linux,default-trigger = "none"; }; - blue { + led-3 { gpios = <&pioB 21 GPIO_ACTIVE_LOW>; linux,default-trigger = "none"; };
arch/arm/boot/dts/microchip/animeo_ip.dts +5 -5
@@ -136,7 +136,7 @@ ubi@60000 { }; }; - usb0: ohci@500000 { + usb0: usb@500000 { num-ports = <2>; atmel,vbus-gpio = <&pioB 15 GPIO_ACTIVE_LOW>; status = "okay";
@@ -146,23 +146,23 @@ usb0: ohci@500000 { leds { compatible = "gpio-leds"; - power_green { + led-0 { label = "power_green"; gpios = <&pioC 17 GPIO_ACTIVE_HIGH>; linux,default-trigger = "heartbeat"; }; - power_red { + led-1 { label = "power_red"; gpios = <&pioA 2 GPIO_ACTIVE_HIGH>; }; - tx_green { + led-2 { label = "tx_green"; gpios = <&pioC 19 GPIO_ACTIVE_HIGH>; }; - tx_red { + led-3 { label = "tx_red"; gpios = <&pioC 18 GPIO_ACTIVE_HIGH>; };
arch/arm/boot/dts/microchip/at91-cosino_mega2560.dts +1 -1
@@ -7,7 +7,7 @@ * HCE Engineering * * Derived from at91sam9g35ek.dts by: - * Copyright (C) 2012 Atmel, + * Copyright (C) 2012 Atmel, * 2012 Nicolas Ferre <[email protected]> */
arch/arm/boot/dts/microchip/at91-foxg20.dts +2 -2
@@ -45,7 +45,7 @@ timer@2 { }; }; - usb1: gadget@fffa4000 { + usb1: usb@fffa4000 { atmel,vbus-gpio = <&pioC 6 GPIO_ACTIVE_HIGH>; status = "okay"; };
@@ -131,7 +131,7 @@ watchdog@fffffd40 { }; }; - usb0: ohci@500000 { + usb0: usb@500000 { num-ports = <2>; status = "okay"; };
arch/arm/boot/dts/microchip/at91-qil_a9260.dts +2 -2
@@ -42,7 +42,7 @@ timer@2 { }; }; - usb1: gadget@fffa4000 { + usb1: usb@fffa4000 { atmel,vbus-gpio = <&pioC 5 GPIO_ACTIVE_HIGH>; status = "okay"; };
@@ -114,7 +114,7 @@ shdwc: poweroff@fffffd10 { }; }; - usb0: ohci@500000 { + usb0: usb@500000 { num-ports = <2>; status = "okay"; };
arch/arm/boot/dts/microchip/at91-sam9_l9260.dts +1 -1
@@ -105,7 +105,7 @@ nand0: nand@40000000 { status = "okay"; }; - usb0: ohci@500000 { + usb0: usb@500000 { status = "okay"; };
arch/arm/boot/dts/microchip/at91-sam9x60ek.dts +3 -3
@@ -53,17 +53,17 @@ leds { pinctrl-0 = <&pinctrl_gpio_leds>; status = "okay"; /* Conflict with pwm0. */ - red { + led-0 { label = "red"; gpios = <&pioB 11 GPIO_ACTIVE_HIGH>; }; - green { + led-1 { label = "green"; gpios = <&pioB 12 GPIO_ACTIVE_HIGH>; }; - blue { + led-2 { label = "blue"; gpios = <&pioB 13 GPIO_ACTIVE_HIGH>; linux,default-trigger = "heartbeat";
arch/arm/boot/dts/microchip/at91-sama5d27_som1.dtsi +1 -1
@@ -106,7 +106,7 @@ i2c0: i2c@f8028000 { scl-gpios = <&pioA PIN_PD22 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; status = "okay"; - at24@50 { + eeprom@50 { compatible = "atmel,24c02"; reg = <0x50>; pagesize = <8>;
arch/arm/boot/dts/microchip/at91-sama5d27_som1_ek.dts +7 -7
@@ -30,14 +30,14 @@ chosen { }; ahb { - usb0: gadget@300000 { + usb0: usb@300000 { atmel,vbus-gpio = <&pioA PIN_PD20 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usba_vbus>; status = "okay"; }; - usb1: ohci@400000 { + usb1: usb@400000 { num-ports = <3>; atmel,vbus-gpio = <0 /* &pioA PIN_PD20 GPIO_ACTIVE_HIGH */ &pioA PIN_PA27 GPIO_ACTIVE_HIGH
@@ -48,7 +48,7 @@ &pioA PIN_PA27 GPIO_ACTIVE_HIGH status = "okay"; }; - usb2: ehci@500000 { + usb2: usb@500000 { status = "okay"; };
@@ -258,10 +258,10 @@ pinctrl_i2c1_default: i2c1_default { }; pinctrl_i2c1_gpio: i2c1_gpio { - pinmux = <PIN_PD4__GPIO>, - <PIN_PD5__GPIO>; - bias-disable; - }; + pinmux = <PIN_PD4__GPIO>, + <PIN_PD5__GPIO>; + bias-disable; + }; pinctrl_isc_base: isc_base {
arch/arm/boot/dts/microchip/at91-sama5d27_wlsom1.dtsi +1 -1
@@ -67,7 +67,7 @@ &i2c1 { scl-gpios = <&pioA PIN_PD20 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; status = "okay"; - mcp16502@5b { + pmic@5b { compatible = "microchip,mcp16502"; reg = <0x5b>; status = "okay";
arch/arm/boot/dts/microchip/at91-sama5d29_curiosity.dts +1 -1
@@ -141,7 +141,7 @@ &i2c0 { i2c-sda-hold-time-ns = <350>; status = "okay"; - mcp16502@5b { + pmic@5b { compatible = "microchip,mcp16502"; reg = <0x5b>; status = "okay";
arch/arm/boot/dts/microchip/at91-sama5d2_icp.dts +5 -5
@@ -187,7 +187,7 @@ i2c6: i2c@600 { i2c-digital-filter-width-ns = <35>; status = "okay"; - mcp16502@5b { + pmic@5b { compatible = "microchip,mcp16502"; reg = <0x5b>; status = "okay";
@@ -407,10 +407,10 @@ pinctrl_i2c1_default: i2c1_default { }; pinctrl_i2c1_gpio: i2c1_gpio { - pinmux = <PIN_PD19__GPIO>, - <PIN_PD20__GPIO>; - bias-disable; - }; + pinmux = <PIN_PD19__GPIO>, + <PIN_PD20__GPIO>; + bias-disable; + }; pinctrl_key_gpio_default: key_gpio_default { pinmux = <PIN_PD0__GPIO>;
arch/arm/boot/dts/microchip/at91-sama5d2_ptc_ek.dts +4 -4
@@ -40,14 +40,14 @@ main_xtal { }; ahb { - usb0: gadget@300000 { + usb0: usb@300000 { atmel,vbus-gpio = <&pioA PIN_PB11 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usba_vbus>; status = "okay"; }; - usb1: ohci@400000 { + usb1: usb@400000 { num-ports = <3>; atmel,vbus-gpio = <0 &pioA PIN_PB12 GPIO_ACTIVE_HIGH
@@ -58,7 +58,7 @@ &pioA PIN_PB12 GPIO_ACTIVE_HIGH status = "okay"; }; - usb2: ehci@500000 { + usb2: usb@500000 { status = "okay"; };
@@ -231,7 +231,7 @@ i2c1: i2c@fc028000 { scl-gpios = <&pioA PIN_PC7 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; status = "okay"; - at24@50 { + eeprom@50 { compatible = "atmel,24c02"; reg = <0x50>; pagesize = <8>;
arch/arm/boot/dts/microchip/at91-sama5d2_xplained.dts +4 -4
@@ -39,14 +39,14 @@ main_xtal { }; ahb { - usb0: gadget@300000 { + usb0: usb@300000 { atmel,vbus-gpio = <&pioA PIN_PA31 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usba_vbus>; status = "okay"; }; - usb1: ohci@400000 { + usb1: usb@400000 { num-ports = <3>; atmel,vbus-gpio = <0 /* &pioA PIN_PB9 GPIO_ACTIVE_HIGH */ &pioA PIN_PB10 GPIO_ACTIVE_HIGH
@@ -57,7 +57,7 @@ &pioA PIN_PB10 GPIO_ACTIVE_HIGH status = "okay"; }; - usb2: ehci@500000 { + usb2: usb@500000 { status = "okay"; };
@@ -411,7 +411,7 @@ i2c1: i2c@fc028000 { scl-gpios = <&pioA PIN_PD5 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; status = "okay"; - at24@54 { + eeprom@54 { compatible = "atmel,24c02"; reg = <0x54>; pagesize = <16>;
arch/arm/boot/dts/microchip/at91-sama5d3_xplained.dts +3 -3
@@ -276,14 +276,14 @@ pinctrl_vcc_mmc0_reg_gpio: vcc_mmc0_reg_gpio_default { }; }; - usb0: gadget@500000 { + usb0: usb@500000 { atmel,vbus-gpio = <&pioE 9 GPIO_ACTIVE_HIGH>; /* PE9, conflicts with A9 */ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usba_vbus>; status = "okay"; }; - usb1: ohci@600000 { + usb1: usb@600000 { num-ports = <3>; atmel,vbus-gpio = <0 &pioE 3 GPIO_ACTIVE_LOW
@@ -294,7 +294,7 @@ &pioE 4 GPIO_ACTIVE_LOW status = "okay"; }; - usb2: ehci@700000 { + usb2: usb@700000 { status = "okay"; };
arch/arm/boot/dts/microchip/at91-sama5d4_ma5d4evk.dts +3 -3
@@ -15,14 +15,14 @@ chosen { }; ahb { - usb0: gadget@400000 { + usb0: usb@400000 { atmel,vbus-gpio = <&pioE 31 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usba_vbus>; status = "okay"; }; - usb1: ohci@500000 { + usb1: usb@500000 { num-ports = <3>; atmel,vbus-gpio = <0 &pioE 11 GPIO_ACTIVE_LOW
@@ -31,7 +31,7 @@ &pioE 14 GPIO_ACTIVE_LOW status = "okay"; }; - usb2: ehci@600000 { + usb2: usb@600000 { status = "okay"; };
arch/arm/boot/dts/microchip/at91-sama5d4_xplained.dts +3 -3
@@ -157,14 +157,14 @@ pinctrl_vcc_mmc1_reg: vcc_mmc1_reg { }; }; - usb0: gadget@400000 { + usb0: usb@400000 { atmel,vbus-gpio = <&pioE 31 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usba_vbus>; status = "okay"; }; - usb1: ohci@500000 { + usb1: usb@500000 { num-ports = <3>; atmel,vbus-gpio = <0 &pioE 11 GPIO_ACTIVE_HIGH
@@ -175,7 +175,7 @@ &pioE 14 GPIO_ACTIVE_HIGH status = "okay"; }; - usb2: ehci@600000 { + usb2: usb@600000 { status = "okay"; };
arch/arm/boot/dts/microchip/at91-sama5d4ek.dts +3 -3
@@ -191,14 +191,14 @@ pinctrl_mxt_ts: mxt_irq { }; }; - usb0: gadget@400000 { + usb0: usb@400000 { atmel,vbus-gpio = <&pioE 31 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usba_vbus>; status = "okay"; }; - usb1: ohci@500000 { + usb1: usb@500000 { num-ports = <3>; atmel,vbus-gpio = <0 /* &pioE 10 GPIO_ACTIVE_LOW */ &pioE 11 GPIO_ACTIVE_LOW
@@ -207,7 +207,7 @@ &pioE 12 GPIO_ACTIVE_LOW status = "okay"; }; - usb2: ehci@600000 { + usb2: usb@600000 { status = "okay"; };
arch/arm/boot/dts/microchip/at91-sama7g5ek.dts +1 -1
@@ -236,7 +236,7 @@ i2c1: i2c@600 { i2c-digital-filter-width-ns = <35>; status = "okay"; - mcp16502@5b { + pmic@5b { compatible = "microchip,mcp16502"; reg = <0x5b>; status = "okay";
arch/arm/boot/dts/microchip/at91-vinco.dts +3 -3
@@ -155,14 +155,14 @@ pinctrl_usba_vbus: usba_vbus { }; }; - usb0: gadget@400000 { + usb0: usb@400000 { atmel,vbus-gpio = <&pioE 31 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usba_vbus>; status = "disabled"; }; - usb1: ohci@500000 { + usb1: usb@500000 { num-ports = <3>; atmel,vbus-gpio = <0 &pioE 11 GPIO_ACTIVE_LOW
@@ -171,7 +171,7 @@ &pioE 12 GPIO_ACTIVE_LOW status = "disabled"; }; - usb2: ehci@600000 { + usb2: usb@600000 { /* 4G Modem */ status = "okay"; };
arch/arm/boot/dts/microchip/at91rm9200.dtsi +2 -2
@@ -662,7 +662,7 @@ usart3: serial@fffcc000 { status = "disabled"; }; - usb1: gadget@fffb0000 { + usb1: usb@fffb0000 { compatible = "atmel,at91rm9200-udc"; reg = <0xfffb0000 0x4000>; interrupts = <11 IRQ_TYPE_LEVEL_HIGH 2>;
@@ -702,7 +702,7 @@ &pioB 1 GPIO_ACTIVE_HIGH status = "disabled"; }; - usb0: ohci@300000 { + usb0: usb@300000 { compatible = "atmel,at91rm9200-ohci", "usb-ohci"; reg = <0x00300000 0x100000>; interrupts = <23 IRQ_TYPE_LEVEL_HIGH 2>;
arch/arm/boot/dts/microchip/at91rm9200ek.dts +5 -5
@@ -43,7 +43,7 @@ timer@2 { }; }; - usb1: gadget@fffb0000 { + usb1: usb@fffb0000 { atmel,vbus-gpio = <&pioD 4 GPIO_ACTIVE_HIGH>; atmel,pullup-gpio = <&pioD 5 GPIO_ACTIVE_HIGH>; status = "okay";
@@ -89,7 +89,7 @@ rtc: rtc@fffffe00 { }; }; - usb0: ohci@300000 { + usb0: usb@300000 { num-ports = <2>; status = "okay"; };
@@ -127,19 +127,19 @@ root@350000 { leds { compatible = "gpio-leds"; - ds2 { + led-ds2 { label = "green"; gpios = <&pioB 0 GPIO_ACTIVE_LOW>; linux,default-trigger = "mmc0"; }; - ds4 { + led-ds4 { label = "yellow"; gpios = <&pioB 1 GPIO_ACTIVE_LOW>; linux,default-trigger = "heartbeat"; }; - ds6 { + led-ds6 { label = "red"; gpios = <&pioB 2 GPIO_ACTIVE_LOW>; };
arch/arm/boot/dts/microchip/at91sam9260.dtsi +2 -2
@@ -637,7 +637,7 @@ macb0: ethernet@fffc4000 { status = "disabled"; }; - usb1: gadget@fffa4000 { + usb1: usb@fffa4000 { compatible = "atmel,at91sam9260-udc"; reg = <0xfffa4000 0x4000>; interrupts = <10 IRQ_TYPE_LEVEL_HIGH 2>;
@@ -742,7 +742,7 @@ gpbr: syscon@fffffd50 { }; }; - usb0: ohci@500000 { + usb0: usb@500000 { compatible = "atmel,at91rm9200-ohci", "usb-ohci"; reg = <0x00500000 0x100000>; interrupts = <20 IRQ_TYPE_LEVEL_HIGH 2>;
arch/arm/boot/dts/microchip/at91sam9260ek.dts +5 -5
@@ -45,7 +45,7 @@ timer@2 { }; }; - usb1: gadget@fffa4000 { + usb1: usb@fffa4000 { atmel,vbus-gpio = <&pioC 5 GPIO_ACTIVE_HIGH>; status = "okay"; };
@@ -131,7 +131,7 @@ gpbr: syscon@fffffd50 { }; }; - usb0: ohci@500000 { + usb0: usb@500000 { num-ports = <2>; status = "okay"; };
@@ -165,7 +165,7 @@ button-4 { i2c-gpio-0 { status = "okay"; - 24c512@50 { + eeprom@50 { compatible = "atmel,24c512"; reg = <0x50>; };
@@ -174,13 +174,13 @@ i2c-gpio-0 { leds { compatible = "gpio-leds"; - ds1 { + led-ds1 { label = "ds1"; gpios = <&pioA 9 GPIO_ACTIVE_HIGH>; linux,default-trigger = "heartbeat"; }; - ds5 { + led-ds5 { label = "ds5"; gpios = <&pioA 6 GPIO_ACTIVE_LOW>; };
arch/arm/boot/dts/microchip/at91sam9261.dtsi +2 -2
@@ -77,7 +77,7 @@ ahb { #size-cells = <1>; ranges; - usb0: ohci@500000 { + usb0: usb@500000 { compatible = "atmel,at91rm9200-ohci", "usb-ohci"; reg = <0x00500000 0x100000>; interrupts = <20 IRQ_TYPE_LEVEL_HIGH 2>;
@@ -142,7 +142,7 @@ tcb0: timer@fffa0000 { clock-names = "t0_clk", "t1_clk", "t2_clk", "slow_clk"; }; - usb1: gadget@fffa4000 { + usb1: usb@fffa4000 { compatible = "atmel,at91sam9261-udc"; reg = <0xfffa4000 0x4000>; interrupts = <10 IRQ_TYPE_LEVEL_HIGH 2>;
arch/arm/boot/dts/microchip/at91sam9261ek.dts +5 -5
@@ -31,7 +31,7 @@ main_xtal { }; ahb { - usb0: ohci@500000 { + usb0: usb@500000 { status = "okay"; };
@@ -136,7 +136,7 @@ timer1: timer@2 { }; }; - usb1: gadget@fffa4000 { + usb1: usb@fffa4000 { atmel,vbus-gpio = <&pioB 29 GPIO_ACTIVE_HIGH>; status = "okay"; };
@@ -192,19 +192,19 @@ watchdog@fffffd40 { leds { compatible = "gpio-leds"; - ds8 { + led-ds8 { label = "ds8"; gpios = <&pioA 13 GPIO_ACTIVE_LOW>; linux,default-trigger = "none"; }; - ds7 { + led-ds7 { label = "ds7"; gpios = <&pioA 14 GPIO_ACTIVE_LOW>; linux,default-trigger = "nand-disk"; }; - ds1 { + led-ds1 { label = "ds1"; gpios = <&pioA 23 GPIO_ACTIVE_LOW>; linux,default-trigger = "heartbeat";
arch/arm/boot/dts/microchip/at91sam9263.dtsi +2 -2
@@ -636,7 +636,7 @@ macb0: ethernet@fffbc000 { status = "disabled"; }; - usb1: gadget@fff78000 { + usb1: usb@fff78000 { compatible = "atmel,at91sam9263-udc"; reg = <0xfff78000 0x4000>; interrupts = <24 IRQ_TYPE_LEVEL_HIGH 2>;
@@ -768,7 +768,7 @@ fb0: fb@700000 { status = "disabled"; }; - usb0: ohci@a00000 { + usb0: usb@a00000 { compatible = "atmel,at91rm9200-ohci", "usb-ohci"; reg = <0x00a00000 0x100000>; interrupts = <29 IRQ_TYPE_LEVEL_HIGH 2>;
arch/arm/boot/dts/microchip/at91sam9263ek.dts +6 -6
@@ -61,7 +61,7 @@ macb0: ethernet@fffbc000 { status = "okay"; }; - usb1: gadget@fff78000 { + usb1: usb@fff78000 { atmel,vbus-gpio = <&pioA 25 GPIO_ACTIVE_HIGH>; status = "okay"; };
@@ -86,7 +86,7 @@ pinctrl@fffff200 { mmc0 { pinctrl_board_mmc0: mmc0-board { atmel,pins = - <AT91_PIOE 18 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH /* PE18 gpio CD pin pull up and deglitch */ + <AT91_PIOE 18 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH /* PE18 gpio CD pin pull up and deglitch */ AT91_PIOE 19 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>; /* PE19 gpio WP pin pull up */ }; };
@@ -207,7 +207,7 @@ data@7ca0000 { }; }; - usb0: ohci@a00000 { + usb0: usb@a00000 { num-ports = <2>; status = "okay"; atmel,vbus-gpio = <&pioA 24 GPIO_ACTIVE_HIGH
@@ -219,13 +219,13 @@ &pioA 21 GPIO_ACTIVE_HIGH leds { compatible = "gpio-leds"; - d3 { + led-d3 { label = "d3"; gpios = <&pioB 7 GPIO_ACTIVE_HIGH>; linux,default-trigger = "heartbeat"; }; - d2 { + led-d2 { label = "d2"; gpios = <&pioC 29 GPIO_ACTIVE_LOW>; linux,default-trigger = "nand-disk";
@@ -253,7 +253,7 @@ button-right-click { i2c-gpio-0 { status = "okay"; - 24c512@50 { + eeprom@50 { compatible = "atmel,24c512"; reg = <0x50>; pagesize = <128>;
arch/arm/boot/dts/microchip/at91sam9g20ek.dts +2 -2
@@ -14,13 +14,13 @@ / { leds { compatible = "gpio-leds"; - ds1 { + led-ds1 { label = "ds1"; gpios = <&pioA 9 GPIO_ACTIVE_HIGH>; linux,default-trigger = "heartbeat"; }; - ds5 { + led-ds5 { label = "ds5"; gpios = <&pioA 6 GPIO_ACTIVE_LOW>; };
arch/arm/boot/dts/microchip/at91sam9g20ek_2mmc.dts +2 -2
@@ -40,13 +40,13 @@ pinctrl_board_mmc0_slot0: mmc0_slot0-board { leds { compatible = "gpio-leds"; - ds1 { + led-ds1 { label = "ds1"; gpios = <&pioB 9 GPIO_ACTIVE_HIGH>; linux,default-trigger = "heartbeat"; }; - ds5 { + led-ds5 { label = "ds5"; gpios = <&pioB 8 GPIO_ACTIVE_LOW>; };
arch/arm/boot/dts/microchip/at91sam9g20ek_common.dtsi +3 -3
@@ -90,7 +90,7 @@ macb0: ethernet@fffc4000 { status = "okay"; }; - usb1: gadget@fffa4000 { + usb1: usb@fffa4000 { pinctrl-0 = <&pinctrl_usb1_vbus_gpio>; pinctrl-names = "default"; atmel,vbus-gpio = <&pioC 5 GPIO_ACTIVE_HIGH>;
@@ -211,7 +211,7 @@ data@7ca0000 { }; }; - usb0: ohci@500000 { + usb0: usb@500000 { num-ports = <2>; status = "okay"; };
@@ -220,7 +220,7 @@ usb0: ohci@500000 { i2c-gpio-0 { status = "okay"; - 24c512@50 { + eeprom@50 { compatible = "atmel,24c512"; reg = <0x50>; vcc-supply = <®_3v3>;
arch/arm/boot/dts/microchip/at91sam9g25-gardena-smart-gateway.dts +12 -12
@@ -37,71 +37,71 @@ button { leds { compatible = "gpio-leds"; - power_blue { + led-0 { label = "smartgw:power:blue"; gpios = <&pioC 21 GPIO_ACTIVE_HIGH>; default-state = "off"; }; - power_green { + led-1 { label = "smartgw:power:green"; gpios = <&pioC 20 GPIO_ACTIVE_HIGH>; default-state = "on"; }; - power_red { + led-2 { label = "smartgw:power:red"; gpios = <&pioC 19 GPIO_ACTIVE_HIGH>; default-state = "off"; }; - radio_blue { + led-3 { label = "smartgw:radio:blue"; gpios = <&pioC 18 GPIO_ACTIVE_HIGH>; default-state = "off"; }; - radio_green { + led-4 { label = "smartgw:radio:green"; gpios = <&pioC 17 GPIO_ACTIVE_HIGH>; default-state = "off"; }; - radio_red { + led-5 { label = "smartgw:radio:red"; gpios = <&pioC 16 GPIO_ACTIVE_HIGH>; default-state = "off"; }; - internet_blue { + led-6 { label = "smartgw:internet:blue"; gpios = <&pioC 15 GPIO_ACTIVE_HIGH>; default-state = "off"; }; - internet_green { + led-7 { label = "smartgw:internet:green"; gpios = <&pioC 14 GPIO_ACTIVE_HIGH>; default-state = "off"; }; - internet_red { + led-8 { label = "smartgw:internet:red"; gpios = <&pioC 13 GPIO_ACTIVE_HIGH>; default-state = "off"; }; - heartbeat { + led-9 { label = "smartgw:heartbeat"; gpios = <&pioB 8 GPIO_ACTIVE_HIGH>; linux,default-trigger = "heartbeat"; }; - pb18 { + led-pb18 { status = "disabled"; }; - pd21 { + led-pd21 { status = "disabled"; }; };
arch/arm/boot/dts/microchip/at91sam9g45.dtsi +3 -3
@@ -913,7 +913,7 @@ spi1: spi@fffa8000 { status = "disabled"; }; - usb2: gadget@fff78000 { + usb2: usb@fff78000 { compatible = "atmel,at91sam9g45-udc"; reg = <0x00600000 0x80000 0xfff78000 0x400>;
@@ -964,7 +964,7 @@ fb0: fb@500000 { status = "disabled"; }; - usb0: ohci@700000 { + usb0: usb@700000 { compatible = "atmel,at91rm9200-ohci", "usb-ohci"; reg = <0x00700000 0x100000>; interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>;
@@ -973,7 +973,7 @@ usb0: ohci@700000 { status = "disabled"; }; - usb1: ehci@800000 { + usb1: usb@800000 { compatible = "atmel,at91sam9g45-ehci", "usb-ehci"; reg = <0x00800000 0x100000>; interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>;
arch/arm/boot/dts/microchip/at91sam9m10g45ek.dts +3 -3
@@ -174,7 +174,7 @@ flash@0 { }; }; - usb2: gadget@fff78000 { + usb2: usb@fff78000 { atmel,vbus-gpio = <&pioB 19 GPIO_ACTIVE_HIGH>; status = "okay"; };
@@ -303,14 +303,14 @@ data@4000000 { }; }; - usb0: ohci@700000 { + usb0: usb@700000 { status = "okay"; num-ports = <2>; atmel,vbus-gpio = <&pioD 1 GPIO_ACTIVE_LOW &pioD 3 GPIO_ACTIVE_LOW>; }; - usb1: ehci@800000 { + usb1: usb@800000 { status = "okay"; }; };
arch/arm/boot/dts/microchip/at91sam9n12.dtsi +2 -2
@@ -738,7 +738,7 @@ pwm0: pwm@f8034000 { status = "disabled"; }; - usb1: gadget@f803c000 { + usb1: usb@f803c000 { compatible = "atmel,at91sam9260-udc"; reg = <0xf803c000 0x4000>; interrupts = <23 IRQ_TYPE_LEVEL_HIGH 2>;
@@ -748,7 +748,7 @@ usb1: gadget@f803c000 { }; }; - usb0: ohci@500000 { + usb0: usb@500000 { compatible = "atmel,at91rm9200-ohci", "usb-ohci"; reg = <0x00500000 0x00100000>; interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>;
arch/arm/boot/dts/microchip/at91sam9n12ek.dts +5 -5
@@ -142,7 +142,7 @@ hlcdc_panel_output: endpoint@0 { }; }; - usb1: gadget@f803c000 { + usb1: usb@f803c000 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb1_vbus_sense>; atmel,vbus-gpio = <&pioB 16 GPIO_ACTIVE_HIGH>;
@@ -180,7 +180,7 @@ nand@3 { }; }; - usb0: ohci@500000 { + usb0: usb@500000 { num-ports = <1>; atmel,vbus-gpio = <&pioB 7 GPIO_ACTIVE_LOW>; status = "okay";
@@ -207,19 +207,19 @@ bl_reg: backlight_regulator { leds { compatible = "gpio-leds"; - d8 { + led-d8 { label = "d8"; gpios = <&pioB 4 GPIO_ACTIVE_LOW>; linux,default-trigger = "mmc0"; }; - d9 { + led-d9 { label = "d9"; gpios = <&pioB 5 GPIO_ACTIVE_LOW>; linux,default-trigger = "nand-disk"; }; - d10 { + led-d10 { label = "d10"; gpios = <&pioB 6 GPIO_ACTIVE_HIGH>; linux,default-trigger = "heartbeat";
arch/arm/boot/dts/microchip/at91sam9rl.dtsi +1 -1
@@ -282,7 +282,7 @@ adc0: adc@fffd0000 { atmel,adc-startup-time = <40>; }; - usb0: gadget@fffd4000 { + usb0: usb@fffd4000 { compatible = "atmel,at91sam9rl-udc"; reg = <0x00600000 0x100000>, <0xfffd4000 0x4000>;
arch/arm/boot/dts/microchip/at91sam9rlek.dts +1 -1
@@ -172,7 +172,7 @@ &pinctrl_adc0_ad5 status = "okay"; }; - usb0: gadget@fffd4000 { + usb0: usb@fffd4000 { atmel,vbus-gpio = <&pioA 8 GPIO_ACTIVE_HIGH>; status = "okay"; };
arch/arm/boot/dts/microchip/at91sam9x5.dtsi +3 -3
@@ -847,7 +847,7 @@ spi1: spi@f0004000 { status = "disabled"; }; - usb2: gadget@f803c000 { + usb2: usb@f803c000 { compatible = "atmel,at91sam9g45-udc"; reg = <0x00500000 0x80000 0xf803c000 0x400>;
@@ -886,7 +886,7 @@ pwm0: pwm@f8034000 { }; }; - usb0: ohci@600000 { + usb0: usb@600000 { compatible = "atmel,at91rm9200-ohci", "usb-ohci"; reg = <0x00600000 0x100000>; interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>;
@@ -895,7 +895,7 @@ usb0: ohci@600000 { status = "disabled"; }; - usb1: ehci@700000 { + usb1: usb@700000 { compatible = "atmel,at91sam9g45-ehci", "usb-ehci"; reg = <0x00700000 0x100000>; interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>;
arch/arm/boot/dts/microchip/at91sam9x5cm.dtsi +2 -2
@@ -120,13 +120,13 @@ rootfs@800000 { leds { compatible = "gpio-leds"; - pb18 { + led-pb18 { label = "pb18"; gpios = <&pioB 18 GPIO_ACTIVE_LOW>; linux,default-trigger = "heartbeat"; }; - pd21 { + led-pd21 { label = "pd21"; gpios = <&pioD 21 GPIO_ACTIVE_HIGH>; };
arch/arm/boot/dts/microchip/ethernut5.dts +2 -2
@@ -60,7 +60,7 @@ macb0: ethernet@fffc4000 { status = "okay"; }; - usb1: gadget@fffa4000 { + usb1: usb@fffa4000 { atmel,vbus-gpio = <&pioC 5 GPIO_ACTIVE_HIGH>; status = "okay"; };
@@ -101,7 +101,7 @@ data@20000 { }; }; - usb0: ohci@500000 { + usb0: usb@500000 { num-ports = <2>; status = "okay"; };
arch/arm/boot/dts/microchip/evk-pro3.dts +2 -2
@@ -35,7 +35,7 @@ usart2: serial@fffb8000 { status = "okay"; }; - usb1: gadget@fffa4000 { + usb1: usb@fffa4000 { atmel,vbus-gpio = <&pioC 5 GPIO_ACTIVE_HIGH>; status = "okay"; };
@@ -45,7 +45,7 @@ watchdog@fffffd40 { }; }; - usb0: ohci@500000 { + usb0: usb@500000 { num-ports = <2>; status = "okay"; };
arch/arm/boot/dts/microchip/mpa1600.dts +1 -1
@@ -57,7 +57,7 @@ ssc1: ssc@fffd4000 { }; }; - usb0: ohci@300000 { + usb0: usb@300000 { num-ports = <1>; status = "okay"; };
arch/arm/boot/dts/microchip/pm9g45.dts +2 -2
@@ -139,12 +139,12 @@ data@900000 { }; }; - usb0: ohci@700000 { + usb0: usb@700000 { status = "okay"; num-ports = <2>; }; - usb1: ehci@800000 { + usb1: usb@800000 { status = "okay"; }; };
arch/arm/boot/dts/microchip/sam9x60.dtsi +3 -3
@@ -74,7 +74,7 @@ ahb { #size-cells = <1>; ranges; - usb0: gadget@500000 { + usb0: usb@500000 { #address-cells = <1>; #size-cells = <0>; compatible = "microchip,sam9x60-udc";
@@ -88,7 +88,7 @@ usb0: gadget@500000 { status = "disabled"; }; - usb1: ohci@600000 { + usb1: usb@600000 { compatible = "atmel,at91rm9200-ohci", "usb-ohci"; reg = <0x00600000 0x100000>; interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>;
@@ -97,7 +97,7 @@ usb1: ohci@600000 { status = "disabled"; }; - usb2: ehci@700000 { + usb2: usb@700000 { compatible = "atmel,at91sam9g45-ehci", "usb-ehci"; reg = <0x00700000 0x100000>; interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>;
arch/arm/boot/dts/microchip/sama5d2.dtsi +3 -3
@@ -126,7 +126,7 @@ nfc_sram: sram@100000 { }; - usb0: gadget@300000 { + usb0: usb@300000 { compatible = "atmel,sama5d3-udc"; reg = <0x00300000 0x100000 0xfc02c000 0x400>;
@@ -136,7 +136,7 @@ usb0: gadget@300000 { status = "disabled"; }; - usb1: ohci@400000 { + usb1: usb@400000 { compatible = "atmel,at91rm9200-ohci", "usb-ohci"; reg = <0x00400000 0x100000>; interrupts = <41 IRQ_TYPE_LEVEL_HIGH 2>;
@@ -145,7 +145,7 @@ usb1: ohci@400000 { status = "disabled"; }; - usb2: ehci@500000 { + usb2: usb@500000 { compatible = "atmel,at91sam9g45-ehci", "usb-ehci"; reg = <0x00500000 0x100000>; interrupts = <41 IRQ_TYPE_LEVEL_HIGH 2>;
arch/arm/boot/dts/microchip/sama5d3.dtsi +3 -3
@@ -1064,7 +1064,7 @@ nfc_sram: sram@200000 { ranges = <0 0x200000 0x2400>; }; - usb0: gadget@500000 { + usb0: usb@500000 { compatible = "atmel,sama5d3-udc"; reg = <0x00500000 0x100000 0xf8030000 0x4000>;
@@ -1074,7 +1074,7 @@ usb0: gadget@500000 { status = "disabled"; }; - usb1: ohci@600000 { + usb1: usb@600000 { compatible = "atmel,at91rm9200-ohci", "usb-ohci"; reg = <0x00600000 0x100000>; interrupts = <32 IRQ_TYPE_LEVEL_HIGH 2>;
@@ -1083,7 +1083,7 @@ usb1: ohci@600000 { status = "disabled"; }; - usb2: ehci@700000 { + usb2: usb@700000 { compatible = "atmel,at91sam9g45-ehci", "usb-ehci"; reg = <0x00700000 0x100000>; interrupts = <32 IRQ_TYPE_LEVEL_HIGH 2>;
arch/arm/boot/dts/microchip/sama5d34ek.dts +1 -1
@@ -36,7 +36,7 @@ i2c0: i2c@f0014000 { i2c1: i2c@f0018000 { status = "okay"; - 24c256@50 { + eeprom@50 { compatible = "atmel,24c256"; reg = <0x50>; pagesize = <64>;
arch/arm/boot/dts/microchip/sama5d3xmb.dtsi +3 -3
@@ -165,14 +165,14 @@ watchdog@fffffe40 { }; }; - usb0: gadget@500000 { + usb0: usb@500000 { atmel,vbus-gpio = <&pioD 29 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usba_vbus>; status = "okay"; }; - usb1: ohci@600000 { + usb1: usb@600000 { num-ports = <3>; atmel,vbus-gpio = <&pioD 25 GPIO_ACTIVE_HIGH &pioD 26 GPIO_ACTIVE_LOW
@@ -181,7 +181,7 @@ &pioD 27 GPIO_ACTIVE_LOW status = "okay"; }; - usb2: ehci@700000 { + usb2: usb@700000 { status = "okay"; }; };
arch/arm/boot/dts/microchip/sama5d3xmb_cmp.dtsi +1 -1
@@ -216,7 +216,7 @@ watchdog@fffffe40 { }; }; - usb0: gadget@500000 { + usb0: usb@500000 { atmel,vbus-gpio = <&pioD 29 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usba_vbus>;
arch/arm/boot/dts/microchip/sama5d4.dtsi +3 -3
@@ -109,7 +109,7 @@ vdec0: vdec@300000 { clocks = <&pmc PMC_TYPE_PERIPHERAL 19>; }; - usb0: gadget@400000 { + usb0: usb@400000 { compatible = "atmel,sama5d3-udc"; reg = <0x00400000 0x100000 0xfc02c000 0x4000>;
@@ -119,7 +119,7 @@ usb0: gadget@400000 { status = "disabled"; }; - usb1: ohci@500000 { + usb1: usb@500000 { compatible = "atmel,at91rm9200-ohci", "usb-ohci"; reg = <0x00500000 0x100000>; interrupts = <46 IRQ_TYPE_LEVEL_HIGH 2>;
@@ -128,7 +128,7 @@ usb1: ohci@500000 { status = "disabled"; }; - usb2: ehci@600000 { + usb2: usb@600000 { compatible = "atmel,at91sam9g45-ehci", "usb-ehci"; reg = <0x00600000 0x100000>; interrupts = <46 IRQ_TYPE_LEVEL_HIGH 2>;
arch/arm/boot/dts/microchip/tny_a9263.dts +1 -1
@@ -47,7 +47,7 @@ timer@2 { }; }; - usb1: gadget@fff78000 { + usb1: usb@fff78000 { atmel,vbus-gpio = <&pioB 11 GPIO_ACTIVE_HIGH>; status = "okay"; };
arch/arm/boot/dts/microchip/usb_a9260_common.dtsi +2 -2
@@ -39,7 +39,7 @@ macb0: ethernet@fffc4000 { status = "okay"; }; - usb1: gadget@fffa4000 { + usb1: usb@fffa4000 { atmel,vbus-gpio = <&pioC 5 GPIO_ACTIVE_HIGH>; status = "okay"; };
@@ -111,7 +111,7 @@ data@7ca0000 { }; }; - usb0: ohci@500000 { + usb0: usb@500000 { num-ports = <2>; status = "okay"; };
arch/arm/boot/dts/microchip/usb_a9263.dts +2 -2
@@ -52,7 +52,7 @@ macb0: ethernet@fffbc000 { status = "okay"; }; - usb1: gadget@fff78000 { + usb1: usb@fff78000 { atmel,vbus-gpio = <&pioB 11 GPIO_ACTIVE_HIGH>; status = "okay"; };
@@ -139,7 +139,7 @@ data@7ca0000 { }; }; - usb0: ohci@a00000 { + usb0: usb@a00000 { num-ports = <2>; status = "okay"; };
base-commit: 2347b4c79f5e6cd3f4996e80c2d3c15f53006bf5
Signature · 1 line
2.34.1
Hello Andrei,
Am Tue, Jul 23, 2024 at 04:12:28PM +0300 schrieb Andrei Simion:
Quoted 4 lines
Cosmetic work:
Rename the eeprom node according to device tree specification. Rename the usb node according to device tree specification. Rename the led sub nodes according to device tree specification.
You have to be careful here if sysfs file names should stay stable, see below.
Quoted 102 lines
Rename the pmic node according to the device tree specification. Clean up spacing and indentation.
Signed-off-by Andrei Simion <[email protected]>---
Modifications Based On:
https://lore.kernel.org/linux-arm-kernel/[email protected]/--- arch/arm/boot/dts/microchip/aks-cdu.dts | 12 +++++----- arch/arm/boot/dts/microchip/animeo_ip.dts | 10 ++++---- .../dts/microchip/at91-cosino_mega2560.dts | 2 +- arch/arm/boot/dts/microchip/at91-foxg20.dts | 4 ++-- .../arm/boot/dts/microchip/at91-qil_a9260.dts | 4 ++-- .../boot/dts/microchip/at91-sam9_l9260.dts | 2 +- .../arm/boot/dts/microchip/at91-sam9x60ek.dts | 6 ++--- .../dts/microchip/at91-sama5d27_som1.dtsi | 2 +- .../dts/microchip/at91-sama5d27_som1_ek.dts | 14 +++++------ .../dts/microchip/at91-sama5d27_wlsom1.dtsi | 2 +- .../dts/microchip/at91-sama5d29_curiosity.dts | 2 +- .../boot/dts/microchip/at91-sama5d2_icp.dts | 10 ++++---- .../dts/microchip/at91-sama5d2_ptc_ek.dts | 8 +++---- .../dts/microchip/at91-sama5d2_xplained.dts | 8 +++---- .../dts/microchip/at91-sama5d3_xplained.dts | 6 ++--- .../dts/microchip/at91-sama5d4_ma5d4evk.dts | 6 ++--- .../dts/microchip/at91-sama5d4_xplained.dts | 6 ++--- .../arm/boot/dts/microchip/at91-sama5d4ek.dts | 6 ++--- .../arm/boot/dts/microchip/at91-sama7g5ek.dts | 2 +- arch/arm/boot/dts/microchip/at91-vinco.dts | 6 ++--- arch/arm/boot/dts/microchip/at91rm9200.dtsi | 4 ++-- arch/arm/boot/dts/microchip/at91rm9200ek.dts | 10 ++++---- arch/arm/boot/dts/microchip/at91sam9260.dtsi | 4 ++-- arch/arm/boot/dts/microchip/at91sam9260ek.dts | 10 ++++---- arch/arm/boot/dts/microchip/at91sam9261.dtsi | 4 ++-- arch/arm/boot/dts/microchip/at91sam9261ek.dts | 10 ++++---- arch/arm/boot/dts/microchip/at91sam9263.dtsi | 4 ++-- arch/arm/boot/dts/microchip/at91sam9263ek.dts | 12 +++++----- arch/arm/boot/dts/microchip/at91sam9g20ek.dts | 4 ++-- .../boot/dts/microchip/at91sam9g20ek_2mmc.dts | 4 ++-- .../dts/microchip/at91sam9g20ek_common.dtsi | 6 ++--- .../at91sam9g25-gardena-smart-gateway.dts | 24 +++++++++---------- arch/arm/boot/dts/microchip/at91sam9g45.dtsi | 6 ++--- .../boot/dts/microchip/at91sam9m10g45ek.dts | 6 ++--- arch/arm/boot/dts/microchip/at91sam9n12.dtsi | 4 ++-- arch/arm/boot/dts/microchip/at91sam9n12ek.dts | 10 ++++---- arch/arm/boot/dts/microchip/at91sam9rl.dtsi | 2 +- arch/arm/boot/dts/microchip/at91sam9rlek.dts | 2 +- arch/arm/boot/dts/microchip/at91sam9x5.dtsi | 6 ++--- arch/arm/boot/dts/microchip/at91sam9x5cm.dtsi | 4 ++-- arch/arm/boot/dts/microchip/ethernut5.dts | 4 ++-- arch/arm/boot/dts/microchip/evk-pro3.dts | 4 ++-- arch/arm/boot/dts/microchip/mpa1600.dts | 2 +- arch/arm/boot/dts/microchip/pm9g45.dts | 4 ++-- arch/arm/boot/dts/microchip/sam9x60.dtsi | 6 ++--- arch/arm/boot/dts/microchip/sama5d2.dtsi | 6 ++--- arch/arm/boot/dts/microchip/sama5d3.dtsi | 6 ++--- arch/arm/boot/dts/microchip/sama5d34ek.dts | 2 +- arch/arm/boot/dts/microchip/sama5d3xmb.dtsi | 6 ++--- .../boot/dts/microchip/sama5d3xmb_cmp.dtsi | 2 +- arch/arm/boot/dts/microchip/sama5d4.dtsi | 6 ++--- arch/arm/boot/dts/microchip/tny_a9263.dts | 2 +- .../boot/dts/microchip/usb_a9260_common.dtsi | 4 ++-- arch/arm/boot/dts/microchip/usb_a9263.dts | 4 ++-- 54 files changed, 156 insertions(+), 156 deletions(-)arch/arm/boot/dts/microchip/aks-cdu.dts +4
-5@@ -50,13 +50,13 @@ macb0: ethernet@fffc4000 { status = "okay"; }; - usb1: gadget@fffa4000 { + usb1: usb@fffa4000 { atmel,vbus-gpio = <&pioC 15 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; - usb0: ohci@500000 { + usb0: usb@500000 { num-ports = <2>; status = "okay"; };@@ -98,23 +98,23 @@ rootfs@500000 { leds { compatible = "gpio-leds"; - red { + led-0 { gpios = <&pioC 10 GPIO_ACTIVE_HIGH>; linux,default-trigger = "none"; }; - green { + led-1 { gpios = <&pioA 5 GPIO_ACTIVE_LOW>; linux,default-trigger = "none"; default-state = "on"; }; - yellow {
arch/arm/boot/dts/microchip/aks-cdu.dts rootfs@500000 { · line 120
Quoted 10 lines
arch/arm/boot/dts/microchip/aks-cdu.dts +2
-1+ led-2 { gpios = <&pioB 20 GPIO_ACTIVE_LOW>; linux,default-trigger = "none"; }; - blue { + led-3 { gpios = <&pioB 21 GPIO_ACTIVE_LOW>; linux,default-trigger = "none"; };
For all these paths would probably change, for example from /sys/class/leds/blue to /sys/class/leds/led-3 … which might break userspace depending on these paths. To keep the old path, an additional node "label" can be added, see other boards for examples. Other boards in this patch don't seem to be affected.
Added [email protected] to Cc.
Greets
Alex
Quoted 1,453 lines
arch/arm/boot/dts/microchip/animeo_ip.dts +5
-5@@ -136,7 +136,7 @@ ubi@60000 { }; }; - usb0: ohci@500000 { + usb0: usb@500000 { num-ports = <2>; atmel,vbus-gpio = <&pioB 15 GPIO_ACTIVE_LOW>; status = "okay";@@ -146,23 +146,23 @@ usb0: ohci@500000 { leds { compatible = "gpio-leds"; - power_green { + led-0 { label = "power_green"; gpios = <&pioC 17 GPIO_ACTIVE_HIGH>; linux,default-trigger = "heartbeat"; }; - power_red { + led-1 { label = "power_red"; gpios = <&pioA 2 GPIO_ACTIVE_HIGH>; }; - tx_green { + led-2 { label = "tx_green"; gpios = <&pioC 19 GPIO_ACTIVE_HIGH>; }; - tx_red { + led-3 { label = "tx_red"; gpios = <&pioC 18 GPIO_ACTIVE_HIGH>; };arch/arm/boot/dts/microchip/at91-cosino_mega2560.dts +1
-1@@ -7,7 +7,7 @@ * HCE Engineering * * Derived from at91sam9g35ek.dts by: - * Copyright (C) 2012 Atmel, + * Copyright (C) 2012 Atmel, * 2012 Nicolas Ferre <[email protected]> */arch/arm/boot/dts/microchip/at91-foxg20.dts +2
-2@@ -45,7 +45,7 @@ timer@2 { }; }; - usb1: gadget@fffa4000 { + usb1: usb@fffa4000 { atmel,vbus-gpio = <&pioC 6 GPIO_ACTIVE_HIGH>; status = "okay"; };@@ -131,7 +131,7 @@ watchdog@fffffd40 { }; }; - usb0: ohci@500000 { + usb0: usb@500000 { num-ports = <2>; status = "okay"; };arch/arm/boot/dts/microchip/at91-qil_a9260.dts +2
-2@@ -42,7 +42,7 @@ timer@2 { }; }; - usb1: gadget@fffa4000 { + usb1: usb@fffa4000 { atmel,vbus-gpio = <&pioC 5 GPIO_ACTIVE_HIGH>; status = "okay"; };@@ -114,7 +114,7 @@ shdwc: poweroff@fffffd10 { }; }; - usb0: ohci@500000 { + usb0: usb@500000 { num-ports = <2>; status = "okay"; };arch/arm/boot/dts/microchip/at91-sam9_l9260.dts +1
-1@@ -105,7 +105,7 @@ nand0: nand@40000000 { status = "okay"; }; - usb0: ohci@500000 { + usb0: usb@500000 { status = "okay"; };arch/arm/boot/dts/microchip/at91-sam9x60ek.dts +3
-3@@ -53,17 +53,17 @@ leds { pinctrl-0 = <&pinctrl_gpio_leds>; status = "okay"; /* Conflict with pwm0. */ - red { + led-0 { label = "red"; gpios = <&pioB 11 GPIO_ACTIVE_HIGH>; }; - green { + led-1 { label = "green"; gpios = <&pioB 12 GPIO_ACTIVE_HIGH>; }; - blue { + led-2 { label = "blue"; gpios = <&pioB 13 GPIO_ACTIVE_HIGH>; linux,default-trigger = "heartbeat";arch/arm/boot/dts/microchip/at91-sama5d27_som1.dtsi +1
-1@@ -106,7 +106,7 @@ i2c0: i2c@f8028000 { scl-gpios = <&pioA PIN_PD22 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; status = "okay"; - at24@50 { + eeprom@50 { compatible = "atmel,24c02"; reg = <0x50>; pagesize = <8>;arch/arm/boot/dts/microchip/at91-sama5d27_som1_ek.dts +7
-7@@ -30,14 +30,14 @@ chosen { }; ahb { - usb0: gadget@300000 { + usb0: usb@300000 { atmel,vbus-gpio = <&pioA PIN_PD20 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usba_vbus>; status = "okay"; }; - usb1: ohci@400000 { + usb1: usb@400000 { num-ports = <3>; atmel,vbus-gpio = <0 /* &pioA PIN_PD20 GPIO_ACTIVE_HIGH */ &pioA PIN_PA27 GPIO_ACTIVE_HIGH@@ -48,7 +48,7 @@ &pioA PIN_PA27 GPIO_ACTIVE_HIGH status = "okay"; }; - usb2: ehci@500000 { + usb2: usb@500000 { status = "okay"; };@@ -258,10 +258,10 @@ pinctrl_i2c1_default: i2c1_default { }; pinctrl_i2c1_gpio: i2c1_gpio { - pinmux = <PIN_PD4__GPIO>, - <PIN_PD5__GPIO>; - bias-disable; - }; + pinmux = <PIN_PD4__GPIO>, + <PIN_PD5__GPIO>; + bias-disable; + }; pinctrl_isc_base: isc_base {arch/arm/boot/dts/microchip/at91-sama5d27_wlsom1.dtsi +1
-1@@ -67,7 +67,7 @@ &i2c1 { scl-gpios = <&pioA PIN_PD20 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; status = "okay"; - mcp16502@5b { + pmic@5b { compatible = "microchip,mcp16502"; reg = <0x5b>; status = "okay";arch/arm/boot/dts/microchip/at91-sama5d29_curiosity.dts +1
-1@@ -141,7 +141,7 @@ &i2c0 { i2c-sda-hold-time-ns = <350>; status = "okay"; - mcp16502@5b { + pmic@5b { compatible = "microchip,mcp16502"; reg = <0x5b>; status = "okay";arch/arm/boot/dts/microchip/at91-sama5d2_icp.dts +5
-5@@ -187,7 +187,7 @@ i2c6: i2c@600 { i2c-digital-filter-width-ns = <35>; status = "okay"; - mcp16502@5b { + pmic@5b { compatible = "microchip,mcp16502"; reg = <0x5b>; status = "okay";@@ -407,10 +407,10 @@ pinctrl_i2c1_default: i2c1_default { }; pinctrl_i2c1_gpio: i2c1_gpio { - pinmux = <PIN_PD19__GPIO>, - <PIN_PD20__GPIO>; - bias-disable; - }; + pinmux = <PIN_PD19__GPIO>, + <PIN_PD20__GPIO>; + bias-disable; + }; pinctrl_key_gpio_default: key_gpio_default { pinmux = <PIN_PD0__GPIO>;arch/arm/boot/dts/microchip/at91-sama5d2_ptc_ek.dts +4
-4@@ -40,14 +40,14 @@ main_xtal { }; ahb { - usb0: gadget@300000 { + usb0: usb@300000 { atmel,vbus-gpio = <&pioA PIN_PB11 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usba_vbus>; status = "okay"; }; - usb1: ohci@400000 { + usb1: usb@400000 { num-ports = <3>; atmel,vbus-gpio = <0 &pioA PIN_PB12 GPIO_ACTIVE_HIGH@@ -58,7 +58,7 @@ &pioA PIN_PB12 GPIO_ACTIVE_HIGH status = "okay"; }; - usb2: ehci@500000 { + usb2: usb@500000 { status = "okay"; };@@ -231,7 +231,7 @@ i2c1: i2c@fc028000 { scl-gpios = <&pioA PIN_PC7 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; status = "okay"; - at24@50 { + eeprom@50 { compatible = "atmel,24c02"; reg = <0x50>; pagesize = <8>;arch/arm/boot/dts/microchip/at91-sama5d2_xplained.dts +4
-4@@ -39,14 +39,14 @@ main_xtal { }; ahb { - usb0: gadget@300000 { + usb0: usb@300000 { atmel,vbus-gpio = <&pioA PIN_PA31 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usba_vbus>; status = "okay"; }; - usb1: ohci@400000 { + usb1: usb@400000 { num-ports = <3>; atmel,vbus-gpio = <0 /* &pioA PIN_PB9 GPIO_ACTIVE_HIGH */ &pioA PIN_PB10 GPIO_ACTIVE_HIGH@@ -57,7 +57,7 @@ &pioA PIN_PB10 GPIO_ACTIVE_HIGH status = "okay"; }; - usb2: ehci@500000 { + usb2: usb@500000 { status = "okay"; };@@ -411,7 +411,7 @@ i2c1: i2c@fc028000 { scl-gpios = <&pioA PIN_PD5 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; status = "okay"; - at24@54 { + eeprom@54 { compatible = "atmel,24c02"; reg = <0x54>; pagesize = <16>;arch/arm/boot/dts/microchip/at91-sama5d3_xplained.dts +3
-3@@ -276,14 +276,14 @@ pinctrl_vcc_mmc0_reg_gpio: vcc_mmc0_reg_gpio_default { }; }; - usb0: gadget@500000 { + usb0: usb@500000 { atmel,vbus-gpio = <&pioE 9 GPIO_ACTIVE_HIGH>; /* PE9, conflicts with A9 */ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usba_vbus>; status = "okay"; }; - usb1: ohci@600000 { + usb1: usb@600000 { num-ports = <3>; atmel,vbus-gpio = <0 &pioE 3 GPIO_ACTIVE_LOW@@ -294,7 +294,7 @@ &pioE 4 GPIO_ACTIVE_LOW status = "okay"; }; - usb2: ehci@700000 { + usb2: usb@700000 { status = "okay"; };arch/arm/boot/dts/microchip/at91-sama5d4_ma5d4evk.dts +3
-3@@ -15,14 +15,14 @@ chosen { }; ahb { - usb0: gadget@400000 { + usb0: usb@400000 { atmel,vbus-gpio = <&pioE 31 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usba_vbus>; status = "okay"; }; - usb1: ohci@500000 { + usb1: usb@500000 { num-ports = <3>; atmel,vbus-gpio = <0 &pioE 11 GPIO_ACTIVE_LOW@@ -31,7 +31,7 @@ &pioE 14 GPIO_ACTIVE_LOW status = "okay"; }; - usb2: ehci@600000 { + usb2: usb@600000 { status = "okay"; };arch/arm/boot/dts/microchip/at91-sama5d4_xplained.dts +3
-3@@ -157,14 +157,14 @@ pinctrl_vcc_mmc1_reg: vcc_mmc1_reg { }; }; - usb0: gadget@400000 { + usb0: usb@400000 { atmel,vbus-gpio = <&pioE 31 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usba_vbus>; status = "okay"; }; - usb1: ohci@500000 { + usb1: usb@500000 { num-ports = <3>; atmel,vbus-gpio = <0 &pioE 11 GPIO_ACTIVE_HIGH@@ -175,7 +175,7 @@ &pioE 14 GPIO_ACTIVE_HIGH status = "okay"; }; - usb2: ehci@600000 { + usb2: usb@600000 { status = "okay"; };arch/arm/boot/dts/microchip/at91-sama5d4ek.dts +3
-3@@ -191,14 +191,14 @@ pinctrl_mxt_ts: mxt_irq { }; }; - usb0: gadget@400000 { + usb0: usb@400000 { atmel,vbus-gpio = <&pioE 31 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usba_vbus>; status = "okay"; }; - usb1: ohci@500000 { + usb1: usb@500000 { num-ports = <3>; atmel,vbus-gpio = <0 /* &pioE 10 GPIO_ACTIVE_LOW */ &pioE 11 GPIO_ACTIVE_LOW@@ -207,7 +207,7 @@ &pioE 12 GPIO_ACTIVE_LOW status = "okay"; }; - usb2: ehci@600000 { + usb2: usb@600000 { status = "okay"; };arch/arm/boot/dts/microchip/at91-sama7g5ek.dts +1
-1@@ -236,7 +236,7 @@ i2c1: i2c@600 { i2c-digital-filter-width-ns = <35>; status = "okay"; - mcp16502@5b { + pmic@5b { compatible = "microchip,mcp16502"; reg = <0x5b>; status = "okay";arch/arm/boot/dts/microchip/at91-vinco.dts +3
-3@@ -155,14 +155,14 @@ pinctrl_usba_vbus: usba_vbus { }; }; - usb0: gadget@400000 { + usb0: usb@400000 { atmel,vbus-gpio = <&pioE 31 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usba_vbus>; status = "disabled"; }; - usb1: ohci@500000 { + usb1: usb@500000 { num-ports = <3>; atmel,vbus-gpio = <0 &pioE 11 GPIO_ACTIVE_LOW@@ -171,7 +171,7 @@ &pioE 12 GPIO_ACTIVE_LOW status = "disabled"; }; - usb2: ehci@600000 { + usb2: usb@600000 { /* 4G Modem */ status = "okay"; };arch/arm/boot/dts/microchip/at91rm9200.dtsi +2
-2@@ -662,7 +662,7 @@ usart3: serial@fffcc000 { status = "disabled"; }; - usb1: gadget@fffb0000 { + usb1: usb@fffb0000 { compatible = "atmel,at91rm9200-udc"; reg = <0xfffb0000 0x4000>; interrupts = <11 IRQ_TYPE_LEVEL_HIGH 2>;@@ -702,7 +702,7 @@ &pioB 1 GPIO_ACTIVE_HIGH status = "disabled"; }; - usb0: ohci@300000 { + usb0: usb@300000 { compatible = "atmel,at91rm9200-ohci", "usb-ohci"; reg = <0x00300000 0x100000>; interrupts = <23 IRQ_TYPE_LEVEL_HIGH 2>;arch/arm/boot/dts/microchip/at91rm9200ek.dts +5
-5@@ -43,7 +43,7 @@ timer@2 { }; }; - usb1: gadget@fffb0000 { + usb1: usb@fffb0000 { atmel,vbus-gpio = <&pioD 4 GPIO_ACTIVE_HIGH>; atmel,pullup-gpio = <&pioD 5 GPIO_ACTIVE_HIGH>; status = "okay";@@ -89,7 +89,7 @@ rtc: rtc@fffffe00 { }; }; - usb0: ohci@300000 { + usb0: usb@300000 { num-ports = <2>; status = "okay"; };@@ -127,19 +127,19 @@ root@350000 { leds { compatible = "gpio-leds"; - ds2 { + led-ds2 { label = "green"; gpios = <&pioB 0 GPIO_ACTIVE_LOW>; linux,default-trigger = "mmc0"; }; - ds4 { + led-ds4 { label = "yellow"; gpios = <&pioB 1 GPIO_ACTIVE_LOW>; linux,default-trigger = "heartbeat"; }; - ds6 { + led-ds6 { label = "red"; gpios = <&pioB 2 GPIO_ACTIVE_LOW>; };arch/arm/boot/dts/microchip/at91sam9260.dtsi +2
-2@@ -637,7 +637,7 @@ macb0: ethernet@fffc4000 { status = "disabled"; }; - usb1: gadget@fffa4000 { + usb1: usb@fffa4000 { compatible = "atmel,at91sam9260-udc"; reg = <0xfffa4000 0x4000>; interrupts = <10 IRQ_TYPE_LEVEL_HIGH 2>;@@ -742,7 +742,7 @@ gpbr: syscon@fffffd50 { }; }; - usb0: ohci@500000 { + usb0: usb@500000 { compatible = "atmel,at91rm9200-ohci", "usb-ohci"; reg = <0x00500000 0x100000>; interrupts = <20 IRQ_TYPE_LEVEL_HIGH 2>;arch/arm/boot/dts/microchip/at91sam9260ek.dts +5
-5@@ -45,7 +45,7 @@ timer@2 { }; }; - usb1: gadget@fffa4000 { + usb1: usb@fffa4000 { atmel,vbus-gpio = <&pioC 5 GPIO_ACTIVE_HIGH>; status = "okay"; };@@ -131,7 +131,7 @@ gpbr: syscon@fffffd50 { }; }; - usb0: ohci@500000 { + usb0: usb@500000 { num-ports = <2>; status = "okay"; };@@ -165,7 +165,7 @@ button-4 { i2c-gpio-0 { status = "okay"; - 24c512@50 { + eeprom@50 { compatible = "atmel,24c512"; reg = <0x50>; };@@ -174,13 +174,13 @@ i2c-gpio-0 { leds { compatible = "gpio-leds"; - ds1 { + led-ds1 { label = "ds1"; gpios = <&pioA 9 GPIO_ACTIVE_HIGH>; linux,default-trigger = "heartbeat"; }; - ds5 { + led-ds5 { label = "ds5"; gpios = <&pioA 6 GPIO_ACTIVE_LOW>; };arch/arm/boot/dts/microchip/at91sam9261.dtsi +2
-2@@ -77,7 +77,7 @@ ahb { #size-cells = <1>; ranges; - usb0: ohci@500000 { + usb0: usb@500000 { compatible = "atmel,at91rm9200-ohci", "usb-ohci"; reg = <0x00500000 0x100000>; interrupts = <20 IRQ_TYPE_LEVEL_HIGH 2>;@@ -142,7 +142,7 @@ tcb0: timer@fffa0000 { clock-names = "t0_clk", "t1_clk", "t2_clk", "slow_clk"; }; - usb1: gadget@fffa4000 { + usb1: usb@fffa4000 { compatible = "atmel,at91sam9261-udc"; reg = <0xfffa4000 0x4000>; interrupts = <10 IRQ_TYPE_LEVEL_HIGH 2>;arch/arm/boot/dts/microchip/at91sam9261ek.dts +5
-5@@ -31,7 +31,7 @@ main_xtal { }; ahb { - usb0: ohci@500000 { + usb0: usb@500000 { status = "okay"; };@@ -136,7 +136,7 @@ timer1: timer@2 { }; }; - usb1: gadget@fffa4000 { + usb1: usb@fffa4000 { atmel,vbus-gpio = <&pioB 29 GPIO_ACTIVE_HIGH>; status = "okay"; };@@ -192,19 +192,19 @@ watchdog@fffffd40 { leds { compatible = "gpio-leds"; - ds8 { + led-ds8 { label = "ds8"; gpios = <&pioA 13 GPIO_ACTIVE_LOW>; linux,default-trigger = "none"; }; - ds7 { + led-ds7 { label = "ds7"; gpios = <&pioA 14 GPIO_ACTIVE_LOW>; linux,default-trigger = "nand-disk"; }; - ds1 { + led-ds1 { label = "ds1"; gpios = <&pioA 23 GPIO_ACTIVE_LOW>; linux,default-trigger = "heartbeat";arch/arm/boot/dts/microchip/at91sam9263.dtsi +2
-2@@ -636,7 +636,7 @@ macb0: ethernet@fffbc000 { status = "disabled"; }; - usb1: gadget@fff78000 { + usb1: usb@fff78000 { compatible = "atmel,at91sam9263-udc"; reg = <0xfff78000 0x4000>; interrupts = <24 IRQ_TYPE_LEVEL_HIGH 2>;@@ -768,7 +768,7 @@ fb0: fb@700000 { status = "disabled"; }; - usb0: ohci@a00000 { + usb0: usb@a00000 { compatible = "atmel,at91rm9200-ohci", "usb-ohci"; reg = <0x00a00000 0x100000>; interrupts = <29 IRQ_TYPE_LEVEL_HIGH 2>;arch/arm/boot/dts/microchip/at91sam9263ek.dts +6
-6@@ -61,7 +61,7 @@ macb0: ethernet@fffbc000 { status = "okay"; }; - usb1: gadget@fff78000 { + usb1: usb@fff78000 { atmel,vbus-gpio = <&pioA 25 GPIO_ACTIVE_HIGH>; status = "okay"; };@@ -86,7 +86,7 @@ pinctrl@fffff200 { mmc0 { pinctrl_board_mmc0: mmc0-board { atmel,pins = - <AT91_PIOE 18 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH /* PE18 gpio CD pin pull up and deglitch */ + <AT91_PIOE 18 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH /* PE18 gpio CD pin pull up and deglitch */ AT91_PIOE 19 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>; /* PE19 gpio WP pin pull up */ }; };@@ -207,7 +207,7 @@ data@7ca0000 { }; }; - usb0: ohci@a00000 { + usb0: usb@a00000 { num-ports = <2>; status = "okay"; atmel,vbus-gpio = <&pioA 24 GPIO_ACTIVE_HIGH@@ -219,13 +219,13 @@ &pioA 21 GPIO_ACTIVE_HIGH leds { compatible = "gpio-leds"; - d3 { + led-d3 { label = "d3"; gpios = <&pioB 7 GPIO_ACTIVE_HIGH>; linux,default-trigger = "heartbeat"; }; - d2 { + led-d2 { label = "d2"; gpios = <&pioC 29 GPIO_ACTIVE_LOW>; linux,default-trigger = "nand-disk";@@ -253,7 +253,7 @@ button-right-click { i2c-gpio-0 { status = "okay"; - 24c512@50 { + eeprom@50 { compatible = "atmel,24c512"; reg = <0x50>; pagesize = <128>;arch/arm/boot/dts/microchip/at91sam9g20ek.dts +2
-2@@ -14,13 +14,13 @@ / { leds { compatible = "gpio-leds"; - ds1 { + led-ds1 { label = "ds1"; gpios = <&pioA 9 GPIO_ACTIVE_HIGH>; linux,default-trigger = "heartbeat"; }; - ds5 { + led-ds5 { label = "ds5"; gpios = <&pioA 6 GPIO_ACTIVE_LOW>; };arch/arm/boot/dts/microchip/at91sam9g20ek_2mmc.dts +2
-2@@ -40,13 +40,13 @@ pinctrl_board_mmc0_slot0: mmc0_slot0-board { leds { compatible = "gpio-leds"; - ds1 { + led-ds1 { label = "ds1"; gpios = <&pioB 9 GPIO_ACTIVE_HIGH>; linux,default-trigger = "heartbeat"; }; - ds5 { + led-ds5 { label = "ds5"; gpios = <&pioB 8 GPIO_ACTIVE_LOW>; };arch/arm/boot/dts/microchip/at91sam9g20ek_common.dtsi +3
-3@@ -90,7 +90,7 @@ macb0: ethernet@fffc4000 { status = "okay"; }; - usb1: gadget@fffa4000 { + usb1: usb@fffa4000 { pinctrl-0 = <&pinctrl_usb1_vbus_gpio>; pinctrl-names = "default"; atmel,vbus-gpio = <&pioC 5 GPIO_ACTIVE_HIGH>;@@ -211,7 +211,7 @@ data@7ca0000 { }; }; - usb0: ohci@500000 { + usb0: usb@500000 { num-ports = <2>; status = "okay"; };@@ -220,7 +220,7 @@ usb0: ohci@500000 { i2c-gpio-0 { status = "okay"; - 24c512@50 { + eeprom@50 { compatible = "atmel,24c512"; reg = <0x50>; vcc-supply = <®_3v3>;arch/arm/boot/dts/microchip/at91sam9g25-gardena-smart-gateway.dts +12
-12@@ -37,71 +37,71 @@ button { leds { compatible = "gpio-leds"; - power_blue { + led-0 { label = "smartgw:power:blue"; gpios = <&pioC 21 GPIO_ACTIVE_HIGH>; default-state = "off"; }; - power_green { + led-1 { label = "smartgw:power:green"; gpios = <&pioC 20 GPIO_ACTIVE_HIGH>; default-state = "on"; }; - power_red { + led-2 { label = "smartgw:power:red"; gpios = <&pioC 19 GPIO_ACTIVE_HIGH>; default-state = "off"; }; - radio_blue { + led-3 { label = "smartgw:radio:blue"; gpios = <&pioC 18 GPIO_ACTIVE_HIGH>; default-state = "off"; }; - radio_green { + led-4 { label = "smartgw:radio:green"; gpios = <&pioC 17 GPIO_ACTIVE_HIGH>; default-state = "off"; }; - radio_red { + led-5 { label = "smartgw:radio:red"; gpios = <&pioC 16 GPIO_ACTIVE_HIGH>; default-state = "off"; }; - internet_blue { + led-6 { label = "smartgw:internet:blue"; gpios = <&pioC 15 GPIO_ACTIVE_HIGH>; default-state = "off"; }; - internet_green { + led-7 { label = "smartgw:internet:green"; gpios = <&pioC 14 GPIO_ACTIVE_HIGH>; default-state = "off"; }; - internet_red { + led-8 { label = "smartgw:internet:red"; gpios = <&pioC 13 GPIO_ACTIVE_HIGH>; default-state = "off"; }; - heartbeat { + led-9 { label = "smartgw:heartbeat"; gpios = <&pioB 8 GPIO_ACTIVE_HIGH>; linux,default-trigger = "heartbeat"; }; - pb18 { + led-pb18 { status = "disabled"; }; - pd21 { + led-pd21 { status = "disabled"; }; };arch/arm/boot/dts/microchip/at91sam9g45.dtsi +3
-3@@ -913,7 +913,7 @@ spi1: spi@fffa8000 { status = "disabled"; }; - usb2: gadget@fff78000 { + usb2: usb@fff78000 { compatible = "atmel,at91sam9g45-udc"; reg = <0x00600000 0x80000 0xfff78000 0x400>;@@ -964,7 +964,7 @@ fb0: fb@500000 { status = "disabled"; }; - usb0: ohci@700000 { + usb0: usb@700000 { compatible = "atmel,at91rm9200-ohci", "usb-ohci"; reg = <0x00700000 0x100000>; interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>;@@ -973,7 +973,7 @@ usb0: ohci@700000 { status = "disabled"; }; - usb1: ehci@800000 { + usb1: usb@800000 { compatible = "atmel,at91sam9g45-ehci", "usb-ehci"; reg = <0x00800000 0x100000>; interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>;arch/arm/boot/dts/microchip/at91sam9m10g45ek.dts +3
-3@@ -174,7 +174,7 @@ flash@0 { }; }; - usb2: gadget@fff78000 { + usb2: usb@fff78000 { atmel,vbus-gpio = <&pioB 19 GPIO_ACTIVE_HIGH>; status = "okay"; };@@ -303,14 +303,14 @@ data@4000000 { }; }; - usb0: ohci@700000 { + usb0: usb@700000 { status = "okay"; num-ports = <2>; atmel,vbus-gpio = <&pioD 1 GPIO_ACTIVE_LOW &pioD 3 GPIO_ACTIVE_LOW>; }; - usb1: ehci@800000 { + usb1: usb@800000 { status = "okay"; }; };arch/arm/boot/dts/microchip/at91sam9n12.dtsi +2
-2@@ -738,7 +738,7 @@ pwm0: pwm@f8034000 { status = "disabled"; }; - usb1: gadget@f803c000 { + usb1: usb@f803c000 { compatible = "atmel,at91sam9260-udc"; reg = <0xf803c000 0x4000>; interrupts = <23 IRQ_TYPE_LEVEL_HIGH 2>;@@ -748,7 +748,7 @@ usb1: gadget@f803c000 { }; }; - usb0: ohci@500000 { + usb0: usb@500000 { compatible = "atmel,at91rm9200-ohci", "usb-ohci"; reg = <0x00500000 0x00100000>; interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>;arch/arm/boot/dts/microchip/at91sam9n12ek.dts +5
-5@@ -142,7 +142,7 @@ hlcdc_panel_output: endpoint@0 { }; }; - usb1: gadget@f803c000 { + usb1: usb@f803c000 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb1_vbus_sense>; atmel,vbus-gpio = <&pioB 16 GPIO_ACTIVE_HIGH>;@@ -180,7 +180,7 @@ nand@3 { }; }; - usb0: ohci@500000 { + usb0: usb@500000 { num-ports = <1>; atmel,vbus-gpio = <&pioB 7 GPIO_ACTIVE_LOW>; status = "okay";@@ -207,19 +207,19 @@ bl_reg: backlight_regulator { leds { compatible = "gpio-leds"; - d8 { + led-d8 { label = "d8"; gpios = <&pioB 4 GPIO_ACTIVE_LOW>; linux,default-trigger = "mmc0"; }; - d9 { + led-d9 { label = "d9"; gpios = <&pioB 5 GPIO_ACTIVE_LOW>; linux,default-trigger = "nand-disk"; }; - d10 { + led-d10 { label = "d10"; gpios = <&pioB 6 GPIO_ACTIVE_HIGH>; linux,default-trigger = "heartbeat";arch/arm/boot/dts/microchip/at91sam9rl.dtsi +1
-1@@ -282,7 +282,7 @@ adc0: adc@fffd0000 { atmel,adc-startup-time = <40>; }; - usb0: gadget@fffd4000 { + usb0: usb@fffd4000 { compatible = "atmel,at91sam9rl-udc"; reg = <0x00600000 0x100000>, <0xfffd4000 0x4000>;arch/arm/boot/dts/microchip/at91sam9rlek.dts +1
-1@@ -172,7 +172,7 @@ &pinctrl_adc0_ad5 status = "okay"; }; - usb0: gadget@fffd4000 { + usb0: usb@fffd4000 { atmel,vbus-gpio = <&pioA 8 GPIO_ACTIVE_HIGH>; status = "okay"; };arch/arm/boot/dts/microchip/at91sam9x5.dtsi +3
-3@@ -847,7 +847,7 @@ spi1: spi@f0004000 { status = "disabled"; }; - usb2: gadget@f803c000 { + usb2: usb@f803c000 { compatible = "atmel,at91sam9g45-udc"; reg = <0x00500000 0x80000 0xf803c000 0x400>;@@ -886,7 +886,7 @@ pwm0: pwm@f8034000 { }; }; - usb0: ohci@600000 { + usb0: usb@600000 { compatible = "atmel,at91rm9200-ohci", "usb-ohci"; reg = <0x00600000 0x100000>; interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>;@@ -895,7 +895,7 @@ usb0: ohci@600000 { status = "disabled"; }; - usb1: ehci@700000 { + usb1: usb@700000 { compatible = "atmel,at91sam9g45-ehci", "usb-ehci"; reg = <0x00700000 0x100000>; interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>;arch/arm/boot/dts/microchip/at91sam9x5cm.dtsi +2
-2@@ -120,13 +120,13 @@ rootfs@800000 { leds { compatible = "gpio-leds"; - pb18 { + led-pb18 { label = "pb18"; gpios = <&pioB 18 GPIO_ACTIVE_LOW>; linux,default-trigger = "heartbeat"; }; - pd21 { + led-pd21 { label = "pd21"; gpios = <&pioD 21 GPIO_ACTIVE_HIGH>; };arch/arm/boot/dts/microchip/ethernut5.dts +2
-2@@ -60,7 +60,7 @@ macb0: ethernet@fffc4000 { status = "okay"; }; - usb1: gadget@fffa4000 { + usb1: usb@fffa4000 { atmel,vbus-gpio = <&pioC 5 GPIO_ACTIVE_HIGH>; status = "okay"; };@@ -101,7 +101,7 @@ data@20000 { }; }; - usb0: ohci@500000 { + usb0: usb@500000 { num-ports = <2>; status = "okay"; };arch/arm/boot/dts/microchip/evk-pro3.dts +2
-2@@ -35,7 +35,7 @@ usart2: serial@fffb8000 { status = "okay"; }; - usb1: gadget@fffa4000 { + usb1: usb@fffa4000 { atmel,vbus-gpio = <&pioC 5 GPIO_ACTIVE_HIGH>; status = "okay"; };@@ -45,7 +45,7 @@ watchdog@fffffd40 { }; }; - usb0: ohci@500000 { + usb0: usb@500000 { num-ports = <2>; status = "okay"; };arch/arm/boot/dts/microchip/mpa1600.dts +1
-1@@ -57,7 +57,7 @@ ssc1: ssc@fffd4000 { }; }; - usb0: ohci@300000 { + usb0: usb@300000 { num-ports = <1>; status = "okay"; };arch/arm/boot/dts/microchip/pm9g45.dts +2
-2@@ -139,12 +139,12 @@ data@900000 { }; }; - usb0: ohci@700000 { + usb0: usb@700000 { status = "okay"; num-ports = <2>; }; - usb1: ehci@800000 { + usb1: usb@800000 { status = "okay"; }; };arch/arm/boot/dts/microchip/sam9x60.dtsi +3
-3@@ -74,7 +74,7 @@ ahb { #size-cells = <1>; ranges; - usb0: gadget@500000 { + usb0: usb@500000 { #address-cells = <1>; #size-cells = <0>; compatible = "microchip,sam9x60-udc";@@ -88,7 +88,7 @@ usb0: gadget@500000 { status = "disabled"; }; - usb1: ohci@600000 { + usb1: usb@600000 { compatible = "atmel,at91rm9200-ohci", "usb-ohci"; reg = <0x00600000 0x100000>; interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>;@@ -97,7 +97,7 @@ usb1: ohci@600000 { status = "disabled"; }; - usb2: ehci@700000 { + usb2: usb@700000 { compatible = "atmel,at91sam9g45-ehci", "usb-ehci"; reg = <0x00700000 0x100000>; interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>;arch/arm/boot/dts/microchip/sama5d2.dtsi +3
-3@@ -126,7 +126,7 @@ nfc_sram: sram@100000 { }; - usb0: gadget@300000 { + usb0: usb@300000 { compatible = "atmel,sama5d3-udc"; reg = <0x00300000 0x100000 0xfc02c000 0x400>;@@ -136,7 +136,7 @@ usb0: gadget@300000 { status = "disabled"; }; - usb1: ohci@400000 { + usb1: usb@400000 { compatible = "atmel,at91rm9200-ohci", "usb-ohci"; reg = <0x00400000 0x100000>; interrupts = <41 IRQ_TYPE_LEVEL_HIGH 2>;@@ -145,7 +145,7 @@ usb1: ohci@400000 { status = "disabled"; }; - usb2: ehci@500000 { + usb2: usb@500000 { compatible = "atmel,at91sam9g45-ehci", "usb-ehci"; reg = <0x00500000 0x100000>; interrupts = <41 IRQ_TYPE_LEVEL_HIGH 2>;arch/arm/boot/dts/microchip/sama5d3.dtsi +3
-3@@ -1064,7 +1064,7 @@ nfc_sram: sram@200000 { ranges = <0 0x200000 0x2400>; }; - usb0: gadget@500000 { + usb0: usb@500000 { compatible = "atmel,sama5d3-udc"; reg = <0x00500000 0x100000 0xf8030000 0x4000>;@@ -1074,7 +1074,7 @@ usb0: gadget@500000 { status = "disabled"; }; - usb1: ohci@600000 { + usb1: usb@600000 { compatible = "atmel,at91rm9200-ohci", "usb-ohci"; reg = <0x00600000 0x100000>; interrupts = <32 IRQ_TYPE_LEVEL_HIGH 2>;@@ -1083,7 +1083,7 @@ usb1: ohci@600000 { status = "disabled"; }; - usb2: ehci@700000 { + usb2: usb@700000 { compatible = "atmel,at91sam9g45-ehci", "usb-ehci"; reg = <0x00700000 0x100000>; interrupts = <32 IRQ_TYPE_LEVEL_HIGH 2>;arch/arm/boot/dts/microchip/sama5d34ek.dts +1
-1@@ -36,7 +36,7 @@ i2c0: i2c@f0014000 { i2c1: i2c@f0018000 { status = "okay"; - 24c256@50 { + eeprom@50 { compatible = "atmel,24c256"; reg = <0x50>; pagesize = <64>;arch/arm/boot/dts/microchip/sama5d3xmb.dtsi +3
-3@@ -165,14 +165,14 @@ watchdog@fffffe40 { }; }; - usb0: gadget@500000 { + usb0: usb@500000 { atmel,vbus-gpio = <&pioD 29 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usba_vbus>; status = "okay"; }; - usb1: ohci@600000 { + usb1: usb@600000 { num-ports = <3>; atmel,vbus-gpio = <&pioD 25 GPIO_ACTIVE_HIGH &pioD 26 GPIO_ACTIVE_LOW@@ -181,7 +181,7 @@ &pioD 27 GPIO_ACTIVE_LOW status = "okay"; }; - usb2: ehci@700000 { + usb2: usb@700000 { status = "okay"; }; };arch/arm/boot/dts/microchip/sama5d3xmb_cmp.dtsi +1
-1@@ -216,7 +216,7 @@ watchdog@fffffe40 { }; }; - usb0: gadget@500000 { + usb0: usb@500000 { atmel,vbus-gpio = <&pioD 29 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usba_vbus>;arch/arm/boot/dts/microchip/sama5d4.dtsi +3
-3@@ -109,7 +109,7 @@ vdec0: vdec@300000 { clocks = <&pmc PMC_TYPE_PERIPHERAL 19>; }; - usb0: gadget@400000 { + usb0: usb@400000 { compatible = "atmel,sama5d3-udc"; reg = <0x00400000 0x100000 0xfc02c000 0x4000>;@@ -119,7 +119,7 @@ usb0: gadget@400000 { status = "disabled"; }; - usb1: ohci@500000 { + usb1: usb@500000 { compatible = "atmel,at91rm9200-ohci", "usb-ohci"; reg = <0x00500000 0x100000>; interrupts = <46 IRQ_TYPE_LEVEL_HIGH 2>;@@ -128,7 +128,7 @@ usb1: ohci@500000 { status = "disabled"; }; - usb2: ehci@600000 { + usb2: usb@600000 { compatible = "atmel,at91sam9g45-ehci", "usb-ehci"; reg = <0x00600000 0x100000>; interrupts = <46 IRQ_TYPE_LEVEL_HIGH 2>;arch/arm/boot/dts/microchip/tny_a9263.dts +1
-1@@ -47,7 +47,7 @@ timer@2 { }; }; - usb1: gadget@fff78000 { + usb1: usb@fff78000 { atmel,vbus-gpio = <&pioB 11 GPIO_ACTIVE_HIGH>; status = "okay"; };arch/arm/boot/dts/microchip/usb_a9260_common.dtsi +2
-2@@ -39,7 +39,7 @@ macb0: ethernet@fffc4000 { status = "okay"; }; - usb1: gadget@fffa4000 { + usb1: usb@fffa4000 { atmel,vbus-gpio = <&pioC 5 GPIO_ACTIVE_HIGH>; status = "okay"; };@@ -111,7 +111,7 @@ data@7ca0000 { }; }; - usb0: ohci@500000 { + usb0: usb@500000 { num-ports = <2>; status = "okay"; };arch/arm/boot/dts/microchip/usb_a9263.dts +2
-2@@ -52,7 +52,7 @@ macb0: ethernet@fffbc000 { status = "okay"; }; - usb1: gadget@fff78000 { + usb1: usb@fff78000 { atmel,vbus-gpio = <&pioB 11 GPIO_ACTIVE_HIGH>; status = "okay"; };@@ -139,7 +139,7 @@ data@7ca0000 { }; }; - usb0: ohci@a00000 { + usb0: usb@a00000 { num-ports = <2>; status = "okay"; };base-commit:
2347b4c79f5e6cd3f4996e80c2d3c15f53006bf5Signature · 1 line
2.34.1
claudiu beznea
maintainerHi, Andrei,
Quoted 1 line · Andrei Simion
Cosmetic work:
Can you please format it as follows:
Quoted 1 line
Rename the eeprom node according to device tree specification.
One patch for this.
Quoted 1 line
Rename the usb node according to device tree specification.
One patch for this.
Quoted 1 line
Rename the led sub nodes according to device tree specification.
One patch for this.
Quoted 1 line
Rename the pmic node according to the device tree specification.
One patch for this.
Quoted 1 line
Clean up spacing and indentation.
One patch for this.
Quoted 5 lines
Signed-off-by Andrei Simion <[email protected]>---
Modifications Based On:
https://lore.kernel.org/linux-arm-kernel/[email protected]/
You had here 6 patches all addressing "Align the eeprom nodename".
Few comments bellow.
Thank you,
Claudiu Beznea
Quoted 57 lines
--- arch/arm/boot/dts/microchip/aks-cdu.dts | 12 +++++----- arch/arm/boot/dts/microchip/animeo_ip.dts | 10 ++++---- .../dts/microchip/at91-cosino_mega2560.dts | 2 +- arch/arm/boot/dts/microchip/at91-foxg20.dts | 4 ++-- .../arm/boot/dts/microchip/at91-qil_a9260.dts | 4 ++-- .../boot/dts/microchip/at91-sam9_l9260.dts | 2 +- .../arm/boot/dts/microchip/at91-sam9x60ek.dts | 6 ++--- .../dts/microchip/at91-sama5d27_som1.dtsi | 2 +- .../dts/microchip/at91-sama5d27_som1_ek.dts | 14 +++++------ .../dts/microchip/at91-sama5d27_wlsom1.dtsi | 2 +- .../dts/microchip/at91-sama5d29_curiosity.dts | 2 +- .../boot/dts/microchip/at91-sama5d2_icp.dts | 10 ++++---- .../dts/microchip/at91-sama5d2_ptc_ek.dts | 8 +++---- .../dts/microchip/at91-sama5d2_xplained.dts | 8 +++---- .../dts/microchip/at91-sama5d3_xplained.dts | 6 ++--- .../dts/microchip/at91-sama5d4_ma5d4evk.dts | 6 ++--- .../dts/microchip/at91-sama5d4_xplained.dts | 6 ++--- .../arm/boot/dts/microchip/at91-sama5d4ek.dts | 6 ++--- .../arm/boot/dts/microchip/at91-sama7g5ek.dts | 2 +- arch/arm/boot/dts/microchip/at91-vinco.dts | 6 ++--- arch/arm/boot/dts/microchip/at91rm9200.dtsi | 4 ++-- arch/arm/boot/dts/microchip/at91rm9200ek.dts | 10 ++++---- arch/arm/boot/dts/microchip/at91sam9260.dtsi | 4 ++-- arch/arm/boot/dts/microchip/at91sam9260ek.dts | 10 ++++---- arch/arm/boot/dts/microchip/at91sam9261.dtsi | 4 ++-- arch/arm/boot/dts/microchip/at91sam9261ek.dts | 10 ++++---- arch/arm/boot/dts/microchip/at91sam9263.dtsi | 4 ++-- arch/arm/boot/dts/microchip/at91sam9263ek.dts | 12 +++++----- arch/arm/boot/dts/microchip/at91sam9g20ek.dts | 4 ++-- .../boot/dts/microchip/at91sam9g20ek_2mmc.dts | 4 ++-- .../dts/microchip/at91sam9g20ek_common.dtsi | 6 ++--- .../at91sam9g25-gardena-smart-gateway.dts | 24 +++++++++---------- arch/arm/boot/dts/microchip/at91sam9g45.dtsi | 6 ++--- .../boot/dts/microchip/at91sam9m10g45ek.dts | 6 ++--- arch/arm/boot/dts/microchip/at91sam9n12.dtsi | 4 ++-- arch/arm/boot/dts/microchip/at91sam9n12ek.dts | 10 ++++---- arch/arm/boot/dts/microchip/at91sam9rl.dtsi | 2 +- arch/arm/boot/dts/microchip/at91sam9rlek.dts | 2 +- arch/arm/boot/dts/microchip/at91sam9x5.dtsi | 6 ++--- arch/arm/boot/dts/microchip/at91sam9x5cm.dtsi | 4 ++-- arch/arm/boot/dts/microchip/ethernut5.dts | 4 ++-- arch/arm/boot/dts/microchip/evk-pro3.dts | 4 ++-- arch/arm/boot/dts/microchip/mpa1600.dts | 2 +- arch/arm/boot/dts/microchip/pm9g45.dts | 4 ++-- arch/arm/boot/dts/microchip/sam9x60.dtsi | 6 ++--- arch/arm/boot/dts/microchip/sama5d2.dtsi | 6 ++--- arch/arm/boot/dts/microchip/sama5d3.dtsi | 6 ++--- arch/arm/boot/dts/microchip/sama5d34ek.dts | 2 +- arch/arm/boot/dts/microchip/sama5d3xmb.dtsi | 6 ++--- .../boot/dts/microchip/sama5d3xmb_cmp.dtsi | 2 +- arch/arm/boot/dts/microchip/sama5d4.dtsi | 6 ++--- arch/arm/boot/dts/microchip/tny_a9263.dts | 2 +- .../boot/dts/microchip/usb_a9260_common.dtsi | 4 ++-- arch/arm/boot/dts/microchip/usb_a9263.dts | 4 ++-- 54 files changed, 156 insertions(+), 156 deletions(-)
[ ... ]
Quoted 4 lines
arch/arm/boot/dts/microchip/at91-sama5d27_som1_ek.dts +0
-0@@ -258,10 +258,10 @@ pinctrl_i2c1_default: i2c1_default { };
arch/arm/boot/dts/microchip/at91-sama5d27_som1_ek.dts pinctrl_i2c1_default: i2c1_default { · line 265
Quoted 10 lines
arch/arm/boot/dts/microchip/at91-sama5d27_som1_ek.dts +4
-4pinctrl_i2c1_gpio: i2c1_gpio { - pinmux = <PIN_PD4__GPIO>, - <PIN_PD5__GPIO>; - bias-disable; - }; + pinmux = <PIN_PD4__GPIO>, + <PIN_PD5__GPIO>; + bias-disable; + };
Please remove this extra line here, too.
[ ... ]
arch/arm/boot/dts/microchip/at91sam9263ek.dts pinctrl@fffff200 { · line 89
Quoted 11 lines
arch/arm/boot/dts/microchip/at91sam9263ek.dts +1
-1- usb1: gadget@fff78000 { + usb1: usb@fff78000 { atmel,vbus-gpio = <&pioA 25 GPIO_ACTIVE_HIGH>;arch/arm/boot/dts/microchip/at91sam9263ek.dts +1
-1status = "okay"; };@@ -86,7 +86,7 @@ pinctrl@fffff200 { mmc0 { pinctrl_board_mmc0: mmc0-board { atmel,pins = - <AT91_PIOE 18 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH /* PE18 gpio CD pin pull up and deglitch */ + <AT91_PIOE 18 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH /* PE18 gpio CD pin pull up and deglitch */
What was wrong here?
Quoted 6 lines
arch/arm/boot/dts/microchip/at91sam9263ek.dts +0
-0AT91_PIOE 19 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>; /* PE19 gpio WP pin pull up */ }; };@@ -207,7 +207,7 @@ data@7ca0000 { }; };
[ ...]
Quoted 75 lines
arch/arm/boot/dts/microchip/at91sam9g25-gardena-smart-gateway.dts +10
-10@@ -37,71 +37,71 @@ button { leds { compatible = "gpio-leds"; - power_blue { + led-0 { label = "smartgw:power:blue"; gpios = <&pioC 21 GPIO_ACTIVE_HIGH>; default-state = "off"; }; - power_green { + led-1 { label = "smartgw:power:green"; gpios = <&pioC 20 GPIO_ACTIVE_HIGH>; default-state = "on"; }; - power_red { + led-2 { label = "smartgw:power:red"; gpios = <&pioC 19 GPIO_ACTIVE_HIGH>; default-state = "off"; }; - radio_blue { + led-3 { label = "smartgw:radio:blue"; gpios = <&pioC 18 GPIO_ACTIVE_HIGH>; default-state = "off"; }; - radio_green { + led-4 { label = "smartgw:radio:green"; gpios = <&pioC 17 GPIO_ACTIVE_HIGH>; default-state = "off"; }; - radio_red { + led-5 { label = "smartgw:radio:red"; gpios = <&pioC 16 GPIO_ACTIVE_HIGH>; default-state = "off"; }; - internet_blue { + led-6 { label = "smartgw:internet:blue"; gpios = <&pioC 15 GPIO_ACTIVE_HIGH>; default-state = "off"; }; - internet_green { + led-7 { label = "smartgw:internet:green"; gpios = <&pioC 14 GPIO_ACTIVE_HIGH>; default-state = "off"; }; - internet_red { + led-8 { label = "smartgw:internet:red"; gpios = <&pioC 13 GPIO_ACTIVE_HIGH>; default-state = "off"; }; - heartbeat { + led-9 { label = "smartgw:heartbeat"; gpios = <&pioB 8 GPIO_ACTIVE_HIGH>;
arch/arm/boot/dts/microchip/at91sam9g25-gardena-smart-gateway.dts button { · line 104
Quoted 10 lines
arch/arm/boot/dts/microchip/at91sam9g25-gardena-smart-gateway.dts +2
-2linux,default-trigger = "heartbeat"; }; - pb18 { + led-pb18 { status = "disabled"; }; - pd21 { + led-pd21 {
Why used led-<old-label> for some leds and led-<integer> for other? Valid for other files.
Hi Claudiu,
Quoted 122 lines · claudiu beznea
EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
Hi, Andrei,
Quoted 1 line · Andrei Simion
Cosmetic work:
Can you please format it as follows:
Quoted 1 line
Rename the eeprom node according to device tree specification.
One patch for this.
Quoted 1 line
Rename the usb node according to device tree specification.
One patch for this.
Quoted 1 line
Rename the led sub nodes according to device tree specification.
One patch for this.
Quoted 1 line
Rename the pmic node according to the device tree specification.
One patch for this.
Quoted 1 line
Clean up spacing and indentation.
One patch for this.
Quoted 5 lines
Signed-off-by Andrei Simion <[email protected]>---
Modifications Based On:
https://lore.kernel.org/linux-arm-kernel/[email protected]/You had here 6 patches all addressing "Align the eeprom nodename".
Few comments bellow.
Thank you,
Claudiu BezneaQuoted 57 lines
--- arch/arm/boot/dts/microchip/aks-cdu.dts | 12 +++++----- arch/arm/boot/dts/microchip/animeo_ip.dts | 10 ++++---- .../dts/microchip/at91-cosino_mega2560.dts | 2 +- arch/arm/boot/dts/microchip/at91-foxg20.dts | 4 ++-- .../arm/boot/dts/microchip/at91-qil_a9260.dts | 4 ++-- .../boot/dts/microchip/at91-sam9_l9260.dts | 2 +- .../arm/boot/dts/microchip/at91-sam9x60ek.dts | 6 ++--- .../dts/microchip/at91-sama5d27_som1.dtsi | 2 +- .../dts/microchip/at91-sama5d27_som1_ek.dts | 14 +++++------ .../dts/microchip/at91-sama5d27_wlsom1.dtsi | 2 +- .../dts/microchip/at91-sama5d29_curiosity.dts | 2 +- .../boot/dts/microchip/at91-sama5d2_icp.dts | 10 ++++---- .../dts/microchip/at91-sama5d2_ptc_ek.dts | 8 +++---- .../dts/microchip/at91-sama5d2_xplained.dts | 8 +++---- .../dts/microchip/at91-sama5d3_xplained.dts | 6 ++--- .../dts/microchip/at91-sama5d4_ma5d4evk.dts | 6 ++--- .../dts/microchip/at91-sama5d4_xplained.dts | 6 ++--- .../arm/boot/dts/microchip/at91-sama5d4ek.dts | 6 ++--- .../arm/boot/dts/microchip/at91-sama7g5ek.dts | 2 +- arch/arm/boot/dts/microchip/at91-vinco.dts | 6 ++--- arch/arm/boot/dts/microchip/at91rm9200.dtsi | 4 ++-- arch/arm/boot/dts/microchip/at91rm9200ek.dts | 10 ++++---- arch/arm/boot/dts/microchip/at91sam9260.dtsi | 4 ++-- arch/arm/boot/dts/microchip/at91sam9260ek.dts | 10 ++++---- arch/arm/boot/dts/microchip/at91sam9261.dtsi | 4 ++-- arch/arm/boot/dts/microchip/at91sam9261ek.dts | 10 ++++---- arch/arm/boot/dts/microchip/at91sam9263.dtsi | 4 ++-- arch/arm/boot/dts/microchip/at91sam9263ek.dts | 12 +++++----- arch/arm/boot/dts/microchip/at91sam9g20ek.dts | 4 ++-- .../boot/dts/microchip/at91sam9g20ek_2mmc.dts | 4 ++-- .../dts/microchip/at91sam9g20ek_common.dtsi | 6 ++--- .../at91sam9g25-gardena-smart-gateway.dts | 24 +++++++++---------- arch/arm/boot/dts/microchip/at91sam9g45.dtsi | 6 ++--- .../boot/dts/microchip/at91sam9m10g45ek.dts | 6 ++--- arch/arm/boot/dts/microchip/at91sam9n12.dtsi | 4 ++-- arch/arm/boot/dts/microchip/at91sam9n12ek.dts | 10 ++++---- arch/arm/boot/dts/microchip/at91sam9rl.dtsi | 2 +- arch/arm/boot/dts/microchip/at91sam9rlek.dts | 2 +- arch/arm/boot/dts/microchip/at91sam9x5.dtsi | 6 ++--- arch/arm/boot/dts/microchip/at91sam9x5cm.dtsi | 4 ++-- arch/arm/boot/dts/microchip/ethernut5.dts | 4 ++-- arch/arm/boot/dts/microchip/evk-pro3.dts | 4 ++-- arch/arm/boot/dts/microchip/mpa1600.dts | 2 +- arch/arm/boot/dts/microchip/pm9g45.dts | 4 ++-- arch/arm/boot/dts/microchip/sam9x60.dtsi | 6 ++--- arch/arm/boot/dts/microchip/sama5d2.dtsi | 6 ++--- arch/arm/boot/dts/microchip/sama5d3.dtsi | 6 ++--- arch/arm/boot/dts/microchip/sama5d34ek.dts | 2 +- arch/arm/boot/dts/microchip/sama5d3xmb.dtsi | 6 ++--- .../boot/dts/microchip/sama5d3xmb_cmp.dtsi | 2 +- arch/arm/boot/dts/microchip/sama5d4.dtsi | 6 ++--- arch/arm/boot/dts/microchip/tny_a9263.dts | 2 +- .../boot/dts/microchip/usb_a9260_common.dtsi | 4 ++-- arch/arm/boot/dts/microchip/usb_a9263.dts | 4 ++-- 54 files changed, 156 insertions(+), 156 deletions(-)[ ... ]
Quoted 4 lines
arch/arm/boot/dts/microchip/at91-sama5d27_som1_ek.dts +0
-0@@ -258,10 +258,10 @@ pinctrl_i2c1_default: i2c1_default { };arch/arm/boot/dts/microchip/at91-sama5d27_som1_ek.dts pinctrl_i2c1_default: i2c1_default { · line 265
Quoted 10 lines
arch/arm/boot/dts/microchip/at91-sama5d27_som1_ek.dts +4
-4pinctrl_i2c1_gpio: i2c1_gpio { - pinmux = <PIN_PD4__GPIO>, - <PIN_PD5__GPIO>; - bias-disable; - }; + pinmux = <PIN_PD4__GPIO>, + <PIN_PD5__GPIO>; + bias-disable; + };Please remove this extra line here, too.
[ ... ]
Quoted 14 lines
arch/arm/boot/dts/microchip/at91sam9263ek.dts pinctrl@fffff200 { · line 89
Quoted 11 lines
arch/arm/boot/dts/microchip/at91sam9263ek.dts +1
-1- usb1: gadget@fff78000 { + usb1: usb@fff78000 { atmel,vbus-gpio = <&pioA 25 GPIO_ACTIVE_HIGH>;status = "okay"; };arch/arm/boot/dts/microchip/at91sam9263ek.dts +1
-1@@ -86,7 +86,7 @@ pinctrl@fffff200 { mmc0 { pinctrl_board_mmc0: mmc0-board { atmel,pins = - <AT91_PIOE 18 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH /* PE18 gpio CD pin pull up and deglitch */ + <AT91_PIOE 18 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH /* PE18 gpio CD pin pull up and deglitch */What was wrong here?
WARNING: please, no space before tabs
#89: FILE: arch/arm/boot/dts/microchip/at91sam9263ek.dts:89:
+^I^I^I^I^I^I^I<AT91_PIOE 18 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH ^I/* PE18 gpio CD pin pull up and deglitch *
Quoted 92 lines
Quoted 6 lines
arch/arm/boot/dts/microchip/at91sam9263ek.dts +0
-0AT91_PIOE 19 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>; /* PE19 gpio WP pin pull up */ }; };@@ -207,7 +207,7 @@ data@7ca0000 { }; };[ ...]
Quoted 83 lines
arch/arm/boot/dts/microchip/at91sam9g25-gardena-smart-gateway.dts +11
-11@@ -37,71 +37,71 @@ button { leds { compatible = "gpio-leds"; - power_blue { + led-0 { label = "smartgw:power:blue"; gpios = <&pioC 21 GPIO_ACTIVE_HIGH>; default-state = "off"; }; - power_green { + led-1 { label = "smartgw:power:green"; gpios = <&pioC 20 GPIO_ACTIVE_HIGH>; default-state = "on"; }; - power_red { + led-2 { label = "smartgw:power:red"; gpios = <&pioC 19 GPIO_ACTIVE_HIGH>; default-state = "off"; }; - radio_blue { + led-3 { label = "smartgw:radio:blue"; gpios = <&pioC 18 GPIO_ACTIVE_HIGH>; default-state = "off"; }; - radio_green { + led-4 { label = "smartgw:radio:green"; gpios = <&pioC 17 GPIO_ACTIVE_HIGH>; default-state = "off"; }; - radio_red { + led-5 { label = "smartgw:radio:red"; gpios = <&pioC 16 GPIO_ACTIVE_HIGH>; default-state = "off"; }; - internet_blue { + led-6 { label = "smartgw:internet:blue"; gpios = <&pioC 15 GPIO_ACTIVE_HIGH>; default-state = "off"; }; - internet_green { + led-7 { label = "smartgw:internet:green"; gpios = <&pioC 14 GPIO_ACTIVE_HIGH>; default-state = "off"; }; - internet_red { + led-8 { label = "smartgw:internet:red"; gpios = <&pioC 13 GPIO_ACTIVE_HIGH>; default-state = "off"; }; - heartbeat { + led-9 { label = "smartgw:heartbeat"; gpios = <&pioB 8 GPIO_ACTIVE_HIGH>; linux,default-trigger = "heartbeat"; }; - pb18 { + led-pb18 { status = "disabled"; };
Quoted 6 lines
arch/arm/boot/dts/microchip/at91sam9g25-gardena-smart-gateway.dts button { · line 104
Quoted 2 lines
arch/arm/boot/dts/microchip/at91sam9g25-gardena-smart-gateway.dts +1
-1- pd21 { + led-pd21 {Why used led-<old-label> for some leds and led-<integer> for other? Valid for other files.
I could have done either rule led-<old-label> or led-<integer> but we ended up with the old label being quite long. So, I use led-<integer> when <old-label> is too long.
I don't think it was the best rule to rename.
In your opinion, how would it be correct to rename these subnodes?
PS: It is a problem on our side with the mail server. The e-mails may not arrive on the linux-arm-kernel mailing list.
BR,
Andrei Simion
claudiu beznea
maintainerHi, Andrei,
Quoted 88 lines · On 08.08.2024 17:25, [email protected] wrote:
Quoted 83 lines
Quoted 83 lines
arch/arm/boot/dts/microchip/at91sam9g25-gardena-smart-gateway.dts +11
-11@@ -37,71 +37,71 @@ button { leds { compatible = "gpio-leds"; - power_blue { + led-0 { label = "smartgw:power:blue"; gpios = <&pioC 21 GPIO_ACTIVE_HIGH>; default-state = "off"; }; - power_green { + led-1 { label = "smartgw:power:green"; gpios = <&pioC 20 GPIO_ACTIVE_HIGH>; default-state = "on"; }; - power_red { + led-2 { label = "smartgw:power:red"; gpios = <&pioC 19 GPIO_ACTIVE_HIGH>; default-state = "off"; }; - radio_blue { + led-3 { label = "smartgw:radio:blue"; gpios = <&pioC 18 GPIO_ACTIVE_HIGH>; default-state = "off"; }; - radio_green { + led-4 { label = "smartgw:radio:green"; gpios = <&pioC 17 GPIO_ACTIVE_HIGH>; default-state = "off"; }; - radio_red { + led-5 { label = "smartgw:radio:red"; gpios = <&pioC 16 GPIO_ACTIVE_HIGH>; default-state = "off"; }; - internet_blue { + led-6 { label = "smartgw:internet:blue"; gpios = <&pioC 15 GPIO_ACTIVE_HIGH>; default-state = "off"; }; - internet_green { + led-7 { label = "smartgw:internet:green"; gpios = <&pioC 14 GPIO_ACTIVE_HIGH>; default-state = "off"; }; - internet_red { + led-8 { label = "smartgw:internet:red"; gpios = <&pioC 13 GPIO_ACTIVE_HIGH>; default-state = "off"; }; - heartbeat { + led-9 { label = "smartgw:heartbeat"; gpios = <&pioB 8 GPIO_ACTIVE_HIGH>; linux,default-trigger = "heartbeat"; }; - pb18 { + led-pb18 { status = "disabled"; };Quoted 5 lines
arch/arm/boot/dts/microchip/at91sam9g25-gardena-smart-gateway.dts button { · line 104
Quoted 2 lines
arch/arm/boot/dts/microchip/at91sam9g25-gardena-smart-gateway.dts +1
-1- pd21 { + led-pd21 {Why used led-<old-label> for some leds and led-<integer> for other? Valid for other files.
Quoted 5 lines
I could have done either rule led-<old-label> or led-<integer> but we ended up with the old label being quite long. So, I use led-<integer> when <old-label> is too long.
I don't think it was the best rule to rename.
In your opinion, how would it be correct to rename these subnodes?
Keeping old label is OK. FYI, these particular changes were already integrated with old labels being kept. See
https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git/commit/?id=b39c457205d0a3513fed1c3863e7cf9b6d72bf86
Thank you,
Claudiu Beznea
Quoted 6 lines
PS: It is a problem on our side with the mail server. The e-mails may not arrive on the linux-arm-kernel mailing list.
BR,
Andrei Simion