Procházet zdrojové kódy

bcm53xx: update pinctrl driver

It's upstream now with a one trivial fix.

Signed-off-by: Rafał Miłecki <[email protected]>
Rafał Miłecki před 7 roky
rodič
revize
f975ab8f4e

+ 1 - 0
target/linux/bcm53xx/patches-4.14/182-pinctrl-bcm-add-Northstar-driver.patch → target/linux/bcm53xx/patches-4.14/082-pinctrl-bcm-add-Northstar-driver.patch

@@ -1,3 +1,4 @@
+From c12fb1774deaa9c9408b19db8d43d3612f6e47a0 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <[email protected]>
 Date: Wed, 26 Sep 2018 21:31:03 +0200
 Subject: [PATCH] pinctrl: bcm: add Northstar driver

+ 38 - 0
target/linux/bcm53xx/patches-4.14/083-pinctrl-bcm-ns-Use-uintptr_t-for-casting-data.patch

@@ -0,0 +1,38 @@
+From ce7bdb957b8e3f1cbf0a3358f1deef385dff6502 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <[email protected]>
+Date: Thu, 11 Oct 2018 13:23:40 +0200
+Subject: [PATCH] pinctrl: bcm: ns: Use uintptr_t for casting data
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fix up a compiler error on 64bit architectures where pointers
+and integers differ in size.
+
+Suggested-by: Arnd Bergmann <[email protected]>
+Signed-off-by: Rafał Miłecki <[email protected]>
+Signed-off-by: Linus Walleij <[email protected]>
+---
+ drivers/pinctrl/bcm/pinctrl-ns.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/pinctrl/bcm/pinctrl-ns.c
++++ b/drivers/pinctrl/bcm/pinctrl-ns.c
+@@ -285,7 +285,7 @@ static int ns_pinctrl_probe(struct platf
+ 	of_id = of_match_device(ns_pinctrl_of_match_table, dev);
+ 	if (!of_id)
+ 		return -EINVAL;
+-	ns_pinctrl->chipset_flag = (unsigned int)of_id->data;
++	ns_pinctrl->chipset_flag = (uintptr_t)of_id->data;
+ 
+ 	res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
+ 					   "cru_gpio_control");
+@@ -307,7 +307,7 @@ static int ns_pinctrl_probe(struct platf
+ 	for (i = 0, pin = (struct pinctrl_pin_desc *)&pctldesc->pins[0];
+ 	     i < ARRAY_SIZE(ns_pinctrl_pins); i++) {
+ 		const struct pinctrl_pin_desc *src = &ns_pinctrl_pins[i];
+-		unsigned int chipsets = (unsigned int)src->drv_data;
++		unsigned int chipsets = (uintptr_t)src->drv_data;
+ 
+ 		if (chipsets & ns_pinctrl->chipset_flag) {
+ 			memcpy(pin++, src, sizeof(*src));