aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/at91/patches-5.4/103-ARM-at91-wb50n-fix-duplicate-label.patch
diff options
context:
space:
mode:
authorSandeep Sheriker M <sandeep.sheriker@microchip.com>2020-08-22 12:55:47 -0700
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-08-25 19:28:42 +0200
commita070e2ee42bb2f1c8c20ca62eac608f526640112 (patch)
tree32a01f8e34488d18eeccf908529889c42c8f6d81 /target/linux/at91/patches-5.4/103-ARM-at91-wb50n-fix-duplicate-label.patch
parent81ac2a73bc227484888a2a715f8e4e2e8043804e (diff)
downloadupstream-a070e2ee42bb2f1c8c20ca62eac608f526640112.tar.gz
upstream-a070e2ee42bb2f1c8c20ca62eac608f526640112.tar.bz2
upstream-a070e2ee42bb2f1c8c20ca62eac608f526640112.zip
at91: bump linux version to 5.4
Move patches to 5.4, put config only in subtarget directories. Signed-off-by: Sandeep Sheriker M <sandeep.sheriker@microchip.com> [refresh patches, add commit message] Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Diffstat (limited to 'target/linux/at91/patches-5.4/103-ARM-at91-wb50n-fix-duplicate-label.patch')
-rw-r--r--target/linux/at91/patches-5.4/103-ARM-at91-wb50n-fix-duplicate-label.patch39
1 files changed, 39 insertions, 0 deletions
diff --git a/target/linux/at91/patches-5.4/103-ARM-at91-wb50n-fix-duplicate-label.patch b/target/linux/at91/patches-5.4/103-ARM-at91-wb50n-fix-duplicate-label.patch
new file mode 100644
index 0000000000..bfe6e5a9ba
--- /dev/null
+++ b/target/linux/at91/patches-5.4/103-ARM-at91-wb50n-fix-duplicate-label.patch
@@ -0,0 +1,39 @@
+--- a/arch/arm/boot/dts/wb50n.dts
++++ b/arch/arm/boot/dts/wb50n.dts
+@@ -60,15 +60,15 @@
+ };
+ };
+
+- usb0: gadget@00500000 {
++ usb0: gadget@500000 {
+ status = "okay";
+ };
+
+- usb1: ohci@00600000 {
++ usb1: ohci@600000 {
+ status = "okay";
+ };
+
+- usb2: ehci@00700000 {
++ usb2: ehci@700000 {
+ status = "okay";
+ };
+ };
+--- a/arch/arm/boot/dts/wb50n.dtsi
++++ b/arch/arm/boot/dts/wb50n.dtsi
+@@ -185,13 +185,13 @@
+
+ };
+
+- usb0: gadget@00500000 {
++ usb0: gadget@500000 {
+ atmel,vbus-gpio = <&pioB 13 GPIO_ACTIVE_LOW>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_usba_vbus>;
+ };
+
+- usb1: ohci@00600000 {
++ usb1: ohci@600000 {
+ num-ports = <3>;
+ atmel,vbus-gpio = <&pioA 2 GPIO_ACTIVE_LOW>;
+ atmel,oc-gpio = <&pioA 4 GPIO_ACTIVE_LOW>;