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

Commit 6c5096e5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC board specific changes from Arnd Bergmann:
 "These updates are all for board specific code, including

   - defconfig updates for shmobile, davinci, bcm2835, imx, omap and
     tegra

   - SD/MMC and I2C support on bcm2835 (Raspberry PI)

   - minor updates for PXA

   - shmobile updates to GPIO usage in board files

   - More things in OMAP board files are moved over to device tree
     probing

   - Better support for audio devices on some OMAP platforms"

* tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (55 commits)
  ARM: imx_v4_v5_defconfig: Add VPU support
  ARM: imx: configs: enable netfilter support
  ARM: OMAP2+: Fix twl section warnings related to omap_twl4030_audio_init
  ARM: OMAP2+: omap2plus_defconfig: enable omap1 rtc
  RX-51: Register twl4030-madc device
  RX-51: Add leds lp5523 names from Maemo 5 2.6.28 kernel
  ARM: OMAP2+: AM33XX: omap2plus_defconfig: Add support for few drivers
  ARM: OMAP1: nokia770: enable CBUS/Retu
  ARM: OMAP2+: omap2plus_defconfig: enable CMA allocator
  ARM: OMAP2+: omap2plus_defconfig: enable TFP410 chip support
  ARM: OMAP3: igep0020: simplify GPIO LEDs dependencies
  ARM: OMAP2+: craneboard: support the TPS65910 PMU
  ARM: OMAP2+: craneboard: support NAND device
  ARM: OMAP3: cm-t3517: add MMC support
  ARM: OMAP2+: Remove apollon board support
  ARM: shmobile: armadillo800eva: set clock rates before timer init
  ARM: tegra: defconfig updates
  ARM: shmobile: mackerel: Use gpio_request_one()
  ARM: shmobile: kzm9g: Use gpio_request_one()
  ARM: shmobile: bonito: Use gpio_request_one()
  ...
parents bab588fc f628e3d9

arch/arm/boot/dts/emev2-kzm9d.dts

+1 −1
Original line number Diff line number Diff line
@@ -21,6 +21,6 @@ 
	};



	chosen {

		bootargs = "console=ttyS1,115200n81";

		bootargs = "console=tty0 console=ttyS1,115200n81 earlyprintk=serial8250-em.1,115200n81 mem=128M@0x40000000 ignore_loglevel root=/dev/nfs ip=dhcp nfsroot=,rsize=4096,wsize=4096";

	};

};

arch/arm/boot/dts/r8a7740-armadillo800eva.dts

+5 −1
Original line number Diff line number Diff line
@@ -9,12 +9,16 @@ 
 */



/dts-v1/;

/include/ "skeleton.dtsi"

/include/ "r8a7740.dtsi"



/ {

	model = "armadillo 800 eva";

	compatible = "renesas,armadillo800eva";



	chosen {

		bootargs = "console=tty0 console=ttySC1,115200 earlyprintk=sh-sci.1,115200 ignore_loglevel root=/dev/nfs ip=dhcp nfsroot=,rsize=4096,wsize=4096 rw";

	};



	memory {

		device_type = "memory";

		reg = <0x40000000 0x20000000>;

arch/arm/boot/dts/sh7372-mackerel.dts

+5 −1
Original line number Diff line number Diff line
@@ -9,12 +9,16 @@ 
 */



/dts-v1/;

/include/ "skeleton.dtsi"

/include/ "sh7372.dtsi"



/ {

	model = "Mackerel (AP4 EVM 2nd)";

	compatible = "renesas,mackerel";



	chosen {

		bootargs = "console=tty0, console=ttySC0,115200 earlyprintk=sh-sci.0,115200 root=/dev/nfs nfsroot=,tcp,v3 ip=dhcp mem=240m rw";

	};



	memory {

		device_type = "memory";

		reg = <0x40000000 0x10000000>;

arch/arm/boot/dts/sh73a0-kzm9g.dts

+5 −1
Original line number Diff line number Diff line
@@ -9,12 +9,16 @@ 
 */



/dts-v1/;

/include/ "skeleton.dtsi"

/include/ "sh73a0.dtsi"



/ {

	model = "KZM-A9-GT";

	compatible = "renesas,kzm9g", "renesas,sh73a0";



	chosen {

		bootargs = "console=tty0 console=ttySC4,115200 root=/dev/nfs ip=dhcp ignore_loglevel earlyprintk=sh-sci.4,115200";

	};



	memory {

		device_type = "memory";

		reg = <0x41000000 0x1e800000>;

arch/arm/configs/armadillo800eva_defconfig

+3 −7
Original line number Diff line number Diff line
@@ -34,12 +34,11 @@ CONFIG_AEABI=y 
CONFIG_FORCE_MAX_ZONEORDER=13

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_CMDLINE="console=tty0 console=ttySC1,115200 earlyprintk=sh-sci.1,115200 ignore_loglevel root=/dev/nfs ip=dhcp nfsroot=,rsize=4096,wsize=4096 rw"

CONFIG_CMDLINE_FORCE=y

CONFIG_ARM_APPENDED_DTB=y

CONFIG_KEXEC=y

CONFIG_VFP=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

# CONFIG_SUSPEND is not set

CONFIG_PM_RUNTIME=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y
@@ -91,14 +90,11 @@ CONFIG_I2C_SH_MOBILE=y 
# CONFIG_HWMON is not set

CONFIG_MEDIA_SUPPORT=y

CONFIG_VIDEO_DEV=y

# CONFIG_RC_CORE is not set

# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set

# CONFIG_V4L_USB_DRIVERS is not set

CONFIG_MEDIA_CAMERA_SUPPORT=y

CONFIG_V4L_PLATFORM_DRIVERS=y

CONFIG_SOC_CAMERA=y

CONFIG_SOC_CAMERA_MT9T112=y

CONFIG_VIDEO_SH_MOBILE_CEU=y

# CONFIG_RADIO_ADAPTERS is not set

CONFIG_FB=y

CONFIG_FB_SH_MOBILE_LCDC=y

CONFIG_FB_SH_MOBILE_HDMI=y