Commit 612341bd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'armsoc-fixes-nc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull non-urgent ARM SoC fixes from Arnd Bergmann:
 "Smaller patches that didn't seem to find a home in other branches, and
  low-priority fixes from late in the merge window.

   - Lee Jones retires as bcm2835 (raspberry pi) co-maintainer.

   - a couple of bugfixes for the ARM CCN bus driver that were regarded
     not important enough

   - minor device tree fixes for the Renesas and Marvell platforms, that
     came a little late or did not justify have another pull request
     after the last -rc"

* tag 'armsoc-fixes-nc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  bus: arm-ccn: Enable stats for CCN-502 interconnect
  dt-bindings: arm-ccn: Add bindings info for CCN-502 compatible string
  bus: arm-ccn: Use devm_kcalloc() in arm_ccn_probe()
  bus: arm-ccn: Fix module autoload
  MAINTAINERS: add RV1108 Rockchip soc to maintained files
  ARM: dts: kirkwood: Fix Openblock A6 nand partition overlap
  ARM: dts: armadillo800eva: Split LCD mux and gpio
  MAINTAINERS: Remove Lee Jones from bcm2835.
parents c9946d01 ff9e0e3b
......@@ -3,6 +3,7 @@
Required properties:
- compatible: (standard compatible string) should be one of:
"arm,ccn-502"
"arm,ccn-504"
"arm,ccn-508"
......
......@@ -1714,6 +1714,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
......@@ -2696,7 +2697,6 @@ N: kona
F: arch/arm/mach-bcm/
BROADCOM BCM2835 ARM ARCHITECTURE
M: Lee Jones <lee@kernel.org>
M: Eric Anholt <eric@anholt.net>
M: Stefan Wahren <stefan.wahren@i2se.com>
L: linux-rpi-kernel@lists.infradead.org (moderated for non-subscribers)
......
......@@ -141,7 +141,7 @@
partition@d4000 {
label = "test";
reg = <0xd4000 0x24000>;
reg = <0xd4000 0x20000>;
};
partition@f4000 {
......
......@@ -266,7 +266,9 @@
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>;
......
......@@ -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;
......@@ -1544,9 +1544,11 @@ 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", },
{},
};
MODULE_DEVICE_TABLE(of, arm_ccn_match);
static struct platform_driver arm_ccn_driver = {
.driver = {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment