From c5c168b66f5b3cb77bf57d84bf624ce412f0976e Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 23 Feb 2017 10:18:32 -0800 Subject: [PATCH 1/8] MAINTAINERS: Remove Lee Jones from bcm2835. Lee has been inactive on the linux-rpi-kernel mailing list for the last year. My thanks go to Lee for his past work in patch merging. Signed-off-by: Eric Anholt --- MAINTAINERS | 1 - 1 file changed, 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index f7d568b8f133..7818cdb67dfd 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2686,7 +2686,6 @@ N: kona F: arch/arm/mach-bcm/ BROADCOM BCM2835 ARM ARCHITECTURE -M: Lee Jones M: Eric Anholt M: Stefan Wahren L: linux-rpi-kernel@lists.infradead.org (moderated for non-subscribers) From 13132b3f44d3600983aceb7e9920b8ebb55a7cf8 Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Thu, 1 Jun 2017 12:27:00 +0200 Subject: [PATCH 2/8] ARM: dts: armadillo800eva: Split LCD mux and gpio Configuration of the lcd0 pinmux group and GPIO hog for the external GPIO mux are done using a single device node, causing the "output-high" property to be applied to both. This will fail for the pinmux group, but doesn't cause any harm, as the failure is ignored silently. However, after "pinctrl: sh-pfc: propagate errors on group config", the failure will become fatal, leading to a broken display: sh-pfc e6050000.pin-controller: pin_config_group_set op failed for group 102 sh-pfc e6050000.pin-controller: Error applying setting, reverse things back sh-pfc e6050000.pin-controller: failed to select default state Move the GPIO hog to its own node to fix this. Fixes: ffd2f9a5afb730b9 ("ARM: shmobile: armadillo800eva dts: Add pinctrl and gpio-hog for lcdc0") Signed-off-by: Geert Uytterhoeven Acked-by: Laurent Pinchart Signed-off-by: Simon Horman --- arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/boot/dts/r8a7740-armadillo800eva.dts b/arch/arm/boot/dts/r8a7740-armadillo800eva.dts index 7885075428bb..1788e186a512 100644 --- a/arch/arm/boot/dts/r8a7740-armadillo800eva.dts +++ b/arch/arm/boot/dts/r8a7740-armadillo800eva.dts @@ -266,7 +266,9 @@ fsia_pins: sounda { lcd0_pins: lcd0 { groups = "lcd0_data24_0", "lcd0_lclk_1", "lcd0_sync"; function = "lcd0"; + }; + lcd0_mux { /* DBGMD/LCDC0/FSIA MUX */ gpio-hog; gpios = <176 0>; From 4fcee14d3802b60f22baf1aeab9f1cff08834c56 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 16 Jun 2017 14:39:57 +0200 Subject: [PATCH 3/8] ARM: dts: kirkwood: Fix Openblock A6 nand partition overlap The "test" and "conf" nand partitions partly overlap: Creating 6 MTD partitions on "orion_nand": 0x000000000000-0x000000090000 : "uboot" 0x000000090000-0x0000000d4000 : "env" 0x0000000d4000-0x0000000f8000 : "test" 0x0000000f4000-0x0000004f4000 : "conf" That is unlikely to be desired, and not matching the partition map used in u-boot - So adjust the test partition size to fix this. Signed-off-by: Peter Korsgaard Signed-off-by: Gregory CLEMENT --- arch/arm/boot/dts/kirkwood-openblocks_a6.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/kirkwood-openblocks_a6.dts b/arch/arm/boot/dts/kirkwood-openblocks_a6.dts index 94e49f32d5f9..c75da5f0ca48 100644 --- a/arch/arm/boot/dts/kirkwood-openblocks_a6.dts +++ b/arch/arm/boot/dts/kirkwood-openblocks_a6.dts @@ -141,7 +141,7 @@ partition@90000 { partition@d4000 { label = "test"; - reg = <0xd4000 0x24000>; + reg = <0xd4000 0x20000>; }; partition@f4000 { From 2b503be33237a6dfc7c406319115aeb35ff5d098 Mon Sep 17 00:00:00 2001 From: Heiko Stuebner Date: Wed, 7 Jun 2017 13:06:27 +0200 Subject: [PATCH 4/8] MAINTAINERS: add RV1108 Rockchip soc to maintained files The RV1108, as a soc targetted at visual applications, does not follow the usual RKxxxx naming scheme and thus falls through the cracks of the current file list for Rockchip socs in MAINTAINERS. The driver side does not pose a problem, as the rv1108 shares most functionality with other Rockchip socs as usual, so we only need to add an expression catching the rv1108* arm32 devicetree files. Signed-off-by: Heiko Stuebner Signed-off-by: Olof Johansson --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 053c3bdd1fe5..80f32df2aad5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1710,6 +1710,7 @@ L: linux-rockchip@lists.infradead.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git S: Maintained F: arch/arm/boot/dts/rk3* +F: arch/arm/boot/dts/rv1108* F: arch/arm/mach-rockchip/ F: drivers/clk/rockchip/ F: drivers/i2c/busses/i2c-rk3x.c From 60aba820dec333eaa7a320de1403b77e444a178c Mon Sep 17 00:00:00 2001 From: Javier Martinez Canillas Date: Mon, 2 Jan 2017 10:02:29 -0300 Subject: [PATCH 5/8] bus: arm-ccn: Fix module autoload If the driver is built as a module, autoload won't work because the module alias information is not filled. So user-space can't match the registered device with the corresponding module. Export the module alias information using the MODULE_DEVICE_TABLE() macro. Before this patch: $ modinfo drivers/bus/arm-ccn.ko | grep alias $ After this patch: $ modinfo drivers/bus/arm-ccn.ko | grep alias alias: of:N*T*Carm,ccn-504C* alias: of:N*T*Carm,ccn-504 Signed-off-by: Javier Martinez Canillas Signed-off-by: Pawel Moll --- drivers/bus/arm-ccn.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/bus/arm-ccn.c b/drivers/bus/arm-ccn.c index 4d6a2b7e4d3f..80758f6fdaa5 100644 --- a/drivers/bus/arm-ccn.c +++ b/drivers/bus/arm-ccn.c @@ -1547,6 +1547,7 @@ static const struct of_device_id arm_ccn_match[] = { { .compatible = "arm,ccn-504", }, {}, }; +MODULE_DEVICE_TABLE(of, arm_ccn_match); static struct platform_driver arm_ccn_driver = { .driver = { From 0a240c5b420194c24882748f1ea35f37643b032e Mon Sep 17 00:00:00 2001 From: Markus Elfring Date: Wed, 19 Apr 2017 09:12:43 +0200 Subject: [PATCH 6/8] bus: arm-ccn: Use devm_kcalloc() in arm_ccn_probe() Multiplications for the size determination of memory allocations indicated that array data structures should be processed. Thus use the corresponding function "devm_kcalloc". This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring Signed-off-by: Pawel Moll --- drivers/bus/arm-ccn.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/bus/arm-ccn.c b/drivers/bus/arm-ccn.c index 80758f6fdaa5..5aaa645ba726 100644 --- a/drivers/bus/arm-ccn.c +++ b/drivers/bus/arm-ccn.c @@ -1520,10 +1520,10 @@ static int arm_ccn_probe(struct platform_device *pdev) if (err) return err; - ccn->node = devm_kzalloc(ccn->dev, sizeof(*ccn->node) * ccn->num_nodes, - GFP_KERNEL); - ccn->xp = devm_kzalloc(ccn->dev, sizeof(*ccn->node) * ccn->num_xps, - GFP_KERNEL); + ccn->node = devm_kcalloc(ccn->dev, ccn->num_nodes, sizeof(*ccn->node), + GFP_KERNEL); + ccn->xp = devm_kcalloc(ccn->dev, ccn->num_xps, sizeof(*ccn->node), + GFP_KERNEL); if (!ccn->node || !ccn->xp) return -ENOMEM; From 6a7f6cf72b5808059c42c49fdc07fa6aebe241d7 Mon Sep 17 00:00:00 2001 From: Velibor Markovski Date: Thu, 15 Jun 2017 23:39:12 -0700 Subject: [PATCH 7/8] dt-bindings: arm-ccn: Add bindings info for CCN-502 compatible string Add CCN-502 to the list of supported devices by ARM CCN PMU driver. Signed-off-by: Velibor Markovski Acked-by: Mark Rutland Signed-off-by: Scott Branden Signed-off-by: Pawel Moll --- Documentation/devicetree/bindings/arm/ccn.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/arm/ccn.txt b/Documentation/devicetree/bindings/arm/ccn.txt index b100d3847d88..29801456c9ee 100644 --- a/Documentation/devicetree/bindings/arm/ccn.txt +++ b/Documentation/devicetree/bindings/arm/ccn.txt @@ -3,6 +3,7 @@ Required properties: - compatible: (standard compatible string) should be one of: + "arm,ccn-502" "arm,ccn-504" "arm,ccn-508" From 2941be2166c2146ded1d1806ae76e78c26b8d4fe Mon Sep 17 00:00:00 2001 From: Velibor Markovski Date: Thu, 15 Jun 2017 23:39:13 -0700 Subject: [PATCH 8/8] bus: arm-ccn: Enable stats for CCN-502 interconnect Add compatible string for the ARM CCN-502 interconnect Signed-off-by: Velibor Markovski Acked-by: Mark Rutland Signed-off-by: Scott Branden Signed-off-by: Pawel Moll --- drivers/bus/arm-ccn.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/bus/arm-ccn.c b/drivers/bus/arm-ccn.c index 5aaa645ba726..e8c6946fed9d 100644 --- a/drivers/bus/arm-ccn.c +++ b/drivers/bus/arm-ccn.c @@ -1544,6 +1544,7 @@ static int arm_ccn_remove(struct platform_device *pdev) } static const struct of_device_id arm_ccn_match[] = { + { .compatible = "arm,ccn-502", }, { .compatible = "arm,ccn-504", }, {}, };