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

Commit 903a9f77 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC board updates from Olof Johansson:
 "This branch is reducing in size for every release since most
  board-related changes have started happening in devicetrees now.
  Still, we have some things going on here.

   * Renesas platforms are still adding a bit more legacy device
     support, something that should trail off shortly as they move to
     full DT
   * We group most defconfig updates into this branch out of old habits
   * Removal of legacy OMAP2 platforms over to DT continues, and a
     handful of old code is being removed here"

* tag 'boards-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (94 commits)
  ARM: dts: OMAP2: fix interrupt number for rng
  ARM: dts: Split omap3 pinmux core device
  ARM: dts: Add omap specific pinctrl defines to use padconf addresses
  ARM: bcm2835: bcm2835_defconfig updates
  ARM: msm_defconfig: Enable restart driver
  defconfig: msm_defconfig: Enable CONFIG_ARCH_MSM8974
  ARM: msm: Add support for APQ8074 Dragonboard
  ARM: exynos_defconfig: Enable S2MPS11 voltage regulator
  ARM: tegra: Enable DRM panel support
  ARM: shmobile: mackerel: Fix USBHS pinconf entry
  ARM: shmobile: Let Koelsch multiplatform boot with Koelsch DTB
  ARM: shmobile: Let Lager multiplatform boot with Lager DTB
  ARM: shmobile: Remove non-multiplatform Koelsch reference support
  ARM: shmobile: Remove non-multiplatform Lager reference support
  ARM: shmobile: koelsch-reference: Instantiate clkdevs for SCIF and CMT
  ARM: shmobile: lager-reference: Instantiate clkdevs for SCIF and CMT
  ARM: shmobile: koelsch-reference: Remove duplicate CCF initialization
  ARM: shmobile: lager-reference: Enable multiplaform kernel support
  ARM: shmobile: armadillo: Set backlight enable GPIO
  ARM: shmobile: Koelsch: add Ether support
  ...

Conflicts:
	arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c
parents 9b6d351a e41006c2

arch/arm/Kconfig

+4 −3
Original line number Diff line number Diff line
@@ -669,7 +669,7 @@ config ARCH_MSM_NODT 
	  (clock and power control, etc).



config ARCH_SHMOBILE_LEGACY

	bool "Renesas SH-Mobile / R-Mobile (non-multiplatform)"

	bool "Renesas ARM SoCs (non-multiplatform)"

	select ARCH_SHMOBILE

	select ARM_PATCH_PHYS_VIRT

	select CLKDEV_LOOKUP
@@ -685,8 +685,9 @@ config ARCH_SHMOBILE_LEGACY 
	select PM_GENERIC_DOMAINS if PM

	select SPARSE_IRQ

	help

	  Support for Renesas's SH-Mobile and R-Mobile ARM platforms using

	  a non-multiplatform kernel.

	  Support for Renesas ARM SoC platforms using a non-multiplatform

	  kernel. This includes the SH-Mobile, R-Mobile, EMMA-Mobile, R-Car

	  and RZ families.



config ARCH_RPC

	bool "RiscPC"

arch/arm/boot/dts/Makefile

+14 −3
Original line number Diff line number Diff line
@@ -119,7 +119,8 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \ 
dtb-$(CONFIG_ARCH_MARCO) += marco-evb.dtb

dtb-$(CONFIG_ARCH_MOXART) += moxart-uc7112lx.dtb

dtb-$(CONFIG_ARCH_MSM) += qcom-msm8660-surf.dtb \

	qcom-msm8960-cdp.dtb

	qcom-msm8960-cdp.dtb \

	qcom-apq8074-dragonboard.dtb

dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \

	armada-370-mirabox.dtb \

	armada-370-netgear-rn102.dtb \
@@ -188,12 +189,19 @@ dtb-$(CONFIG_ARCH_NSPIRE) += nspire-cx.dtb \ 
	nspire-tp.dtb \

	nspire-clp.dtb

dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \

	omap2430-sdp.dtb \

	omap2420-n800.dtb \

	omap2420-n810.dtb \

	omap2420-n810-wimax.dtb \

	omap3430-sdp.dtb \

	omap3-beagle.dtb \

	omap3-cm-t3730.dtb \

	omap3-sbc-t3730.dtb \

	omap3-devkit8000.dtb \

	omap3-beagle-xm.dtb \

	omap3-evm.dtb \

	omap3-evm-37xx.dtb \

	omap3-ldp.dtb \

	omap3-n900.dtb \

	omap3-n9.dtb \

	omap3-n950.dtb \
@@ -233,6 +241,7 @@ dtb-$(CONFIG_ARCH_S3C64XX) += s3c6410-mini6410.dtb \ 
	s3c6410-smdk6410.dtb

dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += emev2-kzm9d.dtb \

	r7s72100-genmai.dtb \

	r7s72100-genmai-reference.dtb \

	r8a7740-armadillo800eva.dtb \

	r8a7778-bockw.dtb \

	r8a7778-bockw-reference.dtb \
@@ -241,13 +250,15 @@ dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += emev2-kzm9d.dtb \ 
	r8a7779-marzen-reference.dtb \

	r8a7791-koelsch.dtb \

	r8a7790-lager.dtb \

	r8a7790-lager-reference.dtb \

	sh73a0-kzm9g.dtb \

	sh73a0-kzm9g-reference.dtb \

	r8a73a4-ape6evm.dtb \

	r8a73a4-ape6evm-reference.dtb \

	sh7372-mackerel.dtb

dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d.dtb

dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d.dtb \

	r7s72100-genmai-reference.dtb \

	r8a7791-koelsch.dtb \

	r8a7790-lager.dtb

dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_arria5_socdk.dtb \

	socfpga_cyclone5_socdk.dtb \

	socfpga_cyclone5_sockit.dtb \

arch/arm/boot/dts/am3517-evm.dts

+29 −0
Original line number Diff line number Diff line
@@ -17,6 +17,21 @@ 
		device_type = "memory";

		reg = <0x80000000 0x10000000>; /* 256 MB */

	};



        vmmc_fixed: vmmc {

                compatible = "regulator-fixed";

                regulator-name = "vmmc_fixed";

                regulator-min-microvolt = <3300000>;

                regulator-max-microvolt = <3300000>;

        };

};



&davinci_emac {

	     status = "okay";

};



&davinci_mdio {

	     status = "okay";

};



&i2c1 {
@@ -30,3 +45,17 @@ 
&i2c3 {

	clock-frequency = <400000>;

};



&mmc1 {

	vmmc-supply = <&vmmc_fixed>;

	bus-width = <4>;

};



&mmc2 {

      status = "disabled";

};



&mmc3 {

      status = "disabled";

};

arch/arm/boot/dts/omap2.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ 
			compatible = "ti,omap2-rng";

			ti,hwmods = "rng";

			reg = <0x480a0000 0x50>;

			interrupts = <36>;

			interrupts = <52>;

		};



		sham: sham@480a4000 {

arch/arm/boot/dts/omap2420-n800.dts

0 → 100644
+8 −0
Original line number Diff line number Diff line 
/dts-v1/;



#include "omap2420-n8x0-common.dtsi"



/ {

	model = "Nokia N800";

	compatible = "nokia,n800", "nokia,n8x0", "ti,omap2420", "ti,omap2";

};