diff options
author | Sandeep Sheriker M <sandeep.sheriker@microchip.com> | 2020-08-22 12:55:47 -0700 |
---|---|---|
committer | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2020-08-25 19:28:42 +0200 |
commit | a070e2ee42bb2f1c8c20ca62eac608f526640112 (patch) | |
tree | 32a01f8e34488d18eeccf908529889c42c8f6d81 /target/linux/at91/patches-5.4 | |
parent | 81ac2a73bc227484888a2a715f8e4e2e8043804e (diff) | |
download | upstream-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')
5 files changed, 93 insertions, 0 deletions
diff --git a/target/linux/at91/patches-5.4/101-ARM-at91-build-dtb-for-q5xr5.patch b/target/linux/at91/patches-5.4/101-ARM-at91-build-dtb-for-q5xr5.patch new file mode 100644 index 0000000000..b736b99f7f --- /dev/null +++ b/target/linux/at91/patches-5.4/101-ARM-at91-build-dtb-for-q5xr5.patch @@ -0,0 +1,10 @@ +--- a/arch/arm/boot/dts/Makefile ++++ b/arch/arm/boot/dts/Makefile +@@ -38,6 +38,7 @@ dtb-$(CONFIG_SOC_AT91SAM9) += \ + at91-ariettag25.dtb \ + at91-cosino_mega2560.dtb \ + at91-kizboxmini.dtb \ ++ at91-q5xr5.dtb \ + at91-wb45n.dtb \ + at91sam9g15ek.dtb \ + at91sam9g25ek.dtb \ diff --git a/target/linux/at91/patches-5.4/102-ARM-at91-build-dtb-for-wb45n.patch b/target/linux/at91/patches-5.4/102-ARM-at91-build-dtb-for-wb45n.patch new file mode 100644 index 0000000000..c35ecc510a --- /dev/null +++ b/target/linux/at91/patches-5.4/102-ARM-at91-build-dtb-for-wb45n.patch @@ -0,0 +1,12 @@ +--- a/arch/arm/boot/dts/Makefile ++++ b/arch/arm/boot/dts/Makefile +@@ -44,7 +44,8 @@ dtb-$(CONFIG_SOC_AT91SAM9) += \ + at91sam9g25ek.dtb \ + at91sam9g35ek.dtb \ + at91sam9x25ek.dtb \ +- at91sam9x35ek.dtb ++ at91sam9x35ek.dtb \ ++ wb45n.dtb + dtb-$(CONFIG_SOC_SAM_V7) += \ + at91-kizbox2.dtb \ + at91-nattis-2-natte-2.dtb \ diff --git a/target/linux/at91/patches-5.4/102-ARM-at91-wb45n-fix-duplicate-label.patch b/target/linux/at91/patches-5.4/102-ARM-at91-wb45n-fix-duplicate-label.patch new file mode 100644 index 0000000000..9d060426ec --- /dev/null +++ b/target/linux/at91/patches-5.4/102-ARM-at91-wb45n-fix-duplicate-label.patch @@ -0,0 +1,20 @@ +--- a/arch/arm/boot/dts/wb45n.dts ++++ b/arch/arm/boot/dts/wb45n.dts +@@ -126,7 +126,7 @@ + }; + }; + +- usb0: ohci@00600000 { ++ usb0: ohci@600000 { + status = "okay"; + num-ports = <2>; + atmel,vbus-gpio = < +@@ -136,7 +136,7 @@ + atmel,oc-gpio = <&pioB 13 GPIO_ACTIVE_LOW>; + }; + +- usb1: ehci@00700000 { ++ usb1: ehci@700000 { + status = "okay"; + }; + diff --git a/target/linux/at91/patches-5.4/103-ARM-at91-build-dtb-for-wb50n.patch b/target/linux/at91/patches-5.4/103-ARM-at91-build-dtb-for-wb50n.patch new file mode 100644 index 0000000000..ab5d7afcbb --- /dev/null +++ b/target/linux/at91/patches-5.4/103-ARM-at91-build-dtb-for-wb50n.patch @@ -0,0 +1,12 @@ +--- a/arch/arm/boot/dts/Makefile ++++ b/arch/arm/boot/dts/Makefile +@@ -66,7 +66,8 @@ dtb-$(CONFIG_SOC_SAM_V7) += \ + at91-sama5d4_ma5d4evk.dtb \ + at91-sama5d4_xplained.dtb \ + at91-sama5d4ek.dtb \ +- at91-vinco.dtb ++ at91-vinco.dtb \ ++ wb50n.dtb + dtb-$(CONFIG_ARCH_ATLAS6) += \ + atlas6-evb.dtb + dtb-$(CONFIG_ARCH_ATLAS7) += \ 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>; |