Skip to content

Commit 5eba504

Browse files
committed
Merge tag 'sunxi-fixes-for-6.17' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into arm/fixes
Allwinner fixes for 6.17 Two device tree style cleanups from the device tree maintainers. * tag 'sunxi-fixes-for-6.17' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: riscv: dts: allwinner: rename devterm i2c-gpio node to comply with binding ARM: dts: allwinner: Minor whitespace cleanup Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 6865ed7 + a5d7a8a commit 5eba504

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

arch/arm/boot/dts/allwinner/sun4i-a10-olinuxino-lime.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@
218218
&usbphy {
219219
usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */
220220
usb0_vbus_det-gpios = <&pio 7 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH5 */
221-
usb0_vbus-supply = <&reg_usb0_vbus>;
221+
usb0_vbus-supply = <&reg_usb0_vbus>;
222222
usb1_vbus-supply = <&reg_usb1_vbus>;
223223
usb2_vbus-supply = <&reg_usb2_vbus>;
224224
status = "okay";

arch/arm/boot/dts/allwinner/sun8i-q8-common.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
};
8383

8484
&ehci0 {
85-
status = "okay";
85+
status = "okay";
8686
};
8787

8888
&mmc1 {

arch/arm/boot/dts/allwinner/sun8i-r40.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -705,7 +705,7 @@
705705
};
706706

707707
/omit-if-no-ref/
708-
uart2_rts_cts_pi_pins: uart2-rts-cts-pi-pins{
708+
uart2_rts_cts_pi_pins: uart2-rts-cts-pi-pins {
709709
pins = "PI16", "PI17";
710710
function = "uart2";
711711
};

arch/arm/boot/dts/allwinner/sun8i-v3s-netcube-kumquat.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
clk_can0: clock-can0 {
3030
compatible = "fixed-clock";
3131
#clock-cells = <0>;
32-
clock-frequency = <40000000>;
32+
clock-frequency = <40000000>;
3333
};
3434

3535
gpio-keys {

arch/riscv/boot/dts/allwinner/sun20i-d1-devterm-v3.14.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#cooling-cells = <2>;
1818
};
1919

20-
i2c-gpio-0 {
20+
i2c-0 {
2121
compatible = "i2c-gpio";
2222
sda-gpios = <&pio 3 14 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>; /* PD14/GPIO44 */
2323
scl-gpios = <&pio 3 15 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>; /* PD15/GPIO45 */

0 commit comments

Comments
 (0)