aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm2708/patches-4.9/031-v4.10-0005-ARM-dts-bcm283x-add-pinctrl-group-to-sdhci-drop-pins.patch
diff options
context:
space:
mode:
authorRafał Miłecki <rafal@milecki.pl>2017-03-22 23:35:39 +0100
committerRafał Miłecki <rafal@milecki.pl>2017-03-24 19:52:00 +0100
commit313197d7079ae5046740909133b1cd89f81e2533 (patch)
treeaad922b97b671381ef38291c41abd07b3f3d9311 /target/linux/brcm2708/patches-4.9/031-v4.10-0005-ARM-dts-bcm283x-add-pinctrl-group-to-sdhci-drop-pins.patch
parent322a7226d32222e19b2a633c05f56fa0f06da435 (diff)
downloadupstream-313197d7079ae5046740909133b1cd89f81e2533.tar.gz
upstream-313197d7079ae5046740909133b1cd89f81e2533.tar.bz2
upstream-313197d7079ae5046740909133b1cd89f81e2533.zip
brcm2708: backport upstream ARM dts commits
This gets us in sync with dts from kernel 4.11. Two patches were already backported earlier. I decided to use 03x prefix as it's kind of similar to the 3xx prefix: 3xx - architecture specific patches It isn't any documented or strict rule though. We don't need to stick to it if we hit any problems. Signed-off-by: Rafał Miłecki <rafal@milecki.pl> Acked-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/brcm2708/patches-4.9/031-v4.10-0005-ARM-dts-bcm283x-add-pinctrl-group-to-sdhci-drop-pins.patch')
-rw-r--r--target/linux/brcm2708/patches-4.9/031-v4.10-0005-ARM-dts-bcm283x-add-pinctrl-group-to-sdhci-drop-pins.patch33
1 files changed, 33 insertions, 0 deletions
diff --git a/target/linux/brcm2708/patches-4.9/031-v4.10-0005-ARM-dts-bcm283x-add-pinctrl-group-to-sdhci-drop-pins.patch b/target/linux/brcm2708/patches-4.9/031-v4.10-0005-ARM-dts-bcm283x-add-pinctrl-group-to-sdhci-drop-pins.patch
new file mode 100644
index 0000000000..b54c2b41a0
--- /dev/null
+++ b/target/linux/brcm2708/patches-4.9/031-v4.10-0005-ARM-dts-bcm283x-add-pinctrl-group-to-sdhci-drop-pins.patch
@@ -0,0 +1,33 @@
+From f8bef3619bb219ed27dfe11cd20547e5b709650a Mon Sep 17 00:00:00 2001
+From: Gerd Hoffmann <kraxel@redhat.com>
+Date: Mon, 19 Sep 2016 10:43:22 +0200
+Subject: [PATCH] ARM: dts: bcm283x: add pinctrl group to &sdhci, drop pins
+ from &gpio
+
+Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
+Signed-off-by: Eric Anholt <eric@anholt.net>
+Acked-by: Stefan Wahren <stefan.wahren@i2se.com>
+---
+ arch/arm/boot/dts/bcm2835-rpi.dtsi | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- a/arch/arm/boot/dts/bcm2835-rpi.dtsi
++++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi
+@@ -44,7 +44,7 @@
+ };
+
+ alt3: alt3 {
+- brcm,pins = <48 49 50 51 52 53>;
++ brcm,pins = <>;
+ brcm,function = <BCM2835_FSEL_ALT3>;
+ };
+ };
+@@ -68,6 +68,8 @@
+ };
+
+ &sdhci {
++ pinctrl-names = "default";
++ pinctrl-0 = <&emmc_gpio48>;
+ status = "okay";
+ bus-width = <4>;
+ };