* [PATCH 00/20] sunxi: Cleanup DT warnings for the A10 and A80
@ 2017-10-05 10:49 Maxime Ripard
2017-10-05 10:49 ` [PATCH 01/20] ARM: dts: sunxi: Remove leading zeros from unit-addresses Maxime Ripard
` (19 more replies)
0 siblings, 20 replies; 50+ messages in thread
From: Maxime Ripard @ 2017-10-05 10:49 UTC (permalink / raw)
To: linux-arm-kernel
We've had quite a big number of warnings in our device trees due to some
convention that was added before any kind of warning was introduced, and
went on since.
Some of our newest SoC will not generate any warning but the unavoidable
ones (generic properties with underscores, mostly, like USB OTG dr_mode).
However, most of them just needed some cleanup. Here is a serie that would
clean two of these SoCs (plus one SoC-tree wide change).
This brings down the number of DTC warnings with W=2 from 10482 to 4504,
which is a nice stat, but will obviously need some more work.
Let me know what you think,
Maxime
Maxime Ripard (20):
ARM: dts: sunxi: Remove leading zeros from unit-addresses
ARM: dts: axp209: Rename usb_power_supply node to avoid warnings
ARM: dts: sun4i: Change framebuffer node names to avoid warnings
ARM: dts: sun4i: Change clock node names to avoid warnings
ARM: dts: sun4i: Change pinctrl nodes to avoid warning
ARM: dts: sun4i: Provide default muxing for relevant controllers
ARM: dts: sun4i: Remove skeleton and memory to avoid warnings
ARM: dts: sun4i: Change LRADC node names to avoid warnings
ARM: dts: sun4i: Remove SoC node unit-name to avoid warnings
ARM: dts: sun4i: Rename thermal nodes to avoid warnings
ARM: dts: sun4i: Remove all useless pinctrl nodes
ARM: dts: sun4i: Remove underscores from nodes names
ARM: dts: sun4i: Remove gpio-keys warnings
ARM: dts: sun9i: Remove skeleton to avoid warnings
ARM: dts: sun9i: Rename pinctrl nodes to avoid warnings
ARM: dts: sun9i: Remove GPIO pinctrl nodes to avoid warnings
ARM: dts: sun9i: optimus: Remove card detect pull-up
ARM: dts: sun9i: cubieboard4: Remove card detect pull-up
ARM: dts: sun9i: Change node names to remove underscores
ARM: dts: sun9i: Change node names to remove underscores
arch/arm/boot/dts/axp209.dtsi | 2 +-
arch/arm/boot/dts/sun4i-a10-a1000.dts | 28 +--
arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts | 16 +-
arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts | 20 +-
arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 20 +-
arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts | 50 +---
arch/arm/boot/dts/sun4i-a10-gemei-g9.dts | 23 +-
arch/arm/boot/dts/sun4i-a10-hackberry.dts | 24 +-
arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts | 10 +-
arch/arm/boot/dts/sun4i-a10-inet1.dts | 36 +--
arch/arm/boot/dts/sun4i-a10-inet97fv2.dts | 24 +-
arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts | 68 +---
arch/arm/boot/dts/sun4i-a10-itead-iteaduino-plus.dts | 21 +-
arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts | 26 +-
arch/arm/boot/dts/sun4i-a10-marsboard.dts | 25 +-
arch/arm/boot/dts/sun4i-a10-mini-xplus.dts | 10 +-
arch/arm/boot/dts/sun4i-a10-mk802.dts | 24 +-
arch/arm/boot/dts/sun4i-a10-mk802ii.dts | 6 +-
arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts | 22 +-
arch/arm/boot/dts/sun4i-a10-pcduino.dts | 32 +--
arch/arm/boot/dts/sun4i-a10-pcduino2.dts | 9 +-
arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts | 43 +--
arch/arm/boot/dts/sun4i-a10.dtsi | 210 ++++++------
arch/arm/boot/dts/sun5i-a10s.dtsi | 6 +-
arch/arm/boot/dts/sun5i-a13.dtsi | 4 +-
arch/arm/boot/dts/sun5i-gr8.dtsi | 8 +-
arch/arm/boot/dts/sun5i.dtsi | 82 ++---
arch/arm/boot/dts/sun6i-a31.dtsi | 112 +++---
arch/arm/boot/dts/sun7i-a20.dtsi | 122 +++----
arch/arm/boot/dts/sun8i-a23-a33.dtsi | 62 ++--
arch/arm/boot/dts/sun8i-a23.dtsi | 4 +-
arch/arm/boot/dts/sun8i-a33.dtsi | 18 +-
arch/arm/boot/dts/sun8i-v3s.dtsi | 32 +-
arch/arm/boot/dts/sun9i-a80-cubieboard4.dts | 36 +--
arch/arm/boot/dts/sun9i-a80-optimus.dts | 56 +---
arch/arm/boot/dts/sun9i-a80.dtsi | 117 +++----
arch/arm/boot/dts/sunxi-itead-core-common.dtsi | 4 +-
37 files changed, 525 insertions(+), 887 deletions(-)
base-commit: c27ad2958485126c3828e59d53013d3b45ec14f2
--
git-series 0.9.1
^ permalink raw reply [flat|nested] 50+ messages in thread* [PATCH 01/20] ARM: dts: sunxi: Remove leading zeros from unit-addresses 2017-10-05 10:49 [PATCH 00/20] sunxi: Cleanup DT warnings for the A10 and A80 Maxime Ripard @ 2017-10-05 10:49 ` Maxime Ripard 2017-10-05 15:22 ` Chen-Yu Tsai 2017-10-05 10:49 ` [PATCH 02/20] ARM: dts: axp209: Rename usb_power_supply node to avoid warnings Maxime Ripard ` (18 subsequent siblings) 19 siblings, 1 reply; 50+ messages in thread From: Maxime Ripard @ 2017-10-05 10:49 UTC (permalink / raw) To: linux-arm-kernel Most of our device trees have had leading zeros for padding as part of the nodes unit-addresses. Remove all these useless zeros that generate warnings Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> --- arch/arm/boot/dts/sun4i-a10.dtsi | 110 ++++++++++++------------- arch/arm/boot/dts/sun5i-a10s.dtsi | 6 +- arch/arm/boot/dts/sun5i-a13.dtsi | 4 +- arch/arm/boot/dts/sun5i-gr8.dtsi | 8 +- arch/arm/boot/dts/sun5i.dtsi | 82 +++++++++---------- arch/arm/boot/dts/sun6i-a31.dtsi | 112 +++++++++++++------------- arch/arm/boot/dts/sun7i-a20.dtsi | 122 ++++++++++++++-------------- arch/arm/boot/dts/sun8i-a23-a33.dtsi | 62 +++++++------- arch/arm/boot/dts/sun8i-a23.dtsi | 4 +- arch/arm/boot/dts/sun8i-a33.dtsi | 18 ++-- arch/arm/boot/dts/sun8i-v3s.dtsi | 32 +++---- arch/arm/boot/dts/sun9i-a80.dtsi | 86 ++++++++++---------- 12 files changed, 323 insertions(+), 323 deletions(-) diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi index 9899ecddeb78..82d4ab6fbbcd 100644 --- a/arch/arm/boot/dts/sun4i-a10.dtsi +++ b/arch/arm/boot/dts/sun4i-a10.dtsi @@ -169,7 +169,7 @@ #size-cells = <1>; ranges; - osc24M: clk at 01c20050 { + osc24M: clk at 1c20050 { #clock-cells = <0>; compatible = "fixed-clock"; clock-frequency = <24000000>; @@ -184,20 +184,20 @@ }; }; - soc at 01c00000 { + soc at 1c00000 { compatible = "simple-bus"; #address-cells = <1>; #size-cells = <1>; ranges; - sram-controller at 01c00000 { + sram-controller at 1c00000 { compatible = "allwinner,sun4i-a10-sram-controller"; reg = <0x01c00000 0x30>; #address-cells = <1>; #size-cells = <1>; ranges; - sram_a: sram at 00000000 { + sram_a: sram at 0 { compatible = "mmio-sram"; reg = <0x00000000 0xc000>; #address-cells = <1>; @@ -211,14 +211,14 @@ }; }; - sram_d: sram at 00010000 { + sram_d: sram at 10000 { compatible = "mmio-sram"; reg = <0x00010000 0x1000>; #address-cells = <1>; #size-cells = <1>; ranges = <0 0x00010000 0x1000>; - otg_sram: sram-section at 0000 { + otg_sram: sram-section at 0 { compatible = "allwinner,sun4i-a10-sram-d"; reg = <0x0000 0x1000>; status = "disabled"; @@ -226,7 +226,7 @@ }; }; - dma: dma-controller at 01c02000 { + dma: dma-controller at 1c02000 { compatible = "allwinner,sun4i-a10-dma"; reg = <0x01c02000 0x1000>; interrupts = <27>; @@ -234,7 +234,7 @@ #dma-cells = <2>; }; - nfc: nand at 01c03000 { + nfc: nand at 1c03000 { compatible = "allwinner,sun4i-a10-nand"; reg = <0x01c03000 0x1000>; interrupts = <37>; @@ -247,7 +247,7 @@ #size-cells = <0>; }; - spi0: spi at 01c05000 { + spi0: spi at 1c05000 { compatible = "allwinner,sun4i-a10-spi"; reg = <0x01c05000 0x1000>; interrupts = <10>; @@ -261,7 +261,7 @@ #size-cells = <0>; }; - spi1: spi at 01c06000 { + spi1: spi at 1c06000 { compatible = "allwinner,sun4i-a10-spi"; reg = <0x01c06000 0x1000>; interrupts = <11>; @@ -275,7 +275,7 @@ #size-cells = <0>; }; - emac: ethernet at 01c0b000 { + emac: ethernet at 1c0b000 { compatible = "allwinner,sun4i-a10-emac"; reg = <0x01c0b000 0x1000>; interrupts = <55>; @@ -284,7 +284,7 @@ status = "disabled"; }; - mdio: mdio at 01c0b080 { + mdio: mdio at 1c0b080 { compatible = "allwinner,sun4i-a10-mdio"; reg = <0x01c0b080 0x14>; status = "disabled"; @@ -292,7 +292,7 @@ #size-cells = <0>; }; - mmc0: mmc at 01c0f000 { + mmc0: mmc at 1c0f000 { compatible = "allwinner,sun4i-a10-mmc"; reg = <0x01c0f000 0x1000>; clocks = <&ccu CLK_AHB_MMC0>, <&ccu CLK_MMC0>; @@ -303,7 +303,7 @@ #size-cells = <0>; }; - mmc1: mmc at 01c10000 { + mmc1: mmc at 1c10000 { compatible = "allwinner,sun4i-a10-mmc"; reg = <0x01c10000 0x1000>; clocks = <&ccu CLK_AHB_MMC1>, <&ccu CLK_MMC1>; @@ -314,7 +314,7 @@ #size-cells = <0>; }; - mmc2: mmc at 01c11000 { + mmc2: mmc at 1c11000 { compatible = "allwinner,sun4i-a10-mmc"; reg = <0x01c11000 0x1000>; clocks = <&ccu CLK_AHB_MMC2>, <&ccu CLK_MMC2>; @@ -325,7 +325,7 @@ #size-cells = <0>; }; - mmc3: mmc at 01c12000 { + mmc3: mmc at 1c12000 { compatible = "allwinner,sun4i-a10-mmc"; reg = <0x01c12000 0x1000>; clocks = <&ccu CLK_AHB_MMC3>, <&ccu CLK_MMC3>; @@ -336,7 +336,7 @@ #size-cells = <0>; }; - usb_otg: usb at 01c13000 { + usb_otg: usb at 1c13000 { compatible = "allwinner,sun4i-a10-musb"; reg = <0x01c13000 0x0400>; clocks = <&ccu CLK_AHB_OTG>; @@ -349,7 +349,7 @@ status = "disabled"; }; - usbphy: phy at 01c13400 { + usbphy: phy at 1c13400 { #phy-cells = <1>; compatible = "allwinner,sun4i-a10-usb-phy"; reg = <0x01c13400 0x10 0x01c14800 0x4 0x01c1c800 0x4>; @@ -363,7 +363,7 @@ status = "disabled"; }; - ehci0: usb at 01c14000 { + ehci0: usb at 1c14000 { compatible = "allwinner,sun4i-a10-ehci", "generic-ehci"; reg = <0x01c14000 0x100>; interrupts = <39>; @@ -373,7 +373,7 @@ status = "disabled"; }; - ohci0: usb at 01c14400 { + ohci0: usb at 1c14400 { compatible = "allwinner,sun4i-a10-ohci", "generic-ohci"; reg = <0x01c14400 0x100>; interrupts = <64>; @@ -383,7 +383,7 @@ status = "disabled"; }; - crypto: crypto-engine at 01c15000 { + crypto: crypto-engine at 1c15000 { compatible = "allwinner,sun4i-a10-crypto"; reg = <0x01c15000 0x1000>; interrupts = <86>; @@ -391,7 +391,7 @@ clock-names = "ahb", "mod"; }; - spi2: spi at 01c17000 { + spi2: spi at 1c17000 { compatible = "allwinner,sun4i-a10-spi"; reg = <0x01c17000 0x1000>; interrupts = <12>; @@ -405,7 +405,7 @@ #size-cells = <0>; }; - ahci: sata at 01c18000 { + ahci: sata at 1c18000 { compatible = "allwinner,sun4i-a10-ahci"; reg = <0x01c18000 0x1000>; interrupts = <56>; @@ -413,7 +413,7 @@ status = "disabled"; }; - ehci1: usb at 01c1c000 { + ehci1: usb at 1c1c000 { compatible = "allwinner,sun4i-a10-ehci", "generic-ehci"; reg = <0x01c1c000 0x100>; interrupts = <40>; @@ -423,7 +423,7 @@ status = "disabled"; }; - ohci1: usb at 01c1c400 { + ohci1: usb at 1c1c400 { compatible = "allwinner,sun4i-a10-ohci", "generic-ohci"; reg = <0x01c1c400 0x100>; interrupts = <65>; @@ -433,7 +433,7 @@ status = "disabled"; }; - spi3: spi at 01c1f000 { + spi3: spi at 1c1f000 { compatible = "allwinner,sun4i-a10-spi"; reg = <0x01c1f000 0x1000>; interrupts = <50>; @@ -447,7 +447,7 @@ #size-cells = <0>; }; - ccu: clock at 01c20000 { + ccu: clock at 1c20000 { compatible = "allwinner,sun4i-a10-ccu"; reg = <0x01c20000 0x400>; clocks = <&osc24M>, <&osc32k>; @@ -456,14 +456,14 @@ #reset-cells = <1>; }; - intc: interrupt-controller at 01c20400 { + intc: interrupt-controller at 1c20400 { compatible = "allwinner,sun4i-a10-ic"; reg = <0x01c20400 0x400>; interrupt-controller; #interrupt-cells = <1>; }; - pio: pinctrl at 01c20800 { + pio: pinctrl at 1c20800 { compatible = "allwinner,sun4i-a10-pinctrl"; reg = <0x01c20800 0x400>; interrupts = <28>; @@ -613,25 +613,25 @@ }; }; - timer at 01c20c00 { + timer at 1c20c00 { compatible = "allwinner,sun4i-a10-timer"; reg = <0x01c20c00 0x90>; interrupts = <22>; clocks = <&osc24M>; }; - wdt: watchdog at 01c20c90 { + wdt: watchdog at 1c20c90 { compatible = "allwinner,sun4i-a10-wdt"; reg = <0x01c20c90 0x10>; }; - rtc: rtc at 01c20d00 { + rtc: rtc at 1c20d00 { compatible = "allwinner,sun4i-a10-rtc"; reg = <0x01c20d00 0x20>; interrupts = <24>; }; - pwm: pwm at 01c20e00 { + pwm: pwm at 1c20e00 { compatible = "allwinner,sun4i-a10-pwm"; reg = <0x01c20e00 0xc>; clocks = <&osc24M>; @@ -639,7 +639,7 @@ status = "disabled"; }; - spdif: spdif at 01c21000 { + spdif: spdif at 1c21000 { #sound-dai-cells = <0>; compatible = "allwinner,sun4i-a10-spdif"; reg = <0x01c21000 0x400>; @@ -652,7 +652,7 @@ status = "disabled"; }; - ir0: ir at 01c21800 { + ir0: ir at 1c21800 { compatible = "allwinner,sun4i-a10-ir"; clocks = <&ccu CLK_APB0_IR0>, <&ccu CLK_IR0>; clock-names = "apb", "ir"; @@ -661,7 +661,7 @@ status = "disabled"; }; - ir1: ir at 01c21c00 { + ir1: ir at 1c21c00 { compatible = "allwinner,sun4i-a10-ir"; clocks = <&ccu CLK_APB0_IR1>, <&ccu CLK_IR1>; clock-names = "apb", "ir"; @@ -670,7 +670,7 @@ status = "disabled"; }; - i2s0: i2s at 01c22400 { + i2s0: i2s at 1c22400 { #sound-dai-cells = <0>; compatible = "allwinner,sun4i-a10-i2s"; reg = <0x01c22400 0x400>; @@ -683,14 +683,14 @@ status = "disabled"; }; - lradc: lradc at 01c22800 { + lradc: lradc at 1c22800 { compatible = "allwinner,sun4i-a10-lradc-keys"; reg = <0x01c22800 0x100>; interrupts = <31>; status = "disabled"; }; - codec: codec at 01c22c00 { + codec: codec at 1c22c00 { #sound-dai-cells = <0>; compatible = "allwinner,sun4i-a10-codec"; reg = <0x01c22c00 0x40>; @@ -703,19 +703,19 @@ status = "disabled"; }; - sid: eeprom at 01c23800 { + sid: eeprom at 1c23800 { compatible = "allwinner,sun4i-a10-sid"; reg = <0x01c23800 0x10>; }; - rtp: rtp at 01c25000 { + rtp: rtp at 1c25000 { compatible = "allwinner,sun4i-a10-ts"; reg = <0x01c25000 0x100>; interrupts = <29>; #thermal-sensor-cells = <0>; }; - uart0: serial at 01c28000 { + uart0: serial at 1c28000 { compatible = "snps,dw-apb-uart"; reg = <0x01c28000 0x400>; interrupts = <1>; @@ -725,7 +725,7 @@ status = "disabled"; }; - uart1: serial at 01c28400 { + uart1: serial at 1c28400 { compatible = "snps,dw-apb-uart"; reg = <0x01c28400 0x400>; interrupts = <2>; @@ -735,7 +735,7 @@ status = "disabled"; }; - uart2: serial at 01c28800 { + uart2: serial at 1c28800 { compatible = "snps,dw-apb-uart"; reg = <0x01c28800 0x400>; interrupts = <3>; @@ -745,7 +745,7 @@ status = "disabled"; }; - uart3: serial at 01c28c00 { + uart3: serial at 1c28c00 { compatible = "snps,dw-apb-uart"; reg = <0x01c28c00 0x400>; interrupts = <4>; @@ -755,7 +755,7 @@ status = "disabled"; }; - uart4: serial at 01c29000 { + uart4: serial at 1c29000 { compatible = "snps,dw-apb-uart"; reg = <0x01c29000 0x400>; interrupts = <17>; @@ -765,7 +765,7 @@ status = "disabled"; }; - uart5: serial at 01c29400 { + uart5: serial at 1c29400 { compatible = "snps,dw-apb-uart"; reg = <0x01c29400 0x400>; interrupts = <18>; @@ -775,7 +775,7 @@ status = "disabled"; }; - uart6: serial at 01c29800 { + uart6: serial at 1c29800 { compatible = "snps,dw-apb-uart"; reg = <0x01c29800 0x400>; interrupts = <19>; @@ -785,7 +785,7 @@ status = "disabled"; }; - uart7: serial at 01c29c00 { + uart7: serial at 1c29c00 { compatible = "snps,dw-apb-uart"; reg = <0x01c29c00 0x400>; interrupts = <20>; @@ -795,7 +795,7 @@ status = "disabled"; }; - ps20: ps2 at 01c2a000 { + ps20: ps2 at 1c2a000 { compatible = "allwinner,sun4i-a10-ps2"; reg = <0x01c2a000 0x400>; interrupts = <62>; @@ -803,7 +803,7 @@ status = "disabled"; }; - ps21: ps2 at 01c2a400 { + ps21: ps2 at 1c2a400 { compatible = "allwinner,sun4i-a10-ps2"; reg = <0x01c2a400 0x400>; interrupts = <63>; @@ -811,7 +811,7 @@ status = "disabled"; }; - i2c0: i2c at 01c2ac00 { + i2c0: i2c at 1c2ac00 { compatible = "allwinner,sun4i-a10-i2c"; reg = <0x01c2ac00 0x400>; interrupts = <7>; @@ -821,7 +821,7 @@ #size-cells = <0>; }; - i2c1: i2c at 01c2b000 { + i2c1: i2c at 1c2b000 { compatible = "allwinner,sun4i-a10-i2c"; reg = <0x01c2b000 0x400>; interrupts = <8>; @@ -831,7 +831,7 @@ #size-cells = <0>; }; - i2c2: i2c at 01c2b400 { + i2c2: i2c at 1c2b400 { compatible = "allwinner,sun4i-a10-i2c"; reg = <0x01c2b400 0x400>; interrupts = <9>; @@ -841,7 +841,7 @@ #size-cells = <0>; }; - can0: can at 01c2bc00 { + can0: can at 1c2bc00 { compatible = "allwinner,sun4i-a10-can"; reg = <0x01c2bc00 0x400>; interrupts = <26>; diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi b/arch/arm/boot/dts/sun5i-a10s.dtsi index 18f25c5e75ae..6ae4d95e230e 100644 --- a/arch/arm/boot/dts/sun5i-a10s.dtsi +++ b/arch/arm/boot/dts/sun5i-a10s.dtsi @@ -76,8 +76,8 @@ allwinner,pipelines = <&fe0>; }; - soc at 01c00000 { - hdmi: hdmi at 01c16000 { + soc at 1c00000 { + hdmi: hdmi at 1c16000 { compatible = "allwinner,sun5i-a10s-hdmi"; reg = <0x01c16000 0x1000>; interrupts = <58>; @@ -111,7 +111,7 @@ }; }; - pwm: pwm at 01c20e00 { + pwm: pwm at 1c20e00 { compatible = "allwinner,sun5i-a10s-pwm"; reg = <0x01c20e00 0xc>; clocks = <&ccu CLK_HOSC>; diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi index 6436bad94404..4e830f5cb7f1 100644 --- a/arch/arm/boot/dts/sun5i-a13.dtsi +++ b/arch/arm/boot/dts/sun5i-a13.dtsi @@ -88,8 +88,8 @@ allwinner,pipelines = <&fe0>; }; - soc at 01c00000 { - pwm: pwm at 01c20e00 { + soc at 1c00000 { + pwm: pwm at 1c20e00 { compatible = "allwinner,sun5i-a13-pwm"; reg = <0x01c20e00 0xc>; clocks = <&ccu CLK_HOSC>; diff --git a/arch/arm/boot/dts/sun5i-gr8.dtsi b/arch/arm/boot/dts/sun5i-gr8.dtsi index 3eb56cad0cea..ef0b7446a99d 100644 --- a/arch/arm/boot/dts/sun5i-gr8.dtsi +++ b/arch/arm/boot/dts/sun5i-gr8.dtsi @@ -54,8 +54,8 @@ allwinner,pipelines = <&fe0>; }; - soc at 01c00000 { - pwm: pwm at 01c20e00 { + soc at 1c00000 { + pwm: pwm at 1c20e00 { compatible = "allwinner,sun5i-a10s-pwm"; reg = <0x01c20e00 0xc>; clocks = <&ccu CLK_HOSC>; @@ -63,7 +63,7 @@ status = "disabled"; }; - spdif: spdif at 01c21000 { + spdif: spdif at 1c21000 { #sound-dai-cells = <0>; compatible = "allwinner,sun4i-a10-spdif"; reg = <0x01c21000 0x400>; @@ -76,7 +76,7 @@ status = "disabled"; }; - i2s0: i2s at 01c22400 { + i2s0: i2s at 1c22400 { #sound-dai-cells = <0>; compatible = "allwinner,sun4i-a10-i2s"; reg = <0x01c22400 0x400>; diff --git a/arch/arm/boot/dts/sun5i.dtsi b/arch/arm/boot/dts/sun5i.dtsi index 98cc00341b00..88fb70701093 100644 --- a/arch/arm/boot/dts/sun5i.dtsi +++ b/arch/arm/boot/dts/sun5i.dtsi @@ -93,7 +93,7 @@ #size-cells = <1>; ranges; - osc24M: clk at 01c20050 { + osc24M: clk at 1c20050 { #clock-cells = <0>; compatible = "fixed-clock"; clock-frequency = <24000000>; @@ -108,13 +108,13 @@ }; }; - soc at 01c00000 { + soc at 1c00000 { compatible = "simple-bus"; #address-cells = <1>; #size-cells = <1>; ranges; - sram-controller at 01c00000 { + sram-controller at 1c00000 { compatible = "allwinner,sun4i-a10-sram-controller"; reg = <0x01c00000 0x30>; #address-cells = <1>; @@ -135,7 +135,7 @@ status = "disabled"; }; - sram_d: sram at 00010000 { + sram_d: sram at 10000 { compatible = "mmio-sram"; reg = <0x00010000 0x1000>; #address-cells = <1>; @@ -150,7 +150,7 @@ }; }; - dma: dma-controller at 01c02000 { + dma: dma-controller at 1c02000 { compatible = "allwinner,sun4i-a10-dma"; reg = <0x01c02000 0x1000>; interrupts = <27>; @@ -158,7 +158,7 @@ #dma-cells = <2>; }; - nfc: nand at 01c03000 { + nfc: nand at 1c03000 { compatible = "allwinner,sun4i-a10-nand"; reg = <0x01c03000 0x1000>; interrupts = <37>; @@ -171,7 +171,7 @@ #size-cells = <0>; }; - spi0: spi at 01c05000 { + spi0: spi at 1c05000 { compatible = "allwinner,sun4i-a10-spi"; reg = <0x01c05000 0x1000>; interrupts = <10>; @@ -185,7 +185,7 @@ #size-cells = <0>; }; - spi1: spi at 01c06000 { + spi1: spi at 1c06000 { compatible = "allwinner,sun4i-a10-spi"; reg = <0x01c06000 0x1000>; interrupts = <11>; @@ -199,7 +199,7 @@ #size-cells = <0>; }; - tve0: tv-encoder at 01c0a000 { + tve0: tv-encoder at 1c0a000 { compatible = "allwinner,sun4i-a10-tv-encoder"; reg = <0x01c0a000 0x1000>; clocks = <&ccu CLK_AHB_TVE>; @@ -217,7 +217,7 @@ }; }; - emac: ethernet at 01c0b000 { + emac: ethernet at 1c0b000 { compatible = "allwinner,sun4i-a10-emac"; reg = <0x01c0b000 0x1000>; interrupts = <55>; @@ -226,7 +226,7 @@ status = "disabled"; }; - mdio: mdio at 01c0b080 { + mdio: mdio at 1c0b080 { compatible = "allwinner,sun4i-a10-mdio"; reg = <0x01c0b080 0x14>; status = "disabled"; @@ -234,7 +234,7 @@ #size-cells = <0>; }; - tcon0: lcd-controller at 01c0c000 { + tcon0: lcd-controller at 1c0c000 { compatible = "allwinner,sun5i-a13-tcon"; reg = <0x01c0c000 0x1000>; interrupts = <44>; @@ -278,7 +278,7 @@ }; }; - mmc0: mmc at 01c0f000 { + mmc0: mmc at 1c0f000 { compatible = "allwinner,sun5i-a13-mmc"; reg = <0x01c0f000 0x1000>; clocks = <&ccu CLK_AHB_MMC0>, <&ccu CLK_MMC0>; @@ -289,7 +289,7 @@ #size-cells = <0>; }; - mmc1: mmc at 01c10000 { + mmc1: mmc at 1c10000 { compatible = "allwinner,sun5i-a13-mmc"; reg = <0x01c10000 0x1000>; clocks = <&ccu CLK_AHB_MMC1>, <&ccu CLK_MMC1>; @@ -300,7 +300,7 @@ #size-cells = <0>; }; - mmc2: mmc at 01c11000 { + mmc2: mmc at 1c11000 { compatible = "allwinner,sun5i-a13-mmc"; reg = <0x01c11000 0x1000>; clocks = <&ccu CLK_AHB_MMC2>, <&ccu CLK_MMC2>; @@ -311,7 +311,7 @@ #size-cells = <0>; }; - usb_otg: usb at 01c13000 { + usb_otg: usb at 1c13000 { compatible = "allwinner,sun4i-a10-musb"; reg = <0x01c13000 0x0400>; clocks = <&ccu CLK_AHB_OTG>; @@ -324,7 +324,7 @@ status = "disabled"; }; - usbphy: phy at 01c13400 { + usbphy: phy at 1c13400 { #phy-cells = <1>; compatible = "allwinner,sun5i-a13-usb-phy"; reg = <0x01c13400 0x10 0x01c14800 0x4>; @@ -336,7 +336,7 @@ status = "disabled"; }; - ehci0: usb at 01c14000 { + ehci0: usb at 1c14000 { compatible = "allwinner,sun5i-a13-ehci", "generic-ehci"; reg = <0x01c14000 0x100>; interrupts = <39>; @@ -346,7 +346,7 @@ status = "disabled"; }; - ohci0: usb at 01c14400 { + ohci0: usb at 1c14400 { compatible = "allwinner,sun5i-a13-ohci", "generic-ohci"; reg = <0x01c14400 0x100>; interrupts = <40>; @@ -356,7 +356,7 @@ status = "disabled"; }; - crypto: crypto-engine at 01c15000 { + crypto: crypto-engine at 1c15000 { compatible = "allwinner,sun5i-a13-crypto", "allwinner,sun4i-a10-crypto"; reg = <0x01c15000 0x1000>; @@ -365,7 +365,7 @@ clock-names = "ahb", "mod"; }; - spi2: spi at 01c17000 { + spi2: spi at 1c17000 { compatible = "allwinner,sun4i-a10-spi"; reg = <0x01c17000 0x1000>; interrupts = <12>; @@ -379,7 +379,7 @@ #size-cells = <0>; }; - ccu: clock at 01c20000 { + ccu: clock at 1c20000 { reg = <0x01c20000 0x400>; clocks = <&osc24M>, <&osc32k>; clock-names = "hosc", "losc"; @@ -387,14 +387,14 @@ #reset-cells = <1>; }; - intc: interrupt-controller at 01c20400 { + intc: interrupt-controller at 1c20400 { compatible = "allwinner,sun4i-a10-ic"; reg = <0x01c20400 0x400>; interrupt-controller; #interrupt-cells = <1>; }; - pio: pinctrl at 01c20800 { + pio: pinctrl at 1c20800 { reg = <0x01c20800 0x400>; interrupts = <28>; clocks = <&ccu CLK_APB0_PIO>, <&osc24M>, <&osc32k>; @@ -538,19 +538,19 @@ }; }; - timer at 01c20c00 { + timer at 1c20c00 { compatible = "allwinner,sun4i-a10-timer"; reg = <0x01c20c00 0x90>; interrupts = <22>; clocks = <&ccu CLK_HOSC>; }; - wdt: watchdog at 01c20c90 { + wdt: watchdog at 1c20c90 { compatible = "allwinner,sun4i-a10-wdt"; reg = <0x01c20c90 0x10>; }; - ir0: ir at 01c21800 { + ir0: ir at 1c21800 { compatible = "allwinner,sun4i-a10-ir"; clocks = <&ccu CLK_APB0_IR>, <&ccu CLK_IR>; clock-names = "apb", "ir"; @@ -559,14 +559,14 @@ status = "disabled"; }; - lradc: lradc at 01c22800 { + lradc: lradc at 1c22800 { compatible = "allwinner,sun4i-a10-lradc-keys"; reg = <0x01c22800 0x100>; interrupts = <31>; status = "disabled"; }; - codec: codec at 01c22c00 { + codec: codec at 1c22c00 { #sound-dai-cells = <0>; compatible = "allwinner,sun4i-a10-codec"; reg = <0x01c22c00 0x40>; @@ -579,19 +579,19 @@ status = "disabled"; }; - sid: eeprom at 01c23800 { + sid: eeprom at 1c23800 { compatible = "allwinner,sun4i-a10-sid"; reg = <0x01c23800 0x10>; }; - rtp: rtp at 01c25000 { + rtp: rtp at 1c25000 { compatible = "allwinner,sun5i-a13-ts"; reg = <0x01c25000 0x100>; interrupts = <29>; #thermal-sensor-cells = <0>; }; - uart0: serial at 01c28000 { + uart0: serial at 1c28000 { compatible = "snps,dw-apb-uart"; reg = <0x01c28000 0x400>; interrupts = <1>; @@ -601,7 +601,7 @@ status = "disabled"; }; - uart1: serial at 01c28400 { + uart1: serial at 1c28400 { compatible = "snps,dw-apb-uart"; reg = <0x01c28400 0x400>; interrupts = <2>; @@ -611,7 +611,7 @@ status = "disabled"; }; - uart2: serial at 01c28800 { + uart2: serial at 1c28800 { compatible = "snps,dw-apb-uart"; reg = <0x01c28800 0x400>; interrupts = <3>; @@ -621,7 +621,7 @@ status = "disabled"; }; - uart3: serial at 01c28c00 { + uart3: serial at 1c28c00 { compatible = "snps,dw-apb-uart"; reg = <0x01c28c00 0x400>; interrupts = <4>; @@ -631,7 +631,7 @@ status = "disabled"; }; - i2c0: i2c at 01c2ac00 { + i2c0: i2c at 1c2ac00 { compatible = "allwinner,sun4i-a10-i2c"; reg = <0x01c2ac00 0x400>; interrupts = <7>; @@ -641,7 +641,7 @@ #size-cells = <0>; }; - i2c1: i2c at 01c2b000 { + i2c1: i2c at 1c2b000 { compatible = "allwinner,sun4i-a10-i2c"; reg = <0x01c2b000 0x400>; interrupts = <8>; @@ -651,7 +651,7 @@ #size-cells = <0>; }; - i2c2: i2c at 01c2b400 { + i2c2: i2c at 1c2b400 { compatible = "allwinner,sun4i-a10-i2c"; reg = <0x01c2b400 0x400>; interrupts = <9>; @@ -661,14 +661,14 @@ #size-cells = <0>; }; - timer at 01c60000 { + timer at 1c60000 { compatible = "allwinner,sun5i-a13-hstimer"; reg = <0x01c60000 0x1000>; interrupts = <82>, <83>; clocks = <&ccu CLK_AHB_HSTIMER>; }; - fe0: display-frontend at 01e00000 { + fe0: display-frontend at 1e00000 { compatible = "allwinner,sun5i-a13-display-frontend"; reg = <0x01e00000 0x20000>; interrupts = <47>; @@ -696,7 +696,7 @@ }; }; - be0: display-backend at 01e60000 { + be0: display-backend at 1e60000 { compatible = "allwinner,sun5i-a13-display-backend"; reg = <0x01e60000 0x10000>; interrupts = <47>; diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi index 93209cda28db..ded5cf14a4af 100644 --- a/arch/arm/boot/dts/sun6i-a31.dtsi +++ b/arch/arm/boot/dts/sun6i-a31.dtsi @@ -221,7 +221,7 @@ clock-output-names = "gmac_int_tx"; }; - gmac_tx_clk: clk at 01c200d0 { + gmac_tx_clk: clk at 1c200d0 { #clock-cells = <0>; compatible = "allwinner,sun7i-a20-gmac-clk"; reg = <0x01c200d0 0x4>; @@ -236,13 +236,13 @@ status = "disabled"; }; - soc at 01c00000 { + soc at 1c00000 { compatible = "simple-bus"; #address-cells = <1>; #size-cells = <1>; ranges; - dma: dma-controller at 01c02000 { + dma: dma-controller at 1c02000 { compatible = "allwinner,sun6i-a31-dma"; reg = <0x01c02000 0x1000>; interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>; @@ -251,7 +251,7 @@ #dma-cells = <1>; }; - tcon0: lcd-controller at 01c0c000 { + tcon0: lcd-controller at 1c0c000 { compatible = "allwinner,sun6i-a31-tcon"; reg = <0x01c0c000 0x1000>; interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>; @@ -293,7 +293,7 @@ }; }; - tcon1: lcd-controller at 01c0d000 { + tcon1: lcd-controller at 1c0d000 { compatible = "allwinner,sun6i-a31-tcon"; reg = <0x01c0d000 0x1000>; interrupts = <GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH>; @@ -335,7 +335,7 @@ }; }; - mmc0: mmc at 01c0f000 { + mmc0: mmc at 1c0f000 { compatible = "allwinner,sun7i-a20-mmc"; reg = <0x01c0f000 0x1000>; clocks = <&ccu CLK_AHB1_MMC0>, @@ -354,7 +354,7 @@ #size-cells = <0>; }; - mmc1: mmc at 01c10000 { + mmc1: mmc at 1c10000 { compatible = "allwinner,sun7i-a20-mmc"; reg = <0x01c10000 0x1000>; clocks = <&ccu CLK_AHB1_MMC1>, @@ -373,7 +373,7 @@ #size-cells = <0>; }; - mmc2: mmc at 01c11000 { + mmc2: mmc at 1c11000 { compatible = "allwinner,sun7i-a20-mmc"; reg = <0x01c11000 0x1000>; clocks = <&ccu CLK_AHB1_MMC2>, @@ -392,7 +392,7 @@ #size-cells = <0>; }; - mmc3: mmc at 01c12000 { + mmc3: mmc at 1c12000 { compatible = "allwinner,sun7i-a20-mmc"; reg = <0x01c12000 0x1000>; clocks = <&ccu CLK_AHB1_MMC3>, @@ -411,7 +411,7 @@ #size-cells = <0>; }; - usb_otg: usb at 01c19000 { + usb_otg: usb at 1c19000 { compatible = "allwinner,sun6i-a31-musb"; reg = <0x01c19000 0x0400>; clocks = <&ccu CLK_AHB1_OTG>; @@ -424,7 +424,7 @@ status = "disabled"; }; - usbphy: phy at 01c19400 { + usbphy: phy at 1c19400 { compatible = "allwinner,sun6i-a31-usb-phy"; reg = <0x01c19400 0x10>, <0x01c1a800 0x4>, @@ -448,7 +448,7 @@ #phy-cells = <1>; }; - ehci0: usb at 01c1a000 { + ehci0: usb at 1c1a000 { compatible = "allwinner,sun6i-a31-ehci", "generic-ehci"; reg = <0x01c1a000 0x100>; interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>; @@ -459,7 +459,7 @@ status = "disabled"; }; - ohci0: usb at 01c1a400 { + ohci0: usb at 1c1a400 { compatible = "allwinner,sun6i-a31-ohci", "generic-ohci"; reg = <0x01c1a400 0x100>; interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>; @@ -470,7 +470,7 @@ status = "disabled"; }; - ehci1: usb at 01c1b000 { + ehci1: usb at 1c1b000 { compatible = "allwinner,sun6i-a31-ehci", "generic-ehci"; reg = <0x01c1b000 0x100>; interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>; @@ -481,7 +481,7 @@ status = "disabled"; }; - ohci1: usb at 01c1b400 { + ohci1: usb at 1c1b400 { compatible = "allwinner,sun6i-a31-ohci", "generic-ohci"; reg = <0x01c1b400 0x100>; interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>; @@ -492,7 +492,7 @@ status = "disabled"; }; - ohci2: usb at 01c1c400 { + ohci2: usb at 1c1c400 { compatible = "allwinner,sun6i-a31-ohci", "generic-ohci"; reg = <0x01c1c400 0x100>; interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>; @@ -501,7 +501,7 @@ status = "disabled"; }; - ccu: clock at 01c20000 { + ccu: clock at 1c20000 { compatible = "allwinner,sun6i-a31-ccu"; reg = <0x01c20000 0x400>; clocks = <&osc24M>, <&osc32k>; @@ -510,7 +510,7 @@ #reset-cells = <1>; }; - pio: pinctrl at 01c20800 { + pio: pinctrl at 1c20800 { compatible = "allwinner,sun6i-a31-pinctrl"; reg = <0x01c20800 0x400>; interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>, @@ -643,7 +643,7 @@ }; }; - timer at 01c20c00 { + timer at 1c20c00 { compatible = "allwinner,sun4i-a10-timer"; reg = <0x01c20c00 0xa0>; interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>, @@ -654,12 +654,12 @@ clocks = <&osc24M>; }; - wdt1: watchdog at 01c20ca0 { + wdt1: watchdog at 1c20ca0 { compatible = "allwinner,sun6i-a31-wdt"; reg = <0x01c20ca0 0x20>; }; - spdif: spdif at 01c21000 { + spdif: spdif at 1c21000 { #sound-dai-cells = <0>; compatible = "allwinner,sun6i-a31-spdif"; reg = <0x01c21000 0x400>; @@ -672,7 +672,7 @@ status = "disabled"; }; - i2s0: i2s at 01c22000 { + i2s0: i2s at 1c22000 { #sound-dai-cells = <0>; compatible = "allwinner,sun6i-a31-i2s"; reg = <0x01c22000 0x400>; @@ -685,7 +685,7 @@ status = "disabled"; }; - i2s1: i2s at 01c22400 { + i2s1: i2s at 1c22400 { #sound-dai-cells = <0>; compatible = "allwinner,sun6i-a31-i2s"; reg = <0x01c22400 0x400>; @@ -698,21 +698,21 @@ status = "disabled"; }; - lradc: lradc at 01c22800 { + lradc: lradc at 1c22800 { compatible = "allwinner,sun4i-a10-lradc-keys"; reg = <0x01c22800 0x100>; interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>; status = "disabled"; }; - rtp: rtp at 01c25000 { + rtp: rtp at 1c25000 { compatible = "allwinner,sun6i-a31-ts"; reg = <0x01c25000 0x100>; interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>; #thermal-sensor-cells = <0>; }; - uart0: serial at 01c28000 { + uart0: serial at 1c28000 { compatible = "snps,dw-apb-uart"; reg = <0x01c28000 0x400>; interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>; @@ -725,7 +725,7 @@ status = "disabled"; }; - uart1: serial at 01c28400 { + uart1: serial at 1c28400 { compatible = "snps,dw-apb-uart"; reg = <0x01c28400 0x400>; interrupts = <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>; @@ -738,7 +738,7 @@ status = "disabled"; }; - uart2: serial at 01c28800 { + uart2: serial at 1c28800 { compatible = "snps,dw-apb-uart"; reg = <0x01c28800 0x400>; interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>; @@ -751,7 +751,7 @@ status = "disabled"; }; - uart3: serial at 01c28c00 { + uart3: serial at 1c28c00 { compatible = "snps,dw-apb-uart"; reg = <0x01c28c00 0x400>; interrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>; @@ -764,7 +764,7 @@ status = "disabled"; }; - uart4: serial at 01c29000 { + uart4: serial at 1c29000 { compatible = "snps,dw-apb-uart"; reg = <0x01c29000 0x400>; interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>; @@ -777,7 +777,7 @@ status = "disabled"; }; - uart5: serial at 01c29400 { + uart5: serial at 1c29400 { compatible = "snps,dw-apb-uart"; reg = <0x01c29400 0x400>; interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>; @@ -790,7 +790,7 @@ status = "disabled"; }; - i2c0: i2c at 01c2ac00 { + i2c0: i2c at 1c2ac00 { compatible = "allwinner,sun6i-a31-i2c"; reg = <0x01c2ac00 0x400>; interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>; @@ -801,7 +801,7 @@ #size-cells = <0>; }; - i2c1: i2c at 01c2b000 { + i2c1: i2c at 1c2b000 { compatible = "allwinner,sun6i-a31-i2c"; reg = <0x01c2b000 0x400>; interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>; @@ -812,7 +812,7 @@ #size-cells = <0>; }; - i2c2: i2c at 01c2b400 { + i2c2: i2c at 1c2b400 { compatible = "allwinner,sun6i-a31-i2c"; reg = <0x01c2b400 0x400>; interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>; @@ -823,7 +823,7 @@ #size-cells = <0>; }; - i2c3: i2c at 01c2b800 { + i2c3: i2c at 1c2b800 { compatible = "allwinner,sun6i-a31-i2c"; reg = <0x01c2b800 0x400>; interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>; @@ -834,7 +834,7 @@ #size-cells = <0>; }; - gmac: ethernet at 01c30000 { + gmac: ethernet at 1c30000 { compatible = "allwinner,sun7i-a20-gmac"; reg = <0x01c30000 0x1054>; interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>; @@ -851,7 +851,7 @@ #size-cells = <0>; }; - crypto: crypto-engine at 01c15000 { + crypto: crypto-engine at 1c15000 { compatible = "allwinner,sun6i-a31-crypto", "allwinner,sun4i-a10-crypto"; reg = <0x01c15000 0x1000>; @@ -862,7 +862,7 @@ reset-names = "ahb"; }; - codec: codec at 01c22c00 { + codec: codec at 1c22c00 { #sound-dai-cells = <0>; compatible = "allwinner,sun6i-a31-codec"; reg = <0x01c22c00 0x400>; @@ -875,7 +875,7 @@ status = "disabled"; }; - timer at 01c60000 { + timer at 1c60000 { compatible = "allwinner,sun6i-a31-hstimer", "allwinner,sun7i-a20-hstimer"; reg = <0x01c60000 0x1000>; @@ -887,7 +887,7 @@ resets = <&ccu RST_AHB1_HSTIMER>; }; - spi0: spi at 01c68000 { + spi0: spi at 1c68000 { compatible = "allwinner,sun6i-a31-spi"; reg = <0x01c68000 0x1000>; interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>; @@ -899,7 +899,7 @@ status = "disabled"; }; - spi1: spi at 01c69000 { + spi1: spi at 1c69000 { compatible = "allwinner,sun6i-a31-spi"; reg = <0x01c69000 0x1000>; interrupts = <GIC_SPI 66 IRQ_TYPE_LEVEL_HIGH>; @@ -911,7 +911,7 @@ status = "disabled"; }; - spi2: spi at 01c6a000 { + spi2: spi at 1c6a000 { compatible = "allwinner,sun6i-a31-spi"; reg = <0x01c6a000 0x1000>; interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>; @@ -923,7 +923,7 @@ status = "disabled"; }; - spi3: spi at 01c6b000 { + spi3: spi at 1c6b000 { compatible = "allwinner,sun6i-a31-spi"; reg = <0x01c6b000 0x1000>; interrupts = <GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>; @@ -935,7 +935,7 @@ status = "disabled"; }; - gic: interrupt-controller at 01c81000 { + gic: interrupt-controller at 1c81000 { compatible = "arm,cortex-a7-gic", "arm,cortex-a15-gic"; reg = <0x01c81000 0x1000>, <0x01c82000 0x2000>, @@ -946,7 +946,7 @@ interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>; }; - fe0: display-frontend at 01e00000 { + fe0: display-frontend at 1e00000 { compatible = "allwinner,sun6i-a31-display-frontend"; reg = <0x01e00000 0x20000>; interrupts = <GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH>; @@ -978,7 +978,7 @@ }; }; - fe1: display-frontend at 01e20000 { + fe1: display-frontend at 1e20000 { compatible = "allwinner,sun6i-a31-display-frontend"; reg = <0x01e20000 0x20000>; interrupts = <GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH>; @@ -1010,7 +1010,7 @@ }; }; - be1: display-backend at 01e40000 { + be1: display-backend at 1e40000 { compatible = "allwinner,sun6i-a31-display-backend"; reg = <0x01e40000 0x10000>; interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>; @@ -1056,7 +1056,7 @@ }; }; - drc1: drc at 01e50000 { + drc1: drc at 1e50000 { compatible = "allwinner,sun6i-a31-drc"; reg = <0x01e50000 0x10000>; interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>; @@ -1102,7 +1102,7 @@ }; }; - be0: display-backend at 01e60000 { + be0: display-backend at 1e60000 { compatible = "allwinner,sun6i-a31-display-backend"; reg = <0x01e60000 0x10000>; interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>; @@ -1148,7 +1148,7 @@ }; }; - drc0: drc at 01e70000 { + drc0: drc at 1e70000 { compatible = "allwinner,sun6i-a31-drc"; reg = <0x01e70000 0x10000>; interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>; @@ -1194,7 +1194,7 @@ }; }; - rtc: rtc at 01f00000 { + rtc: rtc at 1f00000 { compatible = "allwinner,sun6i-a31-rtc"; reg = <0x01f00000 0x54>; interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>, @@ -1209,7 +1209,7 @@ interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>; }; - prcm at 01f01400 { + prcm at 1f01400 { compatible = "allwinner,sun6i-a31-prcm"; reg = <0x01f01400 0x200>; @@ -1261,12 +1261,12 @@ }; }; - cpucfg at 01f01c00 { + cpucfg at 1f01c00 { compatible = "allwinner,sun6i-a31-cpuconfig"; reg = <0x01f01c00 0x300>; }; - ir: ir at 01f02000 { + ir: ir at 1f02000 { compatible = "allwinner,sun5i-a13-ir"; clocks = <&apb0_gates 1>, <&ir_clk>; clock-names = "apb", "ir"; @@ -1276,7 +1276,7 @@ status = "disabled"; }; - r_pio: pinctrl at 01f02c00 { + r_pio: pinctrl at 1f02c00 { compatible = "allwinner,sun6i-a31-r-pinctrl"; reg = <0x01f02c00 0x400>; interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>, @@ -1301,7 +1301,7 @@ }; }; - p2wi: i2c at 01f03400 { + p2wi: i2c at 1f03400 { compatible = "allwinner,sun6i-a31-p2wi"; reg = <0x01f03400 0x400>; interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>; diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi index 39d0727bd9c3..2f63ae861e68 100644 --- a/arch/arm/boot/dts/sun7i-a20.dtsi +++ b/arch/arm/boot/dts/sun7i-a20.dtsi @@ -182,7 +182,7 @@ #size-cells = <1>; ranges; - osc24M: clk at 01c20050 { + osc24M: clk at 1c20050 { #clock-cells = <0>; compatible = "fixed-clock"; clock-frequency = <24000000>; @@ -219,7 +219,7 @@ clock-output-names = "gmac_int_tx"; }; - gmac_tx_clk: clk at 01c20164 { + gmac_tx_clk: clk at 1c20164 { #clock-cells = <0>; compatible = "allwinner,sun7i-a20-gmac-clk"; reg = <0x01c20164 0x4>; @@ -228,13 +228,13 @@ }; }; - soc at 01c00000 { + soc at 1c00000 { compatible = "simple-bus"; #address-cells = <1>; #size-cells = <1>; ranges; - sram-controller at 01c00000 { + sram-controller at 1c00000 { compatible = "allwinner,sun4i-a10-sram-controller"; reg = <0x01c00000 0x30>; #address-cells = <1>; @@ -255,7 +255,7 @@ }; }; - sram_d: sram at 00010000 { + sram_d: sram at 10000 { compatible = "mmio-sram"; reg = <0x00010000 0x1000>; #address-cells = <1>; @@ -270,7 +270,7 @@ }; }; - nmi_intc: interrupt-controller at 01c00030 { + nmi_intc: interrupt-controller at 1c00030 { compatible = "allwinner,sun7i-a20-sc-nmi"; interrupt-controller; #interrupt-cells = <2>; @@ -278,7 +278,7 @@ interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>; }; - dma: dma-controller at 01c02000 { + dma: dma-controller at 1c02000 { compatible = "allwinner,sun4i-a10-dma"; reg = <0x01c02000 0x1000>; interrupts = <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH>; @@ -286,7 +286,7 @@ #dma-cells = <2>; }; - nfc: nand at 01c03000 { + nfc: nand at 1c03000 { compatible = "allwinner,sun4i-a10-nand"; reg = <0x01c03000 0x1000>; interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>; @@ -299,7 +299,7 @@ #size-cells = <0>; }; - spi0: spi at 01c05000 { + spi0: spi at 1c05000 { compatible = "allwinner,sun4i-a10-spi"; reg = <0x01c05000 0x1000>; interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>; @@ -314,7 +314,7 @@ num-cs = <4>; }; - spi1: spi at 01c06000 { + spi1: spi at 1c06000 { compatible = "allwinner,sun4i-a10-spi"; reg = <0x01c06000 0x1000>; interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>; @@ -329,7 +329,7 @@ num-cs = <1>; }; - emac: ethernet at 01c0b000 { + emac: ethernet at 1c0b000 { compatible = "allwinner,sun4i-a10-emac"; reg = <0x01c0b000 0x1000>; interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>; @@ -338,7 +338,7 @@ status = "disabled"; }; - mdio: mdio at 01c0b080 { + mdio: mdio at 1c0b080 { compatible = "allwinner,sun4i-a10-mdio"; reg = <0x01c0b080 0x14>; status = "disabled"; @@ -346,7 +346,7 @@ #size-cells = <0>; }; - mmc0: mmc at 01c0f000 { + mmc0: mmc at 1c0f000 { compatible = "allwinner,sun7i-a20-mmc"; reg = <0x01c0f000 0x1000>; clocks = <&ccu CLK_AHB_MMC0>, @@ -363,7 +363,7 @@ #size-cells = <0>; }; - mmc1: mmc at 01c10000 { + mmc1: mmc at 1c10000 { compatible = "allwinner,sun7i-a20-mmc"; reg = <0x01c10000 0x1000>; clocks = <&ccu CLK_AHB_MMC1>, @@ -380,7 +380,7 @@ #size-cells = <0>; }; - mmc2: mmc at 01c11000 { + mmc2: mmc at 1c11000 { compatible = "allwinner,sun7i-a20-mmc"; reg = <0x01c11000 0x1000>; clocks = <&ccu CLK_AHB_MMC2>, @@ -397,7 +397,7 @@ #size-cells = <0>; }; - mmc3: mmc at 01c12000 { + mmc3: mmc at 1c12000 { compatible = "allwinner,sun7i-a20-mmc"; reg = <0x01c12000 0x1000>; clocks = <&ccu CLK_AHB_MMC3>, @@ -414,7 +414,7 @@ #size-cells = <0>; }; - usb_otg: usb at 01c13000 { + usb_otg: usb at 1c13000 { compatible = "allwinner,sun4i-a10-musb"; reg = <0x01c13000 0x0400>; clocks = <&ccu CLK_AHB_OTG>; @@ -427,7 +427,7 @@ status = "disabled"; }; - usbphy: phy at 01c13400 { + usbphy: phy at 1c13400 { #phy-cells = <1>; compatible = "allwinner,sun7i-a20-usb-phy"; reg = <0x01c13400 0x10 0x01c14800 0x4 0x01c1c800 0x4>; @@ -441,7 +441,7 @@ status = "disabled"; }; - ehci0: usb at 01c14000 { + ehci0: usb at 1c14000 { compatible = "allwinner,sun7i-a20-ehci", "generic-ehci"; reg = <0x01c14000 0x100>; interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>; @@ -451,7 +451,7 @@ status = "disabled"; }; - ohci0: usb at 01c14400 { + ohci0: usb at 1c14400 { compatible = "allwinner,sun7i-a20-ohci", "generic-ohci"; reg = <0x01c14400 0x100>; interrupts = <GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>; @@ -461,7 +461,7 @@ status = "disabled"; }; - crypto: crypto-engine at 01c15000 { + crypto: crypto-engine at 1c15000 { compatible = "allwinner,sun7i-a20-crypto", "allwinner,sun4i-a10-crypto"; reg = <0x01c15000 0x1000>; @@ -470,7 +470,7 @@ clock-names = "ahb", "mod"; }; - spi2: spi at 01c17000 { + spi2: spi at 1c17000 { compatible = "allwinner,sun4i-a10-spi"; reg = <0x01c17000 0x1000>; interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>; @@ -485,7 +485,7 @@ num-cs = <1>; }; - ahci: sata at 01c18000 { + ahci: sata at 1c18000 { compatible = "allwinner,sun4i-a10-ahci"; reg = <0x01c18000 0x1000>; interrupts = <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>; @@ -493,7 +493,7 @@ status = "disabled"; }; - ehci1: usb at 01c1c000 { + ehci1: usb at 1c1c000 { compatible = "allwinner,sun7i-a20-ehci", "generic-ehci"; reg = <0x01c1c000 0x100>; interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>; @@ -503,7 +503,7 @@ status = "disabled"; }; - ohci1: usb at 01c1c400 { + ohci1: usb at 1c1c400 { compatible = "allwinner,sun7i-a20-ohci", "generic-ohci"; reg = <0x01c1c400 0x100>; interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>; @@ -513,7 +513,7 @@ status = "disabled"; }; - spi3: spi at 01c1f000 { + spi3: spi at 1c1f000 { compatible = "allwinner,sun4i-a10-spi"; reg = <0x01c1f000 0x1000>; interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>; @@ -528,7 +528,7 @@ num-cs = <1>; }; - ccu: clock at 01c20000 { + ccu: clock at 1c20000 { compatible = "allwinner,sun7i-a20-ccu"; reg = <0x01c20000 0x400>; clocks = <&osc24M>, <&osc32k>; @@ -537,7 +537,7 @@ #reset-cells = <1>; }; - pio: pinctrl at 01c20800 { + pio: pinctrl at 1c20800 { compatible = "allwinner,sun7i-a20-pinctrl"; reg = <0x01c20800 0x400>; interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>; @@ -776,7 +776,7 @@ }; }; - timer at 01c20c00 { + timer at 1c20c00 { compatible = "allwinner,sun4i-a10-timer"; reg = <0x01c20c00 0x90>; interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>, @@ -788,18 +788,18 @@ clocks = <&osc24M>; }; - wdt: watchdog at 01c20c90 { + wdt: watchdog at 1c20c90 { compatible = "allwinner,sun4i-a10-wdt"; reg = <0x01c20c90 0x10>; }; - rtc: rtc at 01c20d00 { + rtc: rtc at 1c20d00 { compatible = "allwinner,sun7i-a20-rtc"; reg = <0x01c20d00 0x20>; interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>; }; - pwm: pwm at 01c20e00 { + pwm: pwm at 1c20e00 { compatible = "allwinner,sun7i-a20-pwm"; reg = <0x01c20e00 0xc>; clocks = <&osc24M>; @@ -807,7 +807,7 @@ status = "disabled"; }; - spdif: spdif at 01c21000 { + spdif: spdif at 1c21000 { #sound-dai-cells = <0>; compatible = "allwinner,sun4i-a10-spdif"; reg = <0x01c21000 0x400>; @@ -820,7 +820,7 @@ status = "disabled"; }; - ir0: ir at 01c21800 { + ir0: ir at 1c21800 { compatible = "allwinner,sun4i-a10-ir"; clocks = <&ccu CLK_APB0_IR0>, <&ccu CLK_IR0>; clock-names = "apb", "ir"; @@ -829,7 +829,7 @@ status = "disabled"; }; - ir1: ir at 01c21c00 { + ir1: ir at 1c21c00 { compatible = "allwinner,sun4i-a10-ir"; clocks = <&ccu CLK_APB0_IR1>, <&ccu CLK_IR1>; clock-names = "apb", "ir"; @@ -838,7 +838,7 @@ status = "disabled"; }; - i2s1: i2s at 01c22000 { + i2s1: i2s at 1c22000 { #sound-dai-cells = <0>; compatible = "allwinner,sun4i-a10-i2s"; reg = <0x01c22000 0x400>; @@ -851,7 +851,7 @@ status = "disabled"; }; - i2s0: i2s at 01c22400 { + i2s0: i2s at 1c22400 { #sound-dai-cells = <0>; compatible = "allwinner,sun4i-a10-i2s"; reg = <0x01c22400 0x400>; @@ -864,14 +864,14 @@ status = "disabled"; }; - lradc: lradc at 01c22800 { + lradc: lradc at 1c22800 { compatible = "allwinner,sun4i-a10-lradc-keys"; reg = <0x01c22800 0x100>; interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>; status = "disabled"; }; - codec: codec at 01c22c00 { + codec: codec at 1c22c00 { #sound-dai-cells = <0>; compatible = "allwinner,sun7i-a20-codec"; reg = <0x01c22c00 0x40>; @@ -884,12 +884,12 @@ status = "disabled"; }; - sid: eeprom at 01c23800 { + sid: eeprom at 1c23800 { compatible = "allwinner,sun7i-a20-sid"; reg = <0x01c23800 0x200>; }; - i2s2: i2s at 01c24400 { + i2s2: i2s at 1c24400 { #sound-dai-cells = <0>; compatible = "allwinner,sun4i-a10-i2s"; reg = <0x01c24400 0x400>; @@ -902,14 +902,14 @@ status = "disabled"; }; - rtp: rtp at 01c25000 { + rtp: rtp at 1c25000 { compatible = "allwinner,sun5i-a13-ts"; reg = <0x01c25000 0x100>; interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>; #thermal-sensor-cells = <0>; }; - uart0: serial at 01c28000 { + uart0: serial at 1c28000 { compatible = "snps,dw-apb-uart"; reg = <0x01c28000 0x400>; interrupts = <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>; @@ -919,7 +919,7 @@ status = "disabled"; }; - uart1: serial at 01c28400 { + uart1: serial at 1c28400 { compatible = "snps,dw-apb-uart"; reg = <0x01c28400 0x400>; interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>; @@ -929,7 +929,7 @@ status = "disabled"; }; - uart2: serial at 01c28800 { + uart2: serial at 1c28800 { compatible = "snps,dw-apb-uart"; reg = <0x01c28800 0x400>; interrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>; @@ -939,7 +939,7 @@ status = "disabled"; }; - uart3: serial at 01c28c00 { + uart3: serial at 1c28c00 { compatible = "snps,dw-apb-uart"; reg = <0x01c28c00 0x400>; interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>; @@ -949,7 +949,7 @@ status = "disabled"; }; - uart4: serial at 01c29000 { + uart4: serial at 1c29000 { compatible = "snps,dw-apb-uart"; reg = <0x01c29000 0x400>; interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>; @@ -959,7 +959,7 @@ status = "disabled"; }; - uart5: serial at 01c29400 { + uart5: serial at 1c29400 { compatible = "snps,dw-apb-uart"; reg = <0x01c29400 0x400>; interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>; @@ -969,7 +969,7 @@ status = "disabled"; }; - uart6: serial at 01c29800 { + uart6: serial at 1c29800 { compatible = "snps,dw-apb-uart"; reg = <0x01c29800 0x400>; interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>; @@ -979,7 +979,7 @@ status = "disabled"; }; - uart7: serial at 01c29c00 { + uart7: serial at 1c29c00 { compatible = "snps,dw-apb-uart"; reg = <0x01c29c00 0x400>; interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>; @@ -989,7 +989,7 @@ status = "disabled"; }; - ps20: ps2 at 01c2a000 { + ps20: ps2 at 1c2a000 { compatible = "allwinner,sun4i-a10-ps2"; reg = <0x01c2a000 0x400>; interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>; @@ -997,7 +997,7 @@ status = "disabled"; }; - ps21: ps2 at 01c2a400 { + ps21: ps2 at 1c2a400 { compatible = "allwinner,sun4i-a10-ps2"; reg = <0x01c2a400 0x400>; interrupts = <GIC_SPI 63 IRQ_TYPE_LEVEL_HIGH>; @@ -1005,7 +1005,7 @@ status = "disabled"; }; - i2c0: i2c at 01c2ac00 { + i2c0: i2c at 1c2ac00 { compatible = "allwinner,sun7i-a20-i2c", "allwinner,sun4i-a10-i2c"; reg = <0x01c2ac00 0x400>; @@ -1016,7 +1016,7 @@ #size-cells = <0>; }; - i2c1: i2c at 01c2b000 { + i2c1: i2c at 1c2b000 { compatible = "allwinner,sun7i-a20-i2c", "allwinner,sun4i-a10-i2c"; reg = <0x01c2b000 0x400>; @@ -1027,7 +1027,7 @@ #size-cells = <0>; }; - i2c2: i2c at 01c2b400 { + i2c2: i2c at 1c2b400 { compatible = "allwinner,sun7i-a20-i2c", "allwinner,sun4i-a10-i2c"; reg = <0x01c2b400 0x400>; @@ -1038,7 +1038,7 @@ #size-cells = <0>; }; - i2c3: i2c at 01c2b800 { + i2c3: i2c at 1c2b800 { compatible = "allwinner,sun7i-a20-i2c", "allwinner,sun4i-a10-i2c"; reg = <0x01c2b800 0x400>; @@ -1049,7 +1049,7 @@ #size-cells = <0>; }; - can0: can at 01c2bc00 { + can0: can at 1c2bc00 { compatible = "allwinner,sun7i-a20-can", "allwinner,sun4i-a10-can"; reg = <0x01c2bc00 0x400>; @@ -1058,7 +1058,7 @@ status = "disabled"; }; - i2c4: i2c at 01c2c000 { + i2c4: i2c at 1c2c000 { compatible = "allwinner,sun7i-a20-i2c", "allwinner,sun4i-a10-i2c"; reg = <0x01c2c000 0x400>; @@ -1069,7 +1069,7 @@ #size-cells = <0>; }; - gmac: ethernet at 01c50000 { + gmac: ethernet at 1c50000 { compatible = "allwinner,sun7i-a20-gmac"; reg = <0x01c50000 0x10000>; interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>; @@ -1084,7 +1084,7 @@ #size-cells = <0>; }; - hstimer at 01c60000 { + hstimer at 1c60000 { compatible = "allwinner,sun7i-a20-hstimer"; reg = <0x01c60000 0x1000>; interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>, @@ -1094,7 +1094,7 @@ clocks = <&ccu CLK_AHB_HSTIMER>; }; - gic: interrupt-controller at 01c81000 { + gic: interrupt-controller at 1c81000 { compatible = "arm,gic-400", "arm,cortex-a7-gic", "arm,cortex-a15-gic"; reg = <0x01c81000 0x1000>, <0x01c82000 0x2000>, diff --git a/arch/arm/boot/dts/sun8i-a23-a33.dtsi b/arch/arm/boot/dts/sun8i-a23-a33.dtsi index ea50dda75adc..971f9be699a7 100644 --- a/arch/arm/boot/dts/sun8i-a23-a33.dtsi +++ b/arch/arm/boot/dts/sun8i-a23-a33.dtsi @@ -118,13 +118,13 @@ }; }; - soc at 01c00000 { + soc at 1c00000 { compatible = "simple-bus"; #address-cells = <1>; #size-cells = <1>; ranges; - dma: dma-controller at 01c02000 { + dma: dma-controller at 1c02000 { compatible = "allwinner,sun8i-a23-dma"; reg = <0x01c02000 0x1000>; interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>; @@ -133,7 +133,7 @@ #dma-cells = <1>; }; - mmc0: mmc at 01c0f000 { + mmc0: mmc at 1c0f000 { compatible = "allwinner,sun7i-a20-mmc"; reg = <0x01c0f000 0x1000>; clocks = <&ccu CLK_BUS_MMC0>, @@ -152,7 +152,7 @@ #size-cells = <0>; }; - mmc1: mmc at 01c10000 { + mmc1: mmc at 1c10000 { compatible = "allwinner,sun7i-a20-mmc"; reg = <0x01c10000 0x1000>; clocks = <&ccu CLK_BUS_MMC1>, @@ -171,7 +171,7 @@ #size-cells = <0>; }; - mmc2: mmc at 01c11000 { + mmc2: mmc at 1c11000 { compatible = "allwinner,sun7i-a20-mmc"; reg = <0x01c11000 0x1000>; clocks = <&ccu CLK_BUS_MMC2>, @@ -190,7 +190,7 @@ #size-cells = <0>; }; - nfc: nand at 01c03000 { + nfc: nand at 1c03000 { compatible = "allwinner,sun4i-a10-nand"; reg = <0x01c03000 0x1000>; interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>; @@ -203,7 +203,7 @@ #size-cells = <0>; }; - usb_otg: usb at 01c19000 { + usb_otg: usb at 1c19000 { /* compatible gets set in SoC specific dtsi file */ reg = <0x01c19000 0x0400>; clocks = <&ccu CLK_BUS_OTG>; @@ -216,7 +216,7 @@ status = "disabled"; }; - usbphy: phy at 01c19400 { + usbphy: phy at 1c19400 { /* * compatible and address regions get set in * SoC specific dtsi file @@ -233,7 +233,7 @@ #phy-cells = <1>; }; - ehci0: usb at 01c1a000 { + ehci0: usb at 1c1a000 { compatible = "allwinner,sun8i-a23-ehci", "generic-ehci"; reg = <0x01c1a000 0x100>; interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>; @@ -244,7 +244,7 @@ status = "disabled"; }; - ohci0: usb at 01c1a400 { + ohci0: usb at 1c1a400 { compatible = "allwinner,sun8i-a23-ohci", "generic-ohci"; reg = <0x01c1a400 0x100>; interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>; @@ -255,7 +255,7 @@ status = "disabled"; }; - ccu: clock at 01c20000 { + ccu: clock at 1c20000 { reg = <0x01c20000 0x400>; clocks = <&osc24M>, <&rtc 0>; clock-names = "hosc", "losc"; @@ -263,7 +263,7 @@ #reset-cells = <1>; }; - pio: pinctrl at 01c20800 { + pio: pinctrl at 1c20800 { /* compatible gets set in SoC specific dtsi file */ reg = <0x01c20800 0x400>; /* interrupts get set in SoC specific dtsi file */ @@ -344,7 +344,7 @@ }; }; - timer at 01c20c00 { + timer at 1c20c00 { compatible = "allwinner,sun4i-a10-timer"; reg = <0x01c20c00 0xa0>; interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>, @@ -352,13 +352,13 @@ clocks = <&osc24M>; }; - wdt0: watchdog at 01c20ca0 { + wdt0: watchdog at 1c20ca0 { compatible = "allwinner,sun6i-a31-wdt"; reg = <0x01c20ca0 0x20>; interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>; }; - pwm: pwm at 01c21400 { + pwm: pwm at 1c21400 { compatible = "allwinner,sun7i-a20-pwm"; reg = <0x01c21400 0xc>; clocks = <&osc24M>; @@ -366,14 +366,14 @@ status = "disabled"; }; - lradc: lradc at 01c22800 { + lradc: lradc at 1c22800 { compatible = "allwinner,sun4i-a10-lradc-keys"; reg = <0x01c22800 0x100>; interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>; status = "disabled"; }; - uart0: serial at 01c28000 { + uart0: serial at 1c28000 { compatible = "snps,dw-apb-uart"; reg = <0x01c28000 0x400>; interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>; @@ -386,7 +386,7 @@ status = "disabled"; }; - uart1: serial at 01c28400 { + uart1: serial at 1c28400 { compatible = "snps,dw-apb-uart"; reg = <0x01c28400 0x400>; interrupts = <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>; @@ -399,7 +399,7 @@ status = "disabled"; }; - uart2: serial at 01c28800 { + uart2: serial at 1c28800 { compatible = "snps,dw-apb-uart"; reg = <0x01c28800 0x400>; interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>; @@ -412,7 +412,7 @@ status = "disabled"; }; - uart3: serial at 01c28c00 { + uart3: serial at 1c28c00 { compatible = "snps,dw-apb-uart"; reg = <0x01c28c00 0x400>; interrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>; @@ -425,7 +425,7 @@ status = "disabled"; }; - uart4: serial at 01c29000 { + uart4: serial at 1c29000 { compatible = "snps,dw-apb-uart"; reg = <0x01c29000 0x400>; interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>; @@ -438,7 +438,7 @@ status = "disabled"; }; - i2c0: i2c at 01c2ac00 { + i2c0: i2c at 1c2ac00 { compatible = "allwinner,sun6i-a31-i2c"; reg = <0x01c2ac00 0x400>; interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>; @@ -449,7 +449,7 @@ #size-cells = <0>; }; - i2c1: i2c at 01c2b000 { + i2c1: i2c at 1c2b000 { compatible = "allwinner,sun6i-a31-i2c"; reg = <0x01c2b000 0x400>; interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>; @@ -460,7 +460,7 @@ #size-cells = <0>; }; - i2c2: i2c at 01c2b400 { + i2c2: i2c at 1c2b400 { compatible = "allwinner,sun6i-a31-i2c"; reg = <0x01c2b400 0x400>; interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>; @@ -498,7 +498,7 @@ assigned-clock-rates = <384000000>; }; - gic: interrupt-controller at 01c81000 { + gic: interrupt-controller at 1c81000 { compatible = "arm,cortex-a7-gic", "arm,cortex-a15-gic"; reg = <0x01c81000 0x1000>, <0x01c82000 0x2000>, @@ -509,7 +509,7 @@ interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>; }; - rtc: rtc at 01f00000 { + rtc: rtc at 1f00000 { compatible = "allwinner,sun6i-a31-rtc"; reg = <0x01f00000 0x54>; interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>, @@ -527,7 +527,7 @@ interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>; }; - prcm at 01f01400 { + prcm at 1f01400 { compatible = "allwinner,sun8i-a23-prcm"; reg = <0x01f01400 0x200>; @@ -575,12 +575,12 @@ }; }; - cpucfg at 01f01c00 { + cpucfg at 1f01c00 { compatible = "allwinner,sun8i-a23-cpuconfig"; reg = <0x01f01c00 0x300>; }; - r_uart: serial at 01f02800 { + r_uart: serial at 1f02800 { compatible = "snps,dw-apb-uart"; reg = <0x01f02800 0x400>; interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>; @@ -591,7 +591,7 @@ status = "disabled"; }; - r_pio: pinctrl at 01f02c00 { + r_pio: pinctrl at 1f02c00 { compatible = "allwinner,sun8i-a23-r-pinctrl"; reg = <0x01f02c00 0x400>; interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>; @@ -618,7 +618,7 @@ }; }; - r_rsb: rsb at 01f03400 { + r_rsb: rsb at 1f03400 { compatible = "allwinner,sun8i-a23-rsb"; reg = <0x01f03400 0x400>; interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>; diff --git a/arch/arm/boot/dts/sun8i-a23.dtsi b/arch/arm/boot/dts/sun8i-a23.dtsi index 4d1f929780a8..58e6585b504b 100644 --- a/arch/arm/boot/dts/sun8i-a23.dtsi +++ b/arch/arm/boot/dts/sun8i-a23.dtsi @@ -49,8 +49,8 @@ reg = <0x40000000 0x40000000>; }; - soc at 01c00000 { - codec: codec at 01c22c00 { + soc at 1c00000 { + codec: codec at 1c22c00 { #sound-dai-cells = <0>; compatible = "allwinner,sun8i-a23-codec"; reg = <0x01c22c00 0x400>; diff --git a/arch/arm/boot/dts/sun8i-a33.dtsi b/arch/arm/boot/dts/sun8i-a33.dtsi index 22660919bd08..50eb84fa246a 100644 --- a/arch/arm/boot/dts/sun8i-a33.dtsi +++ b/arch/arm/boot/dts/sun8i-a33.dtsi @@ -203,8 +203,8 @@ }; }; - soc at 01c00000 { - tcon0: lcd-controller at 01c0c000 { + soc at 1c00000 { + tcon0: lcd-controller at 1c0c000 { compatible = "allwinner,sun8i-a33-tcon"; reg = <0x01c0c000 0x1000>; interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>; @@ -240,7 +240,7 @@ }; }; - crypto: crypto-engine at 01c15000 { + crypto: crypto-engine at 1c15000 { compatible = "allwinner,sun4i-a10-crypto"; reg = <0x01c15000 0x1000>; interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>; @@ -250,7 +250,7 @@ reset-names = "ahb"; }; - dai: dai at 01c22c00 { + dai: dai at 1c22c00 { #sound-dai-cells = <0>; compatible = "allwinner,sun6i-a31-i2s"; reg = <0x01c22c00 0x200>; @@ -263,7 +263,7 @@ status = "disabled"; }; - codec: codec at 01c22e00 { + codec: codec at 1c22e00 { #sound-dai-cells = <0>; compatible = "allwinner,sun8i-a33-codec"; reg = <0x01c22e00 0x400>; @@ -273,14 +273,14 @@ status = "disabled"; }; - ths: ths at 01c25000 { + ths: ths at 1c25000 { compatible = "allwinner,sun8i-a33-ths"; reg = <0x01c25000 0x100>; #thermal-sensor-cells = <0>; #io-channel-cells = <0>; }; - fe0: display-frontend at 01e00000 { + fe0: display-frontend at 1e00000 { compatible = "allwinner,sun8i-a33-display-frontend"; reg = <0x01e00000 0x20000>; interrupts = <GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH>; @@ -308,7 +308,7 @@ }; }; - be0: display-backend at 01e60000 { + be0: display-backend at 1e60000 { compatible = "allwinner,sun8i-a33-display-backend"; reg = <0x01e60000 0x10000>, <0x01e80000 0x1000>; reg-names = "be", "sat"; @@ -350,7 +350,7 @@ }; }; - drc0: drc at 01e70000 { + drc0: drc at 1e70000 { compatible = "allwinner,sun8i-a33-drc"; reg = <0x01e70000 0x10000>; interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>; diff --git a/arch/arm/boot/dts/sun8i-v3s.dtsi b/arch/arm/boot/dts/sun8i-v3s.dtsi index 3a06dc5b3746..443b083c6adc 100644 --- a/arch/arm/boot/dts/sun8i-v3s.dtsi +++ b/arch/arm/boot/dts/sun8i-v3s.dtsi @@ -178,7 +178,7 @@ }; - mmc0: mmc at 01c0f000 { + mmc0: mmc at 1c0f000 { compatible = "allwinner,sun7i-a20-mmc"; reg = <0x01c0f000 0x1000>; clocks = <&ccu CLK_BUS_MMC0>, @@ -197,7 +197,7 @@ #size-cells = <0>; }; - mmc1: mmc at 01c10000 { + mmc1: mmc at 1c10000 { compatible = "allwinner,sun7i-a20-mmc"; reg = <0x01c10000 0x1000>; clocks = <&ccu CLK_BUS_MMC1>, @@ -218,7 +218,7 @@ #size-cells = <0>; }; - mmc2: mmc at 01c11000 { + mmc2: mmc at 1c11000 { compatible = "allwinner,sun7i-a20-mmc"; reg = <0x01c11000 0x1000>; clocks = <&ccu CLK_BUS_MMC2>, @@ -237,7 +237,7 @@ #size-cells = <0>; }; - usb_otg: usb at 01c19000 { + usb_otg: usb at 1c19000 { compatible = "allwinner,sun8i-h3-musb"; reg = <0x01c19000 0x0400>; clocks = <&ccu CLK_BUS_OTG>; @@ -250,7 +250,7 @@ status = "disabled"; }; - usbphy: phy at 01c19400 { + usbphy: phy at 1c19400 { compatible = "allwinner,sun8i-v3s-usb-phy"; reg = <0x01c19400 0x2c>, <0x01c1a800 0x4>; @@ -264,7 +264,7 @@ #phy-cells = <1>; }; - ccu: clock at 01c20000 { + ccu: clock at 1c20000 { compatible = "allwinner,sun8i-v3s-ccu"; reg = <0x01c20000 0x400>; clocks = <&osc24M>, <&osc32k>; @@ -273,14 +273,14 @@ #reset-cells = <1>; }; - rtc: rtc at 01c20400 { + rtc: rtc at 1c20400 { compatible = "allwinner,sun6i-a31-rtc"; reg = <0x01c20400 0x54>; interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>; }; - pio: pinctrl at 01c20800 { + pio: pinctrl at 1c20800 { compatible = "allwinner,sun8i-v3s-pinctrl"; reg = <0x01c20800 0x400>; interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>, @@ -324,7 +324,7 @@ }; }; - timer at 01c20c00 { + timer at 1c20c00 { compatible = "allwinner,sun4i-a10-timer"; reg = <0x01c20c00 0xa0>; interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>, @@ -332,7 +332,7 @@ clocks = <&osc24M>; }; - wdt0: watchdog at 01c20ca0 { + wdt0: watchdog at 1c20ca0 { compatible = "allwinner,sun6i-a31-wdt"; reg = <0x01c20ca0 0x20>; interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>; @@ -345,7 +345,7 @@ status = "disabled"; }; - uart0: serial at 01c28000 { + uart0: serial at 1c28000 { compatible = "snps,dw-apb-uart"; reg = <0x01c28000 0x400>; interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>; @@ -356,7 +356,7 @@ status = "disabled"; }; - uart1: serial at 01c28400 { + uart1: serial at 1c28400 { compatible = "snps,dw-apb-uart"; reg = <0x01c28400 0x400>; interrupts = <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>; @@ -367,7 +367,7 @@ status = "disabled"; }; - uart2: serial at 01c28800 { + uart2: serial at 1c28800 { compatible = "snps,dw-apb-uart"; reg = <0x01c28800 0x400>; interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>; @@ -378,7 +378,7 @@ status = "disabled"; }; - i2c0: i2c at 01c2ac00 { + i2c0: i2c at 1c2ac00 { compatible = "allwinner,sun6i-a31-i2c"; reg = <0x01c2ac00 0x400>; interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>; @@ -391,7 +391,7 @@ #size-cells = <0>; }; - i2c1: i2c at 01c2b000 { + i2c1: i2c at 1c2b000 { compatible = "allwinner,sun6i-a31-i2c"; reg = <0x01c2b000 0x400>; interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>; @@ -416,7 +416,7 @@ #size-cells = <0>; }; - gic: interrupt-controller at 01c81000 { + gic: interrupt-controller at 1c81000 { compatible = "arm,cortex-a7-gic", "arm,cortex-a15-gic"; reg = <0x01c81000 0x1000>, <0x01c82000 0x1000>, diff --git a/arch/arm/boot/dts/sun9i-a80.dtsi b/arch/arm/boot/dts/sun9i-a80.dtsi index 759a72317eb8..19b01d0bdc37 100644 --- a/arch/arm/boot/dts/sun9i-a80.dtsi +++ b/arch/arm/boot/dts/sun9i-a80.dtsi @@ -164,7 +164,7 @@ clock-output-names = "osc32k"; }; - cpus_clk: clk at 08001410 { + cpus_clk: clk at 8001410 { compatible = "allwinner,sun9i-a80-cpus-clk"; reg = <0x08001410 0x4>; #clock-cells = <0>; @@ -183,7 +183,7 @@ clock-output-names = "ahbs"; }; - apbs: clk at 0800141c { + apbs: clk at 800141c { compatible = "allwinner,sun8i-a23-apb0-clk"; reg = <0x0800141c 0x4>; #clock-cells = <0>; @@ -191,7 +191,7 @@ clock-output-names = "apbs"; }; - apbs_gates: clk at 08001428 { + apbs_gates: clk at 8001428 { compatible = "allwinner,sun9i-a80-apbs-gates-clk"; reg = <0x08001428 0x4>; #clock-cells = <1>; @@ -212,7 +212,7 @@ "apbs_i2s1", "apbs_twd"; }; - r_1wire_clk: clk at 08001450 { + r_1wire_clk: clk at 8001450 { reg = <0x08001450 0x4>; #clock-cells = <0>; compatible = "allwinner,sun4i-a10-mod0-clk"; @@ -220,7 +220,7 @@ clock-output-names = "r_1wire"; }; - r_ir_clk: clk at 08001454 { + r_ir_clk: clk at 8001454 { reg = <0x08001454 0x4>; #clock-cells = <0>; compatible = "allwinner,sun4i-a10-mod0-clk"; @@ -239,7 +239,7 @@ */ ranges = <0 0 0 0x20000000>; - ehci0: usb at 00a00000 { + ehci0: usb at a00000 { compatible = "allwinner,sun9i-a80-ehci", "generic-ehci"; reg = <0x00a00000 0x100>; interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>; @@ -250,7 +250,7 @@ status = "disabled"; }; - ohci0: usb at 00a00400 { + ohci0: usb at a00400 { compatible = "allwinner,sun9i-a80-ohci", "generic-ohci"; reg = <0x00a00400 0x100>; interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>; @@ -262,7 +262,7 @@ status = "disabled"; }; - usbphy1: phy at 00a00800 { + usbphy1: phy at a00800 { compatible = "allwinner,sun9i-a80-usb-phy"; reg = <0x00a00800 0x4>; clocks = <&usb_clocks CLK_USB0_PHY>; @@ -273,7 +273,7 @@ #phy-cells = <0>; }; - ehci1: usb at 00a01000 { + ehci1: usb at a01000 { compatible = "allwinner,sun9i-a80-ehci", "generic-ehci"; reg = <0x00a01000 0x100>; interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>; @@ -284,7 +284,7 @@ status = "disabled"; }; - usbphy2: phy at 00a01800 { + usbphy2: phy at a01800 { compatible = "allwinner,sun9i-a80-usb-phy"; reg = <0x00a01800 0x4>; clocks = <&usb_clocks CLK_USB1_HSIC>, @@ -303,7 +303,7 @@ phy_type = "hsic"; }; - ehci2: usb at 00a02000 { + ehci2: usb at a02000 { compatible = "allwinner,sun9i-a80-ehci", "generic-ehci"; reg = <0x00a02000 0x100>; interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>; @@ -314,7 +314,7 @@ status = "disabled"; }; - ohci2: usb at 00a02400 { + ohci2: usb at a02400 { compatible = "allwinner,sun9i-a80-ohci", "generic-ohci"; reg = <0x00a02400 0x100>; interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>; @@ -326,7 +326,7 @@ status = "disabled"; }; - usbphy3: phy at 00a02800 { + usbphy3: phy at a02800 { compatible = "allwinner,sun9i-a80-usb-phy"; reg = <0x00a02800 0x4>; clocks = <&usb_clocks CLK_USB2_HSIC>, @@ -343,7 +343,7 @@ #phy-cells = <0>; }; - usb_clocks: clock at 00a08000 { + usb_clocks: clock at a08000 { compatible = "allwinner,sun9i-a80-usb-clks"; reg = <0x00a08000 0x8>; clocks = <&ccu CLK_BUS_USB>, <&osc24M>; @@ -352,7 +352,7 @@ #reset-cells = <1>; }; - mmc0: mmc at 01c0f000 { + mmc0: mmc at 1c0f000 { compatible = "allwinner,sun9i-a80-mmc"; reg = <0x01c0f000 0x1000>; clocks = <&mmc_config_clk 0>, <&ccu CLK_MMC0>, @@ -367,7 +367,7 @@ #size-cells = <0>; }; - mmc1: mmc at 01c10000 { + mmc1: mmc at 1c10000 { compatible = "allwinner,sun9i-a80-mmc"; reg = <0x01c10000 0x1000>; clocks = <&mmc_config_clk 1>, <&ccu CLK_MMC1>, @@ -382,7 +382,7 @@ #size-cells = <0>; }; - mmc2: mmc at 01c11000 { + mmc2: mmc at 1c11000 { compatible = "allwinner,sun9i-a80-mmc"; reg = <0x01c11000 0x1000>; clocks = <&mmc_config_clk 2>, <&ccu CLK_MMC2>, @@ -397,7 +397,7 @@ #size-cells = <0>; }; - mmc3: mmc at 01c12000 { + mmc3: mmc at 1c12000 { compatible = "allwinner,sun9i-a80-mmc"; reg = <0x01c12000 0x1000>; clocks = <&mmc_config_clk 3>, <&ccu CLK_MMC3>, @@ -412,7 +412,7 @@ #size-cells = <0>; }; - mmc_config_clk: clk at 01c13000 { + mmc_config_clk: clk at 1c13000 { compatible = "allwinner,sun9i-a80-mmc-config-clk"; reg = <0x01c13000 0x10>; clocks = <&ccu CLK_BUS_MMC>; @@ -425,7 +425,7 @@ "mmc2_config", "mmc3_config"; }; - gic: interrupt-controller at 01c41000 { + gic: interrupt-controller at 1c41000 { compatible = "arm,cortex-a7-gic", "arm,cortex-a15-gic"; reg = <0x01c41000 0x1000>, <0x01c42000 0x2000>, @@ -436,7 +436,7 @@ interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>; }; - de_clocks: clock at 03000000 { + de_clocks: clock at 3000000 { compatible = "allwinner,sun9i-a80-de-clks"; reg = <0x03000000 0x30>; clocks = <&ccu CLK_DE>, @@ -450,7 +450,7 @@ #reset-cells = <1>; }; - ccu: clock at 06000000 { + ccu: clock at 6000000 { compatible = "allwinner,sun9i-a80-ccu"; reg = <0x06000000 0x800>; clocks = <&osc24M>, <&osc32k>; @@ -459,7 +459,7 @@ #reset-cells = <1>; }; - timer at 06000c00 { + timer at 6000c00 { compatible = "allwinner,sun4i-a10-timer"; reg = <0x06000c00 0xa0>; interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>, @@ -472,13 +472,13 @@ clocks = <&osc24M>; }; - wdt: watchdog at 06000ca0 { + wdt: watchdog at 6000ca0 { compatible = "allwinner,sun6i-a31-wdt"; reg = <0x06000ca0 0x20>; interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>; }; - pio: pinctrl at 06000800 { + pio: pinctrl at 6000800 { compatible = "allwinner,sun9i-a80-pinctrl"; reg = <0x06000800 0x400>; interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>, @@ -536,7 +536,7 @@ }; }; - uart0: serial at 07000000 { + uart0: serial at 7000000 { compatible = "snps,dw-apb-uart"; reg = <0x07000000 0x400>; interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>; @@ -547,7 +547,7 @@ status = "disabled"; }; - uart1: serial at 07000400 { + uart1: serial at 7000400 { compatible = "snps,dw-apb-uart"; reg = <0x07000400 0x400>; interrupts = <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>; @@ -558,7 +558,7 @@ status = "disabled"; }; - uart2: serial at 07000800 { + uart2: serial at 7000800 { compatible = "snps,dw-apb-uart"; reg = <0x07000800 0x400>; interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>; @@ -569,7 +569,7 @@ status = "disabled"; }; - uart3: serial at 07000c00 { + uart3: serial at 7000c00 { compatible = "snps,dw-apb-uart"; reg = <0x07000c00 0x400>; interrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>; @@ -580,7 +580,7 @@ status = "disabled"; }; - uart4: serial at 07001000 { + uart4: serial at 7001000 { compatible = "snps,dw-apb-uart"; reg = <0x07001000 0x400>; interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>; @@ -591,7 +591,7 @@ status = "disabled"; }; - uart5: serial at 07001400 { + uart5: serial at 7001400 { compatible = "snps,dw-apb-uart"; reg = <0x07001400 0x400>; interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>; @@ -602,7 +602,7 @@ status = "disabled"; }; - i2c0: i2c at 07002800 { + i2c0: i2c at 7002800 { compatible = "allwinner,sun6i-a31-i2c"; reg = <0x07002800 0x400>; interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>; @@ -613,7 +613,7 @@ #size-cells = <0>; }; - i2c1: i2c at 07002c00 { + i2c1: i2c at 7002c00 { compatible = "allwinner,sun6i-a31-i2c"; reg = <0x07002c00 0x400>; interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>; @@ -624,7 +624,7 @@ #size-cells = <0>; }; - i2c2: i2c at 07003000 { + i2c2: i2c at 7003000 { compatible = "allwinner,sun6i-a31-i2c"; reg = <0x07003000 0x400>; interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>; @@ -635,7 +635,7 @@ #size-cells = <0>; }; - i2c3: i2c at 07003400 { + i2c3: i2c at 7003400 { compatible = "allwinner,sun6i-a31-i2c"; reg = <0x07003400 0x400>; interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>; @@ -646,7 +646,7 @@ #size-cells = <0>; }; - i2c4: i2c at 07003800 { + i2c4: i2c at 7003800 { compatible = "allwinner,sun6i-a31-i2c"; reg = <0x07003800 0x400>; interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>; @@ -657,19 +657,19 @@ #size-cells = <0>; }; - r_wdt: watchdog at 08001000 { + r_wdt: watchdog at 8001000 { compatible = "allwinner,sun6i-a31-wdt"; reg = <0x08001000 0x20>; interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>; }; - apbs_rst: reset at 080014b0 { + apbs_rst: reset at 80014b0 { reg = <0x080014b0 0x4>; compatible = "allwinner,sun6i-a31-clock-reset"; #reset-cells = <1>; }; - nmi_intc: interrupt-controller at 080015a0 { + nmi_intc: interrupt-controller at 80015a0 { compatible = "allwinner,sun9i-a80-nmi"; interrupt-controller; #interrupt-cells = <2>; @@ -677,7 +677,7 @@ interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>; }; - r_ir: ir at 08002000 { + r_ir: ir at 8002000 { compatible = "allwinner,sun5i-a13-ir"; interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>; pinctrl-names = "default"; @@ -689,7 +689,7 @@ status = "disabled"; }; - r_uart: serial at 08002800 { + r_uart: serial at 8002800 { compatible = "snps,dw-apb-uart"; reg = <0x08002800 0x400>; interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>; @@ -700,7 +700,7 @@ status = "disabled"; }; - r_pio: pinctrl at 08002c00 { + r_pio: pinctrl at 8002c00 { compatible = "allwinner,sun9i-a80-r-pinctrl"; reg = <0x08002c00 0x400>; interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>, @@ -726,7 +726,7 @@ }; }; - r_rsb: i2c at 08003400 { + r_rsb: i2c at 8003400 { compatible = "allwinner,sun8i-a23-rsb"; reg = <0x08003400 0x400>; interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>; -- git-series 0.9.1 ^ permalink raw reply related [flat|nested] 50+ messages in thread
* [PATCH 01/20] ARM: dts: sunxi: Remove leading zeros from unit-addresses 2017-10-05 10:49 ` [PATCH 01/20] ARM: dts: sunxi: Remove leading zeros from unit-addresses Maxime Ripard @ 2017-10-05 15:22 ` Chen-Yu Tsai 0 siblings, 0 replies; 50+ messages in thread From: Chen-Yu Tsai @ 2017-10-05 15:22 UTC (permalink / raw) To: linux-arm-kernel On Thu, Oct 5, 2017 at 6:49 PM, Maxime Ripard <maxime.ripard@free-electrons.com> wrote: > Most of our device trees have had leading zeros for padding as part of > the nodes unit-addresses. > > Remove all these useless zeros that generate warnings > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Acked-by: Chen-Yu Tsai <wens@csie.org> ^ permalink raw reply [flat|nested] 50+ messages in thread
* [PATCH 02/20] ARM: dts: axp209: Rename usb_power_supply node to avoid warnings 2017-10-05 10:49 [PATCH 00/20] sunxi: Cleanup DT warnings for the A10 and A80 Maxime Ripard 2017-10-05 10:49 ` [PATCH 01/20] ARM: dts: sunxi: Remove leading zeros from unit-addresses Maxime Ripard @ 2017-10-05 10:49 ` Maxime Ripard 2017-10-05 15:22 ` Chen-Yu Tsai 2017-10-05 10:49 ` [PATCH 03/20] ARM: dts: sun4i: Change framebuffer node names " Maxime Ripard ` (17 subsequent siblings) 19 siblings, 1 reply; 50+ messages in thread From: Maxime Ripard @ 2017-10-05 10:49 UTC (permalink / raw) To: linux-arm-kernel The USB power supply node in the AXP209 DTSI is using underscores in its node name, which is generating a warning. Change those underscores for hyphens. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> --- arch/arm/boot/dts/axp209.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/axp209.dtsi b/arch/arm/boot/dts/axp209.dtsi index 3c8fa26e87b7..897103e0a79b 100644 --- a/arch/arm/boot/dts/axp209.dtsi +++ b/arch/arm/boot/dts/axp209.dtsi @@ -107,7 +107,7 @@ }; }; - usb_power_supply: usb_power_supply { + usb_power_supply: usb-power-supply { compatible = "x-powers,axp202-usb-power-supply"; status = "disabled"; }; -- git-series 0.9.1 ^ permalink raw reply related [flat|nested] 50+ messages in thread
* [PATCH 02/20] ARM: dts: axp209: Rename usb_power_supply node to avoid warnings 2017-10-05 10:49 ` [PATCH 02/20] ARM: dts: axp209: Rename usb_power_supply node to avoid warnings Maxime Ripard @ 2017-10-05 15:22 ` Chen-Yu Tsai 0 siblings, 0 replies; 50+ messages in thread From: Chen-Yu Tsai @ 2017-10-05 15:22 UTC (permalink / raw) To: linux-arm-kernel On Thu, Oct 5, 2017 at 6:49 PM, Maxime Ripard <maxime.ripard@free-electrons.com> wrote: > The USB power supply node in the AXP209 DTSI is using underscores in its > node name, which is generating a warning. Change those underscores for > hyphens. > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Acked-by: Chen-Yu Tsai <wens@csie.org> ^ permalink raw reply [flat|nested] 50+ messages in thread
* [PATCH 03/20] ARM: dts: sun4i: Change framebuffer node names to avoid warnings 2017-10-05 10:49 [PATCH 00/20] sunxi: Cleanup DT warnings for the A10 and A80 Maxime Ripard 2017-10-05 10:49 ` [PATCH 01/20] ARM: dts: sunxi: Remove leading zeros from unit-addresses Maxime Ripard 2017-10-05 10:49 ` [PATCH 02/20] ARM: dts: axp209: Rename usb_power_supply node to avoid warnings Maxime Ripard @ 2017-10-05 10:49 ` Maxime Ripard 2017-10-05 15:23 ` Chen-Yu Tsai 2017-10-05 10:49 ` [PATCH 04/20] ARM: dts: sun4i: Change clock " Maxime Ripard ` (16 subsequent siblings) 19 siblings, 1 reply; 50+ messages in thread From: Maxime Ripard @ 2017-10-05 10:49 UTC (permalink / raw) To: linux-arm-kernel The simple-framebuffer nodes have a unit address, but no reg property which generates a warning when compiling it with DTC. Change the simple-framebuffer node names so that there is no warnings on this anymore. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> --- arch/arm/boot/dts/sun4i-a10.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi index 82d4ab6fbbcd..442d46e7cc8b 100644 --- a/arch/arm/boot/dts/sun4i-a10.dtsi +++ b/arch/arm/boot/dts/sun4i-a10.dtsi @@ -60,7 +60,7 @@ #size-cells = <1>; ranges; - framebuffer at 0 { + framebuffer-lcd0-hdmi { compatible = "allwinner,simple-framebuffer", "simple-framebuffer"; allwinner,pipeline = "de_be0-lcd0-hdmi"; @@ -70,7 +70,7 @@ status = "disabled"; }; - framebuffer at 1 { + framebuffer-fe0-lcd0-hdmi { compatible = "allwinner,simple-framebuffer", "simple-framebuffer"; allwinner,pipeline = "de_fe0-de_be0-lcd0-hdmi"; @@ -82,7 +82,7 @@ status = "disabled"; }; - framebuffer at 2 { + framebuffer-fe0-lcd0 { compatible = "allwinner,simple-framebuffer", "simple-framebuffer"; allwinner,pipeline = "de_fe0-de_be0-lcd0"; @@ -93,7 +93,7 @@ status = "disabled"; }; - framebuffer at 3 { + framebuffer-fe0-lcd0-tve0 { compatible = "allwinner,simple-framebuffer", "simple-framebuffer"; allwinner,pipeline = "de_fe0-de_be0-lcd0-tve0"; -- git-series 0.9.1 ^ permalink raw reply related [flat|nested] 50+ messages in thread
* [PATCH 03/20] ARM: dts: sun4i: Change framebuffer node names to avoid warnings 2017-10-05 10:49 ` [PATCH 03/20] ARM: dts: sun4i: Change framebuffer node names " Maxime Ripard @ 2017-10-05 15:23 ` Chen-Yu Tsai 2017-10-05 15:24 ` Chen-Yu Tsai 0 siblings, 1 reply; 50+ messages in thread From: Chen-Yu Tsai @ 2017-10-05 15:23 UTC (permalink / raw) To: linux-arm-kernel On Thu, Oct 5, 2017 at 6:49 PM, Maxime Ripard <maxime.ripard@free-electrons.com> wrote: > The simple-framebuffer nodes have a unit address, but no reg property which > generates a warning when compiling it with DTC. > > Change the simple-framebuffer node names so that there is no warnings on > this anymore. > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Acked-by: Chen-Yu Tsai <wens@csie.org> Since this is only a couple changed lines per .dtsi, you might want to have them all in one patch? ChenYu ^ permalink raw reply [flat|nested] 50+ messages in thread
* [PATCH 03/20] ARM: dts: sun4i: Change framebuffer node names to avoid warnings 2017-10-05 15:23 ` Chen-Yu Tsai @ 2017-10-05 15:24 ` Chen-Yu Tsai 0 siblings, 0 replies; 50+ messages in thread From: Chen-Yu Tsai @ 2017-10-05 15:24 UTC (permalink / raw) To: linux-arm-kernel On Thu, Oct 5, 2017 at 11:23 PM, Chen-Yu Tsai <wens@csie.org> wrote: > On Thu, Oct 5, 2017 at 6:49 PM, Maxime Ripard > <maxime.ripard@free-electrons.com> wrote: >> The simple-framebuffer nodes have a unit address, but no reg property which >> generates a warning when compiling it with DTC. >> >> Change the simple-framebuffer node names so that there is no warnings on >> this anymore. >> >> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> > > Acked-by: Chen-Yu Tsai <wens@csie.org> > > Since this is only a couple changed lines per .dtsi, you might want to have > them all in one patch? Never mind. I forgot you were only doing sun4i and sun9i right now. ChenYu ^ permalink raw reply [flat|nested] 50+ messages in thread
* [PATCH 04/20] ARM: dts: sun4i: Change clock node names to avoid warnings 2017-10-05 10:49 [PATCH 00/20] sunxi: Cleanup DT warnings for the A10 and A80 Maxime Ripard ` (2 preceding siblings ...) 2017-10-05 10:49 ` [PATCH 03/20] ARM: dts: sun4i: Change framebuffer node names " Maxime Ripard @ 2017-10-05 10:49 ` Maxime Ripard 2017-10-05 15:23 ` Chen-Yu Tsai 2017-10-05 10:49 ` [PATCH 05/20] ARM: dts: sun4i: Change pinctrl nodes to avoid warning Maxime Ripard ` (15 subsequent siblings) 19 siblings, 1 reply; 50+ messages in thread From: Maxime Ripard @ 2017-10-05 10:49 UTC (permalink / raw) To: linux-arm-kernel Our oscillators clock names have a unit address, but no reg property, which generates a warning in DTC. Change these names to remove those unit addresses. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> --- arch/arm/boot/dts/sun4i-a10.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi index 442d46e7cc8b..9671ac72fae9 100644 --- a/arch/arm/boot/dts/sun4i-a10.dtsi +++ b/arch/arm/boot/dts/sun4i-a10.dtsi @@ -169,14 +169,14 @@ #size-cells = <1>; ranges; - osc24M: clk at 1c20050 { + osc24M: clk-24M { #clock-cells = <0>; compatible = "fixed-clock"; clock-frequency = <24000000>; clock-output-names = "osc24M"; }; - osc32k: clk at 0 { + osc32k: clk-32k { #clock-cells = <0>; compatible = "fixed-clock"; clock-frequency = <32768>; -- git-series 0.9.1 ^ permalink raw reply related [flat|nested] 50+ messages in thread
* [PATCH 04/20] ARM: dts: sun4i: Change clock node names to avoid warnings 2017-10-05 10:49 ` [PATCH 04/20] ARM: dts: sun4i: Change clock " Maxime Ripard @ 2017-10-05 15:23 ` Chen-Yu Tsai 0 siblings, 0 replies; 50+ messages in thread From: Chen-Yu Tsai @ 2017-10-05 15:23 UTC (permalink / raw) To: linux-arm-kernel On Thu, Oct 5, 2017 at 6:49 PM, Maxime Ripard <maxime.ripard@free-electrons.com> wrote: > Our oscillators clock names have a unit address, but no reg property, which > generates a warning in DTC. Change these names to remove those unit > addresses. > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Acked-by: Chen-Yu Tsai <wens@csie.org> ^ permalink raw reply [flat|nested] 50+ messages in thread
* [PATCH 05/20] ARM: dts: sun4i: Change pinctrl nodes to avoid warning 2017-10-05 10:49 [PATCH 00/20] sunxi: Cleanup DT warnings for the A10 and A80 Maxime Ripard ` (3 preceding siblings ...) 2017-10-05 10:49 ` [PATCH 04/20] ARM: dts: sun4i: Change clock " Maxime Ripard @ 2017-10-05 10:49 ` Maxime Ripard 2017-10-05 15:29 ` Chen-Yu Tsai 2017-10-05 10:49 ` [PATCH 06/20] ARM: dts: sun4i: Provide default muxing for relevant controllers Maxime Ripard ` (14 subsequent siblings) 19 siblings, 1 reply; 50+ messages in thread From: Maxime Ripard @ 2017-10-05 10:49 UTC (permalink / raw) To: linux-arm-kernel All our pinctrl nodes were using a node name convention with a unit-address to differentiate the different muxing options. However, since those nodes didn't have a reg property, they were generating warnings in DTC. In order to accomodate for this, convert the old nodes to the syntax we've been using for the new SoCs, including removing the letter suffix of the node labels to the bank of those pins to make things more readable. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> --- arch/arm/boot/dts/sun4i-a10-a1000.dts | 12 +- arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts | 10 +- arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts | 10 +- arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 16 +-- arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts | 12 +- arch/arm/boot/dts/sun4i-a10-gemei-g9.dts | 8 +- arch/arm/boot/dts/sun4i-a10-hackberry.dts | 8 +- arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts | 6 +- arch/arm/boot/dts/sun4i-a10-inet1.dts | 12 +- arch/arm/boot/dts/sun4i-a10-inet97fv2.dts | 10 +- arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts | 10 +- arch/arm/boot/dts/sun4i-a10-itead-iteaduino-plus.dts | 21 ++-- arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts | 10 +- arch/arm/boot/dts/sun4i-a10-marsboard.dts | 16 +-- arch/arm/boot/dts/sun4i-a10-mini-xplus.dts | 10 +- arch/arm/boot/dts/sun4i-a10-mk802.dts | 4 +- arch/arm/boot/dts/sun4i-a10-mk802ii.dts | 6 +- arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts | 10 +- arch/arm/boot/dts/sun4i-a10-pcduino.dts | 8 +- arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts | 12 +- arch/arm/boot/dts/sun4i-a10.dtsi | 64 ++++++------- 21 files changed, 141 insertions(+), 134 deletions(-) diff --git a/arch/arm/boot/dts/sun4i-a10-a1000.dts b/arch/arm/boot/dts/sun4i-a10-a1000.dts index f80d37ddc4c6..1c12846227be 100644 --- a/arch/arm/boot/dts/sun4i-a10-a1000.dts +++ b/arch/arm/boot/dts/sun4i-a10-a1000.dts @@ -130,7 +130,7 @@ &emac { pinctrl-names = "default"; - pinctrl-0 = <&emac_pins_a>; + pinctrl-0 = <&emac_pins>; phy = <&phy1>; status = "okay"; }; @@ -141,7 +141,7 @@ &i2c0 { pinctrl-names = "default"; - pinctrl-0 = <&i2c0_pins_a>; + pinctrl-0 = <&i2c0_pins>; status = "okay"; axp209: pmic at 34 { @@ -156,7 +156,7 @@ &ir0 { pinctrl-names = "default"; - pinctrl-0 = <&ir0_rx_pins_a>; + pinctrl-0 = <&ir0_rx_pins>; status = "okay"; }; @@ -171,7 +171,7 @@ &mmc0 { pinctrl-names = "default"; - pinctrl-0 = <&mmc0_pins_a>; + pinctrl-0 = <&mmc0_pins>; vmmc-supply = <®_vcc3v3>; bus-width = <4>; cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */ @@ -236,13 +236,13 @@ &spdif { pinctrl-names = "default"; - pinctrl-0 = <&spdif_tx_pins_a>; + pinctrl-0 = <&spdif_tx_pin>; status = "okay"; }; &uart0 { pinctrl-names = "default"; - pinctrl-0 = <&uart0_pins_a>; + pinctrl-0 = <&uart0_pb_pins>; status = "okay"; }; diff --git a/arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts b/arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts index 6b02de592a02..58fe2fc14f32 100644 --- a/arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts +++ b/arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts @@ -69,7 +69,7 @@ &emac { pinctrl-names = "default"; - pinctrl-0 = <&emac_pins_a>; + pinctrl-0 = <&emac_pins>; phy = <&phy1>; status = "okay"; }; @@ -80,7 +80,7 @@ &i2c0 { pinctrl-names = "default"; - pinctrl-0 = <&i2c0_pins_a>; + pinctrl-0 = <&i2c0_pins>; status = "okay"; axp209: pmic at 34 { @@ -95,7 +95,7 @@ &ir0 { pinctrl-names = "default"; - pinctrl-0 = <&ir0_rx_pins_a>; + pinctrl-0 = <&ir0_rx_pins>; status = "okay"; }; @@ -109,7 +109,7 @@ &mmc0 { pinctrl-names = "default"; - pinctrl-0 = <&mmc0_pins_a>; + pinctrl-0 = <&mmc0_pins>; vmmc-supply = <®_vcc3v3>; bus-width = <4>; cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */ @@ -147,7 +147,7 @@ &uart0 { pinctrl-names = "default"; - pinctrl-0 = <&uart0_pins_a>; + pinctrl-0 = <&uart0_pb_pins>; status = "okay"; }; diff --git a/arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts b/arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts index a7d61994b8fd..b34944188772 100644 --- a/arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts +++ b/arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts @@ -66,7 +66,7 @@ &i2c0 { pinctrl-names = "default"; - pinctrl-0 = <&i2c0_pins_a>; + pinctrl-0 = <&i2c0_pins>; status = "okay"; axp209: pmic at 34 { @@ -81,13 +81,13 @@ &i2c1 { pinctrl-names = "default"; - pinctrl-0 = <&i2c1_pins_a>; + pinctrl-0 = <&i2c1_pins>; status = "okay"; }; &i2c2 { pinctrl-names = "default"; - pinctrl-0 = <&i2c2_pins_a>; + pinctrl-0 = <&i2c2_pins>; status = "okay"; ft5306de4: touchscreen at 38 { @@ -128,7 +128,7 @@ &mmc0 { pinctrl-names = "default"; - pinctrl-0 = <&mmc0_pins_a>; + pinctrl-0 = <&mmc0_pins>; vmmc-supply = <®_vcc3v3>; bus-width = <4>; cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */ @@ -164,7 +164,7 @@ &uart0 { pinctrl-names = "default"; - pinctrl-0 = <&uart0_pins_a>; + pinctrl-0 = <&uart0_pb_pins>; status = "okay"; }; diff --git a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts index 404ce7694899..d240209bfe85 100644 --- a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts +++ b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts @@ -100,7 +100,7 @@ &emac { pinctrl-names = "default"; - pinctrl-0 = <&emac_pins_a>; + pinctrl-0 = <&emac_pins>; phy = <&phy1>; status = "okay"; }; @@ -111,7 +111,7 @@ &i2c0 { pinctrl-names = "default"; - pinctrl-0 = <&i2c0_pins_a>; + pinctrl-0 = <&i2c0_pins>; status = "okay"; axp209: pmic at 34 { @@ -122,13 +122,13 @@ &i2c1 { pinctrl-names = "default"; - pinctrl-0 = <&i2c1_pins_a>; + pinctrl-0 = <&i2c1_pins>; status = "okay"; }; &ir0 { pinctrl-names = "default"; - pinctrl-0 = <&ir0_rx_pins_a>; + pinctrl-0 = <&ir0_rx_pins>; status = "okay"; }; @@ -142,7 +142,7 @@ &mmc0 { pinctrl-names = "default"; - pinctrl-0 = <&mmc0_pins_a>; + pinctrl-0 = <&mmc0_pins>; vmmc-supply = <®_vcc3v3>; bus-width = <4>; cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */ @@ -221,14 +221,14 @@ &spi0 { pinctrl-names = "default"; - pinctrl-0 = <&spi0_pins_a>, - <&spi0_cs0_pins_a>; + pinctrl-0 = <&spi0_pi_pins>, + <&spi0_cs0_pi_pin>; status = "okay"; }; &uart0 { pinctrl-names = "default"; - pinctrl-0 = <&uart0_pins_a>; + pinctrl-0 = <&uart0_pb_pins>; status = "okay"; }; diff --git a/arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts b/arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts index e0777ae808c7..a103b36f59a9 100644 --- a/arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts +++ b/arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts @@ -106,7 +106,7 @@ &i2c0 { pinctrl-names = "default"; - pinctrl-0 = <&i2c0_pins_a>; + pinctrl-0 = <&i2c0_pins>; status = "okay"; axp209: pmic at 34 { @@ -119,14 +119,14 @@ &i2c1 { pinctrl-names = "default"; - pinctrl-0 = <&i2c1_pins_a>; + pinctrl-0 = <&i2c1_pins>; /* pull-ups and devices require AXP209 LDO3 */ status = "failed"; }; &i2c2 { pinctrl-names = "default"; - pinctrl-0 = <&i2c2_pins_a>; + pinctrl-0 = <&i2c2_pins>; status = "okay"; ft5406ee8: touchscreen at 38 { @@ -163,7 +163,7 @@ &mmc0 { pinctrl-names = "default"; - pinctrl-0 = <&mmc0_pins_a>; + pinctrl-0 = <&mmc0_pins>; vmmc-supply = <®_vcc3v3>; bus-width = <4>; cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */ @@ -211,7 +211,7 @@ &pwm { pinctrl-names = "default"; - pinctrl-0 = <&pwm0_pins_a>; + pinctrl-0 = <&pwm0_pin>; status = "okay"; }; @@ -250,7 +250,7 @@ &uart0 { pinctrl-names = "default"; - pinctrl-0 = <&uart0_pins_a>; + pinctrl-0 = <&uart0_pb_pins>; status = "okay"; }; diff --git a/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts b/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts index d8bfd7b74916..deb80dd003a3 100644 --- a/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts +++ b/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts @@ -92,7 +92,7 @@ &i2c0 { pinctrl-names = "default"; - pinctrl-0 = <&i2c0_pins_a>; + pinctrl-0 = <&i2c0_pins>; status = "okay"; axp209: pmic at 34 { @@ -105,7 +105,7 @@ &i2c1 { pinctrl-names = "default"; - pinctrl-0 = <&i2c1_pins_a>; + pinctrl-0 = <&i2c1_pins>; status = "okay"; /* Accelerometer */ @@ -146,7 +146,7 @@ &mmc0 { pinctrl-names = "default"; - pinctrl-0 = <&mmc0_pins_a>; + pinctrl-0 = <&mmc0_pins>; vmmc-supply = <®_vcc3v3>; bus-width = <4>; cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH01 */ @@ -197,7 +197,7 @@ &uart0 { pinctrl-names = "default"; - pinctrl-0 = <&uart0_pins_a>; + pinctrl-0 = <&uart0_pb_pins>; status = "okay"; }; diff --git a/arch/arm/boot/dts/sun4i-a10-hackberry.dts b/arch/arm/boot/dts/sun4i-a10-hackberry.dts index 856cfc9128e6..3d3a6a6ca566 100644 --- a/arch/arm/boot/dts/sun4i-a10-hackberry.dts +++ b/arch/arm/boot/dts/sun4i-a10-hackberry.dts @@ -81,7 +81,7 @@ &emac { pinctrl-names = "default"; - pinctrl-0 = <&emac_pins_a>; + pinctrl-0 = <&emac_pins>; phy = <&phy0>; status = "okay"; }; @@ -92,7 +92,7 @@ &ir0 { pinctrl-names = "default"; - pinctrl-0 = <&ir0_rx_pins_a>; + pinctrl-0 = <&ir0_rx_pins>; status = "okay"; }; @@ -107,7 +107,7 @@ &mmc0 { pinctrl-names = "default"; - pinctrl-0 = <&mmc0_pins_a>; + pinctrl-0 = <&mmc0_pins>; vmmc-supply = <®_vcc3v3>; bus-width = <4>; cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */ @@ -156,6 +156,6 @@ &uart0 { pinctrl-names = "default"; - pinctrl-0 = <&uart0_pins_a>; + pinctrl-0 = <&uart0_pb_pins>; status = "okay"; }; diff --git a/arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts b/arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts index 6506595268b2..0c4437f0ef5c 100644 --- a/arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts +++ b/arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts @@ -64,7 +64,7 @@ &i2c0 { pinctrl-names = "default"; - pinctrl-0 = <&i2c0_pins_a>; + pinctrl-0 = <&i2c0_pins>; status = "okay"; axp209: pmic at 34 { @@ -79,7 +79,7 @@ &mmc0 { pinctrl-names = "default"; - pinctrl-0 = <&mmc0_pins_a>; + pinctrl-0 = <&mmc0_pins>; vmmc-supply = <®_vcc3v3>; bus-width = <4>; cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */ @@ -116,7 +116,7 @@ &uart0 { pinctrl-names = "default"; - pinctrl-0 = <&uart0_pins_a>; + pinctrl-0 = <&uart0_pb_pins>; status = "okay"; }; diff --git a/arch/arm/boot/dts/sun4i-a10-inet1.dts b/arch/arm/boot/dts/sun4i-a10-inet1.dts index d51d8c302daf..f91ca46089af 100644 --- a/arch/arm/boot/dts/sun4i-a10-inet1.dts +++ b/arch/arm/boot/dts/sun4i-a10-inet1.dts @@ -89,7 +89,7 @@ &i2c0 { pinctrl-names = "default"; - pinctrl-0 = <&i2c0_pins_a>; + pinctrl-0 = <&i2c0_pins>; status = "okay"; axp209: pmic at 34 { @@ -102,7 +102,7 @@ &i2c1 { pinctrl-names = "default"; - pinctrl-0 = <&i2c1_pins_a>; + pinctrl-0 = <&i2c1_pins>; status = "okay"; /* Accelerometer */ @@ -116,7 +116,7 @@ &i2c2 { pinctrl-names = "default"; - pinctrl-0 = <&i2c2_pins_a>; + pinctrl-0 = <&i2c2_pins>; status = "okay"; ft5x: touchscreen at 38 { @@ -161,7 +161,7 @@ &mmc0 { pinctrl-names = "default"; - pinctrl-0 = <&mmc0_pins_a>; + pinctrl-0 = <&mmc0_pins>; vmmc-supply = <®_vcc3v3>; bus-width = <4>; cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */ @@ -203,7 +203,7 @@ &pwm { pinctrl-names = "default"; - pinctrl-0 = <&pwm0_pins_a>; + pinctrl-0 = <&pwm0_pin>; status = "okay"; }; @@ -246,7 +246,7 @@ &uart0 { pinctrl-names = "default"; - pinctrl-0 = <&uart0_pins_a>; + pinctrl-0 = <&uart0_pb_pins>; status = "okay"; }; diff --git a/arch/arm/boot/dts/sun4i-a10-inet97fv2.dts b/arch/arm/boot/dts/sun4i-a10-inet97fv2.dts index a8e479fe43ca..8f57832289f3 100644 --- a/arch/arm/boot/dts/sun4i-a10-inet97fv2.dts +++ b/arch/arm/boot/dts/sun4i-a10-inet97fv2.dts @@ -73,7 +73,7 @@ &i2c0 { pinctrl-names = "default"; - pinctrl-0 = <&i2c0_pins_a>; + pinctrl-0 = <&i2c0_pins>; status = "okay"; axp209: pmic at 34 { @@ -86,13 +86,13 @@ &i2c1 { pinctrl-names = "default"; - pinctrl-0 = <&i2c1_pins_a>; + pinctrl-0 = <&i2c1_pins>; status = "okay"; }; &i2c2 { pinctrl-names = "default"; - pinctrl-0 = <&i2c2_pins_a>; + pinctrl-0 = <&i2c2_pins>; status = "okay"; ft5406ee8: touchscreen at 38 { @@ -147,7 +147,7 @@ &mmc0 { pinctrl-names = "default"; - pinctrl-0 = <&mmc0_pins_a>; + pinctrl-0 = <&mmc0_pins>; vmmc-supply = <®_vcc3v3>; bus-width = <4>; cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */ @@ -208,7 +208,7 @@ &uart0 { pinctrl-names = "default"; - pinctrl-0 = <&uart0_pins_a>; + pinctrl-0 = <&uart0_pb_pins>; status = "okay"; }; diff --git a/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts b/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts index 2acb89a87d41..71f22daefbdc 100644 --- a/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts +++ b/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts @@ -223,7 +223,7 @@ &i2c0 { pinctrl-names = "default"; - pinctrl-0 = <&i2c0_pins_a>; + pinctrl-0 = <&i2c0_pins>; status = "okay"; axp209: pmic at 34 { @@ -236,7 +236,7 @@ &i2c1 { pinctrl-names = "default"; - pinctrl-0 = <&i2c1_pins_a>; + pinctrl-0 = <&i2c1_pins>; status = "okay"; /* Accelerometer */ @@ -250,7 +250,7 @@ &i2c2 { pinctrl-names = "default"; - pinctrl-0 = <&i2c2_pins_a>; + pinctrl-0 = <&i2c2_pins>; status = "okay"; ft5406ee8: touchscreen at 38 { @@ -305,7 +305,7 @@ &mmc0 { pinctrl-names = "default"; - pinctrl-0 = <&mmc0_pins_a>; + pinctrl-0 = <&mmc0_pins>; vmmc-supply = <®_vcc3v3>; bus-width = <4>; cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */ @@ -376,7 +376,7 @@ &uart0 { pinctrl-names = "default"; - pinctrl-0 = <&uart0_pins_a>; + pinctrl-0 = <&uart0_pb_pins>; status = "okay"; }; diff --git a/arch/arm/boot/dts/sun4i-a10-itead-iteaduino-plus.dts b/arch/arm/boot/dts/sun4i-a10-itead-iteaduino-plus.dts index 92e3e030ced3..d22bd79562d8 100644 --- a/arch/arm/boot/dts/sun4i-a10-itead-iteaduino-plus.dts +++ b/arch/arm/boot/dts/sun4i-a10-itead-iteaduino-plus.dts @@ -57,7 +57,7 @@ &emac { pinctrl-names = "default"; - pinctrl-0 = <&emac_pins_a>; + pinctrl-0 = <&emac_pins>; phy = <&phy1>; status = "okay"; }; @@ -67,6 +67,9 @@ }; &i2c0 { + pinctrl-names = "default"; + pinctrl-0 = <&i2c0_pins>; + axp209: pmic at 34 { interrupts = <0>; }; @@ -74,19 +77,19 @@ &i2c1 { pinctrl-names = "default"; - pinctrl-0 = <&i2c1_pins_a>; + pinctrl-0 = <&i2c1_pins>; status = "okay"; }; &i2c2 { pinctrl-names = "default"; - pinctrl-0 = <&i2c2_pins_a>; + pinctrl-0 = <&i2c2_pins>; status = "okay"; }; &ir0 { pinctrl-names = "default"; - pinctrl-0 = <&ir0_rx_pins_a>; + pinctrl-0 = <&ir0_rx_pins>; status = "okay"; }; @@ -100,7 +103,7 @@ &mmc0 { pinctrl-names = "default"; - pinctrl-0 = <&mmc0_pins_a>; + pinctrl-0 = <&mmc0_pins>; vmmc-supply = <®_vcc3v3>; bus-width = <4>; cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */ @@ -114,7 +117,11 @@ &spi0 { pinctrl-names = "default"; - pinctrl-0 = <&spi0_pins_a>, - <&spi0_cs0_pins_a>; + pinctrl-0 = <&spi0_pi_pins>, + <&spi0_cs0_pi_pin>; status = "okay"; }; + +&uart0 { + pinctrl-0 = <&uart0_pb_pins>; +}; diff --git a/arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts b/arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts index 92b2d4af3d21..dcf1dd4fc90c 100644 --- a/arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts +++ b/arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts @@ -99,7 +99,7 @@ &emac { pinctrl-names = "default"; - pinctrl-0 = <&emac_pins_a>; + pinctrl-0 = <&emac_pins>; phy = <&phy1>; status = "okay"; }; @@ -110,7 +110,7 @@ &i2c0 { pinctrl-names = "default"; - pinctrl-0 = <&i2c0_pins_a>; + pinctrl-0 = <&i2c0_pins>; status = "okay"; axp209: pmic at 34 { @@ -125,7 +125,7 @@ &ir0 { pinctrl-names = "default"; - pinctrl-0 = <&ir0_rx_pins_a>; + pinctrl-0 = <&ir0_rx_pins>; status = "okay"; }; @@ -140,7 +140,7 @@ &mmc0 { pinctrl-names = "default"; - pinctrl-0 = <&mmc0_pins_a>; + pinctrl-0 = <&mmc0_pins>; vmmc-supply = <®_vcc3v3>; bus-width = <4>; cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */ @@ -187,7 +187,7 @@ &uart0 { pinctrl-names = "default"; - pinctrl-0 = <&uart0_pins_a>; + pinctrl-0 = <&uart0_pb_pins>; status = "okay"; }; diff --git a/arch/arm/boot/dts/sun4i-a10-marsboard.dts b/arch/arm/boot/dts/sun4i-a10-marsboard.dts index 0f927da28ee1..243f58f4323b 100644 --- a/arch/arm/boot/dts/sun4i-a10-marsboard.dts +++ b/arch/arm/boot/dts/sun4i-a10-marsboard.dts @@ -108,26 +108,26 @@ &emac { pinctrl-names = "default"; - pinctrl-0 = <&emac_pins_a>; + pinctrl-0 = <&emac_pins>; phy = <&phy1>; status = "okay"; }; &i2c0 { pinctrl-names = "default"; - pinctrl-0 = <&i2c0_pins_a>; + pinctrl-0 = <&i2c0_pins>; status = "okay"; }; &i2c1 { pinctrl-names = "default"; - pinctrl-0 = <&i2c1_pins_a>; + pinctrl-0 = <&i2c1_pins>; status = "okay"; }; &i2c2 { pinctrl-names = "default"; - pinctrl-0 = <&i2c2_pins_a>; + pinctrl-0 = <&i2c2_pins>; status = "okay"; }; @@ -141,7 +141,7 @@ &mmc0 { pinctrl-names = "default"; - pinctrl-0 = <&mmc0_pins_a>; + pinctrl-0 = <&mmc0_pins>; vmmc-supply = <®_vcc3v3>; bus-width = <4>; cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */ @@ -184,14 +184,14 @@ &spi0 { pinctrl-names = "default"; - pinctrl-0 = <&spi0_pins_a>, - <&spi0_cs0_pins_a>; + pinctrl-0 = <&spi0_pi_pins>, + <&spi0_cs0_pi_pin>; status = "okay"; }; &uart0 { pinctrl-names = "default"; - pinctrl-0 = <&uart0_pins_a>; + pinctrl-0 = <&uart0_pb_pins>; status = "okay"; }; diff --git a/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts b/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts index a5ed9e4e22c6..3d3992d02b0e 100644 --- a/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts +++ b/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts @@ -71,7 +71,7 @@ &i2c0 { pinctrl-names = "default"; - pinctrl-0 = <&i2c0_pins_a>; + pinctrl-0 = <&i2c0_pins>; status = "okay"; axp209: pmic at 34 { @@ -86,18 +86,18 @@ &ir0 { pinctrl-names = "default"; - pinctrl-0 = <&ir0_rx_pins_a>; + pinctrl-0 = <&ir0_rx_pins>; status = "okay"; }; -&ir0_rx_pins_a { +&ir0_rx_pins { /* The ir receiver is not always populated */ bias-pull-up; }; &mmc0 { pinctrl-names = "default"; - pinctrl-0 = <&mmc0_pins_a>; + pinctrl-0 = <&mmc0_pins>; vmmc-supply = <®_vcc3v3>; bus-width = <4>; cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */ @@ -132,7 +132,7 @@ &uart0 { pinctrl-names = "default"; - pinctrl-0 = <&uart0_pins_a>; + pinctrl-0 = <&uart0_pb_pins>; status = "okay"; }; diff --git a/arch/arm/boot/dts/sun4i-a10-mk802.dts b/arch/arm/boot/dts/sun4i-a10-mk802.dts index 81db6824a2c7..57ee332c560f 100644 --- a/arch/arm/boot/dts/sun4i-a10-mk802.dts +++ b/arch/arm/boot/dts/sun4i-a10-mk802.dts @@ -72,7 +72,7 @@ &mmc0 { pinctrl-names = "default"; - pinctrl-0 = <&mmc0_pins_a>; + pinctrl-0 = <&mmc0_pins>; vmmc-supply = <®_vcc3v3>; bus-width = <4>; cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */ @@ -121,7 +121,7 @@ &uart0 { pinctrl-names = "default"; - pinctrl-0 = <&uart0_pins_a>; + pinctrl-0 = <&uart0_pb_pins>; status = "okay"; }; diff --git a/arch/arm/boot/dts/sun4i-a10-mk802ii.dts b/arch/arm/boot/dts/sun4i-a10-mk802ii.dts index e74a881fd9a7..e86e765070d4 100644 --- a/arch/arm/boot/dts/sun4i-a10-mk802ii.dts +++ b/arch/arm/boot/dts/sun4i-a10-mk802ii.dts @@ -68,7 +68,7 @@ &i2c0 { pinctrl-names = "default"; - pinctrl-0 = <&i2c0_pins_a>; + pinctrl-0 = <&i2c0_pins>; status = "okay"; axp209: pmic at 34 { @@ -83,7 +83,7 @@ &mmc0 { pinctrl-names = "default"; - pinctrl-0 = <&mmc0_pins_a>; + pinctrl-0 = <&mmc0_pins>; vmmc-supply = <®_vcc3v3>; bus-width = <4>; cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */ @@ -105,7 +105,7 @@ &uart0 { pinctrl-names = "default"; - pinctrl-0 = <&uart0_pins_a>; + pinctrl-0 = <&uart0_pb_pins>; status = "okay"; }; diff --git a/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts b/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts index 462412ee903c..b49f1f503f69 100644 --- a/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts +++ b/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts @@ -99,7 +99,7 @@ &emac { pinctrl-names = "default"; - pinctrl-0 = <&emac_pins_a>; + pinctrl-0 = <&emac_pins>; phy = <&phy1>; status = "okay"; }; @@ -110,7 +110,7 @@ &i2c0 { pinctrl-names = "default"; - pinctrl-0 = <&i2c0_pins_a>; + pinctrl-0 = <&i2c0_pins>; status = "okay"; axp209: pmic at 34 { @@ -125,7 +125,7 @@ &i2c1 { pinctrl-names = "default"; - pinctrl-0 = <&i2c1_pins_a>; + pinctrl-0 = <&i2c1_pins>; status = "okay"; eeprom: eeprom at 50 { @@ -145,7 +145,7 @@ &mmc0 { pinctrl-names = "default"; - pinctrl-0 = <&mmc0_pins_a>; + pinctrl-0 = <&mmc0_pins>; vmmc-supply = <®_vcc3v3>; bus-width = <4>; cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */ @@ -210,7 +210,7 @@ &uart0 { pinctrl-names = "default"; - pinctrl-0 = <&uart0_pins_a>; + pinctrl-0 = <&uart0_pb_pins>; status = "okay"; }; diff --git a/arch/arm/boot/dts/sun4i-a10-pcduino.dts b/arch/arm/boot/dts/sun4i-a10-pcduino.dts index 84f55e76df0c..f50f0ff00537 100644 --- a/arch/arm/boot/dts/sun4i-a10-pcduino.dts +++ b/arch/arm/boot/dts/sun4i-a10-pcduino.dts @@ -117,7 +117,7 @@ &emac { pinctrl-names = "default"; - pinctrl-0 = <&emac_pins_a>; + pinctrl-0 = <&emac_pins>; phy = <&phy1>; status = "okay"; }; @@ -128,7 +128,7 @@ &i2c0 { pinctrl-names = "default"; - pinctrl-0 = <&i2c0_pins_a>; + pinctrl-0 = <&i2c0_pins>; status = "okay"; axp209: pmic at 34 { @@ -147,7 +147,7 @@ &mmc0 { pinctrl-names = "default"; - pinctrl-0 = <&mmc0_pins_a>; + pinctrl-0 = <&mmc0_pins>; vmmc-supply = <®_vcc3v3>; bus-width = <4>; cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */ @@ -214,7 +214,7 @@ &uart0 { pinctrl-names = "default"; - pinctrl-0 = <&uart0_pins_a>; + pinctrl-0 = <&uart0_pb_pins>; status = "okay"; }; diff --git a/arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts b/arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts index c0f8c88b5a7d..65a149087e5f 100644 --- a/arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts +++ b/arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts @@ -88,7 +88,7 @@ &i2c0 { pinctrl-names = "default"; - pinctrl-0 = <&i2c0_pins_a>; + pinctrl-0 = <&i2c0_pins>; status = "okay"; axp209: pmic at 34 { @@ -101,14 +101,14 @@ &i2c1 { pinctrl-names = "default"; - pinctrl-0 = <&i2c1_pins_a>; + pinctrl-0 = <&i2c1_pins>; /* pull-ups and devices require AXP209 LDO3 */ status = "failed"; }; &i2c2 { pinctrl-names = "default"; - pinctrl-0 = <&i2c2_pins_a>; + pinctrl-0 = <&i2c2_pins>; status = "okay"; pixcir_ts at 5c { @@ -149,7 +149,7 @@ &mmc0 { pinctrl-names = "default"; - pinctrl-0 = <&mmc0_pins_a>; + pinctrl-0 = <&mmc0_pins>; vmmc-supply = <®_vcc3v3>; bus-width = <4>; cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */ @@ -192,7 +192,7 @@ &pwm { pinctrl-names = "default"; - pinctrl-0 = <&pwm0_pins_a>; + pinctrl-0 = <&pwm0_pin>; status = "okay"; }; @@ -231,7 +231,7 @@ &uart0 { pinctrl-names = "default"; - pinctrl-0 = <&uart0_pins_a>; + pinctrl-0 = <&uart0_pb_pins>; status = "okay"; }; diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi index 9671ac72fae9..b6e89de4c092 100644 --- a/arch/arm/boot/dts/sun4i-a10.dtsi +++ b/arch/arm/boot/dts/sun4i-a10.dtsi @@ -474,12 +474,12 @@ #interrupt-cells = <3>; #gpio-cells = <3>; - can0_pins_a: can0 at 0 { + can0_ph_pins: can0-ph-pins { pins = "PH20", "PH21"; function = "can"; }; - emac_pins_a: emac0 at 0 { + emac_pins: emac0-pins { pins = "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", @@ -488,42 +488,42 @@ function = "emac"; }; - i2c0_pins_a: i2c0 at 0 { + i2c0_pins: i2c0-pins { pins = "PB0", "PB1"; function = "i2c0"; }; - i2c1_pins_a: i2c1 at 0 { + i2c1_pins: i2c1-pins { pins = "PB18", "PB19"; function = "i2c1"; }; - i2c2_pins_a: i2c2 at 0 { + i2c2_pins: i2c2-pins { pins = "PB20", "PB21"; function = "i2c2"; }; - ir0_rx_pins_a: ir0 at 0 { + ir0_rx_pins: ir0-rx-pin { pins = "PB4"; function = "ir0"; }; - ir0_tx_pins_a: ir0 at 1 { + ir0_tx_pins: ir0-tx-pin { pins = "PB3"; function = "ir0"; }; - ir1_rx_pins_a: ir1 at 0 { + ir1_rx_pins: ir1-rx-pin { pins = "PB23"; function = "ir1"; }; - ir1_tx_pins_a: ir1 at 1 { + ir1_tx_pins: ir1-tx-pin { pins = "PB22"; function = "ir1"; }; - mmc0_pins_a: mmc0 at 0 { + mmc0_pins: mmc0-pins { pins = "PF0", "PF1", "PF2", "PF3", "PF4", "PF5"; function = "mmc0"; @@ -531,83 +531,83 @@ bias-pull-up; }; - ps20_pins_a: ps20 at 0 { - pins = "PI20", "PI21"; + ps2_ph_pins: ps2-ph-pins { + pins = "PH12", "PH13"; function = "ps2"; }; - ps21_pins_a: ps21 at 0 { - pins = "PH12", "PH13"; + ps2_pi_pins: ps2-pi-pins { + pins = "PI20", "PI21"; function = "ps2"; }; - pwm0_pins_a: pwm0 at 0 { + pwm0_pin: pwm0-pin { pins = "PB2"; function = "pwm"; }; - pwm1_pins_a: pwm1 at 0 { + pwm1_pin: pwm1-pin { pins = "PI3"; function = "pwm"; }; - spdif_tx_pins_a: spdif at 0 { + spdif_tx_pin: spdif-tx-pin { pins = "PB13"; function = "spdif"; bias-pull-up; }; - spi0_pins_a: spi0 at 0 { + spi0_pi_pins: spi0-pi-pins { pins = "PI11", "PI12", "PI13"; function = "spi0"; }; - spi0_cs0_pins_a: spi0_cs0 at 0 { + spi0_cs0_pi_pin: spi0-cs0-pi-pin { pins = "PI10"; function = "spi0"; }; - spi1_pins_a: spi1 at 0 { + spi1_pins: spi1-pins { pins = "PI17", "PI18", "PI19"; function = "spi1"; }; - spi1_cs0_pins_a: spi1_cs0 at 0 { + spi1_cs0_pin: spi1-cs0-pin { pins = "PI16"; function = "spi1"; }; - spi2_pins_a: spi2 at 0 { - pins = "PC20", "PC21", "PC22"; + spi2_pb_pins: spi2-pb-pins { + pins = "PB15", "PB16", "PB17"; function = "spi2"; }; - spi2_pins_b: spi2 at 1 { - pins = "PB15", "PB16", "PB17"; + spi2_pc_pins: spi2-pc-pins { + pins = "PC20", "PC21", "PC22"; function = "spi2"; }; - spi2_cs0_pins_a: spi2_cs0 at 0 { - pins = "PC19"; + spi2_cs0_pb_pin: spi2-cs0-pb-pin { + pins = "PB14"; function = "spi2"; }; - spi2_cs0_pins_b: spi2_cs0 at 1 { - pins = "PB14"; + spi2_cs0_pc_pins: spi2-cs0-pc-pin { + pins = "PC19"; function = "spi2"; }; - uart0_pins_a: uart0 at 0 { + uart0_pb_pins: uart0-pb-pins { pins = "PB22", "PB23"; function = "uart0"; }; - uart0_pins_b: uart0 at 1 { + uart0_pf_pins: uart0-pf-pins { pins = "PF2", "PF4"; function = "uart0"; }; - uart1_pins_a: uart1 at 0 { + uart1_pins: uart1-pins { pins = "PA10", "PA11"; function = "uart1"; }; -- git-series 0.9.1 ^ permalink raw reply related [flat|nested] 50+ messages in thread
* [PATCH 05/20] ARM: dts: sun4i: Change pinctrl nodes to avoid warning 2017-10-05 10:49 ` [PATCH 05/20] ARM: dts: sun4i: Change pinctrl nodes to avoid warning Maxime Ripard @ 2017-10-05 15:29 ` Chen-Yu Tsai 2017-10-06 8:45 ` Maxime Ripard 0 siblings, 1 reply; 50+ messages in thread From: Chen-Yu Tsai @ 2017-10-05 15:29 UTC (permalink / raw) To: linux-arm-kernel On Thu, Oct 5, 2017 at 6:49 PM, Maxime Ripard <maxime.ripard@free-electrons.com> wrote: > All our pinctrl nodes were using a node name convention with a unit-address > to differentiate the different muxing options. However, since those nodes > didn't have a reg property, they were generating warnings in DTC. > > In order to accomodate for this, convert the old nodes to the syntax we've > been using for the new SoCs, including removing the letter suffix of the > node labels to the bank of those pins to make things more readable. > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> > --- > arch/arm/boot/dts/sun4i-a10-a1000.dts | 12 +- > arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts | 10 +- > arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts | 10 +- > arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 16 +-- > arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts | 12 +- > arch/arm/boot/dts/sun4i-a10-gemei-g9.dts | 8 +- > arch/arm/boot/dts/sun4i-a10-hackberry.dts | 8 +- > arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts | 6 +- > arch/arm/boot/dts/sun4i-a10-inet1.dts | 12 +- > arch/arm/boot/dts/sun4i-a10-inet97fv2.dts | 10 +- > arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts | 10 +- > arch/arm/boot/dts/sun4i-a10-itead-iteaduino-plus.dts | 21 ++-- > arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts | 10 +- > arch/arm/boot/dts/sun4i-a10-marsboard.dts | 16 +-- > arch/arm/boot/dts/sun4i-a10-mini-xplus.dts | 10 +- > arch/arm/boot/dts/sun4i-a10-mk802.dts | 4 +- > arch/arm/boot/dts/sun4i-a10-mk802ii.dts | 6 +- > arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts | 10 +- > arch/arm/boot/dts/sun4i-a10-pcduino.dts | 8 +- > arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts | 12 +- > arch/arm/boot/dts/sun4i-a10.dtsi | 64 ++++++------- > 21 files changed, 141 insertions(+), 134 deletions(-) [...] > diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi > index 9671ac72fae9..b6e89de4c092 100644 > --- a/arch/arm/boot/dts/sun4i-a10.dtsi > +++ b/arch/arm/boot/dts/sun4i-a10.dtsi [...] > @@ -531,83 +531,83 @@ > bias-pull-up; > }; > > - ps20_pins_a: ps20 at 0 { > - pins = "PI20", "PI21"; > + ps2_ph_pins: ps2-ph-pins { > + pins = "PH12", "PH13"; > function = "ps2"; > }; > > - ps21_pins_a: ps21 at 0 { > - pins = "PH12", "PH13"; > + ps2_pi_pins: ps2-pi-pins { > + pins = "PI20", "PI21"; > function = "ps2"; > }; This part is slightly incorrect. The PS/2 block has 2 inputs. The first channel, or ps2-0, has only one muxing option, on pins PI20 and PI21. The second channel has two options, either PH12 + PH13 or PI14 + PI15. The names should encode which channel the muxing option is for. ChenYu ^ permalink raw reply [flat|nested] 50+ messages in thread
* [PATCH 05/20] ARM: dts: sun4i: Change pinctrl nodes to avoid warning 2017-10-05 15:29 ` Chen-Yu Tsai @ 2017-10-06 8:45 ` Maxime Ripard 0 siblings, 0 replies; 50+ messages in thread From: Maxime Ripard @ 2017-10-06 8:45 UTC (permalink / raw) To: linux-arm-kernel Hi, On Thu, Oct 05, 2017 at 03:29:56PM +0000, Chen-Yu Tsai wrote: > > @@ -531,83 +531,83 @@ > > bias-pull-up; > > }; > > > > - ps20_pins_a: ps20 at 0 { > > - pins = "PI20", "PI21"; > > + ps2_ph_pins: ps2-ph-pins { > > + pins = "PH12", "PH13"; > > function = "ps2"; > > }; > > > > - ps21_pins_a: ps21 at 0 { > > - pins = "PH12", "PH13"; > > + ps2_pi_pins: ps2-pi-pins { > > + pins = "PI20", "PI21"; > > function = "ps2"; > > }; > > This part is slightly incorrect. The PS/2 block has 2 inputs. > The first channel, or ps2-0, has only one muxing option, on > pins PI20 and PI21. The second channel has two options, either > PH12 + PH13 or PI14 + PI15. The names should encode which channel > the muxing option is for. Would ps2_ch0_pins and ps2_ch1_pi_pins work for you then? Thanks! Maxime -- Maxime Ripard, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 801 bytes Desc: not available URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20171006/2c7b2e2f/attachment.sig> ^ permalink raw reply [flat|nested] 50+ messages in thread
* [PATCH 06/20] ARM: dts: sun4i: Provide default muxing for relevant controllers 2017-10-05 10:49 [PATCH 00/20] sunxi: Cleanup DT warnings for the A10 and A80 Maxime Ripard ` (4 preceding siblings ...) 2017-10-05 10:49 ` [PATCH 05/20] ARM: dts: sun4i: Change pinctrl nodes to avoid warning Maxime Ripard @ 2017-10-05 10:49 ` Maxime Ripard 2017-10-05 15:32 ` Chen-Yu Tsai 2017-10-05 10:49 ` [PATCH 07/20] ARM: dts: sun4i: Remove skeleton and memory to avoid warnings Maxime Ripard ` (13 subsequent siblings) 19 siblings, 1 reply; 50+ messages in thread From: Maxime Ripard @ 2017-10-05 10:49 UTC (permalink / raw) To: linux-arm-kernel Some controllers have only one muxing option in the SoC. In such a case, we can just move the muxing into the DTSI, and remove it from the DTS. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> --- arch/arm/boot/dts/sun4i-a10-a1000.dts | 6 ------ arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts | 6 ------ arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts | 8 -------- arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 8 -------- arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts | 8 -------- arch/arm/boot/dts/sun4i-a10-gemei-g9.dts | 6 ------ arch/arm/boot/dts/sun4i-a10-hackberry.dts | 4 ---- arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts | 4 ---- arch/arm/boot/dts/sun4i-a10-inet1.dts | 8 -------- arch/arm/boot/dts/sun4i-a10-inet97fv2.dts | 8 -------- arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts | 8 -------- arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts | 6 ------ arch/arm/boot/dts/sun4i-a10-marsboard.dts | 10 ---------- arch/arm/boot/dts/sun4i-a10-mini-xplus.dts | 4 ---- arch/arm/boot/dts/sun4i-a10-mk802.dts | 2 -- arch/arm/boot/dts/sun4i-a10-mk802ii.dts | 4 ---- arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts | 8 -------- arch/arm/boot/dts/sun4i-a10-pcduino.dts | 6 ------ arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts | 8 -------- arch/arm/boot/dts/sun4i-a10.dtsi | 12 ++++++++++++ arch/arm/boot/dts/sunxi-itead-core-common.dtsi | 4 ---- 21 files changed, 12 insertions(+), 126 deletions(-) diff --git a/arch/arm/boot/dts/sun4i-a10-a1000.dts b/arch/arm/boot/dts/sun4i-a10-a1000.dts index 1c12846227be..69513f341a8e 100644 --- a/arch/arm/boot/dts/sun4i-a10-a1000.dts +++ b/arch/arm/boot/dts/sun4i-a10-a1000.dts @@ -129,8 +129,6 @@ }; &emac { - pinctrl-names = "default"; - pinctrl-0 = <&emac_pins>; phy = <&phy1>; status = "okay"; }; @@ -140,8 +138,6 @@ }; &i2c0 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c0_pins>; status = "okay"; axp209: pmic at 34 { @@ -170,8 +166,6 @@ }; &mmc0 { - pinctrl-names = "default"; - pinctrl-0 = <&mmc0_pins>; vmmc-supply = <®_vcc3v3>; bus-width = <4>; cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */ diff --git a/arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts b/arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts index 58fe2fc14f32..f18c832d4e16 100644 --- a/arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts +++ b/arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts @@ -68,8 +68,6 @@ }; &emac { - pinctrl-names = "default"; - pinctrl-0 = <&emac_pins>; phy = <&phy1>; status = "okay"; }; @@ -79,8 +77,6 @@ }; &i2c0 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c0_pins>; status = "okay"; axp209: pmic at 34 { @@ -108,8 +104,6 @@ }; &mmc0 { - pinctrl-names = "default"; - pinctrl-0 = <&mmc0_pins>; vmmc-supply = <®_vcc3v3>; bus-width = <4>; cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */ diff --git a/arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts b/arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts index b34944188772..4978e46ca620 100644 --- a/arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts +++ b/arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts @@ -65,8 +65,6 @@ }; &i2c0 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c0_pins>; status = "okay"; axp209: pmic at 34 { @@ -80,14 +78,10 @@ }; &i2c1 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c1_pins>; status = "okay"; }; &i2c2 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c2_pins>; status = "okay"; ft5306de4: touchscreen at 38 { @@ -127,8 +121,6 @@ }; &mmc0 { - pinctrl-names = "default"; - pinctrl-0 = <&mmc0_pins>; vmmc-supply = <®_vcc3v3>; bus-width = <4>; cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */ diff --git a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts index d240209bfe85..b48cc70aa6c2 100644 --- a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts +++ b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts @@ -99,8 +99,6 @@ }; &emac { - pinctrl-names = "default"; - pinctrl-0 = <&emac_pins>; phy = <&phy1>; status = "okay"; }; @@ -110,8 +108,6 @@ }; &i2c0 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c0_pins>; status = "okay"; axp209: pmic at 34 { @@ -121,8 +117,6 @@ }; &i2c1 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c1_pins>; status = "okay"; }; @@ -141,8 +135,6 @@ }; &mmc0 { - pinctrl-names = "default"; - pinctrl-0 = <&mmc0_pins>; vmmc-supply = <®_vcc3v3>; bus-width = <4>; cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */ diff --git a/arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts b/arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts index a103b36f59a9..92e5a772a93f 100644 --- a/arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts +++ b/arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts @@ -105,8 +105,6 @@ }; &i2c0 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c0_pins>; status = "okay"; axp209: pmic at 34 { @@ -118,15 +116,11 @@ #include "axp209.dtsi" &i2c1 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c1_pins>; /* pull-ups and devices require AXP209 LDO3 */ status = "failed"; }; &i2c2 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c2_pins>; status = "okay"; ft5406ee8: touchscreen at 38 { @@ -162,8 +156,6 @@ }; &mmc0 { - pinctrl-names = "default"; - pinctrl-0 = <&mmc0_pins>; vmmc-supply = <®_vcc3v3>; bus-width = <4>; cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */ diff --git a/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts b/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts index deb80dd003a3..e92074c6d894 100644 --- a/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts +++ b/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts @@ -91,8 +91,6 @@ }; &i2c0 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c0_pins>; status = "okay"; axp209: pmic at 34 { @@ -104,8 +102,6 @@ #include "axp209.dtsi" &i2c1 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c1_pins>; status = "okay"; /* Accelerometer */ @@ -145,8 +141,6 @@ }; &mmc0 { - pinctrl-names = "default"; - pinctrl-0 = <&mmc0_pins>; vmmc-supply = <®_vcc3v3>; bus-width = <4>; cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH01 */ diff --git a/arch/arm/boot/dts/sun4i-a10-hackberry.dts b/arch/arm/boot/dts/sun4i-a10-hackberry.dts index 3d3a6a6ca566..d6ae111d8cd1 100644 --- a/arch/arm/boot/dts/sun4i-a10-hackberry.dts +++ b/arch/arm/boot/dts/sun4i-a10-hackberry.dts @@ -80,8 +80,6 @@ }; &emac { - pinctrl-names = "default"; - pinctrl-0 = <&emac_pins>; phy = <&phy0>; status = "okay"; }; @@ -106,8 +104,6 @@ }; &mmc0 { - pinctrl-names = "default"; - pinctrl-0 = <&mmc0_pins>; vmmc-supply = <®_vcc3v3>; bus-width = <4>; cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */ diff --git a/arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts b/arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts index 0c4437f0ef5c..f5e9b643007e 100644 --- a/arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts +++ b/arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts @@ -63,8 +63,6 @@ }; &i2c0 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c0_pins>; status = "okay"; axp209: pmic at 34 { @@ -78,8 +76,6 @@ }; &mmc0 { - pinctrl-names = "default"; - pinctrl-0 = <&mmc0_pins>; vmmc-supply = <®_vcc3v3>; bus-width = <4>; cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */ diff --git a/arch/arm/boot/dts/sun4i-a10-inet1.dts b/arch/arm/boot/dts/sun4i-a10-inet1.dts index f91ca46089af..016ec3e1889f 100644 --- a/arch/arm/boot/dts/sun4i-a10-inet1.dts +++ b/arch/arm/boot/dts/sun4i-a10-inet1.dts @@ -88,8 +88,6 @@ }; &i2c0 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c0_pins>; status = "okay"; axp209: pmic at 34 { @@ -101,8 +99,6 @@ #include "axp209.dtsi" &i2c1 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c1_pins>; status = "okay"; /* Accelerometer */ @@ -115,8 +111,6 @@ }; &i2c2 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c2_pins>; status = "okay"; ft5x: touchscreen at 38 { @@ -160,8 +154,6 @@ }; &mmc0 { - pinctrl-names = "default"; - pinctrl-0 = <&mmc0_pins>; vmmc-supply = <®_vcc3v3>; bus-width = <4>; cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */ diff --git a/arch/arm/boot/dts/sun4i-a10-inet97fv2.dts b/arch/arm/boot/dts/sun4i-a10-inet97fv2.dts index 8f57832289f3..8250c720883e 100644 --- a/arch/arm/boot/dts/sun4i-a10-inet97fv2.dts +++ b/arch/arm/boot/dts/sun4i-a10-inet97fv2.dts @@ -72,8 +72,6 @@ }; &i2c0 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c0_pins>; status = "okay"; axp209: pmic at 34 { @@ -85,14 +83,10 @@ #include "axp209.dtsi" &i2c1 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c1_pins>; status = "okay"; }; &i2c2 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c2_pins>; status = "okay"; ft5406ee8: touchscreen at 38 { @@ -146,8 +140,6 @@ }; &mmc0 { - pinctrl-names = "default"; - pinctrl-0 = <&mmc0_pins>; vmmc-supply = <®_vcc3v3>; bus-width = <4>; cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */ diff --git a/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts b/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts index 71f22daefbdc..98e13cba1714 100644 --- a/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts +++ b/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts @@ -222,8 +222,6 @@ }; &i2c0 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c0_pins>; status = "okay"; axp209: pmic at 34 { @@ -235,8 +233,6 @@ #include "axp209.dtsi" &i2c1 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c1_pins>; status = "okay"; /* Accelerometer */ @@ -249,8 +245,6 @@ }; &i2c2 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c2_pins>; status = "okay"; ft5406ee8: touchscreen at 38 { @@ -304,8 +298,6 @@ }; &mmc0 { - pinctrl-names = "default"; - pinctrl-0 = <&mmc0_pins>; vmmc-supply = <®_vcc3v3>; bus-width = <4>; cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */ diff --git a/arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts b/arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts index dcf1dd4fc90c..86f779bd9648 100644 --- a/arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts +++ b/arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts @@ -98,8 +98,6 @@ }; &emac { - pinctrl-names = "default"; - pinctrl-0 = <&emac_pins>; phy = <&phy1>; status = "okay"; }; @@ -109,8 +107,6 @@ }; &i2c0 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c0_pins>; status = "okay"; axp209: pmic at 34 { @@ -139,8 +135,6 @@ }; &mmc0 { - pinctrl-names = "default"; - pinctrl-0 = <&mmc0_pins>; vmmc-supply = <®_vcc3v3>; bus-width = <4>; cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */ diff --git a/arch/arm/boot/dts/sun4i-a10-marsboard.dts b/arch/arm/boot/dts/sun4i-a10-marsboard.dts index 243f58f4323b..d9af1042b045 100644 --- a/arch/arm/boot/dts/sun4i-a10-marsboard.dts +++ b/arch/arm/boot/dts/sun4i-a10-marsboard.dts @@ -107,27 +107,19 @@ }; &emac { - pinctrl-names = "default"; - pinctrl-0 = <&emac_pins>; phy = <&phy1>; status = "okay"; }; &i2c0 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c0_pins>; status = "okay"; }; &i2c1 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c1_pins>; status = "okay"; }; &i2c2 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c2_pins>; status = "okay"; }; @@ -140,8 +132,6 @@ }; &mmc0 { - pinctrl-names = "default"; - pinctrl-0 = <&mmc0_pins>; vmmc-supply = <®_vcc3v3>; bus-width = <4>; cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */ diff --git a/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts b/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts index 3d3992d02b0e..1b639e5f9172 100644 --- a/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts +++ b/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts @@ -70,8 +70,6 @@ }; &i2c0 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c0_pins>; status = "okay"; axp209: pmic at 34 { @@ -96,8 +94,6 @@ }; &mmc0 { - pinctrl-names = "default"; - pinctrl-0 = <&mmc0_pins>; vmmc-supply = <®_vcc3v3>; bus-width = <4>; cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */ diff --git a/arch/arm/boot/dts/sun4i-a10-mk802.dts b/arch/arm/boot/dts/sun4i-a10-mk802.dts index 57ee332c560f..b8d1501ef7e6 100644 --- a/arch/arm/boot/dts/sun4i-a10-mk802.dts +++ b/arch/arm/boot/dts/sun4i-a10-mk802.dts @@ -71,8 +71,6 @@ }; &mmc0 { - pinctrl-names = "default"; - pinctrl-0 = <&mmc0_pins>; vmmc-supply = <®_vcc3v3>; bus-width = <4>; cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */ diff --git a/arch/arm/boot/dts/sun4i-a10-mk802ii.dts b/arch/arm/boot/dts/sun4i-a10-mk802ii.dts index e86e765070d4..e460da2eb139 100644 --- a/arch/arm/boot/dts/sun4i-a10-mk802ii.dts +++ b/arch/arm/boot/dts/sun4i-a10-mk802ii.dts @@ -67,8 +67,6 @@ }; &i2c0 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c0_pins>; status = "okay"; axp209: pmic at 34 { @@ -82,8 +80,6 @@ }; &mmc0 { - pinctrl-names = "default"; - pinctrl-0 = <&mmc0_pins>; vmmc-supply = <®_vcc3v3>; bus-width = <4>; cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */ diff --git a/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts b/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts index b49f1f503f69..45df067cb35f 100644 --- a/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts +++ b/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts @@ -98,8 +98,6 @@ }; &emac { - pinctrl-names = "default"; - pinctrl-0 = <&emac_pins>; phy = <&phy1>; status = "okay"; }; @@ -109,8 +107,6 @@ }; &i2c0 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c0_pins>; status = "okay"; axp209: pmic at 34 { @@ -124,8 +120,6 @@ }; &i2c1 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c1_pins>; status = "okay"; eeprom: eeprom at 50 { @@ -144,8 +138,6 @@ }; &mmc0 { - pinctrl-names = "default"; - pinctrl-0 = <&mmc0_pins>; vmmc-supply = <®_vcc3v3>; bus-width = <4>; cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */ diff --git a/arch/arm/boot/dts/sun4i-a10-pcduino.dts b/arch/arm/boot/dts/sun4i-a10-pcduino.dts index f50f0ff00537..d19e0ddfe353 100644 --- a/arch/arm/boot/dts/sun4i-a10-pcduino.dts +++ b/arch/arm/boot/dts/sun4i-a10-pcduino.dts @@ -116,8 +116,6 @@ }; &emac { - pinctrl-names = "default"; - pinctrl-0 = <&emac_pins>; phy = <&phy1>; status = "okay"; }; @@ -127,8 +125,6 @@ }; &i2c0 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c0_pins>; status = "okay"; axp209: pmic at 34 { @@ -146,8 +142,6 @@ }; &mmc0 { - pinctrl-names = "default"; - pinctrl-0 = <&mmc0_pins>; vmmc-supply = <®_vcc3v3>; bus-width = <4>; cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */ diff --git a/arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts b/arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts index 65a149087e5f..654a2de3414b 100644 --- a/arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts +++ b/arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts @@ -87,8 +87,6 @@ }; &i2c0 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c0_pins>; status = "okay"; axp209: pmic at 34 { @@ -100,15 +98,11 @@ #include "axp209.dtsi" &i2c1 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c1_pins>; /* pull-ups and devices require AXP209 LDO3 */ status = "failed"; }; &i2c2 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c2_pins>; status = "okay"; pixcir_ts at 5c { @@ -148,8 +142,6 @@ }; &mmc0 { - pinctrl-names = "default"; - pinctrl-0 = <&mmc0_pins>; vmmc-supply = <®_vcc3v3>; bus-width = <4>; cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */ diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi index b6e89de4c092..1876abb62ec7 100644 --- a/arch/arm/boot/dts/sun4i-a10.dtsi +++ b/arch/arm/boot/dts/sun4i-a10.dtsi @@ -270,6 +270,8 @@ dmas = <&dma SUN4I_DMA_DEDICATED 9>, <&dma SUN4I_DMA_DEDICATED 8>; dma-names = "rx", "tx"; + pinctrl-names = "default"; + pinctrl-0 = <&spi1_pins>, <&spi1_cs0_pin>; status = "disabled"; #address-cells = <1>; #size-cells = <0>; @@ -281,6 +283,8 @@ interrupts = <55>; clocks = <&ccu CLK_AHB_EMAC>; allwinner,sram = <&emac_sram 1>; + pinctrl-names = "default"; + pinctrl-0 = <&emac_pins>; status = "disabled"; }; @@ -298,6 +302,8 @@ clocks = <&ccu CLK_AHB_MMC0>, <&ccu CLK_MMC0>; clock-names = "ahb", "mmc"; interrupts = <32>; + pinctrl-names = "default"; + pinctrl-0 = <&mmc0_pins>; status = "disabled"; #address-cells = <1>; #size-cells = <0>; @@ -816,6 +822,8 @@ reg = <0x01c2ac00 0x400>; interrupts = <7>; clocks = <&ccu CLK_APB1_I2C0>; + pinctrl-names = "default"; + pinctrl-0 = <&i2c0_pins>; status = "disabled"; #address-cells = <1>; #size-cells = <0>; @@ -826,6 +834,8 @@ reg = <0x01c2b000 0x400>; interrupts = <8>; clocks = <&ccu CLK_APB1_I2C1>; + pinctrl-names = "default"; + pinctrl-0 = <&i2c1_pins>; status = "disabled"; #address-cells = <1>; #size-cells = <0>; @@ -836,6 +846,8 @@ reg = <0x01c2b400 0x400>; interrupts = <9>; clocks = <&ccu CLK_APB1_I2C2>; + pinctrl-names = "default"; + pinctrl-0 = <&i2c2_pins>; status = "disabled"; #address-cells = <1>; #size-cells = <0>; diff --git a/arch/arm/boot/dts/sunxi-itead-core-common.dtsi b/arch/arm/boot/dts/sunxi-itead-core-common.dtsi index 2565d5137a17..ddf4e722ea93 100644 --- a/arch/arm/boot/dts/sunxi-itead-core-common.dtsi +++ b/arch/arm/boot/dts/sunxi-itead-core-common.dtsi @@ -65,8 +65,6 @@ }; &i2c0 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c0_pins_a>; status = "okay"; axp209: pmic at 34 { @@ -75,8 +73,6 @@ }; &i2c1 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c1_pins_a>; status = "okay"; }; -- git-series 0.9.1 ^ permalink raw reply related [flat|nested] 50+ messages in thread
* [PATCH 06/20] ARM: dts: sun4i: Provide default muxing for relevant controllers 2017-10-05 10:49 ` [PATCH 06/20] ARM: dts: sun4i: Provide default muxing for relevant controllers Maxime Ripard @ 2017-10-05 15:32 ` Chen-Yu Tsai 0 siblings, 0 replies; 50+ messages in thread From: Chen-Yu Tsai @ 2017-10-05 15:32 UTC (permalink / raw) To: linux-arm-kernel On Thu, Oct 5, 2017 at 6:49 PM, Maxime Ripard <maxime.ripard@free-electrons.com> wrote: > Some controllers have only one muxing option in the SoC. In such a case, we > can just move the muxing into the DTSI, and remove it from the DTS. > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> It would be helpful if you could mention which controllers match the criteria. Otherwise, Acked-by: Chen-Yu Tsai <wens@csie.org> ^ permalink raw reply [flat|nested] 50+ messages in thread
* [PATCH 07/20] ARM: dts: sun4i: Remove skeleton and memory to avoid warnings 2017-10-05 10:49 [PATCH 00/20] sunxi: Cleanup DT warnings for the A10 and A80 Maxime Ripard ` (5 preceding siblings ...) 2017-10-05 10:49 ` [PATCH 06/20] ARM: dts: sun4i: Provide default muxing for relevant controllers Maxime Ripard @ 2017-10-05 10:49 ` Maxime Ripard 2017-10-05 15:43 ` Chen-Yu Tsai 2017-10-05 10:49 ` [PATCH 08/20] ARM: dts: sun4i: Change LRADC node names " Maxime Ripard ` (12 subsequent siblings) 19 siblings, 1 reply; 50+ messages in thread From: Maxime Ripard @ 2017-10-05 10:49 UTC (permalink / raw) To: linux-arm-kernel Using skeleton.dtsi will create a memory node that will generate a warning in DTC. However, that node will be created by the bootloader, so we can just remove it entirely in order to remove that warning. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> --- arch/arm/boot/dts/sun4i-a10.dtsi | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi index 1876abb62ec7..f64544f615ea 100644 --- a/arch/arm/boot/dts/sun4i-a10.dtsi +++ b/arch/arm/boot/dts/sun4i-a10.dtsi @@ -41,14 +41,14 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include "skeleton.dtsi" - #include <dt-bindings/thermal/thermal.h> #include <dt-bindings/dma/sun4i-a10.h> #include <dt-bindings/clock/sun4i-a10-ccu.h> #include <dt-bindings/reset/sun4i-a10-ccu.h> / { + #address-cells = <1>; + #size-cells = <1>; interrupt-parent = <&intc>; aliases { @@ -160,10 +160,6 @@ }; }; - memory { - reg = <0x40000000 0x80000000>; - }; - clocks { #address-cells = <1>; #size-cells = <1>; -- git-series 0.9.1 ^ permalink raw reply related [flat|nested] 50+ messages in thread
* [PATCH 07/20] ARM: dts: sun4i: Remove skeleton and memory to avoid warnings 2017-10-05 10:49 ` [PATCH 07/20] ARM: dts: sun4i: Remove skeleton and memory to avoid warnings Maxime Ripard @ 2017-10-05 15:43 ` Chen-Yu Tsai 2017-10-06 8:47 ` Maxime Ripard 0 siblings, 1 reply; 50+ messages in thread From: Chen-Yu Tsai @ 2017-10-05 15:43 UTC (permalink / raw) To: linux-arm-kernel On Thu, Oct 5, 2017 at 6:49 PM, Maxime Ripard <maxime.ripard@free-electrons.com> wrote: > Using skeleton.dtsi will create a memory node that will generate a warning > in DTC. However, that node will be created by the bootloader, so we can > just remove it entirely in order to remove that warning. > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> > --- > arch/arm/boot/dts/sun4i-a10.dtsi | 8 ++------ > 1 file changed, 2 insertions(+), 6 deletions(-) > > diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi > index 1876abb62ec7..f64544f615ea 100644 > --- a/arch/arm/boot/dts/sun4i-a10.dtsi > +++ b/arch/arm/boot/dts/sun4i-a10.dtsi > @@ -41,14 +41,14 @@ > * OTHER DEALINGS IN THE SOFTWARE. > */ > > -#include "skeleton.dtsi" > - > #include <dt-bindings/thermal/thermal.h> > #include <dt-bindings/dma/sun4i-a10.h> > #include <dt-bindings/clock/sun4i-a10-ccu.h> > #include <dt-bindings/reset/sun4i-a10-ccu.h> > > / { > + #address-cells = <1>; > + #size-cells = <1>; > interrupt-parent = <&intc>; > > aliases { > @@ -160,10 +160,6 @@ > }; > }; > > - memory { > - reg = <0x40000000 0x80000000>; > - }; > - My only concern (I'm not sure if it's valid or not) is U-boot not being able to add nodes or properties due to lack of space within the DT blob. It seemed like a possibility in older versions. Otherwise, Acked-by: Chen-Yu Tsai <wens@csie.org> ^ permalink raw reply [flat|nested] 50+ messages in thread
* [PATCH 07/20] ARM: dts: sun4i: Remove skeleton and memory to avoid warnings 2017-10-05 15:43 ` Chen-Yu Tsai @ 2017-10-06 8:47 ` Maxime Ripard 2017-10-06 10:59 ` Chen-Yu Tsai 0 siblings, 1 reply; 50+ messages in thread From: Maxime Ripard @ 2017-10-06 8:47 UTC (permalink / raw) To: linux-arm-kernel On Thu, Oct 05, 2017 at 03:43:53PM +0000, Chen-Yu Tsai wrote: > On Thu, Oct 5, 2017 at 6:49 PM, Maxime Ripard > <maxime.ripard@free-electrons.com> wrote: > > Using skeleton.dtsi will create a memory node that will generate a warning > > in DTC. However, that node will be created by the bootloader, so we can > > just remove it entirely in order to remove that warning. > > > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> > > --- > > arch/arm/boot/dts/sun4i-a10.dtsi | 8 ++------ > > 1 file changed, 2 insertions(+), 6 deletions(-) > > > > diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi > > index 1876abb62ec7..f64544f615ea 100644 > > --- a/arch/arm/boot/dts/sun4i-a10.dtsi > > +++ b/arch/arm/boot/dts/sun4i-a10.dtsi > > @@ -41,14 +41,14 @@ > > * OTHER DEALINGS IN THE SOFTWARE. > > */ > > > > -#include "skeleton.dtsi" > > - > > #include <dt-bindings/thermal/thermal.h> > > #include <dt-bindings/dma/sun4i-a10.h> > > #include <dt-bindings/clock/sun4i-a10-ccu.h> > > #include <dt-bindings/reset/sun4i-a10-ccu.h> > > > > / { > > + #address-cells = <1>; > > + #size-cells = <1>; > > interrupt-parent = <&intc>; > > > > aliases { > > @@ -160,10 +160,6 @@ > > }; > > }; > > > > - memory { > > - reg = <0x40000000 0x80000000>; > > - }; > > - > > My only concern (I'm not sure if it's valid or not) is U-boot not being > able to add nodes or properties due to lack of space within the DT > blob. It seemed like a possibility in older versions. > > Otherwise, > > Acked-by: Chen-Yu Tsai <wens@csie.org> I don't think we really have to worry about it. We've had a bunch of nodes (like the PSCI nodes) created in the same way for quite some time already without causing any issues. Maxime -- Maxime Ripard, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 801 bytes Desc: not available URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20171006/08188b7f/attachment-0001.sig> ^ permalink raw reply [flat|nested] 50+ messages in thread
* [PATCH 07/20] ARM: dts: sun4i: Remove skeleton and memory to avoid warnings 2017-10-06 8:47 ` Maxime Ripard @ 2017-10-06 10:59 ` Chen-Yu Tsai 0 siblings, 0 replies; 50+ messages in thread From: Chen-Yu Tsai @ 2017-10-06 10:59 UTC (permalink / raw) To: linux-arm-kernel On Fri, Oct 6, 2017 at 4:47 PM, Maxime Ripard <maxime.ripard@free-electrons.com> wrote: > On Thu, Oct 05, 2017 at 03:43:53PM +0000, Chen-Yu Tsai wrote: >> On Thu, Oct 5, 2017 at 6:49 PM, Maxime Ripard >> <maxime.ripard@free-electrons.com> wrote: >> > Using skeleton.dtsi will create a memory node that will generate a warning >> > in DTC. However, that node will be created by the bootloader, so we can >> > just remove it entirely in order to remove that warning. >> > >> > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> >> > --- >> > arch/arm/boot/dts/sun4i-a10.dtsi | 8 ++------ >> > 1 file changed, 2 insertions(+), 6 deletions(-) >> > >> > diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi >> > index 1876abb62ec7..f64544f615ea 100644 >> > --- a/arch/arm/boot/dts/sun4i-a10.dtsi >> > +++ b/arch/arm/boot/dts/sun4i-a10.dtsi >> > @@ -41,14 +41,14 @@ >> > * OTHER DEALINGS IN THE SOFTWARE. >> > */ >> > >> > -#include "skeleton.dtsi" >> > - >> > #include <dt-bindings/thermal/thermal.h> >> > #include <dt-bindings/dma/sun4i-a10.h> >> > #include <dt-bindings/clock/sun4i-a10-ccu.h> >> > #include <dt-bindings/reset/sun4i-a10-ccu.h> >> > >> > / { >> > + #address-cells = <1>; >> > + #size-cells = <1>; >> > interrupt-parent = <&intc>; >> > >> > aliases { >> > @@ -160,10 +160,6 @@ >> > }; >> > }; >> > >> > - memory { >> > - reg = <0x40000000 0x80000000>; >> > - }; >> > - >> >> My only concern (I'm not sure if it's valid or not) is U-boot not being >> able to add nodes or properties due to lack of space within the DT >> blob. It seemed like a possibility in older versions. >> >> Otherwise, >> >> Acked-by: Chen-Yu Tsai <wens@csie.org> > > I don't think we really have to worry about it. We've had a bunch of > nodes (like the PSCI nodes) created in the same way for quite some > time already without causing any issues. Indeed. Ack it is then. ChenYu ^ permalink raw reply [flat|nested] 50+ messages in thread
* [PATCH 08/20] ARM: dts: sun4i: Change LRADC node names to avoid warnings 2017-10-05 10:49 [PATCH 00/20] sunxi: Cleanup DT warnings for the A10 and A80 Maxime Ripard ` (6 preceding siblings ...) 2017-10-05 10:49 ` [PATCH 07/20] ARM: dts: sun4i: Remove skeleton and memory to avoid warnings Maxime Ripard @ 2017-10-05 10:49 ` Maxime Ripard 2017-10-05 15:52 ` Chen-Yu Tsai 2017-10-05 10:49 ` [PATCH 09/20] ARM: dts: sun4i: Remove SoC node unit-name " Maxime Ripard ` (11 subsequent siblings) 19 siblings, 1 reply; 50+ messages in thread From: Maxime Ripard @ 2017-10-05 10:49 UTC (permalink / raw) To: linux-arm-kernel One of the usage of the LRADC is to implement buttons. The bindings define that we should have one subnode per button, with their associated voltage as a property. However, there was no reg property but we still used the voltage associated to the button as the unit-address, which eventually generated warnings in DTC. Rename the node names to avoid those warnings. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> --- arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts | 6 +++--- arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts | 4 ++-- arch/arm/boot/dts/sun4i-a10-gemei-g9.dts | 6 +++--- arch/arm/boot/dts/sun4i-a10-inet1.dts | 6 +++--- arch/arm/boot/dts/sun4i-a10-inet97fv2.dts | 10 +++++----- arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts | 10 +++++----- arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts | 4 ++-- 7 files changed, 23 insertions(+), 23 deletions(-) diff --git a/arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts b/arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts index 4978e46ca620..b2dbdac19c0f 100644 --- a/arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts +++ b/arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts @@ -98,21 +98,21 @@ vref-supply = <®_vcc3v0>; status = "okay"; - button at 800 { + button-800 { label = "Volume Up"; linux,code = <KEY_VOLUMEUP>; channel = <0>; voltage = <800000>; }; - button at 1000 { + button-1000 { label = "Volume Down"; linux,code = <KEY_VOLUMEDOWN>; channel = <0>; voltage = <1000000>; }; - button at 1200 { + button-1200 { label = "Back"; linux,code = <KEY_BACK>; channel = <0>; diff --git a/arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts b/arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts index 92e5a772a93f..96b595d4c064 100644 --- a/arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts +++ b/arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts @@ -140,14 +140,14 @@ vref-supply = <®_ldo2>; status = "okay"; - button at 400 { + button-400 { label = "Volume Down"; linux,code = <KEY_VOLUMEDOWN>; channel = <0>; voltage = <400000>; }; - button at 800 { + button-800 { label = "Volume Up"; linux,code = <KEY_VOLUMEUP>; channel = <0>; diff --git a/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts b/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts index e92074c6d894..4d85262f6292 100644 --- a/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts +++ b/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts @@ -118,21 +118,21 @@ status = "okay"; - button at 158 { + button-158 { label = "Volume Down"; linux,code = <KEY_VOLUMEDOWN>; channel = <0>; voltage = <158730>; }; - button at 349 { + button-349 { label = "Volume Up"; linux,code = <KEY_VOLUMEUP>; channel = <0>; voltage = <349206>; }; - button at 1142 { + button-1142 { label = "Esc"; linux,code = <KEY_ESC>; channel = <0>; diff --git a/arch/arm/boot/dts/sun4i-a10-inet1.dts b/arch/arm/boot/dts/sun4i-a10-inet1.dts index 016ec3e1889f..d96e149e7909 100644 --- a/arch/arm/boot/dts/sun4i-a10-inet1.dts +++ b/arch/arm/boot/dts/sun4i-a10-inet1.dts @@ -131,21 +131,21 @@ vref-supply = <®_ldo2>; status = "okay"; - button at 200 { + button-200 { label = "Volume Up"; linux,code = <KEY_VOLUMEUP>; channel = <0>; voltage = <200000>; }; - button at 1000 { + button-1000 { label = "Volume Down"; linux,code = <KEY_VOLUMEDOWN>; channel = <0>; voltage = <1000000>; }; - button at 1200 { + button-1200 { label = "Home"; linux,code = <KEY_HOMEPAGE>; channel = <0>; diff --git a/arch/arm/boot/dts/sun4i-a10-inet97fv2.dts b/arch/arm/boot/dts/sun4i-a10-inet97fv2.dts index 8250c720883e..c76f2538e3a2 100644 --- a/arch/arm/boot/dts/sun4i-a10-inet97fv2.dts +++ b/arch/arm/boot/dts/sun4i-a10-inet97fv2.dts @@ -103,35 +103,35 @@ vref-supply = <®_ldo2>; status = "okay"; - button at 200 { + button-200 { label = "Menu"; linux,code = <KEY_MENU>; channel = <0>; voltage = <200000>; }; - button at 600 { + button-600 { label = "Volume Up"; linux,code = <KEY_VOLUMEUP>; channel = <0>; voltage = <600000>; }; - button at 800 { + button-800 { label = "Volume Down"; linux,code = <KEY_VOLUMEDOWN>; channel = <0>; voltage = <800000>; }; - button at 1000 { + button-1000 { label = "Home"; linux,code = <KEY_HOMEPAGE>; channel = <0>; voltage = <1000000>; }; - button at 1200 { + button-1200 { label = "Esc"; linux,code = <KEY_ESC>; channel = <0>; diff --git a/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts b/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts index 98e13cba1714..1ed0d56dd2b4 100644 --- a/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts +++ b/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts @@ -261,35 +261,35 @@ vref-supply = <®_ldo2>; status = "okay"; - button at 200 { + button-200 { label = "Menu"; linux,code = <KEY_MENU>; channel = <0>; voltage = <200000>; }; - button at 600 { + button-600 { label = "Volume Up"; linux,code = <KEY_VOLUMEUP>; channel = <0>; voltage = <600000>; }; - button at 800 { + button-800 { label = "Volume Down"; linux,code = <KEY_VOLUMEDOWN>; channel = <0>; voltage = <800000>; }; - button at 1000 { + button-1000 { label = "Home"; linux,code = <KEY_HOMEPAGE>; channel = <0>; voltage = <1000000>; }; - button at 1200 { + button-1200 { label = "Esc"; linux,code = <KEY_ESC>; channel = <0>; diff --git a/arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts b/arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts index 654a2de3414b..96d100828ab4 100644 --- a/arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts +++ b/arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts @@ -126,14 +126,14 @@ vref-supply = <®_ldo2>; status = "okay"; - button at 400 { + button-400 { label = "Volume Up"; linux,code = <KEY_VOLUMEUP>; channel = <0>; voltage = <400000>; }; - button at 800 { + button-800 { label = "Volume Down"; linux,code = <KEY_VOLUMEDOWN>; channel = <0>; -- git-series 0.9.1 ^ permalink raw reply related [flat|nested] 50+ messages in thread
* [PATCH 08/20] ARM: dts: sun4i: Change LRADC node names to avoid warnings 2017-10-05 10:49 ` [PATCH 08/20] ARM: dts: sun4i: Change LRADC node names " Maxime Ripard @ 2017-10-05 15:52 ` Chen-Yu Tsai 2017-10-06 9:26 ` Maxime Ripard 0 siblings, 1 reply; 50+ messages in thread From: Chen-Yu Tsai @ 2017-10-05 15:52 UTC (permalink / raw) To: linux-arm-kernel On Thu, Oct 5, 2017 at 6:49 PM, Maxime Ripard <maxime.ripard@free-electrons.com> wrote: > One of the usage of the LRADC is to implement buttons. The bindings define > that we should have one subnode per button, with their associated voltage > as a property. > > However, there was no reg property but we still used the voltage associated > to the button as the unit-address, which eventually generated warnings in > DTC. > > Rename the node names to avoid those warnings. > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> > --- > arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts | 6 +++--- > arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts | 4 ++-- > arch/arm/boot/dts/sun4i-a10-gemei-g9.dts | 6 +++--- > arch/arm/boot/dts/sun4i-a10-inet1.dts | 6 +++--- > arch/arm/boot/dts/sun4i-a10-inet97fv2.dts | 10 +++++----- > arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts | 10 +++++----- > arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts | 4 ++-- > 7 files changed, 23 insertions(+), 23 deletions(-) > > diff --git a/arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts b/arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts > index 4978e46ca620..b2dbdac19c0f 100644 > --- a/arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts > +++ b/arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts > @@ -98,21 +98,21 @@ > vref-supply = <®_vcc3v0>; > status = "okay"; > > - button at 800 { > + button-800 { I think 800mV-button would be better, i.e. have the "generic" part of the name as a suffix. ChenYu ^ permalink raw reply [flat|nested] 50+ messages in thread
* [PATCH 08/20] ARM: dts: sun4i: Change LRADC node names to avoid warnings 2017-10-05 15:52 ` Chen-Yu Tsai @ 2017-10-06 9:26 ` Maxime Ripard 0 siblings, 0 replies; 50+ messages in thread From: Maxime Ripard @ 2017-10-06 9:26 UTC (permalink / raw) To: linux-arm-kernel On Thu, Oct 05, 2017 at 03:52:29PM +0000, Chen-Yu Tsai wrote: > On Thu, Oct 5, 2017 at 6:49 PM, Maxime Ripard > <maxime.ripard@free-electrons.com> wrote: > > One of the usage of the LRADC is to implement buttons. The bindings define > > that we should have one subnode per button, with their associated voltage > > as a property. > > > > However, there was no reg property but we still used the voltage associated > > to the button as the unit-address, which eventually generated warnings in > > DTC. > > > > Rename the node names to avoid those warnings. > > > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> > > --- > > arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts | 6 +++--- > > arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts | 4 ++-- > > arch/arm/boot/dts/sun4i-a10-gemei-g9.dts | 6 +++--- > > arch/arm/boot/dts/sun4i-a10-inet1.dts | 6 +++--- > > arch/arm/boot/dts/sun4i-a10-inet97fv2.dts | 10 +++++----- > > arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts | 10 +++++----- > > arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts | 4 ++-- > > 7 files changed, 23 insertions(+), 23 deletions(-) > > > > diff --git a/arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts b/arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts > > index 4978e46ca620..b2dbdac19c0f 100644 > > --- a/arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts > > +++ b/arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts > > @@ -98,21 +98,21 @@ > > vref-supply = <®_vcc3v0>; > > status = "okay"; > > > > - button at 800 { > > + button-800 { > > I think 800mV-button would be better, i.e. have the "generic" > part of the name as a suffix. It would go against most of the convention that we have everywhere else for framebuffers, pin muxings, or even regular node names that start with the class, and then have the most specific part. Maxime -- Maxime Ripard, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 801 bytes Desc: not available URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20171006/09fef6eb/attachment.sig> ^ permalink raw reply [flat|nested] 50+ messages in thread
* [PATCH 09/20] ARM: dts: sun4i: Remove SoC node unit-name to avoid warnings 2017-10-05 10:49 [PATCH 00/20] sunxi: Cleanup DT warnings for the A10 and A80 Maxime Ripard ` (7 preceding siblings ...) 2017-10-05 10:49 ` [PATCH 08/20] ARM: dts: sun4i: Change LRADC node names " Maxime Ripard @ 2017-10-05 10:49 ` Maxime Ripard 2017-10-05 15:44 ` Chen-Yu Tsai 2017-10-05 10:49 ` [PATCH 10/20] ARM: dts: sun4i: Rename thermal nodes " Maxime Ripard ` (10 subsequent siblings) 19 siblings, 1 reply; 50+ messages in thread From: Maxime Ripard @ 2017-10-05 10:49 UTC (permalink / raw) To: linux-arm-kernel Our main node for all the in-SoC controllers used to have a unit name. The unit-name, in addition to being actually false, would not match any reg property, which generates a warning. Remove it in order to remove those warnings. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> --- arch/arm/boot/dts/sun4i-a10.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi index f64544f615ea..6ce4aafdfd92 100644 --- a/arch/arm/boot/dts/sun4i-a10.dtsi +++ b/arch/arm/boot/dts/sun4i-a10.dtsi @@ -180,7 +180,7 @@ }; }; - soc at 1c00000 { + soc { compatible = "simple-bus"; #address-cells = <1>; #size-cells = <1>; -- git-series 0.9.1 ^ permalink raw reply related [flat|nested] 50+ messages in thread
* [PATCH 09/20] ARM: dts: sun4i: Remove SoC node unit-name to avoid warnings 2017-10-05 10:49 ` [PATCH 09/20] ARM: dts: sun4i: Remove SoC node unit-name " Maxime Ripard @ 2017-10-05 15:44 ` Chen-Yu Tsai 0 siblings, 0 replies; 50+ messages in thread From: Chen-Yu Tsai @ 2017-10-05 15:44 UTC (permalink / raw) To: linux-arm-kernel On Thu, Oct 5, 2017 at 6:49 PM, Maxime Ripard <maxime.ripard@free-electrons.com> wrote: > Our main node for all the in-SoC controllers used to have a unit name. The > unit-name, in addition to being actually false, would not match any reg > property, which generates a warning. > > Remove it in order to remove those warnings. > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Acked-by: Chen-Yu Tsai <wens@csie.org> ^ permalink raw reply [flat|nested] 50+ messages in thread
* [PATCH 10/20] ARM: dts: sun4i: Rename thermal nodes to avoid warnings 2017-10-05 10:49 [PATCH 00/20] sunxi: Cleanup DT warnings for the A10 and A80 Maxime Ripard ` (8 preceding siblings ...) 2017-10-05 10:49 ` [PATCH 09/20] ARM: dts: sun4i: Remove SoC node unit-name " Maxime Ripard @ 2017-10-05 10:49 ` Maxime Ripard 2017-10-05 15:44 ` Chen-Yu Tsai 2017-10-05 10:49 ` [PATCH 11/20] ARM: dts: sun4i: Remove all useless pinctrl nodes Maxime Ripard ` (9 subsequent siblings) 19 siblings, 1 reply; 50+ messages in thread From: Maxime Ripard @ 2017-10-05 10:49 UTC (permalink / raw) To: linux-arm-kernel The thermal-zone subnodes we defined for the A10 have underscores in them that will generate DTC warnings. Change those underscores for hyphens. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> --- arch/arm/boot/dts/sun4i-a10.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi index 6ce4aafdfd92..9e384234398a 100644 --- a/arch/arm/boot/dts/sun4i-a10.dtsi +++ b/arch/arm/boot/dts/sun4i-a10.dtsi @@ -129,7 +129,7 @@ }; thermal-zones { - cpu_thermal { + cpu-thermal { /* milliseconds */ polling-delay-passive = <250>; polling-delay = <1000>; @@ -143,14 +143,14 @@ }; trips { - cpu_alert0: cpu_alert0 { + cpu_alert0: cpu-alert0 { /* milliCelsius */ temperature = <850000>; hysteresis = <2000>; type = "passive"; }; - cpu_crit: cpu_crit { + cpu_crit: cpu-crit { /* milliCelsius */ temperature = <100000>; hysteresis = <2000>; -- git-series 0.9.1 ^ permalink raw reply related [flat|nested] 50+ messages in thread
* [PATCH 10/20] ARM: dts: sun4i: Rename thermal nodes to avoid warnings 2017-10-05 10:49 ` [PATCH 10/20] ARM: dts: sun4i: Rename thermal nodes " Maxime Ripard @ 2017-10-05 15:44 ` Chen-Yu Tsai 0 siblings, 0 replies; 50+ messages in thread From: Chen-Yu Tsai @ 2017-10-05 15:44 UTC (permalink / raw) To: linux-arm-kernel On Thu, Oct 5, 2017 at 6:49 PM, Maxime Ripard <maxime.ripard@free-electrons.com> wrote: > The thermal-zone subnodes we defined for the A10 have underscores in them > that will generate DTC warnings. Change those underscores for hyphens. > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Acked-by: Chen-Yu Tsai <wens@csie.org> ^ permalink raw reply [flat|nested] 50+ messages in thread
* [PATCH 11/20] ARM: dts: sun4i: Remove all useless pinctrl nodes 2017-10-05 10:49 [PATCH 00/20] sunxi: Cleanup DT warnings for the A10 and A80 Maxime Ripard ` (9 preceding siblings ...) 2017-10-05 10:49 ` [PATCH 10/20] ARM: dts: sun4i: Rename thermal nodes " Maxime Ripard @ 2017-10-05 10:49 ` Maxime Ripard 2017-10-05 15:48 ` Chen-Yu Tsai 2017-10-05 10:49 ` [PATCH 12/20] ARM: dts: sun4i: Remove underscores from nodes names Maxime Ripard ` (8 subsequent siblings) 19 siblings, 1 reply; 50+ messages in thread From: Maxime Ripard @ 2017-10-05 10:49 UTC (permalink / raw) To: linux-arm-kernel The gpio pinctrl nodes are redundant and as such useless most of the times. Since they will also generate warnings in DTC, we can simply remove most of them. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> --- arch/arm/boot/dts/sun4i-a10-a1000.dts | 16 +---------- arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts | 6 +---- arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts | 28 +----------------- arch/arm/boot/dts/sun4i-a10-gemei-g9.dts | 9 +----- arch/arm/boot/dts/sun4i-a10-hackberry.dts | 16 +---------- arch/arm/boot/dts/sun4i-a10-inet1.dts | 14 +--------- arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts | 16 +---------- arch/arm/boot/dts/sun4i-a10-marsboard.dts | 7 +---- arch/arm/boot/dts/sun4i-a10-mk802.dts | 20 +------------ arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts | 6 +---- arch/arm/boot/dts/sun4i-a10-pcduino.dts | 14 +--------- arch/arm/boot/dts/sun4i-a10-pcduino2.dts | 9 +----- arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts | 21 +------------- 13 files changed, 182 deletions(-) diff --git a/arch/arm/boot/dts/sun4i-a10-a1000.dts b/arch/arm/boot/dts/sun4i-a10-a1000.dts index 69513f341a8e..09e909576c61 100644 --- a/arch/arm/boot/dts/sun4i-a10-a1000.dts +++ b/arch/arm/boot/dts/sun4i-a10-a1000.dts @@ -62,8 +62,6 @@ leds { compatible = "gpio-leds"; - pinctrl-names = "default"; - pinctrl-0 = <&led_pins_a1000>; red { label = "a1000:red:usr"; @@ -79,8 +77,6 @@ reg_emac_3v3: emac-3v3 { compatible = "regulator-fixed"; - pinctrl-names = "default"; - pinctrl-0 = <&emac_power_pin_a1000>; regulator-name = "emac-3v3"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; @@ -181,18 +177,6 @@ status = "okay"; }; -&pio { - emac_power_pin_a1000: emac_power_pin at 0 { - pins = "PH15"; - function = "gpio_out"; - }; - - led_pins_a1000: led_pins at 0 { - pins = "PH10", "PH20"; - function = "gpio_out"; - }; -}; - #include "axp209.dtsi" ®_dcdc2 { diff --git a/arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts b/arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts index f18c832d4e16..39ba4ccb9e2e 100644 --- a/arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts +++ b/arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts @@ -119,12 +119,6 @@ status = "okay"; }; -&pio { - usb2_vbus_pin_a: usb2_vbus_pin at 0 { - pins = "PH12"; - }; -}; - ®_usb0_vbus { regulator-boot-on; status = "okay"; diff --git a/arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts b/arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts index 96b595d4c064..acbf692e837f 100644 --- a/arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts +++ b/arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts @@ -58,8 +58,6 @@ backlight: backlight { compatible = "pwm-backlight"; - pinctrl-names = "default"; - pinctrl-0 = <&bl_en_pin_dsrv9703c>; pwms = <&pwm 0 50000 PWM_POLARITY_INVERTED>; brightness-levels = <0 10 20 30 40 50 60 70 80 90 100>; default-brightness-level = <8>; @@ -79,8 +77,6 @@ reg_motor: reg_motor { compatible = "regulator-fixed"; - pinctrl-names = "default"; - pinctrl-0 = <&motor_pins>; regulator-name = "vcc-motor"; regulator-min-microvolt = <3000000>; regulator-max-microvolt = <3000000>; @@ -90,8 +86,6 @@ }; &codec { - pinctrl-names = "default"; - pinctrl-0 = <&codec_pa_pin>; allwinner,pa-gpios = <&pio 7 15 GPIO_ACTIVE_HIGH>; /* PH15 */ status = "okay"; }; @@ -128,8 +122,6 @@ reg = <0x38>; interrupt-parent = <&pio>; interrupts = <7 21 IRQ_TYPE_EDGE_FALLING>; - pinctrl-names = "default"; - pinctrl-0 = <&touchscreen_pins>; reset-gpios = <&pio 1 13 GPIO_ACTIVE_LOW>; touchscreen-size-x = <1024>; touchscreen-size-y = <768>; @@ -168,26 +160,6 @@ }; &pio { - bl_en_pin_dsrv9703c: bl_en_pin at 0 { - pins = "PH7"; - function = "gpio_out"; - }; - - codec_pa_pin: codec_pa_pin at 0 { - pins = "PH15"; - function = "gpio_out"; - }; - - motor_pins: motor_pins at 0 { - pins = "PB3"; - function = "gpio_out"; - }; - - touchscreen_pins: touchscreen_pins at 0 { - pins = "PB13"; - function = "gpio_out"; - }; - usb0_id_detect_pin: usb0_id_detect_pin at 0 { pins = "PH4"; function = "gpio_in"; diff --git a/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts b/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts index 4d85262f6292..41ca8bded89f 100644 --- a/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts +++ b/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts @@ -72,8 +72,6 @@ */ &codec { /* PH15 controls power to external amplifier (ft2012q) */ - pinctrl-names = "default"; - pinctrl-0 = <&codec_pa_pin>; allwinner,pa-gpios = <&pio 7 15 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -148,13 +146,6 @@ status = "okay"; }; -&pio { - codec_pa_pin: codec_pa_pin at 0 { - pins = "PH15"; - function = "gpio_out"; - }; -}; - ®_dcdc2 { regulator-always-on; regulator-min-microvolt = <1000000>; diff --git a/arch/arm/boot/dts/sun4i-a10-hackberry.dts b/arch/arm/boot/dts/sun4i-a10-hackberry.dts index d6ae111d8cd1..f33e42d6ce8b 100644 --- a/arch/arm/boot/dts/sun4i-a10-hackberry.dts +++ b/arch/arm/boot/dts/sun4i-a10-hackberry.dts @@ -119,27 +119,11 @@ status = "okay"; }; -&pio { - pinctrl-names = "default"; - pinctrl-0 = <&hackberry_hogs>; - - hackberry_hogs: hogs at 0 { - pins = "PH19"; - function = "gpio_out"; - }; - - usb2_vbus_pin_hackberry: usb2_vbus_pin at 0 { - pins = "PH12"; - function = "gpio_out"; - }; -}; - ®_usb1_vbus { status = "okay"; }; ®_usb2_vbus { - pinctrl-0 = <&usb2_vbus_pin_hackberry>; gpio = <&pio 7 12 GPIO_ACTIVE_HIGH>; status = "okay"; }; diff --git a/arch/arm/boot/dts/sun4i-a10-inet1.dts b/arch/arm/boot/dts/sun4i-a10-inet1.dts index d96e149e7909..2374ee7dfc64 100644 --- a/arch/arm/boot/dts/sun4i-a10-inet1.dts +++ b/arch/arm/boot/dts/sun4i-a10-inet1.dts @@ -58,8 +58,6 @@ backlight: backlight { compatible = "pwm-backlight"; - pinctrl-names = "default"; - pinctrl-0 = <&bl_en_pin_inet>; pwms = <&pwm 0 50000 PWM_POLARITY_INVERTED>; brightness-levels = <0 10 20 30 40 50 60 70 80 90 100>; default-brightness-level = <8>; @@ -118,8 +116,6 @@ reg = <0x38>; interrupt-parent = <&pio>; interrupts = <7 21 IRQ_TYPE_EDGE_FALLING>; - pinctrl-names = "default"; - pinctrl-0 = <&touchscreen_wake_pin>; wake-gpios = <&pio 1 13 GPIO_ACTIVE_HIGH>; /* PB13 */ touchscreen-size-x = <600>; touchscreen-size-y = <1024>; @@ -170,16 +166,6 @@ }; &pio { - bl_en_pin_inet: bl_en_pin at 0 { - pins = "PH7"; - function = "gpio_out"; - }; - - touchscreen_wake_pin: touchscreen_wake_pin at 0 { - pins = "PB13"; - function = "gpio_out"; - }; - usb0_id_detect_pin: usb0_id_detect_pin at 0 { pins = "PH4"; function = "gpio_in"; diff --git a/arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts b/arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts index 86f779bd9648..879141ca6027 100644 --- a/arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts +++ b/arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts @@ -62,8 +62,6 @@ leds { compatible = "gpio-leds"; - pinctrl-names = "default"; - pinctrl-0 = <&led_pins_q5>; green { label = "q5:green:usr"; @@ -74,8 +72,6 @@ reg_emac_3v3: emac-3v3 { compatible = "regulator-fixed"; - pinctrl-names = "default"; - pinctrl-0 = <&emac_power_pin_q5>; regulator-name = "emac-3v3"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; @@ -154,18 +150,6 @@ status = "okay"; }; -&pio { - emac_power_pin_q5: emac_power_pin at 0 { - pins = "PH19"; - function = "gpio_out"; - }; - - led_pins_q5: led_pins at 0 { - pins = "PH20"; - function = "gpio_out"; - }; -}; - ®_usb0_vbus { regulator-boot-on; status = "okay"; diff --git a/arch/arm/boot/dts/sun4i-a10-marsboard.dts b/arch/arm/boot/dts/sun4i-a10-marsboard.dts index d9af1042b045..86c7c3fcaf9c 100644 --- a/arch/arm/boot/dts/sun4i-a10-marsboard.dts +++ b/arch/arm/boot/dts/sun4i-a10-marsboard.dts @@ -61,8 +61,6 @@ leds { compatible = "gpio-leds"; - pinctrl-names = "default"; - pinctrl-0 = <&led_pins_marsboard>; red1 { label = "marsboard:red1:usr"; @@ -152,11 +150,6 @@ }; &pio { - led_pins_marsboard: led_pins at 0 { - pins = "PB5", "PB6", "PB7", "PB8"; - function = "gpio_out"; - }; - usb0_id_detect_pin: usb0_id_detect_pin at 0 { pins = "PH4"; function = "gpio_in"; diff --git a/arch/arm/boot/dts/sun4i-a10-mk802.dts b/arch/arm/boot/dts/sun4i-a10-mk802.dts index b8d1501ef7e6..7198b34e2e50 100644 --- a/arch/arm/boot/dts/sun4i-a10-mk802.dts +++ b/arch/arm/boot/dts/sun4i-a10-mk802.dts @@ -86,23 +86,6 @@ status = "okay"; }; -&pio { - usb0_id_detect_pin: usb0_id_detect_pin at 0 { - pins = "PH4"; - function = "gpio_in"; - }; - - usb0_vbus_detect_pin: usb0_vbus_detect_pin at 0 { - pins = "PH5"; - function = "gpio_in"; - }; - - usb2_vbus_pin_mk802: usb2_vbus_pin at 0 { - pins = "PH12"; - function = "gpio_out"; - }; -}; - ®_usb0_vbus { status = "okay"; }; @@ -112,7 +95,6 @@ }; ®_usb2_vbus { - pinctrl-0 = <&usb2_vbus_pin_mk802>; gpio = <&pio 7 12 GPIO_ACTIVE_HIGH>; /* PH12 */ status = "okay"; }; @@ -129,8 +111,6 @@ }; &usbphy { - pinctrl-names = "default"; - pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>; usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ usb0_vbus_det-gpios = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */ usb0_vbus-supply = <®_usb0_vbus>; diff --git a/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts b/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts index 45df067cb35f..3689b8c3b7a0 100644 --- a/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts +++ b/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts @@ -158,11 +158,6 @@ }; &pio { - ahci_pwr_pin_olinuxinolime: ahci_pwr_pin at 1 { - pins = "PC3"; - function = "gpio_out"; - }; - led_pins_olinuxinolime: led_pins at 0 { pins = "PH2"; function = "gpio_out"; @@ -183,7 +178,6 @@ }; ®_ahci_5v { - pinctrl-0 = <&ahci_pwr_pin_olinuxinolime>; gpio = <&pio 2 3 GPIO_ACTIVE_HIGH>; status = "okay"; }; diff --git a/arch/arm/boot/dts/sun4i-a10-pcduino.dts b/arch/arm/boot/dts/sun4i-a10-pcduino.dts index d19e0ddfe353..c62db1e2c115 100644 --- a/arch/arm/boot/dts/sun4i-a10-pcduino.dts +++ b/arch/arm/boot/dts/sun4i-a10-pcduino.dts @@ -62,8 +62,6 @@ leds { compatible = "gpio-leds"; - pinctrl-names = "default"; - pinctrl-0 = <&led_pins_pcduino>; tx { label = "pcduino:green:tx"; @@ -78,8 +76,6 @@ gpio_keys { compatible = "gpio-keys"; - pinctrl-names = "default"; - pinctrl-0 = <&key_pins_pcduino>; #address-cells = <1>; #size-cells = <0>; @@ -162,16 +158,6 @@ }; &pio { - led_pins_pcduino: led_pins at 0 { - pins = "PH15", "PH16"; - function = "gpio_out"; - }; - - key_pins_pcduino: key_pins at 0 { - pins = "PH17", "PH18", "PH19"; - function = "gpio_in"; - }; - usb0_id_detect_pin: usb0_id_detect_pin at 0 { pins = "PH4"; function = "gpio_in"; diff --git a/arch/arm/boot/dts/sun4i-a10-pcduino2.dts b/arch/arm/boot/dts/sun4i-a10-pcduino2.dts index 811d00ee2ade..bc4f128965ed 100644 --- a/arch/arm/boot/dts/sun4i-a10-pcduino2.dts +++ b/arch/arm/boot/dts/sun4i-a10-pcduino2.dts @@ -55,16 +55,7 @@ compatible = "linksprite,a10-pcduino2", "allwinner,sun4i-a10"; }; -&pio { - usb2_vbus_pin_pcduino2: usb2_vbus_pin at 0 { - pins = "PD2"; - function = "gpio_out"; - }; -}; - ®_usb2_vbus { - pinctrl-names = "default"; - pinctrl-0 = <&usb2_vbus_pin_pcduino2>; gpio = <&pio 3 2 GPIO_ACTIVE_HIGH>; status = "okay"; }; diff --git a/arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts b/arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts index 96d100828ab4..46e485ff925b 100644 --- a/arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts +++ b/arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts @@ -58,8 +58,6 @@ backlight: backlight { compatible = "pwm-backlight"; - pinctrl-names = "default"; - pinctrl-0 = <&bl_en_pin_protab>; pwms = <&pwm 0 50000 PWM_POLARITY_INVERTED>; brightness-levels = <0 10 20 30 40 50 60 70 80 90 100>; default-brightness-level = <8>; @@ -72,8 +70,6 @@ }; &codec { - pinctrl-names = "default"; - pinctrl-0 = <&codec_pa_pin>; allwinner,pa-gpios = <&pio 7 15 GPIO_ACTIVE_HIGH>; /* PH15 */ status = "okay"; }; @@ -106,8 +102,6 @@ status = "okay"; pixcir_ts at 5c { - pinctrl-names = "default"; - pinctrl-0 = <&touchscreen_pins>; compatible = "pixcir,pixcir_tangoc"; reg = <0x5c>; interrupt-parent = <&pio>; @@ -154,21 +148,6 @@ }; &pio { - bl_en_pin_protab: bl_en_pin at 0 { - pins = "PH7"; - function = "gpio_out"; - }; - - codec_pa_pin: codec_pa_pin at 0 { - pins = "PH15"; - function = "gpio_out"; - }; - - touchscreen_pins: touchscreen_pins at 0 { - pins = "PA5", "PB13"; - function = "gpio_out"; - }; - usb0_id_detect_pin: usb0_id_detect_pin at 0 { pins = "PH4"; function = "gpio_in"; -- git-series 0.9.1 ^ permalink raw reply related [flat|nested] 50+ messages in thread
* [PATCH 11/20] ARM: dts: sun4i: Remove all useless pinctrl nodes 2017-10-05 10:49 ` [PATCH 11/20] ARM: dts: sun4i: Remove all useless pinctrl nodes Maxime Ripard @ 2017-10-05 15:48 ` Chen-Yu Tsai 0 siblings, 0 replies; 50+ messages in thread From: Chen-Yu Tsai @ 2017-10-05 15:48 UTC (permalink / raw) To: linux-arm-kernel On Thu, Oct 5, 2017 at 6:49 PM, Maxime Ripard <maxime.ripard@free-electrons.com> wrote: > The gpio pinctrl nodes are redundant and as such useless most of the times. > Since they will also generate warnings in DTC, we can simply remove most of > them. > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Acked-by: Chen-Yu Tsai <wens@csie.org> ^ permalink raw reply [flat|nested] 50+ messages in thread
* [PATCH 12/20] ARM: dts: sun4i: Remove underscores from nodes names 2017-10-05 10:49 [PATCH 00/20] sunxi: Cleanup DT warnings for the A10 and A80 Maxime Ripard ` (10 preceding siblings ...) 2017-10-05 10:49 ` [PATCH 11/20] ARM: dts: sun4i: Remove all useless pinctrl nodes Maxime Ripard @ 2017-10-05 10:49 ` Maxime Ripard 2017-10-05 15:49 ` Chen-Yu Tsai 2017-10-05 10:49 ` [PATCH 13/20] ARM: dts: sun4i: Remove gpio-keys warnings Maxime Ripard ` (7 subsequent siblings) 19 siblings, 1 reply; 50+ messages in thread From: Maxime Ripard @ 2017-10-05 10:49 UTC (permalink / raw) To: linux-arm-kernel Some GPIO pinctrl nodes cannot be easily removed, because they would also change the pin configuration, for example to add a pull resistor or change the current delivered by the pin. Those nodes still have underscores and unit-addresses in their node names in our DTs, so adjust their name to remove the warnings. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> --- arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts | 4 ++-- arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 4 ++-- arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts | 6 +++--- arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts | 4 ++-- arch/arm/boot/dts/sun4i-a10-inet1.dts | 4 ++-- arch/arm/boot/dts/sun4i-a10-inet97fv2.dts | 4 ++-- arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts | 8 ++++---- arch/arm/boot/dts/sun4i-a10-marsboard.dts | 2 +- arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts | 6 +++--- arch/arm/boot/dts/sun4i-a10-pcduino.dts | 4 ++-- arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts | 6 +++--- 11 files changed, 26 insertions(+), 26 deletions(-) diff --git a/arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts b/arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts index b2dbdac19c0f..dfc88aee4fe3 100644 --- a/arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts +++ b/arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts @@ -133,13 +133,13 @@ }; &pio { - usb0_id_detect_pin: usb0_id_detect_pin at 0 { + usb0_id_detect_pin: usb0-id-detect-pin { pins = "PH4"; function = "gpio_in"; bias-pull-up; }; - usb0_vbus_detect_pin: usb0_vbus_detect_pin at 0 { + usb0_vbus_detect_pin: usb0-vbus-detect-pin { pins = "PH5"; function = "gpio_in"; bias-pull-down; diff --git a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts index b48cc70aa6c2..d5ba5400a975 100644 --- a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts +++ b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts @@ -155,13 +155,13 @@ }; &pio { - led_pins_cubieboard: led_pins at 0 { + led_pins_cubieboard: led-pins { pins = "PH20", "PH21"; function = "gpio_out"; drive-strength = <20>; }; - usb0_id_detect_pin: usb0_id_detect_pin at 0 { + usb0_id_detect_pin: usb0-id-detect-pin { pins = "PH4"; function = "gpio_in"; bias-pull-up; diff --git a/arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts b/arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts index acbf692e837f..147cbc5e08ac 100644 --- a/arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts +++ b/arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts @@ -75,7 +75,7 @@ max-microvolt = <3000000>; }; - reg_motor: reg_motor { + reg_motor: reg-motor { compatible = "regulator-fixed"; regulator-name = "vcc-motor"; regulator-min-microvolt = <3000000>; @@ -160,13 +160,13 @@ }; &pio { - usb0_id_detect_pin: usb0_id_detect_pin at 0 { + usb0_id_detect_pin: usb0-id-detect-pin { pins = "PH4"; function = "gpio_in"; bias-pull-up; }; - usb0_vbus_detect_pin: usb0_vbus_detect_pin at 0 { + usb0_vbus_detect_pin: usb0-vbus-detect-pin { pins = "PH5"; function = "gpio_in"; bias-pull-down; diff --git a/arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts b/arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts index f5e9b643007e..35c57d065dd8 100644 --- a/arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts +++ b/arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts @@ -88,13 +88,13 @@ }; &pio { - usb0_id_detect_pin: usb0_id_detect_pin at 0 { + usb0_id_detect_pin: usb0-id-detect-pin { pins = "PH4"; function = "gpio_in"; bias-pull-up; }; - usb0_vbus_detect_pin: usb0_vbus_detect_pin at 0 { + usb0_vbus_detect_pin: usb0-vbus-detect-pin { pins = "PH5"; function = "gpio_in"; bias-pull-down; diff --git a/arch/arm/boot/dts/sun4i-a10-inet1.dts b/arch/arm/boot/dts/sun4i-a10-inet1.dts index 2374ee7dfc64..9482e831a9a1 100644 --- a/arch/arm/boot/dts/sun4i-a10-inet1.dts +++ b/arch/arm/boot/dts/sun4i-a10-inet1.dts @@ -166,13 +166,13 @@ }; &pio { - usb0_id_detect_pin: usb0_id_detect_pin at 0 { + usb0_id_detect_pin: usb0-id-detect-pin { pins = "PH4"; function = "gpio_in"; bias-pull-up; }; - usb0_vbus_detect_pin: usb0_vbus_detect_pin at 0 { + usb0_vbus_detect_pin: usb0-vbus-detect-pin { pins = "PH5"; function = "gpio_in"; bias-pull-down; diff --git a/arch/arm/boot/dts/sun4i-a10-inet97fv2.dts b/arch/arm/boot/dts/sun4i-a10-inet97fv2.dts index c76f2538e3a2..4b5c91c8e85b 100644 --- a/arch/arm/boot/dts/sun4i-a10-inet97fv2.dts +++ b/arch/arm/boot/dts/sun4i-a10-inet97fv2.dts @@ -152,13 +152,13 @@ }; &pio { - usb0_id_detect_pin: usb0_id_detect_pin at 0 { + usb0_id_detect_pin: usb0-id-detect-pin { pins = "PH4"; function = "gpio_in"; bias-pull-up; }; - usb0_vbus_detect_pin: usb0_vbus_detect_pin at 0 { + usb0_vbus_detect_pin: usb0-vbus-detect-pin { pins = "PH5"; function = "gpio_in"; bias-pull-down; diff --git a/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts b/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts index 1ed0d56dd2b4..7c7f12132ea3 100644 --- a/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts +++ b/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts @@ -59,7 +59,7 @@ stdout-path = "serial0:115200n8"; }; - gpio_keys { + gpio-keys { compatible = "gpio-keys-polled"; pinctrl-names = "default"; pinctrl-0 = <&key_pins_inet9f>; @@ -310,7 +310,7 @@ }; &pio { - key_pins_inet9f: key_pins at 0 { + key_pins_inet9f: key-pins { pins = "PA0", "PA1", "PA3", "PA4", "PA5", "PA6", "PA8", "PA9", "PA11", "PA12", "PA13", @@ -320,13 +320,13 @@ bias-pull-up; }; - usb0_id_detect_pin: usb0_id_detect_pin at 0 { + usb0_id_detect_pin: usb0-id-detect-pin { pins = "PH4"; function = "gpio_in"; bias-pull-up; }; - usb0_vbus_detect_pin: usb0_vbus_detect_pin at 0 { + usb0_vbus_detect_pin: usb0-vbus-detect-pin { pins = "PH5"; function = "gpio_in"; bias-pull-down; diff --git a/arch/arm/boot/dts/sun4i-a10-marsboard.dts b/arch/arm/boot/dts/sun4i-a10-marsboard.dts index 86c7c3fcaf9c..435c551aef0f 100644 --- a/arch/arm/boot/dts/sun4i-a10-marsboard.dts +++ b/arch/arm/boot/dts/sun4i-a10-marsboard.dts @@ -150,7 +150,7 @@ }; &pio { - usb0_id_detect_pin: usb0_id_detect_pin at 0 { + usb0_id_detect_pin: usb0-id-detect-pin { pins = "PH4"; function = "gpio_in"; bias-pull-up; diff --git a/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts b/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts index 3689b8c3b7a0..2d1b4329f54a 100644 --- a/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts +++ b/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts @@ -158,19 +158,19 @@ }; &pio { - led_pins_olinuxinolime: led_pins at 0 { + led_pins_olinuxinolime: led-pin { pins = "PH2"; function = "gpio_out"; drive-strength = <20>; }; - usb0_id_detect_pin: usb0_id_detect_pin at 0 { + usb0_id_detect_pin: usb0-id-detect-pin { pins = "PH4"; function = "gpio_in"; bias-pull-up; }; - usb0_vbus_detect_pin: usb0_vbus_detect_pin at 0 { + usb0_vbus_detect_pin: usb0-vbus-detect-pin { pins = "PH5"; function = "gpio_in"; bias-pull-down; diff --git a/arch/arm/boot/dts/sun4i-a10-pcduino.dts b/arch/arm/boot/dts/sun4i-a10-pcduino.dts index c62db1e2c115..be7508cecd2e 100644 --- a/arch/arm/boot/dts/sun4i-a10-pcduino.dts +++ b/arch/arm/boot/dts/sun4i-a10-pcduino.dts @@ -74,7 +74,7 @@ }; }; - gpio_keys { + gpio-keys { compatible = "gpio-keys"; #address-cells = <1>; #size-cells = <0>; @@ -158,7 +158,7 @@ }; &pio { - usb0_id_detect_pin: usb0_id_detect_pin at 0 { + usb0_id_detect_pin: usb0-id-detect-pin { pins = "PH4"; function = "gpio_in"; bias-pull-up; diff --git a/arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts b/arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts index 46e485ff925b..5081303f79e7 100644 --- a/arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts +++ b/arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts @@ -101,7 +101,7 @@ &i2c2 { status = "okay"; - pixcir_ts at 5c { + touchscreen at 5c { compatible = "pixcir,pixcir_tangoc"; reg = <0x5c>; interrupt-parent = <&pio>; @@ -148,13 +148,13 @@ }; &pio { - usb0_id_detect_pin: usb0_id_detect_pin at 0 { + usb0_id_detect_pin: usb0-id-detect-pin { pins = "PH4"; function = "gpio_in"; bias-pull-up; }; - usb0_vbus_detect_pin: usb0_vbus_detect_pin at 0 { + usb0_vbus_detect_pin: usb0-vbus-detect-pin { pins = "PH5"; function = "gpio_in"; bias-pull-down; -- git-series 0.9.1 ^ permalink raw reply related [flat|nested] 50+ messages in thread
* [PATCH 12/20] ARM: dts: sun4i: Remove underscores from nodes names 2017-10-05 10:49 ` [PATCH 12/20] ARM: dts: sun4i: Remove underscores from nodes names Maxime Ripard @ 2017-10-05 15:49 ` Chen-Yu Tsai 0 siblings, 0 replies; 50+ messages in thread From: Chen-Yu Tsai @ 2017-10-05 15:49 UTC (permalink / raw) To: linux-arm-kernel On Thu, Oct 5, 2017 at 6:49 PM, Maxime Ripard <maxime.ripard@free-electrons.com> wrote: > Some GPIO pinctrl nodes cannot be easily removed, because they would also > change the pin configuration, for example to add a pull resistor or change > the current delivered by the pin. > > Those nodes still have underscores and unit-addresses in their node names > in our DTs, so adjust their name to remove the warnings. > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> > --- [...] > diff --git a/arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts b/arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts > index 46e485ff925b..5081303f79e7 100644 > --- a/arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts > +++ b/arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts > @@ -101,7 +101,7 @@ > &i2c2 { > status = "okay"; > > - pixcir_ts at 5c { > + touchscreen at 5c { You also fixed up a name here. Please mention it. > compatible = "pixcir,pixcir_tangoc"; > reg = <0x5c>; > interrupt-parent = <&pio>; [...] Otherwise, Acked-by: Chen-Yu Tsai <wens@csie.org> ^ permalink raw reply [flat|nested] 50+ messages in thread
* [PATCH 13/20] ARM: dts: sun4i: Remove gpio-keys warnings 2017-10-05 10:49 [PATCH 00/20] sunxi: Cleanup DT warnings for the A10 and A80 Maxime Ripard ` (11 preceding siblings ...) 2017-10-05 10:49 ` [PATCH 12/20] ARM: dts: sun4i: Remove underscores from nodes names Maxime Ripard @ 2017-10-05 10:49 ` Maxime Ripard 2017-10-05 15:51 ` Chen-Yu Tsai 2017-10-05 10:49 ` [PATCH 14/20] ARM: dts: sun9i: Remove skeleton to avoid warnings Maxime Ripard ` (6 subsequent siblings) 19 siblings, 1 reply; 50+ messages in thread From: Maxime Ripard @ 2017-10-05 10:49 UTC (permalink / raw) To: linux-arm-kernel Some gpio-keys definitions in our DTs were having buttons defined with a unit-address and that would generate a DTC warning. Change the buttons node names to remove the warnings. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> --- arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts | 40 ++++++++++----------- arch/arm/boot/dts/sun4i-a10-pcduino.dts | 6 +-- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts b/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts index 7c7f12132ea3..13224f5ac166 100644 --- a/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts +++ b/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts @@ -67,7 +67,7 @@ #size-cells = <0>; poll-interval = <20>; - button at 0 { + left-joystick-left { label = "Left Joystick Left"; linux,code = <ABS_X>; linux,input-type = <EV_ABS>; @@ -75,7 +75,7 @@ gpios = <&pio 0 6 GPIO_ACTIVE_LOW>; /* PA6 */ }; - button at 1 { + left-joystick-right { label = "Left Joystick Right"; linux,code = <ABS_X>; linux,input-type = <EV_ABS>; @@ -83,7 +83,7 @@ gpios = <&pio 0 5 GPIO_ACTIVE_LOW>; /* PA5 */ }; - button at 2 { + left-joystick-up { label = "Left Joystick Up"; linux,code = <ABS_Y>; linux,input-type = <EV_ABS>; @@ -91,7 +91,7 @@ gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */ }; - button at 3 { + left-joystick-down { label = "Left Joystick Down"; linux,code = <ABS_Y>; linux,input-type = <EV_ABS>; @@ -99,7 +99,7 @@ gpios = <&pio 0 9 GPIO_ACTIVE_LOW>; /* PA9 */ }; - button at 4 { + right-joystick-left { label = "Right Joystick Left"; linux,code = <ABS_Z>; linux,input-type = <EV_ABS>; @@ -107,7 +107,7 @@ gpios = <&pio 0 1 GPIO_ACTIVE_LOW>; /* PA1 */ }; - button at 5 { + right-joystick-right { label = "Right Joystick Right"; linux,code = <ABS_Z>; linux,input-type = <EV_ABS>; @@ -115,7 +115,7 @@ gpios = <&pio 0 0 GPIO_ACTIVE_LOW>; /* PA0 */ }; - button at 6 { + right-joystick-up { label = "Right Joystick Up"; linux,code = <ABS_RZ>; linux,input-type = <EV_ABS>; @@ -123,7 +123,7 @@ gpios = <&pio 0 3 GPIO_ACTIVE_LOW>; /* PA3 */ }; - button at 7 { + right-joystick-down { label = "Right Joystick Down"; linux,code = <ABS_RZ>; linux,input-type = <EV_ABS>; @@ -131,7 +131,7 @@ gpios = <&pio 0 4 GPIO_ACTIVE_LOW>; /* PA4 */ }; - button at 8 { + dpad-left { label = "DPad Left"; linux,code = <ABS_HAT0X>; linux,input-type = <EV_ABS>; @@ -139,7 +139,7 @@ gpios = <&pio 7 23 GPIO_ACTIVE_LOW>; /* PH23 */ }; - button at 9 { + dpad-right { label = "DPad Right"; linux,code = <ABS_HAT0X>; linux,input-type = <EV_ABS>; @@ -147,7 +147,7 @@ gpios = <&pio 7 24 GPIO_ACTIVE_LOW>; /* PH24 */ }; - button at 10 { + dpad-up { label = "DPad Up"; linux,code = <ABS_HAT0Y>; linux,input-type = <EV_ABS>; @@ -155,7 +155,7 @@ gpios = <&pio 7 25 GPIO_ACTIVE_LOW>; /* PH25 */ }; - button at 11 { + dpad-down { label = "DPad Down"; linux,code = <ABS_HAT0Y>; linux,input-type = <EV_ABS>; @@ -163,49 +163,49 @@ gpios = <&pio 7 26 GPIO_ACTIVE_LOW>; /* PH26 */ }; - button at 12 { + x { label = "Button X"; linux,code = <BTN_X>; gpios = <&pio 0 16 GPIO_ACTIVE_LOW>; /* PA16 */ }; - button at 13 { + y { label = "Button Y"; linux,code = <BTN_Y>; gpios = <&pio 0 14 GPIO_ACTIVE_LOW>; /* PA14 */ }; - button at 14 { + a { label = "Button A"; linux,code = <BTN_A>; gpios = <&pio 0 17 GPIO_ACTIVE_LOW>; /* PA17 */ }; - button at 15 { + b { label = "Button B"; linux,code = <BTN_B>; gpios = <&pio 0 15 GPIO_ACTIVE_LOW>; /* PA15 */ }; - button at 16 { + select { label = "Select Button"; linux,code = <BTN_SELECT>; gpios = <&pio 0 11 GPIO_ACTIVE_LOW>; /* PA11 */ }; - button at 17 { + start { label = "Start Button"; linux,code = <BTN_START>; gpios = <&pio 0 12 GPIO_ACTIVE_LOW>; /* PA12 */ }; - button at 18 { + top-left { label = "Top Left Button"; linux,code = <BTN_TL>; gpios = <&pio 7 22 GPIO_ACTIVE_LOW>; /* PH22 */ }; - button at 19 { + top-right { label = "Top Right Button"; linux,code = <BTN_TR>; gpios = <&pio 0 13 GPIO_ACTIVE_LOW>; /* PA13 */ diff --git a/arch/arm/boot/dts/sun4i-a10-pcduino.dts b/arch/arm/boot/dts/sun4i-a10-pcduino.dts index be7508cecd2e..6e140547b638 100644 --- a/arch/arm/boot/dts/sun4i-a10-pcduino.dts +++ b/arch/arm/boot/dts/sun4i-a10-pcduino.dts @@ -79,19 +79,19 @@ #address-cells = <1>; #size-cells = <0>; - button at 0 { + back { label = "Key Back"; linux,code = <KEY_BACK>; gpios = <&pio 7 17 GPIO_ACTIVE_LOW>; }; - button at 1 { + home { label = "Key Home"; linux,code = <KEY_HOME>; gpios = <&pio 7 18 GPIO_ACTIVE_LOW>; }; - button at 2 { + menu { label = "Key Menu"; linux,code = <KEY_MENU>; gpios = <&pio 7 19 GPIO_ACTIVE_LOW>; -- git-series 0.9.1 ^ permalink raw reply related [flat|nested] 50+ messages in thread
* [PATCH 13/20] ARM: dts: sun4i: Remove gpio-keys warnings 2017-10-05 10:49 ` [PATCH 13/20] ARM: dts: sun4i: Remove gpio-keys warnings Maxime Ripard @ 2017-10-05 15:51 ` Chen-Yu Tsai 2017-10-06 9:27 ` Maxime Ripard 0 siblings, 1 reply; 50+ messages in thread From: Chen-Yu Tsai @ 2017-10-05 15:51 UTC (permalink / raw) To: linux-arm-kernel On Thu, Oct 5, 2017 at 6:49 PM, Maxime Ripard <maxime.ripard@free-electrons.com> wrote: > Some gpio-keys definitions in our DTs were having buttons defined with a > unit-address and that would generate a DTC warning. > > Change the buttons node names to remove the warnings. > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> > --- > arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts | 40 ++++++++++----------- > arch/arm/boot/dts/sun4i-a10-pcduino.dts | 6 +-- > 2 files changed, 23 insertions(+), 23 deletions(-) > > diff --git a/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts b/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts > index 7c7f12132ea3..13224f5ac166 100644 > --- a/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts > +++ b/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts > @@ -67,7 +67,7 @@ > #size-cells = <0>; > poll-interval = <20>; > > - button at 0 { > + left-joystick-left { Does this fit the naming scheme? Should we have "-button" suffices? Otherwise, Acked-by: Chen-Yu Tsai <wens@csie.org> ^ permalink raw reply [flat|nested] 50+ messages in thread
* [PATCH 13/20] ARM: dts: sun4i: Remove gpio-keys warnings 2017-10-05 15:51 ` Chen-Yu Tsai @ 2017-10-06 9:27 ` Maxime Ripard 2017-10-06 10:25 ` Chen-Yu Tsai 0 siblings, 1 reply; 50+ messages in thread From: Maxime Ripard @ 2017-10-06 9:27 UTC (permalink / raw) To: linux-arm-kernel On Thu, Oct 05, 2017 at 03:51:02PM +0000, Chen-Yu Tsai wrote: > On Thu, Oct 5, 2017 at 6:49 PM, Maxime Ripard > <maxime.ripard@free-electrons.com> wrote: > > Some gpio-keys definitions in our DTs were having buttons defined with a > > unit-address and that would generate a DTC warning. > > > > Change the buttons node names to remove the warnings. > > > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> > > --- > > arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts | 40 ++++++++++----------- > > arch/arm/boot/dts/sun4i-a10-pcduino.dts | 6 +-- > > 2 files changed, 23 insertions(+), 23 deletions(-) > > > > diff --git a/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts b/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts > > index 7c7f12132ea3..13224f5ac166 100644 > > --- a/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts > > +++ b/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts > > @@ -67,7 +67,7 @@ > > #size-cells = <0>; > > poll-interval = <20>; > > > > - button at 0 { > > + left-joystick-left { > > Does this fit the naming scheme? Should we have "-button" suffices? The example binding of gpio-keys just have the key name as node name, just like most of the DT out there I could find. Maxime -- Maxime Ripard, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 801 bytes Desc: not available URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20171006/d3bce6e6/attachment.sig> ^ permalink raw reply [flat|nested] 50+ messages in thread
* [PATCH 13/20] ARM: dts: sun4i: Remove gpio-keys warnings 2017-10-06 9:27 ` Maxime Ripard @ 2017-10-06 10:25 ` Chen-Yu Tsai 0 siblings, 0 replies; 50+ messages in thread From: Chen-Yu Tsai @ 2017-10-06 10:25 UTC (permalink / raw) To: linux-arm-kernel On Fri, Oct 6, 2017 at 5:27 PM, Maxime Ripard <maxime.ripard@free-electrons.com> wrote: > On Thu, Oct 05, 2017 at 03:51:02PM +0000, Chen-Yu Tsai wrote: >> On Thu, Oct 5, 2017 at 6:49 PM, Maxime Ripard >> <maxime.ripard@free-electrons.com> wrote: >> > Some gpio-keys definitions in our DTs were having buttons defined with a >> > unit-address and that would generate a DTC warning. >> > >> > Change the buttons node names to remove the warnings. >> > >> > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> >> > --- >> > arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts | 40 ++++++++++----------- >> > arch/arm/boot/dts/sun4i-a10-pcduino.dts | 6 +-- >> > 2 files changed, 23 insertions(+), 23 deletions(-) >> > >> > diff --git a/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts b/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts >> > index 7c7f12132ea3..13224f5ac166 100644 >> > --- a/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts >> > +++ b/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts >> > @@ -67,7 +67,7 @@ >> > #size-cells = <0>; >> > poll-interval = <20>; >> > >> > - button at 0 { >> > + left-joystick-left { >> >> Does this fit the naming scheme? Should we have "-button" suffices? > > The example binding of gpio-keys just have the key name as node name, > just like most of the DT out there I could find. OK. Then Acked-by: Chen-Yu Tsai <wens@csie.org> On the topic of having the class in the node name, I'm not aware of any rules governing it. It feels like I made it up along the way. I'm not even sure if it is supposed to be context-specific, like if the node is the pin controller, then all child nodes would be pin mux settings, and don't need to have "pins" in their names. So I'm not so sure about this anymore. Feel free to ignore these types of comments. :) ChenYu ^ permalink raw reply [flat|nested] 50+ messages in thread
* [PATCH 14/20] ARM: dts: sun9i: Remove skeleton to avoid warnings 2017-10-05 10:49 [PATCH 00/20] sunxi: Cleanup DT warnings for the A10 and A80 Maxime Ripard ` (12 preceding siblings ...) 2017-10-05 10:49 ` [PATCH 13/20] ARM: dts: sun4i: Remove gpio-keys warnings Maxime Ripard @ 2017-10-05 10:49 ` Maxime Ripard 2017-10-05 15:51 ` Chen-Yu Tsai 2017-10-05 10:49 ` [PATCH 15/20] ARM: dts: sun9i: Rename pinctrl nodes " Maxime Ripard ` (5 subsequent siblings) 19 siblings, 1 reply; 50+ messages in thread From: Maxime Ripard @ 2017-10-05 10:49 UTC (permalink / raw) To: linux-arm-kernel Using skeleton.dtsi will create a memory node that will generate a warning in DTC. However, that node will be created by the bootloader, so we can just remove it entirely in order to remove that warning. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> --- arch/arm/boot/dts/sun9i-a80.dtsi | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/arch/arm/boot/dts/sun9i-a80.dtsi b/arch/arm/boot/dts/sun9i-a80.dtsi index 19b01d0bdc37..190d1f9df2d4 100644 --- a/arch/arm/boot/dts/sun9i-a80.dtsi +++ b/arch/arm/boot/dts/sun9i-a80.dtsi @@ -42,8 +42,6 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include "skeleton64.dtsi" - #include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/clock/sun9i-a80-ccu.h> @@ -54,6 +52,8 @@ #include <dt-bindings/reset/sun9i-a80-usb.h> / { + #address-cells = <2>; + #size-cells = <2>; interrupt-parent = <&gic>; cpus { @@ -109,11 +109,6 @@ }; }; - memory { - /* 8GB max. with LPAE */ - reg = <0 0x20000000 0x02 0>; - }; - timer { compatible = "arm,armv7-timer"; interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, -- git-series 0.9.1 ^ permalink raw reply related [flat|nested] 50+ messages in thread
* [PATCH 14/20] ARM: dts: sun9i: Remove skeleton to avoid warnings 2017-10-05 10:49 ` [PATCH 14/20] ARM: dts: sun9i: Remove skeleton to avoid warnings Maxime Ripard @ 2017-10-05 15:51 ` Chen-Yu Tsai 0 siblings, 0 replies; 50+ messages in thread From: Chen-Yu Tsai @ 2017-10-05 15:51 UTC (permalink / raw) To: linux-arm-kernel On Thu, Oct 5, 2017 at 6:49 PM, Maxime Ripard <maxime.ripard@free-electrons.com> wrote: > Using skeleton.dtsi will create a memory node that will generate a warning > in DTC. However, that node will be created by the bootloader, so we can > just remove it entirely in order to remove that warning. > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Acked-by: Chen-Yu Tsai <wens@csie.org> ^ permalink raw reply [flat|nested] 50+ messages in thread
* [PATCH 15/20] ARM: dts: sun9i: Rename pinctrl nodes to avoid warnings 2017-10-05 10:49 [PATCH 00/20] sunxi: Cleanup DT warnings for the A10 and A80 Maxime Ripard ` (13 preceding siblings ...) 2017-10-05 10:49 ` [PATCH 14/20] ARM: dts: sun9i: Remove skeleton to avoid warnings Maxime Ripard @ 2017-10-05 10:49 ` Maxime Ripard 2017-10-05 15:54 ` Chen-Yu Tsai 2017-10-05 10:49 ` [PATCH 16/20] ARM: dts: sun9i: Remove GPIO " Maxime Ripard ` (4 subsequent siblings) 19 siblings, 1 reply; 50+ messages in thread From: Maxime Ripard @ 2017-10-05 10:49 UTC (permalink / raw) To: linux-arm-kernel Our pinctrl node names were containing unit-adresses without a reg property, resulting in a warning. Change the names for our new convention. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> --- arch/arm/boot/dts/sun9i-a80-cubieboard4.dts | 2 +- arch/arm/boot/dts/sun9i-a80-optimus.dts | 2 +- arch/arm/boot/dts/sun9i-a80.dtsi | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm/boot/dts/sun9i-a80-cubieboard4.dts b/arch/arm/boot/dts/sun9i-a80-cubieboard4.dts index 3741ac71c3d6..1a09a35d266a 100644 --- a/arch/arm/boot/dts/sun9i-a80-cubieboard4.dts +++ b/arch/arm/boot/dts/sun9i-a80-cubieboard4.dts @@ -427,6 +427,6 @@ &uart0 { pinctrl-names = "default"; - pinctrl-0 = <&uart0_pins_a>; + pinctrl-0 = <&uart0_ph_pins>; status = "okay"; }; diff --git a/arch/arm/boot/dts/sun9i-a80-optimus.dts b/arch/arm/boot/dts/sun9i-a80-optimus.dts index 85f1ad670310..cc9e6a88f2a2 100644 --- a/arch/arm/boot/dts/sun9i-a80-optimus.dts +++ b/arch/arm/boot/dts/sun9i-a80-optimus.dts @@ -492,7 +492,7 @@ &uart0 { pinctrl-names = "default"; - pinctrl-0 = <&uart0_pins_a>; + pinctrl-0 = <&uart0_ph_pins>; status = "okay"; }; diff --git a/arch/arm/boot/dts/sun9i-a80.dtsi b/arch/arm/boot/dts/sun9i-a80.dtsi index 190d1f9df2d4..f9cb701f29b0 100644 --- a/arch/arm/boot/dts/sun9i-a80.dtsi +++ b/arch/arm/boot/dts/sun9i-a80.dtsi @@ -489,12 +489,12 @@ #size-cells = <0>; #gpio-cells = <3>; - i2c3_pins_a: i2c3 at 0 { + i2c3_pins: i2c3-pins { pins = "PG10", "PG11"; function = "i2c3"; }; - mmc0_pins: mmc0 { + mmc0_pins: mmc0-pins { pins = "PF0", "PF1" ,"PF2", "PF3", "PF4", "PF5"; function = "mmc0"; @@ -502,7 +502,7 @@ bias-pull-up; }; - mmc1_pins: mmc1 { + mmc1_pins: mmc1-pins { pins = "PG0", "PG1" ,"PG2", "PG3", "PG4", "PG5"; function = "mmc1"; @@ -510,7 +510,7 @@ bias-pull-up; }; - mmc2_8bit_pins: mmc2_8bit { + mmc2_8bit_pins: mmc2-8bit-pins { pins = "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", @@ -520,12 +520,12 @@ bias-pull-up; }; - uart0_pins_a: uart0 at 0 { + uart0_ph_pins: uart0-ph-pins { pins = "PH12", "PH13"; function = "uart0"; }; - uart4_pins_a: uart4 at 0 { + uart4_pins: uart4-pins { pins = "PG12", "PG13", "PG14", "PG15"; function = "uart4"; }; -- git-series 0.9.1 ^ permalink raw reply related [flat|nested] 50+ messages in thread
* [PATCH 15/20] ARM: dts: sun9i: Rename pinctrl nodes to avoid warnings 2017-10-05 10:49 ` [PATCH 15/20] ARM: dts: sun9i: Rename pinctrl nodes " Maxime Ripard @ 2017-10-05 15:54 ` Chen-Yu Tsai 0 siblings, 0 replies; 50+ messages in thread From: Chen-Yu Tsai @ 2017-10-05 15:54 UTC (permalink / raw) To: linux-arm-kernel On Thu, Oct 5, 2017 at 6:49 PM, Maxime Ripard <maxime.ripard@free-electrons.com> wrote: > Our pinctrl node names were containing unit-adresses without a reg > property, resulting in a warning. Change the names for our new convention. > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Acked-by: Chen-Yu Tsai <wens@csie.org> ^ permalink raw reply [flat|nested] 50+ messages in thread
* [PATCH 16/20] ARM: dts: sun9i: Remove GPIO pinctrl nodes to avoid warnings 2017-10-05 10:49 [PATCH 00/20] sunxi: Cleanup DT warnings for the A10 and A80 Maxime Ripard ` (14 preceding siblings ...) 2017-10-05 10:49 ` [PATCH 15/20] ARM: dts: sun9i: Rename pinctrl nodes " Maxime Ripard @ 2017-10-05 10:49 ` Maxime Ripard 2017-10-05 15:53 ` Chen-Yu Tsai 2017-10-05 10:49 ` [PATCH 17/20] ARM: dts: sun9i: optimus: Remove card detect pull-up Maxime Ripard ` (3 subsequent siblings) 19 siblings, 1 reply; 50+ messages in thread From: Maxime Ripard @ 2017-10-05 10:49 UTC (permalink / raw) To: linux-arm-kernel The A80 boards still define some GPIO pinctrl nodes that are not really useful, and redundant with the muxing already happening on gpio_request. Let's remove those nodes. This will also remove DTC warnings. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> --- arch/arm/boot/dts/sun9i-a80-cubieboard4.dts | 16 +---------- arch/arm/boot/dts/sun9i-a80-optimus.dts | 36 +---------------------- 2 files changed, 2 insertions(+), 50 deletions(-) diff --git a/arch/arm/boot/dts/sun9i-a80-cubieboard4.dts b/arch/arm/boot/dts/sun9i-a80-cubieboard4.dts index 1a09a35d266a..15cc82350360 100644 --- a/arch/arm/boot/dts/sun9i-a80-cubieboard4.dts +++ b/arch/arm/boot/dts/sun9i-a80-cubieboard4.dts @@ -62,8 +62,6 @@ leds { compatible = "gpio-leds"; - pinctrl-names = "default"; - pinctrl-0 = <&led_pins_cubieboard4>; green { label = "cubieboard4:green:usr"; @@ -97,7 +95,7 @@ &mmc1 { pinctrl-names = "default"; - pinctrl-0 = <&mmc1_pins>, <&wifi_en_pin_cubieboard4>; + pinctrl-0 = <&mmc1_pins>; vmmc-supply = <®_dldo1>; vqmmc-supply = <®_cldo3>; mmc-pwrseq = <&wifi_pwrseq>; @@ -131,11 +129,6 @@ }; &pio { - led_pins_cubieboard4: led-pins at 0 { - pins = "PH6", "PH17"; - function = "gpio_out"; - }; - mmc0_cd_pin_cubieboard4: mmc0_cd_pin at 0 { pins = "PH18"; function = "gpio_in"; @@ -147,13 +140,6 @@ status = "okay"; }; -&r_pio { - wifi_en_pin_cubieboard4: wifi_en_pin at 0 { - pins = "PL2"; - function = "gpio_out"; - }; -}; - &r_rsb { status = "okay"; diff --git a/arch/arm/boot/dts/sun9i-a80-optimus.dts b/arch/arm/boot/dts/sun9i-a80-optimus.dts index cc9e6a88f2a2..199777e1c5ea 100644 --- a/arch/arm/boot/dts/sun9i-a80-optimus.dts +++ b/arch/arm/boot/dts/sun9i-a80-optimus.dts @@ -62,11 +62,8 @@ leds { compatible = "gpio-leds"; - pinctrl-names = "default"; - pinctrl-0 = <&led_pins_optimus>, <&led_r_pins_optimus>; /* The LED names match those found on the board */ - led2 { label = "optimus:led2:usr"; gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; @@ -86,8 +83,6 @@ reg_usb1_vbus: usb1-vbus { compatible = "regulator-fixed"; pinctrl-names = "default"; - pinctrl-0 = <&usb1_vbus_pin_optimus>; - regulator-name = "usb1-vbus"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; enable-active-high; @@ -97,8 +92,6 @@ reg_usb3_vbus: usb3-vbus { compatible = "regulator-fixed"; pinctrl-names = "default"; - pinctrl-0 = <&usb3_vbus_pin_optimus>; - regulator-name = "usb3-vbus"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; enable-active-high; @@ -139,7 +132,7 @@ &mmc1 { pinctrl-names = "default"; - pinctrl-0 = <&mmc1_pins>, <&wifi_en_pin_optimus>; + pinctrl-0 = <&mmc1_pins>; vmmc-supply = <®_dldo1>; vqmmc-supply = <®_cldo3>; mmc-pwrseq = <&wifi_pwrseq>; @@ -181,44 +174,17 @@ }; &pio { - led_pins_optimus: led-pins at 0 { - pins = "PH0", "PH1"; - function = "gpio_out"; - }; - mmc0_cd_pin_optimus: mmc0_cd_pin at 0 { pins = "PH18"; function = "gpio_in"; bias-pull-up; }; - - usb1_vbus_pin_optimus: usb1_vbus_pin at 1 { - pins = "PH4"; - function = "gpio_out"; - }; - - usb3_vbus_pin_optimus: usb3_vbus_pin at 1 { - pins = "PH5"; - function = "gpio_out"; - }; }; &r_ir { status = "okay"; }; -&r_pio { - led_r_pins_optimus: led-pins at 1 { - pins = "PM15"; - function = "gpio_out"; - }; - - wifi_en_pin_optimus: wifi_en_pin at 0 { - pins = "PL2"; - function = "gpio_out"; - }; -}; - &r_rsb { status = "okay"; -- git-series 0.9.1 ^ permalink raw reply related [flat|nested] 50+ messages in thread
* [PATCH 16/20] ARM: dts: sun9i: Remove GPIO pinctrl nodes to avoid warnings 2017-10-05 10:49 ` [PATCH 16/20] ARM: dts: sun9i: Remove GPIO " Maxime Ripard @ 2017-10-05 15:53 ` Chen-Yu Tsai 0 siblings, 0 replies; 50+ messages in thread From: Chen-Yu Tsai @ 2017-10-05 15:53 UTC (permalink / raw) To: linux-arm-kernel On Thu, Oct 5, 2017 at 6:49 PM, Maxime Ripard <maxime.ripard@free-electrons.com> wrote: > The A80 boards still define some GPIO pinctrl nodes that are not really > useful, and redundant with the muxing already happening on gpio_request. > > Let's remove those nodes. This will also remove DTC warnings. > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Acked-by: Chen-Yu Tsai <wens@csie.org> ^ permalink raw reply [flat|nested] 50+ messages in thread
* [PATCH 17/20] ARM: dts: sun9i: optimus: Remove card detect pull-up 2017-10-05 10:49 [PATCH 00/20] sunxi: Cleanup DT warnings for the A10 and A80 Maxime Ripard ` (15 preceding siblings ...) 2017-10-05 10:49 ` [PATCH 16/20] ARM: dts: sun9i: Remove GPIO " Maxime Ripard @ 2017-10-05 10:49 ` Maxime Ripard 2017-10-05 15:53 ` Chen-Yu Tsai 2017-10-05 10:49 ` [PATCH 18/20] ARM: dts: sun9i: cubieboard4: " Maxime Ripard ` (2 subsequent siblings) 19 siblings, 1 reply; 50+ messages in thread From: Maxime Ripard @ 2017-10-05 10:49 UTC (permalink / raw) To: linux-arm-kernel The board has an external pull-up on the card-detect signal, so there's no need to add another one. This also removes a DTC warning. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> --- arch/arm/boot/dts/sun9i-a80-optimus.dts | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/arch/arm/boot/dts/sun9i-a80-optimus.dts b/arch/arm/boot/dts/sun9i-a80-optimus.dts index 199777e1c5ea..ba62e814f4b8 100644 --- a/arch/arm/boot/dts/sun9i-a80-optimus.dts +++ b/arch/arm/boot/dts/sun9i-a80-optimus.dts @@ -122,7 +122,7 @@ &mmc0 { pinctrl-names = "default"; - pinctrl-0 = <&mmc0_pins>, <&mmc0_cd_pin_optimus>; + pinctrl-0 = <&mmc0_pins>; vmmc-supply = <®_dcdc1>; bus-width = <4>; cd-gpios = <&pio 7 18 GPIO_ACTIVE_HIGH>; /* PH8 */ @@ -173,14 +173,6 @@ clocks = <&ac100_rtc 0>; }; -&pio { - mmc0_cd_pin_optimus: mmc0_cd_pin at 0 { - pins = "PH18"; - function = "gpio_in"; - bias-pull-up; - }; -}; - &r_ir { status = "okay"; }; -- git-series 0.9.1 ^ permalink raw reply related [flat|nested] 50+ messages in thread
* [PATCH 17/20] ARM: dts: sun9i: optimus: Remove card detect pull-up 2017-10-05 10:49 ` [PATCH 17/20] ARM: dts: sun9i: optimus: Remove card detect pull-up Maxime Ripard @ 2017-10-05 15:53 ` Chen-Yu Tsai 0 siblings, 0 replies; 50+ messages in thread From: Chen-Yu Tsai @ 2017-10-05 15:53 UTC (permalink / raw) To: linux-arm-kernel On Thu, Oct 5, 2017 at 6:49 PM, Maxime Ripard <maxime.ripard@free-electrons.com> wrote: > The board has an external pull-up on the card-detect signal, so there's no > need to add another one. > > This also removes a DTC warning. > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Acked-by: Chen-Yu Tsai <wens@csie.org> ^ permalink raw reply [flat|nested] 50+ messages in thread
* [PATCH 18/20] ARM: dts: sun9i: cubieboard4: Remove card detect pull-up 2017-10-05 10:49 [PATCH 00/20] sunxi: Cleanup DT warnings for the A10 and A80 Maxime Ripard ` (16 preceding siblings ...) 2017-10-05 10:49 ` [PATCH 17/20] ARM: dts: sun9i: optimus: Remove card detect pull-up Maxime Ripard @ 2017-10-05 10:49 ` Maxime Ripard 2017-10-05 15:53 ` Chen-Yu Tsai 2017-10-05 10:49 ` [PATCH 19/20] ARM: dts: sun9i: Change node names to remove underscores Maxime Ripard 2017-10-05 10:49 ` [PATCH 20/20] " Maxime Ripard 19 siblings, 1 reply; 50+ messages in thread From: Maxime Ripard @ 2017-10-05 10:49 UTC (permalink / raw) To: linux-arm-kernel The board has an external pull-up on the card-detect signal, so there's no need to add another one. This also removes a DTC warning. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> --- arch/arm/boot/dts/sun9i-a80-cubieboard4.dts | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/arch/arm/boot/dts/sun9i-a80-cubieboard4.dts b/arch/arm/boot/dts/sun9i-a80-cubieboard4.dts index 15cc82350360..cb337e08adab 100644 --- a/arch/arm/boot/dts/sun9i-a80-cubieboard4.dts +++ b/arch/arm/boot/dts/sun9i-a80-cubieboard4.dts @@ -85,7 +85,7 @@ &mmc0 { pinctrl-names = "default"; - pinctrl-0 = <&mmc0_pins>, <&mmc0_cd_pin_cubieboard4>; + pinctrl-0 = <&mmc0_pins>; vmmc-supply = <®_dcdc1>; bus-width = <4>; cd-gpios = <&pio 7 18 GPIO_ACTIVE_HIGH>; /* PH18 */ @@ -128,14 +128,6 @@ clocks = <&ac100_rtc 0>; }; -&pio { - mmc0_cd_pin_cubieboard4: mmc0_cd_pin at 0 { - pins = "PH18"; - function = "gpio_in"; - bias-pull-up; - }; -}; - &r_ir { status = "okay"; }; -- git-series 0.9.1 ^ permalink raw reply related [flat|nested] 50+ messages in thread
* [PATCH 18/20] ARM: dts: sun9i: cubieboard4: Remove card detect pull-up 2017-10-05 10:49 ` [PATCH 18/20] ARM: dts: sun9i: cubieboard4: " Maxime Ripard @ 2017-10-05 15:53 ` Chen-Yu Tsai 0 siblings, 0 replies; 50+ messages in thread From: Chen-Yu Tsai @ 2017-10-05 15:53 UTC (permalink / raw) To: linux-arm-kernel On Thu, Oct 5, 2017 at 6:49 PM, Maxime Ripard <maxime.ripard@free-electrons.com> wrote: > The board has an external pull-up on the card-detect signal, so there's no > need to add another one. > > This also removes a DTC warning. > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Acked-by: Chen-Yu Tsai <wens@csie.org> ^ permalink raw reply [flat|nested] 50+ messages in thread
* [PATCH 19/20] ARM: dts: sun9i: Change node names to remove underscores 2017-10-05 10:49 [PATCH 00/20] sunxi: Cleanup DT warnings for the A10 and A80 Maxime Ripard ` (17 preceding siblings ...) 2017-10-05 10:49 ` [PATCH 18/20] ARM: dts: sun9i: cubieboard4: " Maxime Ripard @ 2017-10-05 10:49 ` Maxime Ripard 2017-10-05 15:56 ` Chen-Yu Tsai 2017-10-05 10:49 ` [PATCH 20/20] " Maxime Ripard 19 siblings, 1 reply; 50+ messages in thread From: Maxime Ripard @ 2017-10-05 10:49 UTC (permalink / raw) To: linux-arm-kernel Some node names in the A80 DTSI still have underscores in them. Remove them in favour of hyphens to remove DTC warnings. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> --- arch/arm/boot/dts/sun9i-a80.dtsi | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/boot/dts/sun9i-a80.dtsi b/arch/arm/boot/dts/sun9i-a80.dtsi index f9cb701f29b0..70d79ef711b3 100644 --- a/arch/arm/boot/dts/sun9i-a80.dtsi +++ b/arch/arm/boot/dts/sun9i-a80.dtsi @@ -139,7 +139,7 @@ * would also throw all the PLL clock rates off, or just the * downstream clocks in the PRCM. */ - osc24M: osc24M_clk { + osc24M: clk-24M { #clock-cells = <0>; compatible = "fixed-clock"; clock-frequency = <24000000>; @@ -151,7 +151,7 @@ * AC100 codec/RTC chip. This serves as a placeholder for * board dts files to specify the source. */ - osc32k: osc32k_clk { + osc32k: clk-32k { #clock-cells = <0>; compatible = "fixed-factor-clock"; clock-div = <1>; @@ -169,7 +169,7 @@ clock-output-names = "cpus"; }; - ahbs: ahbs_clk { + ahbs: ahbs-clk { compatible = "fixed-factor-clock"; #clock-cells = <0>; clock-div = <1>; @@ -708,12 +708,12 @@ #interrupt-cells = <3>; #gpio-cells = <3>; - r_ir_pins: r_ir { + r_ir_pins: r-ir { pins = "PL6"; function = "s_cir_rx"; }; - r_rsb_pins: r_rsb { + r_rsb_pins: r-rsb { pins = "PN0", "PN1"; function = "s_rsb"; drive-strength = <20>; -- git-series 0.9.1 ^ permalink raw reply related [flat|nested] 50+ messages in thread
* [PATCH 19/20] ARM: dts: sun9i: Change node names to remove underscores 2017-10-05 10:49 ` [PATCH 19/20] ARM: dts: sun9i: Change node names to remove underscores Maxime Ripard @ 2017-10-05 15:56 ` Chen-Yu Tsai 2017-10-06 9:34 ` Maxime Ripard 0 siblings, 1 reply; 50+ messages in thread From: Chen-Yu Tsai @ 2017-10-05 15:56 UTC (permalink / raw) To: linux-arm-kernel On Thu, Oct 5, 2017 at 6:49 PM, Maxime Ripard <maxime.ripard@free-electrons.com> wrote: > Some node names in the A80 DTSI still have underscores in them. Remove them > in favour of hyphens to remove DTC warnings. > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> > --- > arch/arm/boot/dts/sun9i-a80.dtsi | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/arch/arm/boot/dts/sun9i-a80.dtsi b/arch/arm/boot/dts/sun9i-a80.dtsi > index f9cb701f29b0..70d79ef711b3 100644 > --- a/arch/arm/boot/dts/sun9i-a80.dtsi > +++ b/arch/arm/boot/dts/sun9i-a80.dtsi > @@ -139,7 +139,7 @@ > * would also throw all the PLL clock rates off, or just the > * downstream clocks in the PRCM. > */ > - osc24M: osc24M_clk { > + osc24M: clk-24M { Can we stick with the same style for all clks? Like "X-clk"? > #clock-cells = <0>; > compatible = "fixed-clock"; > clock-frequency = <24000000>; > @@ -151,7 +151,7 @@ > * AC100 codec/RTC chip. This serves as a placeholder for > * board dts files to specify the source. > */ > - osc32k: osc32k_clk { > + osc32k: clk-32k { And here. > #clock-cells = <0>; > compatible = "fixed-factor-clock"; > clock-div = <1>; > @@ -169,7 +169,7 @@ > clock-output-names = "cpus"; > }; > > - ahbs: ahbs_clk { > + ahbs: ahbs-clk { > compatible = "fixed-factor-clock"; > #clock-cells = <0>; > clock-div = <1>; > @@ -708,12 +708,12 @@ > #interrupt-cells = <3>; > #gpio-cells = <3>; > > - r_ir_pins: r_ir { > + r_ir_pins: r-ir { "r-ir-pins". > pins = "PL6"; > function = "s_cir_rx"; > }; > > - r_rsb_pins: r_rsb { > + r_rsb_pins: r-rsb { "r-rsb-pins". ChenYu > pins = "PN0", "PN1"; > function = "s_rsb"; > drive-strength = <20>; > -- > git-series 0.9.1 ^ permalink raw reply [flat|nested] 50+ messages in thread
* [PATCH 19/20] ARM: dts: sun9i: Change node names to remove underscores 2017-10-05 15:56 ` Chen-Yu Tsai @ 2017-10-06 9:34 ` Maxime Ripard 0 siblings, 0 replies; 50+ messages in thread From: Maxime Ripard @ 2017-10-06 9:34 UTC (permalink / raw) To: linux-arm-kernel On Thu, Oct 05, 2017 at 03:56:29PM +0000, Chen-Yu Tsai wrote: > On Thu, Oct 5, 2017 at 6:49 PM, Maxime Ripard > <maxime.ripard@free-electrons.com> wrote: > > Some node names in the A80 DTSI still have underscores in them. Remove them > > in favour of hyphens to remove DTC warnings. > > > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> > > --- > > arch/arm/boot/dts/sun9i-a80.dtsi | 10 +++++----- > > 1 file changed, 5 insertions(+), 5 deletions(-) > > > > diff --git a/arch/arm/boot/dts/sun9i-a80.dtsi b/arch/arm/boot/dts/sun9i-a80.dtsi > > index f9cb701f29b0..70d79ef711b3 100644 > > --- a/arch/arm/boot/dts/sun9i-a80.dtsi > > +++ b/arch/arm/boot/dts/sun9i-a80.dtsi > > @@ -139,7 +139,7 @@ > > * would also throw all the PLL clock rates off, or just the > > * downstream clocks in the PRCM. > > */ > > - osc24M: osc24M_clk { > > + osc24M: clk-24M { > > Can we stick with the same style for all clks? Like "X-clk"? > > > #clock-cells = <0>; > > compatible = "fixed-clock"; > > clock-frequency = <24000000>; > > @@ -151,7 +151,7 @@ > > * AC100 codec/RTC chip. This serves as a placeholder for > > * board dts files to specify the source. > > */ > > - osc32k: osc32k_clk { > > + osc32k: clk-32k { > > And here. I guess that's the same argument for buttons. Most of the other nodes are starting with the device class, and have a suffix to make them generic. > > #clock-cells = <0>; > > compatible = "fixed-factor-clock"; > > clock-div = <1>; > > @@ -169,7 +169,7 @@ > > clock-output-names = "cpus"; > > }; > > > > - ahbs: ahbs_clk { > > + ahbs: ahbs-clk { > > compatible = "fixed-factor-clock"; > > #clock-cells = <0>; > > clock-div = <1>; > > @@ -708,12 +708,12 @@ > > #interrupt-cells = <3>; > > #gpio-cells = <3>; > > > > - r_ir_pins: r_ir { > > + r_ir_pins: r-ir { > > "r-ir-pins". > > > pins = "PL6"; > > function = "s_cir_rx"; > > }; > > > > - r_rsb_pins: r_rsb { > > + r_rsb_pins: r-rsb { > > "r-rsb-pins". I'll address those comments, thanks! Maxime -- Maxime Ripard, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 801 bytes Desc: not available URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20171006/10e5cbd4/attachment-0001.sig> ^ permalink raw reply [flat|nested] 50+ messages in thread
* [PATCH 20/20] ARM: dts: sun9i: Change node names to remove underscores 2017-10-05 10:49 [PATCH 00/20] sunxi: Cleanup DT warnings for the A10 and A80 Maxime Ripard ` (18 preceding siblings ...) 2017-10-05 10:49 ` [PATCH 19/20] ARM: dts: sun9i: Change node names to remove underscores Maxime Ripard @ 2017-10-05 10:49 ` Maxime Ripard 2017-10-05 15:59 ` Chen-Yu Tsai 19 siblings, 1 reply; 50+ messages in thread From: Maxime Ripard @ 2017-10-05 10:49 UTC (permalink / raw) To: linux-arm-kernel Some boards have had node names with underscores. Remove them in favour of hyphens in order to reduce the DTC warnings. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> --- arch/arm/boot/dts/sun9i-a80-cubieboard4.dts | 8 ++++---- arch/arm/boot/dts/sun9i-a80-optimus.dts | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm/boot/dts/sun9i-a80-cubieboard4.dts b/arch/arm/boot/dts/sun9i-a80-cubieboard4.dts index cb337e08adab..fa09186bc6d7 100644 --- a/arch/arm/boot/dts/sun9i-a80-cubieboard4.dts +++ b/arch/arm/boot/dts/sun9i-a80-cubieboard4.dts @@ -74,7 +74,7 @@ }; }; - wifi_pwrseq: wifi_pwrseq { + wifi_pwrseq: wifi-pwrseq { compatible = "mmc-pwrseq-simple"; clocks = <&ac100_rtc 1>; clock-names = "ext_clock"; @@ -241,20 +241,20 @@ regulator-name = "vcc-pm-codec-io1"; }; - reg_ldo_io0: ldo_io0 { + reg_ldo_io0: ldo-io0 { regulator-always-on; regulator-min-microvolt = <3000000>; regulator-max-microvolt = <3000000>; regulator-name = "vcc-pg"; }; - reg_ldo_io1: ldo_io1 { + reg_ldo_io1: ldo-io1 { regulator-min-microvolt = <2500000>; regulator-max-microvolt = <2500000>; regulator-name = "vcc-pa-gmac-2v5"; }; - reg_rtc_ldo: rtc_ldo { + reg_rtc_ldo: rtc-ldo { regulator-name = "vcc-rtc-vdd1v8-io"; }; diff --git a/arch/arm/boot/dts/sun9i-a80-optimus.dts b/arch/arm/boot/dts/sun9i-a80-optimus.dts index ba62e814f4b8..43808f608da2 100644 --- a/arch/arm/boot/dts/sun9i-a80-optimus.dts +++ b/arch/arm/boot/dts/sun9i-a80-optimus.dts @@ -98,7 +98,7 @@ gpio = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */ }; - wifi_pwrseq: wifi_pwrseq { + wifi_pwrseq: wifi-pwrseq { compatible = "mmc-pwrseq-simple"; clocks = <&ac100_rtc 1>; clock-names = "ext_clock"; @@ -286,20 +286,20 @@ regulator-name = "vcc-pm-codec-io1"; }; - reg_ldo_io0: ldo_io0 { + reg_ldo_io0: ldo-io0 { regulator-always-on; regulator-min-microvolt = <3000000>; regulator-max-microvolt = <3000000>; regulator-name = "vcc-pg"; }; - reg_ldo_io1: ldo_io1 { + reg_ldo_io1: ldo-io1 { regulator-min-microvolt = <2500000>; regulator-max-microvolt = <2500000>; regulator-name = "vcc-pa-gmac-2v5"; }; - reg_rtc_ldo: rtc_ldo { + reg_rtc_ldo: rtc-ldo { regulator-name = "vcc-rtc-vdd1v8-io"; }; -- git-series 0.9.1 ^ permalink raw reply related [flat|nested] 50+ messages in thread
* [PATCH 20/20] ARM: dts: sun9i: Change node names to remove underscores 2017-10-05 10:49 ` [PATCH 20/20] " Maxime Ripard @ 2017-10-05 15:59 ` Chen-Yu Tsai 2017-10-06 9:34 ` Maxime Ripard 0 siblings, 1 reply; 50+ messages in thread From: Chen-Yu Tsai @ 2017-10-05 15:59 UTC (permalink / raw) To: linux-arm-kernel On Thu, Oct 5, 2017 at 6:49 PM, Maxime Ripard <maxime.ripard@free-electrons.com> wrote: > Some boards have had node names with underscores. Remove them in favour of > hyphens in order to reduce the DTC warnings. > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> > --- > arch/arm/boot/dts/sun9i-a80-cubieboard4.dts | 8 ++++---- > arch/arm/boot/dts/sun9i-a80-optimus.dts | 8 ++++---- > 2 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/arch/arm/boot/dts/sun9i-a80-cubieboard4.dts b/arch/arm/boot/dts/sun9i-a80-cubieboard4.dts > index cb337e08adab..fa09186bc6d7 100644 > --- a/arch/arm/boot/dts/sun9i-a80-cubieboard4.dts > +++ b/arch/arm/boot/dts/sun9i-a80-cubieboard4.dts > @@ -74,7 +74,7 @@ > }; > }; > > - wifi_pwrseq: wifi_pwrseq { > + wifi_pwrseq: wifi-pwrseq { > compatible = "mmc-pwrseq-simple"; > clocks = <&ac100_rtc 1>; > clock-names = "ext_clock"; > @@ -241,20 +241,20 @@ > regulator-name = "vcc-pm-codec-io1"; > }; > > - reg_ldo_io0: ldo_io0 { > + reg_ldo_io0: ldo-io0 { We can't change these. They are part of the device tree binding. The regulator code matches against the node names. ChenYu ^ permalink raw reply [flat|nested] 50+ messages in thread
* [PATCH 20/20] ARM: dts: sun9i: Change node names to remove underscores 2017-10-05 15:59 ` Chen-Yu Tsai @ 2017-10-06 9:34 ` Maxime Ripard 0 siblings, 0 replies; 50+ messages in thread From: Maxime Ripard @ 2017-10-06 9:34 UTC (permalink / raw) To: linux-arm-kernel On Thu, Oct 05, 2017 at 03:59:29PM +0000, Chen-Yu Tsai wrote: > On Thu, Oct 5, 2017 at 6:49 PM, Maxime Ripard > <maxime.ripard@free-electrons.com> wrote: > > Some boards have had node names with underscores. Remove them in favour of > > hyphens in order to reduce the DTC warnings. > > > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> > > --- > > arch/arm/boot/dts/sun9i-a80-cubieboard4.dts | 8 ++++---- > > arch/arm/boot/dts/sun9i-a80-optimus.dts | 8 ++++---- > > 2 files changed, 8 insertions(+), 8 deletions(-) > > > > diff --git a/arch/arm/boot/dts/sun9i-a80-cubieboard4.dts b/arch/arm/boot/dts/sun9i-a80-cubieboard4.dts > > index cb337e08adab..fa09186bc6d7 100644 > > --- a/arch/arm/boot/dts/sun9i-a80-cubieboard4.dts > > +++ b/arch/arm/boot/dts/sun9i-a80-cubieboard4.dts > > @@ -74,7 +74,7 @@ > > }; > > }; > > > > - wifi_pwrseq: wifi_pwrseq { > > + wifi_pwrseq: wifi-pwrseq { > > compatible = "mmc-pwrseq-simple"; > > clocks = <&ac100_rtc 1>; > > clock-names = "ext_clock"; > > @@ -241,20 +241,20 @@ > > regulator-name = "vcc-pm-codec-io1"; > > }; > > > > - reg_ldo_io0: ldo_io0 { > > + reg_ldo_io0: ldo-io0 { > > We can't change these. They are part of the device tree binding. > The regulator code matches against the node names. Ah, right... I'll drop this part then. Thanks! Maxime -- Maxime Ripard, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 801 bytes Desc: not available URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20171006/df4cec7a/attachment.sig> ^ permalink raw reply [flat|nested] 50+ messages in thread
end of thread, other threads:[~2017-10-06 10:59 UTC | newest] Thread overview: 50+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2017-10-05 10:49 [PATCH 00/20] sunxi: Cleanup DT warnings for the A10 and A80 Maxime Ripard 2017-10-05 10:49 ` [PATCH 01/20] ARM: dts: sunxi: Remove leading zeros from unit-addresses Maxime Ripard 2017-10-05 15:22 ` Chen-Yu Tsai 2017-10-05 10:49 ` [PATCH 02/20] ARM: dts: axp209: Rename usb_power_supply node to avoid warnings Maxime Ripard 2017-10-05 15:22 ` Chen-Yu Tsai 2017-10-05 10:49 ` [PATCH 03/20] ARM: dts: sun4i: Change framebuffer node names " Maxime Ripard 2017-10-05 15:23 ` Chen-Yu Tsai 2017-10-05 15:24 ` Chen-Yu Tsai 2017-10-05 10:49 ` [PATCH 04/20] ARM: dts: sun4i: Change clock " Maxime Ripard 2017-10-05 15:23 ` Chen-Yu Tsai 2017-10-05 10:49 ` [PATCH 05/20] ARM: dts: sun4i: Change pinctrl nodes to avoid warning Maxime Ripard 2017-10-05 15:29 ` Chen-Yu Tsai 2017-10-06 8:45 ` Maxime Ripard 2017-10-05 10:49 ` [PATCH 06/20] ARM: dts: sun4i: Provide default muxing for relevant controllers Maxime Ripard 2017-10-05 15:32 ` Chen-Yu Tsai 2017-10-05 10:49 ` [PATCH 07/20] ARM: dts: sun4i: Remove skeleton and memory to avoid warnings Maxime Ripard 2017-10-05 15:43 ` Chen-Yu Tsai 2017-10-06 8:47 ` Maxime Ripard 2017-10-06 10:59 ` Chen-Yu Tsai 2017-10-05 10:49 ` [PATCH 08/20] ARM: dts: sun4i: Change LRADC node names " Maxime Ripard 2017-10-05 15:52 ` Chen-Yu Tsai 2017-10-06 9:26 ` Maxime Ripard 2017-10-05 10:49 ` [PATCH 09/20] ARM: dts: sun4i: Remove SoC node unit-name " Maxime Ripard 2017-10-05 15:44 ` Chen-Yu Tsai 2017-10-05 10:49 ` [PATCH 10/20] ARM: dts: sun4i: Rename thermal nodes " Maxime Ripard 2017-10-05 15:44 ` Chen-Yu Tsai 2017-10-05 10:49 ` [PATCH 11/20] ARM: dts: sun4i: Remove all useless pinctrl nodes Maxime Ripard 2017-10-05 15:48 ` Chen-Yu Tsai 2017-10-05 10:49 ` [PATCH 12/20] ARM: dts: sun4i: Remove underscores from nodes names Maxime Ripard 2017-10-05 15:49 ` Chen-Yu Tsai 2017-10-05 10:49 ` [PATCH 13/20] ARM: dts: sun4i: Remove gpio-keys warnings Maxime Ripard 2017-10-05 15:51 ` Chen-Yu Tsai 2017-10-06 9:27 ` Maxime Ripard 2017-10-06 10:25 ` Chen-Yu Tsai 2017-10-05 10:49 ` [PATCH 14/20] ARM: dts: sun9i: Remove skeleton to avoid warnings Maxime Ripard 2017-10-05 15:51 ` Chen-Yu Tsai 2017-10-05 10:49 ` [PATCH 15/20] ARM: dts: sun9i: Rename pinctrl nodes " Maxime Ripard 2017-10-05 15:54 ` Chen-Yu Tsai 2017-10-05 10:49 ` [PATCH 16/20] ARM: dts: sun9i: Remove GPIO " Maxime Ripard 2017-10-05 15:53 ` Chen-Yu Tsai 2017-10-05 10:49 ` [PATCH 17/20] ARM: dts: sun9i: optimus: Remove card detect pull-up Maxime Ripard 2017-10-05 15:53 ` Chen-Yu Tsai 2017-10-05 10:49 ` [PATCH 18/20] ARM: dts: sun9i: cubieboard4: " Maxime Ripard 2017-10-05 15:53 ` Chen-Yu Tsai 2017-10-05 10:49 ` [PATCH 19/20] ARM: dts: sun9i: Change node names to remove underscores Maxime Ripard 2017-10-05 15:56 ` Chen-Yu Tsai 2017-10-06 9:34 ` Maxime Ripard 2017-10-05 10:49 ` [PATCH 20/20] " Maxime Ripard 2017-10-05 15:59 ` Chen-Yu Tsai 2017-10-06 9:34 ` Maxime Ripard
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox