dt-bindings: arm: Remove the CPU compatible documentation
Subsystems (2)
PATCH 1/28 dt-bindings: arm: Remove the CPU compatible documentation
Commit 1f8afea8fee0 ("dt-bindings: Add YAML description for Allwinner boards") added an exhaustive list of the valid compatibles used for both the SoCs and boards.
We can therefore remove the old documentation, that never got as well updated as it should have.
--- .../devicetree/bindings/arm/sunxi.txt | 23 ------------------- 1 file changed, 23 deletions(-) delete mode 100644 Documentation/devicetree/bindings/arm/sunxi.txt
Documentation/devicetree/bindings/arm/sunxi.txt deleted +0 -23
@@ -1,23 +0,0 @@ -Allwinner sunXi Platforms Device Tree Bindings - -Each device tree must specify which Allwinner SoC it uses, -using one of the following compatible strings: - - allwinner,sun4i-a10 - allwinner,sun5i-a10s - allwinner,sun5i-a13 - allwinner,sun5i-r8 - allwinner,sun6i-a31 - allwinner,sun7i-a20 - allwinner,sun8i-a23 - allwinner,sun8i-a33 - allwinner,sun8i-a83t - allwinner,sun8i-h2-plus - allwinner,sun8i-h3 - allwinner,sun8i-r40 - allwinner,sun8i-t3 - allwinner,sun8i-v3s - allwinner,sun9i-a80 - allwinner,sun50i-a64 - allwinner,suniv-f1c100s - nextthing,gr8
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH 2/28 ARM: dts: sun9i: optimus: Fix fixed-regulators
Commit 1848f3f44444 ("ARM: dts: sun9i: Remove GPIO pinctrl nodes to avoid warnings") was wrong on the optimus, and instead of droping the pinctrl-names property, it dropped the regulator-name one.
Obviously, that wasn't what was intended. Reinstate regulator-name and drop pinctrl-names.
--- arch/arm/boot/dts/sun9i-a80-optimus.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/sun9i-a80-optimus.dts +2 -2
@@ -82,7 +82,7 @@ reg_usb1_vbus: usb1-vbus { compatible = "regulator-fixed"; - pinctrl-names = "default"; + regulator-name = "usb1-vbus"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; enable-active-high;
@@ -91,7 +91,7 @@ reg_usb3_vbus: usb3-vbus { compatible = "regulator-fixed"; - pinctrl-names = "default"; + regulator-name = "usb3-vbus"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; enable-active-high;
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH 02/28] ARM: dts: sun9i: optimus: Fix fixed-regulators
Quoted 10 lines · Maxime Ripard
Commit
1848f3f44444("ARM: dts: sun9i: Remove GPIO pinctrl nodes to avoid warnings") was wrong on the optimus, and instead of droping the pinctrl-names property, it dropped the regulator-name one.Obviously, that wasn't what was intended. Reinstate regulator-name and drop pinctrl-names.
Fixes 1848f3f44444 ("ARM: dts: sun9i: Remove GPIO pinctrl nodes to avoid warnings")Signed-off-by Maxime Ripard <[email protected]>
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH 3/28 ARM: dts: sunxi: Remove stale pinctrl-names entry
In reply to Maxime RipardSome nodes still have pinctrl-names entry, yet they don't have any pinctrl group anymore. Drop them.
--- arch/arm/boot/dts/sun8i-h2-plus-bananapi-m2-zero.dts | 3 --- arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts | 1 - arch/arm/boot/dts/sun8i-h3-orangepi-zero-plus2.dts | 1 - arch/arm/boot/dts/sunxi-bananapi-m2-plus.dtsi | 3 --- .../boot/dts/allwinner/sun50i-h5-emlid-neutis-n5-devboard.dts | 1 - arch/arm64/boot/dts/allwinner/sun50i-h5-emlid-neutis-n5.dtsi | 1 - arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts | 3 --- .../arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts | 1 - 8 files changed, 14 deletions(-)
arch/arm/boot/dts/sun8i-h2-plus-bananapi-m2-zero.dts +0 -3
@@ -28,7 +28,6 @@ leds { compatible = "gpio-leds"; - pinctrl-names = "default"; pwr_led { label = "bananapi-m2-zero:red:pwr";
@@ -39,7 +38,6 @@ gpio_keys { compatible = "gpio-keys"; - pinctrl-names = "default"; sw4 { label = "power";
@@ -67,7 +65,6 @@ wifi_pwrseq: wifi_pwrseq { compatible = "mmc-pwrseq-simple"; - pinctrl-names = "default"; reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 */ }; };
arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts +0 -1
@@ -64,7 +64,6 @@ wifi_pwrseq: wifi_pwrseq { compatible = "mmc-pwrseq-simple"; - pinctrl-names = "default"; reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 */ };
arch/arm/boot/dts/sun8i-h3-orangepi-zero-plus2.dts +0 -1
@@ -79,7 +79,6 @@ wifi_pwrseq: wifi_pwrseq { compatible = "mmc-pwrseq-simple"; - pinctrl-names = "default"; reset-gpios = <&pio 0 9 GPIO_ACTIVE_LOW>; /* PA9 */ post-power-on-delay-ms = <200>; };
arch/arm/boot/dts/sunxi-bananapi-m2-plus.dtsi +0 -3
@@ -69,7 +69,6 @@ leds { compatible = "gpio-leds"; - pinctrl-names = "default"; pwr_led { label = "bananapi-m2-plus:red:pwr";
@@ -80,7 +79,6 @@ gpio_keys { compatible = "gpio-keys"; - pinctrl-names = "default"; sw4 { label = "power";
@@ -101,7 +99,6 @@ wifi_pwrseq: wifi_pwrseq { compatible = "mmc-pwrseq-simple"; - pinctrl-names = "default"; reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 */ clocks = <&rtc 1>; clock-names = "ext_clock";
arch/arm64/boot/dts/allwinner/sun50i-h5-emlid-neutis-n5-devboard.dts +0 -1
@@ -46,7 +46,6 @@ vdd_cpux: gpio-regulator { compatible = "regulator-gpio"; - pinctrl-names = "default"; regulator-name = "vdd-cpux"; regulator-type = "voltage"; regulator-boot-on;
arch/arm64/boot/dts/allwinner/sun50i-h5-emlid-neutis-n5.dtsi +0 -1
@@ -21,7 +21,6 @@ wifi_pwrseq: wifi_pwrseq { compatible = "mmc-pwrseq-simple"; - pinctrl-names = "default"; reset-gpios = <&pio 2 7 GPIO_ACTIVE_LOW>; /* PC7 */ post-power-on-delay-ms = <200>; };
arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts +0 -3
@@ -78,7 +78,6 @@ reg_gmac_3v3: gmac-3v3 { compatible = "regulator-fixed"; - pinctrl-names = "default"; regulator-name = "gmac-3v3"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
@@ -96,7 +95,6 @@ vdd_cpux: gpio-regulator { compatible = "regulator-gpio"; - pinctrl-names = "default"; regulator-name = "vdd-cpux"; regulator-type = "voltage"; regulator-boot-on;
@@ -112,7 +110,6 @@ wifi_pwrseq: wifi_pwrseq { compatible = "mmc-pwrseq-simple"; - pinctrl-names = "default"; reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 */ post-power-on-delay-ms = <200>; };
arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts +0 -1
@@ -78,7 +78,6 @@ wifi_pwrseq: wifi_pwrseq { compatible = "mmc-pwrseq-simple"; - pinctrl-names = "default"; reset-gpios = <&pio 0 9 GPIO_ACTIVE_LOW>; /* PA9 */ post-power-on-delay-ms = <200>; };
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH 03/28] ARM: dts: sunxi: Remove stale pinctrl-names entry
Quoted 5 lines · Maxime Ripard
Some nodes still have pinctrl-names entry, yet they don't have any pinctrl group anymore. Drop them.
Signed-off-by Maxime Ripard <[email protected]>
Though you might want to add "h3/h5:" to the subject.
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH 03/28] ARM: dts: sunxi: Remove stale pinctrl-names entry
Quoted 10 lines · Chen-Yu Tsai
Quoted 5 lines · Maxime Ripard
Some nodes still have pinctrl-names entry, yet they don't have any pinctrl group anymore. Drop them.
Signed-off-by Maxime Ripard <[email protected]>Acked-by Chen-Yu Tsai <[email protected]>Though you might want to add "h3/h5:" to the subject.
Added the prefix and applied, thanks!
Maxime
--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH 4/28 ARM: dts: sun5i: lichee-pi one: Remove stale pinctrl-names entry
In reply to Maxime RipardSome nodes still have pinctrl-names entry, yet they don't have any pinctrl group anymore. Drop them.
--- arch/arm/boot/dts/sun5i-a13-licheepi-one.dts | 1 - 1 file changed, 1 deletion(-)
arch/arm/boot/dts/sun5i-a13-licheepi-one.dts +0 -1
@@ -206,7 +206,6 @@ }; &usbphy { - pinctrl-names = "default"; usb0_id_det-gpio = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */ usb0_vbus_det-gpio = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */ usb0_vbus-supply = <®_usb0_vbus>;
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH 04/28] ARM: dts: sun5i: lichee-pi one: Remove stale pinctrl-names entry
Quoted 5 lines · Maxime Ripard
Some nodes still have pinctrl-names entry, yet they don't have any pinctrl group anymore. Drop them.
Signed-off-by Maxime Ripard <[email protected]>
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH 5/28 ARM: dts: sunxi: Fix GIC compatible
In reply to Maxime RipardAs can be shown by the YAML schema now, the combination of GIC compatibles we were using has never been an option.
Switch to the gic-400 variant, which is the more correct option.
--- arch/arm/boot/dts/sun6i-a31.dtsi | 2 +- arch/arm/boot/dts/sun7i-a20.dtsi | 2 +- arch/arm/boot/dts/sun8i-a23-a33.dtsi | 2 +- arch/arm/boot/dts/sun8i-a83t.dtsi | 2 +- arch/arm/boot/dts/sun8i-v3s.dtsi | 2 +- arch/arm/boot/dts/sun9i-a80.dtsi | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-)
arch/arm/boot/dts/sun6i-a31.dtsi +1 -1
@@ -1027,7 +1027,7 @@ }; gic: interrupt-controller@1c81000 { - compatible = "arm,cortex-a7-gic", "arm,cortex-a15-gic"; + compatible = "arm,gic-400"; reg = <0x01c81000 0x1000>, <0x01c82000 0x2000>, <0x01c84000 0x2000>,
arch/arm/boot/dts/sun7i-a20.dtsi +1 -1
@@ -1453,7 +1453,7 @@ }; gic: interrupt-controller@1c81000 { - compatible = "arm,gic-400", "arm,cortex-a7-gic", "arm,cortex-a15-gic"; + compatible = "arm,gic-400"; reg = <0x01c81000 0x1000>, <0x01c82000 0x2000>, <0x01c84000 0x2000>,
arch/arm/boot/dts/sun8i-a23-a33.dtsi +1 -1
@@ -599,7 +599,7 @@ }; gic: interrupt-controller@1c81000 { - compatible = "arm,cortex-a7-gic", "arm,cortex-a15-gic"; + compatible = "arm,gic-400"; reg = <0x01c81000 0x1000>, <0x01c82000 0x2000>, <0x01c84000 0x2000>,
arch/arm/boot/dts/sun8i-a83t.dtsi +1 -1
@@ -931,7 +931,7 @@ }; gic: interrupt-controller@1c81000 { - compatible = "arm,cortex-a7-gic", "arm,cortex-a15-gic"; + compatible = "arm,gic-400"; reg = <0x01c81000 0x1000>, <0x01c82000 0x2000>, <0x01c84000 0x2000>,
arch/arm/boot/dts/sun8i-v3s.dtsi +1 -1
@@ -413,7 +413,7 @@ }; gic: interrupt-controller@1c81000 { - compatible = "arm,cortex-a7-gic", "arm,cortex-a15-gic"; + compatible = "arm,gic-400"; reg = <0x01c81000 0x1000>, <0x01c82000 0x1000>, <0x01c84000 0x2000>,
arch/arm/boot/dts/sun9i-a80.dtsi +1 -1
@@ -527,7 +527,7 @@ }; gic: interrupt-controller@1c41000 { - compatible = "arm,cortex-a7-gic", "arm,cortex-a15-gic"; + compatible = "arm,gic-400"; reg = <0x01c41000 0x1000>, <0x01c42000 0x2000>, <0x01c44000 0x2000>,
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH 05/28] ARM: dts: sunxi: Fix GIC compatible
Quoted 7 lines · Maxime Ripard
As can be shown by the YAML schema now, the combination of GIC compatibles we were using has never been an option.
Switch to the gic-400 variant, which is the more correct option.
Signed-off-by Maxime Ripard <[email protected]>
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH 6/28 ARM: dts: sunxi: Switch to new GPIOs properties for i2c-gpio
In reply to Maxime RipardThe i2c-gpio driver uses named gpios now and the array of GPIOs is deprecated. Switch to the new binding.
--- arch/arm/boot/dts/sun5i-a13-utoo-p66.dts | 6 +++--- arch/arm/boot/dts/sun6i-a31-colombus.dts | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-)
arch/arm/boot/dts/sun5i-a13-utoo-p66.dts +3 -3
@@ -58,13 +58,13 @@ /delete-property/stdout-path; }; - i2c_lcd: i2c-gpio { + i2c_lcd: i2c { /* The lcd panel i2c interface is hooked up via gpios */ compatible = "i2c-gpio"; pinctrl-names = "default"; pinctrl-0 = <&i2c_lcd_pins>; - gpios = <&pio 6 12 GPIO_ACTIVE_HIGH>, /* PG12, sda */ - <&pio 6 10 GPIO_ACTIVE_HIGH>; /* PG10, scl */ + sda-gpios = <&pio 6 12 GPIO_ACTIVE_HIGH>; /* PG12 */ + scl-gpios = <&pio 6 10 GPIO_ACTIVE_HIGH>; /* PG10 */ i2c-gpio,delay-us = <5>; }; };
arch/arm/boot/dts/sun6i-a31-colombus.dts +2 -2
@@ -65,8 +65,8 @@ compatible = "i2c-gpio"; pinctrl-names = "default"; pinctrl-0 = <&i2c_lcd_pins>; - gpios = <&pio 0 23 GPIO_ACTIVE_HIGH>, /* PA23, sda */ - <&pio 0 24 GPIO_ACTIVE_HIGH>; /* PA24, scl */ + sda-gpios = <&pio 0 23 GPIO_ACTIVE_HIGH>; /* PA23 */ + scl-gpios = <&pio 0 24 GPIO_ACTIVE_HIGH>; /* PA24 */ i2c-gpio,delay-us = <5>; }; };
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH 06/28] ARM: dts: sunxi: Switch to new GPIOs properties for i2c-gpio
Quoted 5 lines · Maxime Ripard
The i2c-gpio driver uses named gpios now and the array of GPIOs is deprecated. Switch to the new binding.
Signed-off-by Maxime Ripard <[email protected]>
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH 7/28 ARM: sunxi: Fix the USB PHY ID detect GPIO properties
In reply to Maxime RipardWhile the USB PHY Device Tree mandates that the name of the ID detect pin should be usb0_id_det-gpios, a significant number of device tree use usb0_id_det-gpio instead.
This was functional because the GPIO framework falls back to the gpio suffix that is legacy, but we should fix this.
--- arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts | 2 +- arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 2 +- arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts | 2 +- arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts | 2 +- arch/arm/boot/dts/sun4i-a10-inet1.dts | 2 +- arch/arm/boot/dts/sun4i-a10-inet97fv2.dts | 2 +- arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts | 2 +- arch/arm/boot/dts/sun4i-a10-marsboard.dts | 2 +- arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts | 2 +- arch/arm/boot/dts/sun4i-a10-pcduino.dts | 2 +- arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts | 2 +- arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts | 2 +- arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 2 +- arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts | 2 +- arch/arm/boot/dts/sun5i-a13-licheepi-one.dts | 2 +- arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts | 2 +- arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 2 +- arch/arm/boot/dts/sun5i-gr8-chip-pro.dts | 2 +- arch/arm/boot/dts/sun5i-gr8-evb.dts | 2 +- arch/arm/boot/dts/sun5i-r8-chip.dts | 2 +- arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi | 2 +- arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 2 +- arch/arm/boot/dts/sun6i-a31s-primo81.dts | 2 +- arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi | 2 +- arch/arm/boot/dts/sun7i-a20-bananapi.dts | 2 +- arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 2 +- arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts | 2 +- arch/arm/boot/dts/sun7i-a20-olimex-som204-evb.dts | 2 +- arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts | 2 +- arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 2 +- arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 2 +- arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts | 2 +- arch/arm/boot/dts/sun7i-a20-orangepi.dts | 2 +- arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts | 2 +- arch/arm/boot/dts/sun7i-a20-pcduino3.dts | 2 +- arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts | 2 +- arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts | 2 +- arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi | 2 +- arch/arm/boot/dts/sun8i-v3s-licheepi-zero.dts | 2 +- 39 files changed, 39 insertions(+), 39 deletions(-)
arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts +1 -1
@@ -167,7 +167,7 @@ &usbphy { pinctrl-names = "default"; pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>; - usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ + usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ usb0_vbus_det-gpio = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */ usb0_vbus-supply = <®_usb0_vbus>; usb2_vbus-supply = <®_usb2_vbus>;
arch/arm/boot/dts/sun4i-a10-cubieboard.dts +1 -1
@@ -256,7 +256,7 @@ &usbphy { pinctrl-names = "default"; pinctrl-0 = <&usb0_id_detect_pin>; - usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ + usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ usb1_vbus-supply = <®_usb1_vbus>; usb2_vbus-supply = <®_usb2_vbus>; status = "okay";
arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts +1 -1
@@ -225,7 +225,7 @@ &usbphy { pinctrl-names = "default"; pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>; - usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ + usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ usb0_vbus_det-gpio = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */ usb0_vbus-supply = <®_usb0_vbus>; usb2_vbus-supply = <®_usb2_vbus>;
arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts +1 -1
@@ -123,7 +123,7 @@ &usbphy { pinctrl-names = "default"; pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>; - usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ + usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ usb0_vbus_det-gpio = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */ usb0_vbus-supply = <®_usb0_vbus>; usb2_vbus-supply = <®_usb2_vbus>;
arch/arm/boot/dts/sun4i-a10-inet1.dts +1 -1
@@ -235,7 +235,7 @@ &usbphy { pinctrl-names = "default"; pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>; - usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ + usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ usb0_vbus_det-gpio = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */ usb0_vbus-supply = <®_usb0_vbus>; usb1_vbus-supply = <®_usb1_vbus>;
arch/arm/boot/dts/sun4i-a10-inet97fv2.dts +1 -1
@@ -211,7 +211,7 @@ &usbphy { pinctrl-names = "default"; pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>; - usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ + usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ usb0_vbus_det-gpio = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */ usb0_vbus-supply = <®_usb0_vbus>; usb2_vbus-supply = <®_usb2_vbus>;
arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts +1 -1
@@ -377,7 +377,7 @@ &usbphy { pinctrl-names = "default"; pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>; - usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ + usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ usb0_vbus_det-gpio = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */ usb0_vbus-supply = <®_usb0_vbus>; usb2_vbus-supply = <®_usb2_vbus>;
arch/arm/boot/dts/sun4i-a10-marsboard.dts +1 -1
@@ -185,7 +185,7 @@ &usbphy { pinctrl-names = "default"; pinctrl-0 = <&usb0_id_detect_pin>; - usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ + usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ usb1_vbus-supply = <®_usb1_vbus>; usb2_vbus-supply = <®_usb2_vbus>; status = "okay";
arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts +1 -1
@@ -231,7 +231,7 @@ &usbphy { pinctrl-names = "default"; pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>; - usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ + usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ usb0_vbus_det-gpio = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */ usb0_vbus-supply = <®_usb0_vbus>; usb1_vbus-supply = <®_usb1_vbus>;
arch/arm/boot/dts/sun4i-a10-pcduino.dts +1 -1
@@ -203,7 +203,7 @@ &usbphy { pinctrl-names = "default"; pinctrl-0 = <&usb0_id_detect_pin>; - usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ + usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ usb1_vbus-supply = <®_vcc5v0>; /* USB1 VBUS is always on */ usb2_vbus-supply = <®_vcc5v0>; /* USB2 VBUS is always on */ status = "okay";
arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts +1 -1
@@ -213,7 +213,7 @@ &usbphy { pinctrl-names = "default"; pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>; - usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ + usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ usb0_vbus_det-gpio = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */ usb0_vbus-supply = <®_usb0_vbus>; usb1_vbus-supply = <®_usb1_vbus>;
arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts +1 -1
@@ -151,7 +151,7 @@ &usbphy { pinctrl-names = "default"; pinctrl-0 = <&usb0_id_detect_pin>; - usb0_id_det-gpio = <&pio 6 12 GPIO_ACTIVE_HIGH>; /* PG12 */ + usb0_id_det-gpios = <&pio 6 12 GPIO_ACTIVE_HIGH>; /* PG12 */ usb1_vbus-supply = <®_usb1_vbus>; status = "okay"; };
arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts +1 -1
@@ -273,7 +273,7 @@ &usbphy { pinctrl-names = "default"; pinctrl-0 = <&usb0_id_detect_pin>; - usb0_id_det-gpio = <&pio 6 12 GPIO_ACTIVE_HIGH>; /* PG12 */ + usb0_id_det-gpios = <&pio 6 12 GPIO_ACTIVE_HIGH>; /* PG12 */ usb0_vbus-supply = <®_usb0_vbus>; usb1_vbus-supply = <®_usb1_vbus>; status = "okay";
arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts +1 -1
@@ -197,7 +197,7 @@ &usbphy { pinctrl-names = "default"; pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>; - usb0_id_det-gpio = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */ + usb0_id_det-gpios = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */ usb0_vbus_det-gpio = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */ usb0_vbus-supply = <®_usb0_vbus>; usb1_vbus-supply = <®_ldo3>;
arch/arm/boot/dts/sun5i-a13-licheepi-one.dts +1 -1
@@ -206,7 +206,7 @@ }; &usbphy { - usb0_id_det-gpio = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */ + usb0_id_det-gpios = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */ usb0_vbus_det-gpio = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */ usb0_vbus-supply = <®_usb0_vbus>; usb1_vbus-supply = <®_vcc5v0>;
arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts +1 -1
@@ -147,7 +147,7 @@ &usbphy { pinctrl-names = "default"; pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>; - usb0_id_det-gpio = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */ + usb0_id_det-gpios = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */ usb0_vbus_det-gpio = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */ usb0_vbus-supply = <®_usb0_vbus>; usb1_vbus-supply = <®_usb1_vbus>;
arch/arm/boot/dts/sun5i-a13-olinuxino.dts +1 -1
@@ -253,7 +253,7 @@ &usbphy { pinctrl-names = "default"; pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>; - usb0_id_det-gpio = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */ + usb0_id_det-gpios = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */ usb0_vbus_det-gpio = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */ usb0_vbus-supply = <®_usb0_vbus>; usb1_vbus-supply = <®_usb1_vbus>;
arch/arm/boot/dts/sun5i-gr8-chip-pro.dts +1 -1
@@ -233,7 +233,7 @@ }; &usbphy { - usb0_id_det-gpio = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */ + usb0_id_det-gpios = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */ usb0_vbus_power-supply = <&usb_power_supply>; usb1_vbus-supply = <®_vcc5v0>; status = "okay";
arch/arm/boot/dts/sun5i-gr8-evb.dts +1 -1
@@ -325,7 +325,7 @@ }; &usbphy { - usb0_id_det-gpio = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */ + usb0_id_det-gpios = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */ usb0_vbus_det-gpio = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */ usb0_vbus_power-supply = <&usb_power_supply>; usb1_vbus-supply = <®_usb1_vbus>;
arch/arm/boot/dts/sun5i-r8-chip.dts +1 -1
@@ -279,7 +279,7 @@ &usbphy { status = "okay"; - usb0_id_det-gpio = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */ + usb0_id_det-gpios = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */ usb0_vbus_power-supply = <&usb_power_supply>; usb0_vbus-supply = <®_usb0_vbus>; usb1_vbus-supply = <®_vcc5v0>;
arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi +1 -1
@@ -200,7 +200,7 @@ &usbphy { pinctrl-names = "default"; pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>; - usb0_id_det-gpio = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */ + usb0_id_det-gpios = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */ usb0_vbus_det-gpio = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */ usb0_vbus_power-supply = <&usb_power_supply>; usb0_vbus-supply = <®_usb0_vbus>;
arch/arm/boot/dts/sun6i-a31-hummingbird.dts +1 -1
@@ -327,7 +327,7 @@ }; &usbphy { - usb0_id_det-gpio = <&pio 0 15 GPIO_ACTIVE_HIGH>; /* PA15 */ + usb0_id_det-gpios = <&pio 0 15 GPIO_ACTIVE_HIGH>; /* PA15 */ usb0_vbus_det-gpio = <&pio 0 16 GPIO_ACTIVE_HIGH>; /* PA16 */ usb0_vbus_power-supply = <&usb_power_supply>; usb0_vbus-supply = <®_drivevbus>;
arch/arm/boot/dts/sun6i-a31s-primo81.dts +1 -1
@@ -260,7 +260,7 @@ }; &usbphy { - usb0_id_det-gpio = <&pio 0 15 GPIO_ACTIVE_HIGH>; /* PA15 */ + usb0_id_det-gpios = <&pio 0 15 GPIO_ACTIVE_HIGH>; /* PA15 */ usb0_vbus_power-supply = <&usb_power_supply>; usb0_vbus-supply = <®_drivevbus>; usb1_vbus-supply = <®_dldo1>;
arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi +1 -1
@@ -175,7 +175,7 @@ &usbphy { pinctrl-names = "default"; pinctrl-0 = <&usb0_id_detect_pin>; - usb0_id_det-gpio = <&pio 0 15 GPIO_ACTIVE_HIGH>; /* PA15 */ + usb0_id_det-gpios = <&pio 0 15 GPIO_ACTIVE_HIGH>; /* PA15 */ usb0_vbus_power-supply = <&usb_power_supply>; usb0_vbus-supply = <®_drivevbus>; usb1_vbus-supply = <®_dldo1>;
arch/arm/boot/dts/sun7i-a20-bananapi.dts +1 -1
@@ -331,7 +331,7 @@ &usbphy { pinctrl-names = "default"; pinctrl-0 = <&usb0_id_detect_pin>; - usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ + usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ usb0_vbus_power-supply = <&usb_power_supply>; usb0_vbus-supply = <®_usb0_vbus>; usb1_vbus-supply = <®_usb1_vbus>;
arch/arm/boot/dts/sun7i-a20-cubieboard2.dts +1 -1
@@ -238,7 +238,7 @@ &usbphy { pinctrl-names = "default"; pinctrl-0 = <&usb0_id_detect_pin>; - usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ + usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ usb1_vbus-supply = <®_usb1_vbus>; usb2_vbus-supply = <®_usb2_vbus>; status = "okay";
arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts +1 -1
@@ -324,7 +324,7 @@ &usbphy { pinctrl-names = "default"; pinctrl-0 = <&usb0_id_detect_pin>; - usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ + usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ usb0_vbus_power-supply = <&usb_power_supply>; usb0_vbus-supply = <®_usb0_vbus>; usb2_vbus-supply = <®_usb2_vbus>;
arch/arm/boot/dts/sun7i-a20-olimex-som204-evb.dts +1 -1
@@ -314,7 +314,7 @@ }; &usbphy { - usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ + usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ usb0_vbus_det-gpio = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */ usb0_vbus_power-supply = <&usb_power_supply>; usb0_vbus-supply = <®_usb0_vbus>;
arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts +1 -1
@@ -219,7 +219,7 @@ &usbphy { pinctrl-names = "default"; pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>; - usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ + usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ usb0_vbus_det-gpio = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */ usb0_vbus-supply = <®_usb0_vbus>; usb1_vbus-supply = <®_usb1_vbus>;
arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts +1 -1
@@ -275,7 +275,7 @@ &usbphy { pinctrl-names = "default"; pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>; - usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ + usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ usb0_vbus_det-gpio = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */ usb0_vbus-supply = <®_usb0_vbus>; usb1_vbus-supply = <®_usb1_vbus>;
arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts +1 -1
@@ -357,7 +357,7 @@ &usbphy { pinctrl-names = "default"; pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>; - usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ + usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ usb0_vbus_det-gpio = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */ usb0_vbus-supply = <®_usb0_vbus>; usb1_vbus-supply = <®_usb1_vbus>;
arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts +1 -1
@@ -241,7 +241,7 @@ &usbphy { pinctrl-names = "default"; pinctrl-0 = <&usb0_id_detect_pin>; - usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ + usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ usb0_vbus_power-supply = <&usb_power_supply>; usb0_vbus-supply = <®_usb0_vbus>; usb1_vbus-supply = <®_usb1_vbus>;
arch/arm/boot/dts/sun7i-a20-orangepi.dts +1 -1
@@ -200,7 +200,7 @@ &usbphy { pinctrl-names = "default"; pinctrl-0 = <&usb0_id_detect_pin>; - usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ + usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ usb0_vbus_power-supply = <&usb_power_supply>; usb0_vbus-supply = <®_usb0_vbus>; usb1_vbus-supply = <®_usb1_vbus>;
arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts +1 -1
@@ -228,7 +228,7 @@ &usbphy { pinctrl-names = "default"; pinctrl-0 = <&usb0_id_detect_pin>; - usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ + usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ usb1_vbus-supply = <®_usb1_vbus>; usb2_vbus-supply = <®_usb1_vbus>; status = "okay";
arch/arm/boot/dts/sun7i-a20-pcduino3.dts +1 -1
@@ -228,7 +228,7 @@ &usbphy { pinctrl-names = "default"; pinctrl-0 = <&usb0_id_detect_pin>; - usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ + usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ usb1_vbus-supply = <®_usb1_vbus>; usb2_vbus-supply = <®_usb2_vbus>; status = "okay";
arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts +1 -1
@@ -225,7 +225,7 @@ &usbphy { pinctrl-names = "default"; pinctrl-0 = <&usb0_id_detect_pin>; - usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ + usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ usb0_vbus_power-supply = <&usb_power_supply>; usb0_vbus-supply = <®_usb0_vbus>; usb1_vbus-supply = <®_usb1_vbus>;
arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts +1 -1
@@ -208,7 +208,7 @@ &usbphy { pinctrl-names = "default"; pinctrl-0 = <&usb0_id_detect_pin>; - usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ + usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ usb0_vbus_power-supply = <&usb_power_supply>; usb0_vbus-supply = <®_usb0_vbus>; usb1_vbus-supply = <®_usb1_vbus>;
arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi +1 -1
@@ -226,7 +226,7 @@ &usbphy { pinctrl-names = "default"; pinctrl-0 = <&usb0_id_detect_pin>; - usb0_id_det-gpio = <&pio 7 8 GPIO_ACTIVE_HIGH>; /* PH8 */ + usb0_id_det-gpios = <&pio 7 8 GPIO_ACTIVE_HIGH>; /* PH8 */ usb0_vbus_power-supply = <&usb_power_supply>; usb0_vbus-supply = <®_drivevbus>; status = "okay";
arch/arm/boot/dts/sun8i-v3s-licheepi-zero.dts +1 -1
@@ -96,6 +96,6 @@ }; &usbphy { - usb0_id_det-gpio = <&pio 5 6 GPIO_ACTIVE_HIGH>; + usb0_id_det-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>; status = "okay"; };
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH 07/28] ARM: sunxi: Fix the USB PHY ID detect GPIO properties
Quoted 9 lines · Maxime Ripard
While the USB PHY Device Tree mandates that the name of the ID detect pin should be usb0_id_det-gpios, a significant number of device tree use usb0_id_det-gpio instead.
This was functional because the GPIO framework falls back to the gpio suffix that is legacy, but we should fix this.
Signed-off-by Maxime Ripard <[email protected]>
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH 8/28 ARM: sunxi: Fix the USB PHY VBUS detect GPIO properties
In reply to Maxime RipardWhile the USB PHY Device Tree mandates that the name of the ID detect pin should be usb0_vbus_det-gpios, a significant number of device tree use usb0_vbus_det-gpio instead.
This was functional because the GPIO framework falls back to the gpio suffix that is legacy, but we should fix this.
--- arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts | 2 +- arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts | 2 +- arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts | 2 +- arch/arm/boot/dts/sun4i-a10-inet1.dts | 2 +- arch/arm/boot/dts/sun4i-a10-inet97fv2.dts | 2 +- arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts | 2 +- arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts | 2 +- arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts | 2 +- arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts | 2 +- arch/arm/boot/dts/sun5i-a13-licheepi-one.dts | 2 +- arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts | 2 +- arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 2 +- arch/arm/boot/dts/sun5i-gr8-evb.dts | 2 +- arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi | 2 +- arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 2 +- arch/arm/boot/dts/sun7i-a20-olimex-som204-evb.dts | 2 +- arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts | 2 +- arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 2 +- arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-)
arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts +1 -1
@@ -168,7 +168,7 @@ 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-gpio = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */ + usb0_vbus_det-gpios = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */ usb0_vbus-supply = <®_usb0_vbus>; usb2_vbus-supply = <®_usb2_vbus>; status = "okay";
arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts +1 -1
@@ -226,7 +226,7 @@ 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-gpio = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */ + usb0_vbus_det-gpios = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */ usb0_vbus-supply = <®_usb0_vbus>; usb2_vbus-supply = <®_usb2_vbus>; status = "okay";
arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts +1 -1
@@ -124,7 +124,7 @@ 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-gpio = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */ + usb0_vbus_det-gpios = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */ usb0_vbus-supply = <®_usb0_vbus>; usb2_vbus-supply = <®_usb2_vbus>; status = "okay";
arch/arm/boot/dts/sun4i-a10-inet1.dts +1 -1
@@ -236,7 +236,7 @@ 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-gpio = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */ + usb0_vbus_det-gpios = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */ usb0_vbus-supply = <®_usb0_vbus>; usb1_vbus-supply = <®_usb1_vbus>; usb2_vbus-supply = <®_usb2_vbus>;
arch/arm/boot/dts/sun4i-a10-inet97fv2.dts +1 -1
@@ -212,7 +212,7 @@ 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-gpio = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */ + usb0_vbus_det-gpios = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */ usb0_vbus-supply = <®_usb0_vbus>; usb2_vbus-supply = <®_usb2_vbus>; status = "okay";
arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts +1 -1
@@ -378,7 +378,7 @@ 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-gpio = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */ + usb0_vbus_det-gpios = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */ usb0_vbus-supply = <®_usb0_vbus>; usb2_vbus-supply = <®_usb2_vbus>; status = "okay";
arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts +1 -1
@@ -232,7 +232,7 @@ 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-gpio = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */ + usb0_vbus_det-gpios = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */ usb0_vbus-supply = <®_usb0_vbus>; usb1_vbus-supply = <®_usb1_vbus>; usb2_vbus-supply = <®_usb2_vbus>;
arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts +1 -1
@@ -214,7 +214,7 @@ 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-gpio = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */ + usb0_vbus_det-gpios = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */ usb0_vbus-supply = <®_usb0_vbus>; usb1_vbus-supply = <®_usb1_vbus>; status = "okay";
arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts +1 -1
@@ -198,7 +198,7 @@ pinctrl-names = "default"; pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>; usb0_id_det-gpios = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */ - usb0_vbus_det-gpio = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */ + usb0_vbus_det-gpios = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */ usb0_vbus-supply = <®_usb0_vbus>; usb1_vbus-supply = <®_ldo3>; status = "okay";
arch/arm/boot/dts/sun5i-a13-licheepi-one.dts +1 -1
@@ -207,7 +207,7 @@ &usbphy { usb0_id_det-gpios = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */ - usb0_vbus_det-gpio = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */ + usb0_vbus_det-gpios = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */ usb0_vbus-supply = <®_usb0_vbus>; usb1_vbus-supply = <®_vcc5v0>; status = "okay";
arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts +1 -1
@@ -148,7 +148,7 @@ pinctrl-names = "default"; pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>; usb0_id_det-gpios = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */ - usb0_vbus_det-gpio = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */ + usb0_vbus_det-gpios = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */ usb0_vbus-supply = <®_usb0_vbus>; usb1_vbus-supply = <®_usb1_vbus>; status = "okay";
arch/arm/boot/dts/sun5i-a13-olinuxino.dts +1 -1
@@ -254,7 +254,7 @@ pinctrl-names = "default"; pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>; usb0_id_det-gpios = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */ - usb0_vbus_det-gpio = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */ + usb0_vbus_det-gpios = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */ usb0_vbus-supply = <®_usb0_vbus>; usb1_vbus-supply = <®_usb1_vbus>; status = "okay";
arch/arm/boot/dts/sun5i-gr8-evb.dts +1 -1
@@ -326,7 +326,7 @@ &usbphy { usb0_id_det-gpios = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */ - usb0_vbus_det-gpio = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */ + usb0_vbus_det-gpios = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */ usb0_vbus_power-supply = <&usb_power_supply>; usb1_vbus-supply = <®_usb1_vbus>; status = "okay";
arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi +1 -1
@@ -201,7 +201,7 @@ pinctrl-names = "default"; pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>; usb0_id_det-gpios = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */ - usb0_vbus_det-gpio = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */ + usb0_vbus_det-gpios = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */ usb0_vbus_power-supply = <&usb_power_supply>; usb0_vbus-supply = <®_usb0_vbus>; usb1_vbus-supply = <®_ldo3>;
arch/arm/boot/dts/sun6i-a31-hummingbird.dts +1 -1
@@ -328,7 +328,7 @@ &usbphy { usb0_id_det-gpios = <&pio 0 15 GPIO_ACTIVE_HIGH>; /* PA15 */ - usb0_vbus_det-gpio = <&pio 0 16 GPIO_ACTIVE_HIGH>; /* PA16 */ + usb0_vbus_det-gpios = <&pio 0 16 GPIO_ACTIVE_HIGH>; /* PA16 */ usb0_vbus_power-supply = <&usb_power_supply>; usb0_vbus-supply = <®_drivevbus>; usb1_vbus-supply = <®_usb1_vbus>;
arch/arm/boot/dts/sun7i-a20-olimex-som204-evb.dts +1 -1
@@ -315,7 +315,7 @@ &usbphy { usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ - usb0_vbus_det-gpio = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */ + usb0_vbus_det-gpios = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */ usb0_vbus_power-supply = <&usb_power_supply>; usb0_vbus-supply = <®_usb0_vbus>; usb1_vbus-supply = <®_usb1_vbus>;
arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts +1 -1
@@ -220,7 +220,7 @@ 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-gpio = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */ + usb0_vbus_det-gpios = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */ usb0_vbus-supply = <®_usb0_vbus>; usb1_vbus-supply = <®_usb1_vbus>; usb2_vbus-supply = <®_usb2_vbus>;
arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts +1 -1
@@ -276,7 +276,7 @@ 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-gpio = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */ + usb0_vbus_det-gpios = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */ usb0_vbus-supply = <®_usb0_vbus>; usb1_vbus-supply = <®_usb1_vbus>; usb2_vbus-supply = <®_usb2_vbus>;
arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts +1 -1
@@ -358,7 +358,7 @@ 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-gpio = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */ + usb0_vbus_det-gpios = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */ usb0_vbus-supply = <®_usb0_vbus>; usb1_vbus-supply = <®_usb1_vbus>; usb2_vbus-supply = <®_usb2_vbus>;
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH 08/28] ARM: sunxi: Fix the USB PHY VBUS detect GPIO properties
Quoted 2 lines · Maxime Ripard
While the USB PHY Device Tree mandates that the name of the ID detect pin
^^ copy/paste?
Quoted 7 lines
should be usb0_vbus_det-gpios, a significant number of device tree use usb0_vbus_det-gpio instead.
This was functional because the GPIO framework falls back to the gpio suffix that is legacy, but we should fix this.
Signed-off-by Maxime Ripard <[email protected]>
Otherwise,
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH 08/28] ARM: sunxi: Fix the USB PHY VBUS detect GPIO properties
Quoted 9 lines · Chen-Yu Tsai
Quoted 2 lines · Maxime Ripard
While the USB PHY Device Tree mandates that the name of the ID detect pin
^^ copy/paste?Quoted 3 lines
should be usb0_vbus_det-gpios, a significant number of device tree use usb0_vbus_det-gpio instead.
Quoted 8 lines
Quoted 4 lines
This was functional because the GPIO framework falls back to the gpio suffix that is legacy, but we should fix this.
Signed-off-by Maxime Ripard <[email protected]>Otherwise,
Acked-by Chen-Yu Tsai <[email protected]>
Good catch, fixed while applying, thanks!
Maxime
--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH 9/28 ARM: dts: sunxi: Fix the TCON output clock
In reply to Maxime RipardEven though we shouldn't really have any external user of the clock provided by the TCON, if clock-output-names is set, then #clock-cells must be there as well.
Fix this.
--- arch/arm/boot/dts/sun4i-a10.dtsi | 2 ++ arch/arm/boot/dts/sun5i.dtsi | 1 + arch/arm/boot/dts/sun6i-a31.dtsi | 2 ++ arch/arm/boot/dts/sun7i-a20.dtsi | 2 ++ arch/arm/boot/dts/sun8i-a23-a33.dtsi | 1 + arch/arm/boot/dts/sun8i-a83t.dtsi | 1 + arch/arm/boot/dts/sun8i-v3s.dtsi | 1 + arch/arm/boot/dts/sun9i-a80.dtsi | 1 + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 1 + 9 files changed, 12 insertions(+)
arch/arm/boot/dts/sun4i-a10.dtsi +2 -0
@@ -343,6 +343,7 @@ "tcon-ch1"; clock-output-names = "tcon0-pixel-clock"; dmas = <&dma SUN4I_DMA_DEDICATED 14>; + #clock-cells = <0>; ports { #address-cells = <1>;
@@ -392,6 +393,7 @@ "tcon-ch1"; clock-output-names = "tcon1-pixel-clock"; dmas = <&dma SUN4I_DMA_DEDICATED 15>; + #clock-cells = <0>; ports { #address-cells = <1>;
arch/arm/boot/dts/sun5i.dtsi +1 -0
@@ -276,6 +276,7 @@ "tcon-ch1"; clock-output-names = "tcon-pixel-clock"; status = "disabled"; + #clock-cells = <0>; ports { #address-cells = <1>;
arch/arm/boot/dts/sun6i-a31.dtsi +2 -0
@@ -292,6 +292,7 @@ "tcon-ch0", "tcon-ch1"; clock-output-names = "tcon0-pixel-clock"; + #clock-cells = <0>; ports { #address-cells = <1>;
@@ -340,6 +341,7 @@ "tcon-ch0", "tcon-ch1"; clock-output-names = "tcon1-pixel-clock"; + #clock-cells = <0>; ports { #address-cells = <1>;
arch/arm/boot/dts/sun7i-a20.dtsi +2 -0
@@ -407,6 +407,7 @@ "tcon-ch1"; clock-output-names = "tcon0-pixel-clock"; dmas = <&dma SUN4I_DMA_DEDICATED 14>; + #clock-cells = <0>; ports { #address-cells = <1>;
@@ -456,6 +457,7 @@ "tcon-ch1"; clock-output-names = "tcon1-pixel-clock"; dmas = <&dma SUN4I_DMA_DEDICATED 15>; + #clock-cells = <0>; ports { #address-cells = <1>;
arch/arm/boot/dts/sun8i-a23-a33.dtsi +1 -0
@@ -188,6 +188,7 @@ resets = <&ccu RST_BUS_LCD>; reset-names = "lcd"; status = "disabled"; + #clock-cells = <0>; ports { #address-cells = <1>;
arch/arm/boot/dts/sun8i-a83t.dtsi +1 -0
@@ -435,6 +435,7 @@ clock-output-names = "tcon-pixel-clock"; resets = <&ccu RST_BUS_TCON0>, <&ccu RST_BUS_LVDS>; reset-names = "lcd", "lvds"; + #clock-cells = <0>; ports { #address-cells = <1>;
arch/arm/boot/dts/sun8i-v3s.dtsi +1 -0
@@ -150,6 +150,7 @@ resets = <&ccu RST_BUS_TCON0>; reset-names = "lcd"; status = "disabled"; + #clock-cells = <0>; ports { #address-cells = <1>;
arch/arm/boot/dts/sun9i-a80.dtsi +1 -0
@@ -870,6 +870,7 @@ resets = <&ccu RST_BUS_LCD0>, <&ccu RST_BUS_EDP>; reset-names = "lcd", "edp"; clock-output-names = "tcon0-pixel-clock"; + #clock-cells = <0>; ports { #address-cells = <1>;
arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi +1 -0
@@ -354,6 +354,7 @@ clock-output-names = "tcon-pixel-clock"; resets = <&ccu RST_BUS_TCON0>, <&ccu RST_BUS_LVDS>; reset-names = "lcd", "lvds"; + #clock-cells = <0>; ports { #address-cells = <1>;
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH 09/28] ARM: dts: sunxi: Fix the TCON output clock
Quoted 25 lines · Maxime Ripard
Even though we shouldn't really have any external user of the clock provided by the TCON, if clock-output-names is set, then #clock-cells must be there as well.
Fix this.
Signed-off-by Maxime Ripard <[email protected]>--- arch/arm/boot/dts/sun4i-a10.dtsi | 2 ++ arch/arm/boot/dts/sun5i.dtsi | 1 + arch/arm/boot/dts/sun6i-a31.dtsi | 2 ++ arch/arm/boot/dts/sun7i-a20.dtsi | 2 ++ arch/arm/boot/dts/sun8i-a23-a33.dtsi | 1 + arch/arm/boot/dts/sun8i-a83t.dtsi | 1 + arch/arm/boot/dts/sun8i-v3s.dtsi | 1 + arch/arm/boot/dts/sun9i-a80.dtsi | 1 + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 1 + 9 files changed, 12 insertions(+)arch/arm/boot/dts/sun4i-a10.dtsi +0
-0
arch/arm/boot/dts/sun4i-a10.dtsi line 346
Quoted 4 lines
arch/arm/boot/dts/sun4i-a10.dtsi +1
-0@@ -343,6 +343,7 @@ "tcon-ch1"; clock-output-names = "tcon0-pixel-clock"; dmas = <&dma SUN4I_DMA_DEDICATED 14>; + #clock-cells = <0>;
Nit: could we group #clock-cells with clock-output-names?
Either way,
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH 09/28] ARM: dts: sunxi: Fix the TCON output clock
Quoted 33 lines · Chen-Yu Tsai
Quoted 25 lines · Maxime Ripard
Even though we shouldn't really have any external user of the clock provided by the TCON, if clock-output-names is set, then #clock-cells must be there as well.
Fix this.
Signed-off-by Maxime Ripard <[email protected]>--- arch/arm/boot/dts/sun4i-a10.dtsi | 2 ++ arch/arm/boot/dts/sun5i.dtsi | 1 + arch/arm/boot/dts/sun6i-a31.dtsi | 2 ++ arch/arm/boot/dts/sun7i-a20.dtsi | 2 ++ arch/arm/boot/dts/sun8i-a23-a33.dtsi | 1 + arch/arm/boot/dts/sun8i-a83t.dtsi | 1 + arch/arm/boot/dts/sun8i-v3s.dtsi | 1 + arch/arm/boot/dts/sun9i-a80.dtsi | 1 + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 1 + 9 files changed, 12 insertions(+)arch/arm/boot/dts/sun4i-a10.dtsi +0
-0arch/arm/boot/dts/sun4i-a10.dtsi line 346
Quoted 4 lines
arch/arm/boot/dts/sun4i-a10.dtsi +1
-0@@ -343,6 +343,7 @@ "tcon-ch1"; clock-output-names = "tcon0-pixel-clock"; dmas = <&dma SUN4I_DMA_DEDICATED 14>; + #clock-cells = <0>;Nit: could we group #clock-cells with clock-output-names?
Quoted 3 lines
Either way,
Acked-by Chen-Yu Tsai <[email protected]>
I fixed it (and split the A64 change in a separate patch) while applying, thanks!
Maxime
--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH 10/28 ARM: dts: sun8i: tbs-a711: Fix typo in regulators
In reply to Maxime RipardThe regulator properties suffix is -supply, yet a _supply slipped in.
This was working because the regulator framework will provide a dummy regulator when none is provided in the device tree, and the regulator itself was always enabled.
--- arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts +2 -2
@@ -417,7 +417,7 @@ &usbphy { usb0_id_det-gpios = <&pio 7 11 GPIO_ACTIVE_HIGH>; /* PH11 */ usb0_vbus-supply = <®_drivevbus>; - usb1_vbus_supply = <®_vmain>; - usb2_vbus_supply = <®_vmain>; + usb1_vbus-supply = <®_vmain>; + usb2_vbus-supply = <®_vmain>; status = "okay"; };
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH 10/28] ARM: dts: sun8i: tbs-a711: Fix typo in regulators
Quoted 8 lines · Maxime Ripard
The regulator properties suffix is -supply, yet a
_supplyslipped in.This was working because the regulator framework will provide a dummy regulator when none is provided in the device tree, and the regulator itself was always enabled.
Signed-off-by Maxime Ripard <[email protected]>
Could you add a fixes tag?
Once added,
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH 10/28] ARM: dts: sun8i: tbs-a711: Fix typo in regulators
Quoted 8 lines · Chen-Yu Tsai
Quoted 7 lines · Maxime Ripard
The regulator properties suffix is -supply, yet a
_supplyslipped in.This was working because the regulator framework will provide a dummy regulator when none is provided in the device tree, and the regulator itself was always enabled.
Quoted 7 lines
Quoted 1 line
Signed-off-by Maxime Ripard <[email protected]>Could you add a fixes tag?
Once added,
Acked-by Chen-Yu Tsai <[email protected]>
I added it, thanks!
Maxime
--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH 11/28 ARM: sunxi: dts: Split USB PHY cells into an array
In reply to Maxime RipardEven though it doesn't make any difference at the binary level, the reg property is an array of cells, and should be represented as such.
--- arch/arm/boot/dts/sun4i-a10.dtsi | 2 +- arch/arm/boot/dts/sun5i.dtsi | 2 +- arch/arm/boot/dts/sun7i-a20.dtsi | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/sun4i-a10.dtsi +1 -1
@@ -502,7 +502,7 @@ usbphy: phy@1c13400 { #phy-cells = <1>; compatible = "allwinner,sun4i-a10-usb-phy"; - reg = <0x01c13400 0x10 0x01c14800 0x4 0x01c1c800 0x4>; + reg = <0x01c13400 0x10>, <0x01c14800 0x4>, <0x01c1c800 0x4>; reg-names = "phy_ctrl", "pmu1", "pmu2"; clocks = <&ccu CLK_USB_PHY>; clock-names = "usb_phy";
arch/arm/boot/dts/sun5i.dtsi +1 -1
@@ -366,7 +366,7 @@ usbphy: phy@1c13400 { #phy-cells = <1>; compatible = "allwinner,sun5i-a13-usb-phy"; - reg = <0x01c13400 0x10 0x01c14800 0x4>; + reg = <0x01c13400 0x10>, <0x01c14800 0x4>; reg-names = "phy_ctrl", "pmu1"; clocks = <&ccu CLK_USB_PHY0>; clock-names = "usb_phy";
arch/arm/boot/dts/sun7i-a20.dtsi +1 -1
@@ -594,7 +594,7 @@ usbphy: phy@1c13400 { #phy-cells = <1>; compatible = "allwinner,sun7i-a20-usb-phy"; - reg = <0x01c13400 0x10 0x01c14800 0x4 0x01c1c800 0x4>; + reg = <0x01c13400 0x10>, <0x01c14800 0x4>, <0x01c1c800 0x4>; reg-names = "phy_ctrl", "pmu1", "pmu2"; clocks = <&ccu CLK_USB_PHY>; clock-names = "usb_phy";
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH 11/28] ARM: sunxi: dts: Split USB PHY cells into an array
Quoted 5 lines · Maxime Ripard
Even though it doesn't make any difference at the binary level, the reg property is an array of cells, and should be represented as such.
Signed-off-by Maxime Ripard <[email protected]>
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH 12/28 ARM: dts: sun8i: r40: Fix AHCI reset-names property
In reply to Maxime RipardThe AHCI node was introduced with a typo in the reset-names property that got written resets-name instead.
This was working because the reset is optional for that driver, and the controller was put out of reset by the bootloader.
--- arch/arm/boot/dts/sun8i-r40.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/sun8i-r40.dtsi +1 -1
@@ -562,7 +562,7 @@ interrupts = <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>; clocks = <&ccu CLK_BUS_SATA>, <&ccu CLK_SATA>; resets = <&ccu RST_BUS_SATA>; - resets-name = "ahci"; + reset-names = "ahci"; #address-cells = <1>; #size-cells = <0>; status = "disabled";
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH 12/28] ARM: dts: sun8i: r40: Fix AHCI reset-names property
Quoted 8 lines · Maxime Ripard
The AHCI node was introduced with a typo in the reset-names property that got written resets-name instead.
This was working because the reset is optional for that driver, and the controller was put out of reset by the bootloader.
Signed-off-by Maxime Ripard <[email protected]>
Fixes tag? For the odd case that the bootloader didn't pull the controller out of reset.
Otherwise,
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH 12/28] ARM: dts: sun8i: r40: Fix AHCI reset-names property
Quoted 8 lines · Chen-Yu Tsai
Quoted 7 lines · Maxime Ripard
The AHCI node was introduced with a typo in the reset-names property that got written resets-name instead.
This was working because the reset is optional for that driver, and the controller was put out of reset by the bootloader.
Quoted 8 lines
Quoted 1 line
Signed-off-by Maxime Ripard <[email protected]>Fixes tag? For the odd case that the bootloader didn't pull the controller out of reset.
Otherwise,
Acked-by Chen-Yu Tsai <[email protected]>
I added the fixes tag and applied, thanks!
Maxime
--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH 13/28 ARM: dts: sun8i: r40: Remove useless AHCI properties
In reply to Maxime RipardThe SATA controller never have any children nodes, so we don't need the address and size cells properties.
--- arch/arm/boot/dts/sun8i-r40.dtsi | 2 -- 1 file changed, 2 deletions(-)
arch/arm/boot/dts/sun8i-r40.dtsi +0 -2
@@ -563,8 +563,6 @@ clocks = <&ccu CLK_BUS_SATA>, <&ccu CLK_SATA>; resets = <&ccu RST_BUS_SATA>; reset-names = "ahci"; - #address-cells = <1>; - #size-cells = <0>; status = "disabled"; };
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH 13/28] ARM: dts: sun8i: r40: Remove useless AHCI properties
Quoted 5 lines · Maxime Ripard
The SATA controller never have any children nodes, so we don't need the address and size cells properties.
Signed-off-by Maxime Ripard <[email protected]>
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH 14/28 arm64: dts: allwinner: a64: Fix endpoints nodes
In reply to Maxime RipardCommit a7f7047ffcee ("arm64: dts: allwinner: a64: Add cross links for the mixers") introduced a few errors while fixing the cross links. Make sure to correct them.
--- arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi +3 -1
@@ -282,6 +282,8 @@ #size-cells = <0>; mixer1_out: port@1 { + #address-cells = <1>; + #size-cells = <0>; reg = <1>; mixer1_out_tcon0: endpoint@0 {
@@ -372,7 +374,7 @@ tcon0_in_mixer1: endpoint@1 { reg = <1>; - remote-endpoint = <&mixer1_out_tcon1>; + remote-endpoint = <&mixer1_out_tcon0>; }; };
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH 14/28] arm64: dts: allwinner: a64: Fix endpoints nodes
Quoted 1 line · Maxime Ripard
You might want to be a bit more specific in the topic, as in "display pipeline endpoints".
One might confuse it with endpoints of the camera sensor.
Quoted 6 lines
Commit
a7f7047ffcee("arm64: dts: allwinner: a64: Add cross links for the mixers") introduced a few errors while fixing the cross links. Make sure to correct them.Fixes a7f7047ffcee ("arm64: dts: allwinner: a64: Add cross links for the mixers")Signed-off-by Maxime Ripard <[email protected]>
Otherwise,
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH 14/28] arm64: dts: allwinner: a64: Fix endpoints nodes
Quoted 12 lines · Chen-Yu Tsai
Quoted 1 line · Maxime Ripard
You might want to be a bit more specific in the topic, as in "display pipeline endpoints".
One might confuse it with endpoints of the camera sensor.
Quoted 4 lines
Commit
a7f7047ffcee("arm64: dts: allwinner: a64: Add cross links for the mixers") introduced a few errors while fixing the cross links. Make sure to correct them.
Quoted 6 lines
Quoted 2 lines
Fixes a7f7047ffcee ("arm64: dts: allwinner: a64: Add cross links for the mixers")Signed-off-by Maxime Ripard <[email protected]>Otherwise,
Acked-by Chen-Yu Tsai <[email protected]>
I fixed it and applied, thanks!
Maxime
--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH 15/28 ARM: dts: sunxi: Remove pinctrl size-cells property
In reply to Maxime RipardThe children nodes of the pinctrl node hadn't have any reg property for quite some time, so we don't need the size-cells property. Remove it.
--- arch/arm/boot/dts/sun6i-a31.dtsi | 1 - arch/arm/boot/dts/sun9i-a80.dtsi | 1 - 2 files changed, 2 deletions(-)
arch/arm/boot/dts/sun6i-a31.dtsi +0 -1
@@ -1374,7 +1374,6 @@ gpio-controller; interrupt-controller; #interrupt-cells = <3>; - #size-cells = <0>; #gpio-cells = <3>; s_ir_rx_pin: s-ir-rx-pin {
arch/arm/boot/dts/sun9i-a80.dtsi +0 -1
@@ -958,7 +958,6 @@ gpio-controller; interrupt-controller; #interrupt-cells = <3>; - #size-cells = <0>; #gpio-cells = <3>; gmac_rgmii_pins: gmac-rgmii-pins {
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH 15/28] ARM: dts: sunxi: Remove pinctrl size-cells property
Quoted 5 lines · Maxime Ripard
The children nodes of the pinctrl node hadn't have any reg property for quite some time, so we don't need the size-cells property. Remove it.
Signed-off-by Maxime Ripard <[email protected]>
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH 16/28 ARM: dts: sun8i: A23/A33: Fix pinctrl node names
In reply to Maxime RipardThe NAND pinctrl nodes names don't follow the pattern we've used and enforced for some time. Make sure they do.
--- arch/arm/boot/dts/sun8i-a23-a33.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm/boot/dts/sun8i-a23-a33.dtsi +4 -4
@@ -394,25 +394,25 @@ function = "nand0"; }; - nand_pins_cs0: nand-pins-cs0 { + nand_cs0_pin: nand-cs0-pin { pins = "PC4"; function = "nand0"; bias-pull-up; }; - nand_pins_cs1: nand-pins-cs1 { + nand_cs1_pin: nand-cs1-pin { pins = "PC3"; function = "nand0"; bias-pull-up; }; - nand_pins_rb0: nand-pins-rb0 { + nand_rb0_pin: nand-rb0-pin { pins = "PC6"; function = "nand0"; bias-pull-up; }; - nand_pins_rb1: nand-pins-rb1 { + nand_rb1_pin: nand-rb1-pin { pins = "PC7"; function = "nand0"; bias-pull-up;
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH 16/28] ARM: dts: sun8i: A23/A33: Fix pinctrl node names
Quoted 5 lines · Maxime Ripard
The NAND pinctrl nodes names don't follow the pattern we've used and enforced for some time. Make sure they do.
Signed-off-by Maxime Ripard <[email protected]>
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH 17/28 ARM: dts: sun9i: Remove deprecated pinctrl properties
In reply to Maxime RipardWe switched to the generic pinctrl binding some time ago, yet the GMAC pinctrl node apparently slipped through. Fix this.
--- arch/arm/boot/dts/sun9i-a80.dtsi | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
arch/arm/boot/dts/sun9i-a80.dtsi +4 -5
@@ -961,11 +961,10 @@ #gpio-cells = <3>; gmac_rgmii_pins: gmac-rgmii-pins { - allwinner,pins = "PA0", "PA1", "PA2", "PA3", - "PA4", "PA5", "PA7", "PA8", - "PA9", "PA10", "PA12", "PA13", - "PA15", "PA16", "PA17"; - allwinner,function = "gmac"; + pins = "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", + "PA7", "PA8", "PA9", "PA10", "PA12", + "PA13", "PA15", "PA16", "PA17"; + function = "gmac"; /* * data lines in RGMII mode use DDR mode * and need a higher signal drive strength
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH 17/28] ARM: dts: sun9i: Remove deprecated pinctrl properties
Quoted 5 lines · Maxime Ripard
We switched to the generic pinctrl binding some time ago, yet the GMAC pinctrl node apparently slipped through. Fix this.
Signed-off-by Maxime Ripard <[email protected]>
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH 18/28 arm64: dts: allwinner: a64: Add missing PIO clocks
In reply to Maxime RipardThe pinctrl binding mandates that we have the three clocks fed into the PIO described.
Even though the old case is still supported for backward compatibility, we should update our DTs to fix this.
--- arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi +2 -1
@@ -583,7 +583,8 @@ interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&ccu 58>; + clocks = <&ccu 58>, <&osc24M>, <&rtc 0>; + clock-names = "apb", "hosc", "losc"; gpio-controller; #gpio-cells = <3>; interrupt-controller;
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH 18/28] arm64: dts: allwinner: a64: Add missing PIO clocks
Quoted 8 lines · Maxime Ripard
The pinctrl binding mandates that we have the three clocks fed into the PIO described.
Even though the old case is still supported for backward compatibility, we should update our DTs to fix this.
Signed-off-by Maxime Ripard <[email protected]>
Maybe a fixes tag?
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH 18/28] arm64: dts: allwinner: a64: Add missing PIO clocks
Quoted 5 lines · Chen-Yu Tsai
Quoted 4 lines · Maxime Ripard
The pinctrl binding mandates that we have the three clocks fed into the PIO described.
Quoted 8 lines
Quoted 4 lines
Even though the old case is still supported for backward compatibility, we should update our DTs to fix this.
Signed-off-by Maxime Ripard <[email protected]>Maybe a fixes tag?
Acked-by Chen-Yu Tsai <[email protected]>
I've added the fixes tag and applied, thanks!
Maxime
--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH 19/28 arm64: dts: allwinner: Fix pinctrl node names
In reply to Maxime RipardSome pinctrl node names for the A64 and H6 do not follow the convention that we switched to and enforced, most notably by using underscores in node names, which also trigger a DTC warning.
Let's change that.
--- arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 24 +++++++++---------- arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 6 ++--- 2 files changed, 15 insertions(+), 15 deletions(-)
arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi +12 -12
@@ -596,12 +596,12 @@ function = "csi"; }; - i2c0_pins: i2c0_pins { + i2c0_pins: i2c0-pins { pins = "PH0", "PH1"; function = "i2c0"; }; - i2c1_pins: i2c1_pins { + i2c1_pins: i2c1-pins { pins = "PH2", "PH3"; function = "i2c1"; };
@@ -638,19 +638,19 @@ bias-pull-up; }; - pwm_pin: pwm_pin { + pwm_pin: pwm-pin { pins = "PD22"; function = "pwm"; }; - rmii_pins: rmii_pins { + rmii_pins: rmii-pins { pins = "PD10", "PD11", "PD13", "PD14", "PD17", "PD18", "PD19", "PD20", "PD22", "PD23"; function = "emac"; drive-strength = <40>; }; - rgmii_pins: rgmii_pins { + rgmii_pins: rgmii-pins { pins = "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD15", "PD16", "PD17", "PD18", "PD19", "PD20", "PD21", "PD22", "PD23";
@@ -658,17 +658,17 @@ drive-strength = <40>; }; - spdif_tx_pin: spdif { + spdif_tx_pin: spdif-tx-pin { pins = "PH8"; function = "spdif"; }; - spi0_pins: spi0 { + spi0_pins: spi0-pins { pins = "PC0", "PC1", "PC2", "PC3"; function = "spi0"; }; - spi1_pins: spi1 { + spi1_pins: spi1-pins { pins = "PD0", "PD1", "PD2", "PD3"; function = "spi1"; };
@@ -678,12 +678,12 @@ function = "uart0"; }; - uart1_pins: uart1_pins { + uart1_pins: uart1-pins { pins = "PG6", "PG7"; function = "uart1"; }; - uart1_rts_cts_pins: uart1_rts_cts_pins { + uart1_rts_cts_pins: uart1-rts-cts-pins { pins = "PG8", "PG9"; function = "uart1"; };
@@ -1095,12 +1095,12 @@ function = "s_i2c"; }; - r_pwm_pin: pwm { + r_pwm_pin: r-pwm-pin { pins = "PL10"; function = "s_pwm"; }; - r_rsb_pins: rsb { + r_rsb_pins: r-rsb-pins { pins = "PL0", "PL1"; function = "s_rsb"; };
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +3 -3
@@ -217,7 +217,7 @@ interrupt-controller; #interrupt-cells = <3>; - ext_rgmii_pins: rgmii_pins { + ext_rgmii_pins: rgmii-pins { pins = "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD19", "PD20";
@@ -247,7 +247,7 @@ bias-pull-up; }; - uart0_ph_pins: uart0-ph { + uart0_ph_pins: uart0-ph-pins { pins = "PH0", "PH1"; function = "uart0"; };
@@ -625,7 +625,7 @@ interrupt-controller; #interrupt-cells = <3>; - r_i2c_pins: r-i2c { + r_i2c_pins: r-i2c-pins { pins = "PL0", "PL1"; function = "s_i2c"; };
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH 19/28] arm64: dts: allwinner: Fix pinctrl node names
Quoted 8 lines · Maxime Ripard
Some pinctrl node names for the A64 and H6 do not follow the convention that we switched to and enforced, most notably by using underscores in node names, which also trigger a DTC warning.
Let's change that.
Signed-off-by Maxime Ripard <[email protected]>
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH 20/28 ARM: dts: sun8i: h3: Refactor the pinctrl node names
In reply to Maxime RipardThe H3 and H5 have never been converted to the new convention we want to have for the pinctrl nodes.
Convert them.
--- .../dts/sun8i-h2-plus-bananapi-m2-zero.dts | 2 +- .../boot/dts/sun8i-h2-plus-orangepi-zero.dts | 2 +- arch/arm/boot/dts/sun8i-h3-beelink-x2.dts | 6 +-- .../boot/dts/sun8i-h3-mapleboard-mp130.dts | 4 +- arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts | 2 +- arch/arm/boot/dts/sun8i-h3-nanopi-m1.dts | 2 +- arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts | 2 +- arch/arm/boot/dts/sun8i-h3-nanopi.dtsi | 2 +- arch/arm/boot/dts/sun8i-h3-orangepi-2.dts | 4 +- arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts | 4 +- arch/arm/boot/dts/sun8i-h3-orangepi-one.dts | 2 +- arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts | 4 +- .../boot/dts/sun8i-h3-orangepi-zero-plus2.dts | 2 +- arch/arm/boot/dts/sun8i-h3-rervision-dvk.dts | 2 +- arch/arm/boot/dts/sunxi-bananapi-m2-plus.dtsi | 4 +- arch/arm/boot/dts/sunxi-h3-h5.dtsi | 38 +++++++++---------- .../boot/dts/sunxi-libretech-all-h3-cc.dtsi | 4 +- .../sun50i-h5-emlid-neutis-n5-devboard.dts | 2 +- .../allwinner/sun50i-h5-nanopi-neo-plus2.dts | 2 +- .../dts/allwinner/sun50i-h5-nanopi-neo2.dts | 2 +- .../dts/allwinner/sun50i-h5-orangepi-pc2.dts | 4 +- .../allwinner/sun50i-h5-orangepi-prime.dts | 4 +- .../sun50i-h5-orangepi-zero-plus.dts | 2 +- .../sun50i-h5-orangepi-zero-plus2.dts | 2 +- 24 files changed, 52 insertions(+), 52 deletions(-)
arch/arm/boot/dts/sun8i-h2-plus-bananapi-m2-zero.dts +1 -1
@@ -112,7 +112,7 @@ &uart0 { pinctrl-names = "default"; - pinctrl-0 = <&uart0_pins_a>; + pinctrl-0 = <&uart0_pa_pins>; status = "okay"; };
arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts +1 -1
@@ -178,7 +178,7 @@ &uart0 { pinctrl-names = "default"; - pinctrl-0 = <&uart0_pins_a>; + pinctrl-0 = <&uart0_pa_pins>; status = "okay"; };
arch/arm/boot/dts/sun8i-h3-beelink-x2.dts +3 -3
@@ -142,7 +142,7 @@ &ir { pinctrl-names = "default"; - pinctrl-0 = <&ir_pins_a>; + pinctrl-0 = <&r_ir_rx_pin>; status = "okay"; };
@@ -193,13 +193,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_pa_pins>; status = "okay"; };
arch/arm/boot/dts/sun8i-h3-mapleboard-mp130.dts +2 -2
@@ -84,7 +84,7 @@ &ir { pinctrl-names = "default"; - pinctrl-0 = <&ir_pins_a>; + pinctrl-0 = <&r_ir_rx_pin>; status = "okay"; };
@@ -120,7 +120,7 @@ &uart0 { pinctrl-names = "default"; - pinctrl-0 = <&uart0_pins_a>; + pinctrl-0 = <&uart0_pa_pins>; status = "okay"; };
arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts +1 -1
@@ -120,7 +120,7 @@ &ir { pinctrl-names = "default"; - pinctrl-0 = <&ir_pins_a>; + pinctrl-0 = <&r_ir_rx_pin>; status = "okay"; };
arch/arm/boot/dts/sun8i-h3-nanopi-m1.dts +1 -1
@@ -93,7 +93,7 @@ &ir { pinctrl-names = "default"; - pinctrl-0 = <&ir_pins_a>; + pinctrl-0 = <&r_ir_rx_pin>; status = "okay"; };
arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts +1 -1
@@ -105,7 +105,7 @@ &uart0 { pinctrl-names = "default"; - pinctrl-0 = <&uart0_pins_a>; + pinctrl-0 = <&uart0_pa_pins>; status = "okay"; };
arch/arm/boot/dts/sun8i-h3-nanopi.dtsi +1 -1
@@ -125,7 +125,7 @@ &uart0 { pinctrl-names = "default"; - pinctrl-0 = <&uart0_pins_a>; + pinctrl-0 = <&uart0_pa_pins>; status = "okay"; };
arch/arm/boot/dts/sun8i-h3-orangepi-2.dts +2 -2
@@ -152,7 +152,7 @@ &ir { pinctrl-names = "default"; - pinctrl-0 = <&ir_pins_a>; + pinctrl-0 = <&r_ir_rx_pin>; status = "okay"; };
@@ -210,7 +210,7 @@ &uart0 { pinctrl-names = "default"; - pinctrl-0 = <&uart0_pins_a>; + pinctrl-0 = <&uart0_pa_pins>; status = "okay"; };
arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts +2 -2
@@ -126,7 +126,7 @@ &ir { pinctrl-names = "default"; - pinctrl-0 = <&ir_pins_a>; + pinctrl-0 = <&r_ir_rx_pin>; status = "okay"; };
@@ -181,7 +181,7 @@ &uart0 { pinctrl-names = "default"; - pinctrl-0 = <&uart0_pins_a>; + pinctrl-0 = <&uart0_pa_pins>; status = "okay"; };
arch/arm/boot/dts/sun8i-h3-orangepi-one.dts +1 -1
@@ -192,7 +192,7 @@ &uart0 { pinctrl-names = "default"; - pinctrl-0 = <&uart0_pins_a>; + pinctrl-0 = <&uart0_pa_pins>; status = "okay"; };
arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts +2 -2
@@ -152,7 +152,7 @@ &ir { pinctrl-names = "default"; - pinctrl-0 = <&ir_pins_a>; + pinctrl-0 = <&r_ir_rx_pin>; status = "okay"; };
@@ -229,7 +229,7 @@ &uart0 { pinctrl-names = "default"; - pinctrl-0 = <&uart0_pins_a>; + pinctrl-0 = <&uart0_pa_pins>; status = "okay"; };
arch/arm/boot/dts/sun8i-h3-orangepi-zero-plus2.dts +1 -1
@@ -134,6 +134,6 @@ &uart0 { pinctrl-names = "default"; - pinctrl-0 = <&uart0_pins_a>; + pinctrl-0 = <&uart0_pa_pins>; status = "okay"; };
arch/arm/boot/dts/sun8i-h3-rervision-dvk.dts +1 -1
@@ -100,7 +100,7 @@ &uart0 { pinctrl-names = "default"; - pinctrl-0 = <&uart0_pins_a>; + pinctrl-0 = <&uart0_pa_pins>; status = "okay"; };
arch/arm/boot/dts/sunxi-bananapi-m2-plus.dtsi +2 -2
@@ -150,7 +150,7 @@ &ir { pinctrl-names = "default"; - pinctrl-0 = <&ir_pins_a>; + pinctrl-0 = <&r_ir_rx_pin>; status = "okay"; };
@@ -207,7 +207,7 @@ &uart0 { pinctrl-names = "default"; - pinctrl-0 = <&uart0_pins_a>; + pinctrl-0 = <&uart0_pa_pins>; status = "okay"; };
arch/arm/boot/dts/sunxi-h3-h5.dtsi +19 -19
@@ -386,14 +386,14 @@ interrupt-controller; #interrupt-cells = <3>; - csi_pins: csi { + csi_pins: csi-pins { pins = "PE0", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11"; function = "csi"; }; - emac_rgmii_pins: emac0 { + emac_rgmii_pins: emac-rgmii-pins { pins = "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD7", "PD8", "PD9", "PD10", "PD12", "PD13", "PD15", "PD16", "PD17";
@@ -401,22 +401,22 @@ drive-strength = <40>; }; - i2c0_pins: i2c0 { + i2c0_pins: i2c0-pins { pins = "PA11", "PA12"; function = "i2c0"; }; - i2c1_pins: i2c1 { + i2c1_pins: i2c1-pins { pins = "PA18", "PA19"; function = "i2c1"; }; - i2c2_pins: i2c2 { + i2c2_pins: i2c2-pins { pins = "PE12", "PE13"; function = "i2c2"; }; - mmc0_pins: mmc0 { + mmc0_pins: mmc0-pins { pins = "PF0", "PF1", "PF2", "PF3", "PF4", "PF5"; function = "mmc0";
@@ -424,7 +424,7 @@ bias-pull-up; }; - mmc1_pins: mmc1 { + mmc1_pins: mmc1-pins { pins = "PG0", "PG1", "PG2", "PG3", "PG4", "PG5"; function = "mmc1";
@@ -432,7 +432,7 @@ bias-pull-up; }; - mmc2_8bit_pins: mmc2_8bit { + mmc2_8bit_pins: mmc2-8bit-pins { pins = "PC5", "PC6", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14",
@@ -442,47 +442,47 @@ bias-pull-up; }; - spdif_tx_pins_a: spdif { + spdif_tx_pin: spdif-tx-pin { pins = "PA17"; function = "spdif"; }; - spi0_pins: spi0 { + spi0_pins: spi0-pins { pins = "PC0", "PC1", "PC2", "PC3"; function = "spi0"; }; - spi1_pins: spi1 { + spi1_pins: spi1-pins { pins = "PA15", "PA16", "PA14", "PA13"; function = "spi1"; }; - uart0_pins_a: uart0 { + uart0_pa_pins: uart0-pa-pins { pins = "PA4", "PA5"; function = "uart0"; }; - uart1_pins: uart1 { + uart1_pins: uart1-pins { pins = "PG6", "PG7"; function = "uart1"; }; - uart1_rts_cts_pins: uart1_rts_cts { + uart1_rts_cts_pins: uart1-rts-cts-pins { pins = "PG8", "PG9"; function = "uart1"; }; - uart2_pins: uart2 { + uart2_pins: uart2-pins { pins = "PA0", "PA1"; function = "uart2"; }; - uart3_pins: uart3 { + uart3_pins: uart3-pins { pins = "PA13", "PA14"; function = "uart3"; }; - uart3_rts_cts_pins: uart3_rts_cts { + uart3_rts_cts_pins: uart3-rts-cts-pins { pins = "PA15", "PA16"; function = "uart3"; };
@@ -860,12 +860,12 @@ interrupt-controller; #interrupt-cells = <3>; - ir_pins_a: ir { + r_ir_rx_pin: r-ir-rx-pin { pins = "PL11"; function = "s_cir_rx"; }; - r_i2c_pins: r-i2c { + r_i2c_pins: r-i2c-pins { pins = "PL0", "PL1"; function = "s_i2c"; };
arch/arm/boot/dts/sunxi-libretech-all-h3-cc.dtsi +2 -2
@@ -167,7 +167,7 @@ &ir { pinctrl-names = "default"; - pinctrl-0 = <&ir_pins_a>; + pinctrl-0 = <&r_ir_rx_pin>; status = "okay"; };
@@ -205,7 +205,7 @@ &uart0 { pinctrl-names = "default"; - pinctrl-0 = <&uart0_pins_a>; + pinctrl-0 = <&uart0_pa_pins>; status = "okay"; };
arch/arm64/boot/dts/allwinner/sun50i-h5-emlid-neutis-n5-devboard.dts +1 -1
@@ -132,7 +132,7 @@ &uart0 { pinctrl-names = "default"; - pinctrl-0 = <&uart0_pins_a>; + pinctrl-0 = <&uart0_pa_pins>; status = "okay"; };
arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts +1 -1
@@ -188,7 +188,7 @@ &uart0 { pinctrl-names = "default"; - pinctrl-0 = <&uart0_pins_a>; + pinctrl-0 = <&uart0_pa_pins>; status = "okay"; };
arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts +1 -1
@@ -142,7 +142,7 @@ &uart0 { pinctrl-names = "default"; - pinctrl-0 = <&uart0_pins_a>; + pinctrl-0 = <&uart0_pa_pins>; status = "okay"; };
arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts +2 -2
@@ -180,7 +180,7 @@ &ir { pinctrl-names = "default"; - pinctrl-0 = <&ir_pins_a>; + pinctrl-0 = <&r_ir_rx_pin>; status = "okay"; };
@@ -221,7 +221,7 @@ &uart0 { pinctrl-names = "default"; - pinctrl-0 = <&uart0_pins_a>; + pinctrl-0 = <&uart0_pa_pins>; status = "okay"; };
arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts +2 -2
@@ -187,7 +187,7 @@ &ir { pinctrl-names = "default"; - pinctrl-0 = <&ir_pins_a>; + pinctrl-0 = <&r_ir_rx_pin>; status = "okay"; };
@@ -224,7 +224,7 @@ &uart0 { pinctrl-names = "default"; - pinctrl-0 = <&uart0_pins_a>; + pinctrl-0 = <&uart0_pa_pins>; status = "okay"; };
arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus.dts +1 -1
@@ -127,7 +127,7 @@ &uart0 { pinctrl-names = "default"; - pinctrl-0 = <&uart0_pins_a>; + pinctrl-0 = <&uart0_pa_pins>; status = "okay"; };
arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts +1 -1
@@ -133,7 +133,7 @@ &uart0 { pinctrl-names = "default"; - pinctrl-0 = <&uart0_pins_a>; + pinctrl-0 = <&uart0_pa_pins>; status = "okay"; };
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH 20/28] ARM: dts: sun8i: h3: Refactor the pinctrl node names
Quoted 7 lines · Maxime Ripard
The H3 and H5 have never been converted to the new convention we want to have for the pinctrl nodes.
Convert them.
Signed-off-by Maxime Ripard <[email protected]>
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH 21/28 ARM: dts: sunxi: Add default dr_mode
In reply to Maxime RipardThe USB OTG binding we have mandates to have a dr_mode property, yet not all boards are setting it.
Since the generic otg binding states that the default mode should be the OTG mode, let's use that one in our DTSI.
--- arch/arm/boot/dts/sun4i-a10.dtsi | 1 + arch/arm/boot/dts/sun5i.dtsi | 1 + arch/arm/boot/dts/sun6i-a31.dtsi | 1 + arch/arm/boot/dts/sun7i-a20.dtsi | 1 + arch/arm/boot/dts/sun8i-a23-a33.dtsi | 1 + arch/arm/boot/dts/sun8i-a83t.dtsi | 1 + 6 files changed, 6 insertions(+)
arch/arm/boot/dts/sun4i-a10.dtsi +1 -0
@@ -496,6 +496,7 @@ phy-names = "usb"; extcon = <&usbphy 0>; allwinner,sram = <&otg_sram 1>; + dr_mode = "otg"; status = "disabled"; };
arch/arm/boot/dts/sun5i.dtsi +1 -0
@@ -360,6 +360,7 @@ phy-names = "usb"; extcon = <&usbphy 0>; allwinner,sram = <&otg_sram 1>; + dr_mode = "otg"; status = "disabled"; };
arch/arm/boot/dts/sun6i-a31.dtsi +1 -0
@@ -508,6 +508,7 @@ phys = <&usbphy 0>; phy-names = "usb"; extcon = <&usbphy 0>; + dr_mode = "otg"; status = "disabled"; };
arch/arm/boot/dts/sun7i-a20.dtsi +1 -0
@@ -588,6 +588,7 @@ phy-names = "usb"; extcon = <&usbphy 0>; allwinner,sram = <&otg_sram 1>; + dr_mode = "otg"; status = "disabled"; };
arch/arm/boot/dts/sun8i-a23-a33.dtsi +1 -0
@@ -277,6 +277,7 @@ phys = <&usbphy 0>; phy-names = "usb"; extcon = <&usbphy 0>; + dr_mode = "otg"; status = "disabled"; };
arch/arm/boot/dts/sun8i-a83t.dtsi +1 -0
@@ -582,6 +582,7 @@ phys = <&usbphy 0>; phy-names = "usb"; extcon = <&usbphy 0>; + dr_mode = "otg"; status = "disabled"; };
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH 21/28] ARM: dts: sunxi: Add default dr_mode
Quoted 8 lines · Maxime Ripard
The USB OTG binding we have mandates to have a
dr_modeproperty, yet not all boards are setting it.Since the generic otg binding states that the default mode should be the OTG mode, let's use that one in our DTSI.
Signed-off-by Maxime Ripard <[email protected]>
Do we know which ones don't have it set? Just the ones that don't enable it?
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH 22/28 ARM: dts: sun8i: h3: Add default dr_mode
In reply to Maxime RipardThe USB OTG binding we have mandates to have a dr_mode property, yet not all boards are setting it.
Since the generic otg binding states that the default mode should be the OTG mode, let's use that one in our DTSI.
--- arch/arm/boot/dts/sunxi-h3-h5.dtsi | 1 + 1 file changed, 1 insertion(+)
arch/arm/boot/dts/sunxi-h3-h5.dtsi +1 -0
@@ -242,6 +242,7 @@ phys = <&usbphy 0>; phy-names = "usb"; extcon = <&usbphy 0>; + dr_mode = "otg"; status = "disabled"; };
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH 22/28] ARM: dts: sun8i: h3: Add default dr_mode
Quoted 8 lines · Maxime Ripard
The USB OTG binding we have mandates to have a
dr_modeproperty, yet not all boards are setting it.Since the generic otg binding states that the default mode should be the OTG mode, let's use that one in our DTSI.
Signed-off-by Maxime Ripard <[email protected]>
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH 23/28 arm64: dts: allwinner: a64: Add default dr_mode
In reply to Maxime RipardThe USB OTG binding we have mandates to have a dr_mode property, yet not all boards are setting it.
Since the generic otg binding states that the default mode should be the OTG mode, let's use that one in our DTSI.
--- arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 1 + 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi +1 -0
@@ -497,6 +497,7 @@ phys = <&usbphy 0>; phy-names = "usb"; extcon = <&usbphy 0>; + dr_mode = "otg"; status = "disabled"; };
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH 23/28] arm64: dts: allwinner: a64: Add default dr_mode
Quoted 8 lines · Maxime Ripard
The USB OTG binding we have mandates to have a
dr_modeproperty, yet not all boards are setting it.Since the generic otg binding states that the default mode should be the OTG mode, let's use that one in our DTSI.
Signed-off-by Maxime Ripard <[email protected]>
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH 24/28 ARM: dts: sun8i: a83t: Fix the SPDIF binding
In reply to Maxime RipardThe SPDIF binding mandates that we have two DMA channels, one for reception and one in transmission. However, the device tree only specifies one.
This has gone un-noticed since the driver only has support for transmission currently.
--- arch/arm/boot/dts/sun8i-a83t.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/sun8i-a83t.dtsi +2 -2
@@ -794,8 +794,8 @@ clocks = <&ccu CLK_BUS_SPDIF>, <&ccu CLK_SPDIF>; resets = <&ccu RST_BUS_SPDIF>; clock-names = "apb", "spdif"; - dmas = <&dma 2>; - dma-names = "tx"; + dmas = <&dma 2>, <&dma 2>; + dma-names = "rx", "tx"; pinctrl-names = "default"; pinctrl-0 = <&spdif_tx_pin>; status = "disabled";
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH 24/28] ARM: dts: sun8i: a83t: Fix the SPDIF binding
Quoted 8 lines · Maxime Ripard
The SPDIF binding mandates that we have two DMA channels, one for reception and one in transmission. However, the device tree only specifies one.
This has gone un-noticed since the driver only has support for transmission currently.
Signed-off-by Maxime Ripard <[email protected]>
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH 25/28 ARM: dts: sun8i: h3: Fix the SPDIF binding
In reply to Maxime RipardThe SPDIF binding mandates that we have two DMA channels, one for reception and one in transmission. However, the device tree only specifies one.
This has gone un-noticed since the driver only has support for transmission currently.
--- arch/arm/boot/dts/sunxi-h3-h5.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/sunxi-h3-h5.dtsi +2 -2
@@ -590,8 +590,8 @@ clocks = <&ccu CLK_BUS_SPDIF>, <&ccu CLK_SPDIF>; resets = <&ccu RST_BUS_SPDIF>; clock-names = "apb", "spdif"; - dmas = <&dma 2>; - dma-names = "tx"; + dmas = <&dma 2>, <&dma 2>; + dma-names = "rx", "tx"; status = "disabled"; };
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH 25/28] ARM: dts: sun8i: h3: Fix the SPDIF binding
Quoted 6 lines · Maxime Ripard
The SPDIF binding mandates that we have two DMA channels, one for reception and one in transmission. However, the device tree only specifies one.
This has gone un-noticed since the driver only has support for transmission currently.
The H3 does not have the RX DRQ listed, nor does it have an SPDIF IN pin to test if it works, even though the OWA section does list RX capability and registers.
I suggest leaving it out (since there's no way to verify it), and updating the bindings to cover this case.
On the side, the A83T does not have an SPDIF IN pin either. And it doesn't have documentation for the SPDIF block. But it does list the RX DRQ.
ChenYu
Quoted 22 lines
Signed-off-by Maxime Ripard <[email protected]>--- arch/arm/boot/dts/sunxi-h3-h5.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)arch/arm/boot/dts/sunxi-h3-h5.dtsi +2
-3@@ -590,8 +590,8 @@ clocks = <&ccu CLK_BUS_SPDIF>, <&ccu CLK_SPDIF>; resets = <&ccu RST_BUS_SPDIF>; clock-names = "apb", "spdif"; - dmas = <&dma 2>; - dma-names = "tx"; + dmas = <&dma 2>, <&dma 2>; + dma-names = "rx", "tx"; status = "disabled"; }; --
Quoted 2 lines
2.20.1
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH 26/28 arm64: dts: allwinner: a64: Fix the SPDIF binding
In reply to Maxime RipardThe SPDIF binding mandates that we have two DMA channels, one for reception and one in transmission. However, the device tree only specifies one.
This has gone un-noticed since the driver only has support for transmission currently.
--- arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi +2 -2
@@ -719,8 +719,8 @@ clocks = <&ccu CLK_BUS_SPDIF>, <&ccu CLK_SPDIF>; resets = <&ccu RST_BUS_SPDIF>; clock-names = "apb", "spdif"; - dmas = <&dma 2>; - dma-names = "tx"; + dmas = <&dma 2>, <&dma 2>; + dma-names = "rx", "tx"; pinctrl-names = "default"; pinctrl-0 = <&spdif_tx_pin>; status = "disabled";
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH 26/28] arm64: dts: allwinner: a64: Fix the SPDIF binding
Quoted 8 lines · Maxime Ripard
The SPDIF binding mandates that we have two DMA channels, one for reception and one in transmission. However, the device tree only specifies one.
This has gone un-noticed since the driver only has support for transmission currently.
Signed-off-by Maxime Ripard <[email protected]>
Same comment as the H5.
ChenYu
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH 26/28] arm64: dts: allwinner: a64: Fix the SPDIF binding
Quoted 6 lines · Chen-Yu Tsai
Quoted 4 lines · Maxime Ripard
The SPDIF binding mandates that we have two DMA channels, one for reception and one in transmission. However, the device tree only specifies one.
Quoted 6 lines
Quoted 4 lines
This has gone un-noticed since the driver only has support for transmission currently.
Signed-off-by Maxime Ripard <[email protected]>Same comment as the H5.
Ugh, I meant the H3.
Quoted 1 line
ChenYu
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH 27/28 arm64: dts: allwinner: a64: Fix the Codec I2S binding
In reply to Maxime RipardThe I2S binding never mentions a reset-names property, or mentions which value it should have. To avoid any further issue, remove it.
--- arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 1 - 1 file changed, 1 deletion(-)
arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi +0 -1
@@ -762,7 +762,6 @@ clocks = <&ccu CLK_BUS_CODEC>, <&ccu CLK_AC_DIG>; clock-names = "apb", "mod"; resets = <&ccu RST_BUS_CODEC>; - reset-names = "rst"; dmas = <&dma 15>, <&dma 15>; dma-names = "rx", "tx"; status = "disabled";
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH 27/28] arm64: dts: allwinner: a64: Fix the Codec I2S binding
Quoted 5 lines · Maxime Ripard
The I2S binding never mentions a reset-names property, or mentions which value it should have. To avoid any further issue, remove it.
Signed-off-by Maxime Ripard <[email protected]>
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH 28/28 ARM: dts: sun8i: a83t: Fix the I2S binding
In reply to Maxime RipardThe I2S binding mandates that we have two DMA channels, one for reception and one in transmission. However, the device tree only specifies one.
This has probably gone un-noticed since no boards are using that controller.
--- arch/arm/boot/dts/sun8i-a83t.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/sun8i-a83t.dtsi +2 -2
@@ -836,9 +836,9 @@ interrupts = <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>; clocks = <&ccu CLK_BUS_I2S2>, <&ccu CLK_I2S2>; clock-names = "apb", "mod"; - dmas = <&dma 27>; + dmas = <&dma 27>, <&dma 27>; resets = <&ccu RST_BUS_I2S2>; - dma-names = "tx"; + dma-names = "rx", "tx"; status = "disabled"; };
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH 28/28] ARM: dts: sun8i: a83t: Fix the I2S binding
Quoted 17 lines · Maxime Ripard
The I2S binding mandates that we have two DMA channels, one for reception and one in transmission. However, the device tree only specifies one.
This has probably gone un-noticed since no boards are using that controller.
Signed-off-by Maxime Ripard <[email protected]>--- arch/arm/boot/dts/sun8i-a83t.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)arch/arm/boot/dts/sun8i-a83t.dtsi +0
-0
arch/arm/boot/dts/sun8i-a83t.dtsi line 841
Quoted 8 lines
arch/arm/boot/dts/sun8i-a83t.dtsi +2
-2@@ -836,9 +836,9 @@ interrupts = <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>; clocks = <&ccu CLK_BUS_I2S2>, <&ccu CLK_I2S2>; clock-names = "apb", "mod"; - dmas = <&dma 27>; + dmas = <&dma 27>, <&dma 27>; resets = <&ccu RST_BUS_I2S2>; - dma-names = "tx"; + dma-names = "rx", "tx";
Similar to SPDIF on H3, the RX DRQ is not listed. This controller being responsible for HDMI audio out, there's no way to verify if the DRQ is there or not.
ChenYu
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 9 lines · Maxime Ripard
Commit
1f8afea8fee0("dt-bindings: Add YAML description for Allwinner boards") added an exhaustive list of the valid compatibles used for both the SoCs and boards.We can therefore remove the old documentation, that never got as well updated as it should have.
Signed-off-by Maxime Ripard <[email protected]>
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel