Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1f368b5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC fixes from Olof Johansson:
 "Another quiet week:

   - a fix to silence edma probe error on non-supported platforms from
     Arnd
   - a fix to enable the PL clock for Parallella, to make mainline
     usable with the SDK.
   - a somewhat verbose fix for the PLL clock tree on VF610
   - enabling of SD/MMC on one of the VF610-based boards (for testing)
   - a fix for i.MX where CONFIG_SPI used to be implicitly enabled and
     now needs to be added to the defconfig instead
   - another maintainer added for bcm2835: Lee Jones"

* tag 'armsoc-for-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: dts: zynq: Enable PL clocks for Parallella
  dma: edma: move device registration to platform code
  ARM: dts: vf610: add SD node to cosmic dts
  MAINTAINERS: update bcm2835 entry
  ARM: imx: Fix the removal of CONFIG_SPI option
  ARM: imx: clk-vf610: define PLL's clock tree
parents a3157809 92c9e0c7

MAINTAINERS

+2 −1
Original line number Original line Diff line number Diff line
@@ -2072,8 +2072,9 @@ F: drivers/clocksource/bcm_kona_timer.c 




BROADCOM BCM2835 ARM ARCHITECTURE

BROADCOM BCM2835 ARM ARCHITECTURE

M:	Stephen Warren <swarren@wwwdotorg.org>

M:	Stephen Warren <swarren@wwwdotorg.org>

M:	Lee Jones <lee@kernel.org>

L:	linux-rpi-kernel@lists.infradead.org (moderated for non-subscribers)

L:	linux-rpi-kernel@lists.infradead.org (moderated for non-subscribers)

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/rpi/linux-rpi.git

S:	Maintained

S:	Maintained

N:	bcm2835

N:	bcm2835

arch/arm/boot/dts/vf610-cosmic.dts

+19 −0
Original line number Original line Diff line number Diff line
@@ -33,6 +33,13 @@ 




};

};





&esdhc1 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_esdhc1>;

	bus-width = <4>;

	status = "okay";

};



&fec1 {

&fec1 {

	phy-mode = "rmii";

	phy-mode = "rmii";

	pinctrl-names = "default";

	pinctrl-names = "default";
@@ -42,6 +49,18 @@ 




&iomuxc {

&iomuxc {

	vf610-cosmic {

	vf610-cosmic {

		pinctrl_esdhc1: esdhc1grp {

			fsl,pins = <

				VF610_PAD_PTA24__ESDHC1_CLK	0x31ef

				VF610_PAD_PTA25__ESDHC1_CMD	0x31ef

				VF610_PAD_PTA26__ESDHC1_DAT0	0x31ef

				VF610_PAD_PTA27__ESDHC1_DAT1	0x31ef

				VF610_PAD_PTA28__ESDHC1_DATA2	0x31ef

				VF610_PAD_PTA29__ESDHC1_DAT3	0x31ef

				VF610_PAD_PTB28__GPIO_98	0x219d

			>;

		};



		pinctrl_fec1: fec1grp {

		pinctrl_fec1: fec1grp {

			fsl,pins = <

			fsl,pins = <

				VF610_PAD_PTC9__ENET_RMII1_MDC		0x30d2

				VF610_PAD_PTC9__ENET_RMII1_MDC		0x30d2

arch/arm/boot/dts/zynq-parallella.dts

+4 −0
Original line number Original line Diff line number Diff line
@@ -34,6 +34,10 @@ 
	};

	};

};

};





&clkc {

	fclk-enable = <0xf>;

};



&gem0 {

&gem0 {

	status = "okay";

	status = "okay";

	phy-mode = "rgmii-id";

	phy-mode = "rgmii-id";

arch/arm/common/edma.c

+9 −0
Original line number Original line Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <linux/io.h>

#include <linux/io.h>

#include <linux/slab.h>

#include <linux/slab.h>

#include <linux/edma.h>

#include <linux/edma.h>

#include <linux/dma-mapping.h>

#include <linux/of_address.h>

#include <linux/of_address.h>

#include <linux/of_device.h>

#include <linux/of_device.h>

#include <linux/of_dma.h>

#include <linux/of_dma.h>
@@ -1623,6 +1624,11 @@ static int edma_probe(struct platform_device *pdev) 
	struct device_node	*node = pdev->dev.of_node;

	struct device_node	*node = pdev->dev.of_node;

	struct device		*dev = &pdev->dev;

	struct device		*dev = &pdev->dev;

	int			ret;

	int			ret;

	struct platform_device_info edma_dev_info = {

		.name = "edma-dma-engine",

		.dma_mask = DMA_BIT_MASK(32),

		.parent = &pdev->dev,

	};





	if (node) {

	if (node) {

		/* Check if this is a second instance registered */

		/* Check if this is a second instance registered */
@@ -1793,6 +1799,9 @@ static int edma_probe(struct platform_device *pdev) 
			edma_write_array(j, EDMA_QRAE, i, 0x0);

			edma_write_array(j, EDMA_QRAE, i, 0x0);

		}

		}

		arch_num_cc++;

		arch_num_cc++;



		edma_dev_info.id = j;

		platform_device_register_full(&edma_dev_info);

	}

	}





	return 0;

	return 0;

arch/arm/configs/imx_v4_v5_defconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -97,6 +97,7 @@ CONFIG_SERIAL_IMX_CONSOLE=y 
# CONFIG_HW_RANDOM is not set

# CONFIG_HW_RANDOM is not set

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_IMX=y

CONFIG_I2C_IMX=y

CONFIG_SPI=y

CONFIG_SPI_IMX=y

CONFIG_SPI_IMX=y

CONFIG_SPI_SPIDEV=y

CONFIG_SPI_SPIDEV=y

CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_SYSFS=y