From 03e40cecc21c9b24d3911896755fde933fc52887 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Mon, 15 Apr 2013 13:44:52 +0900 Subject: ARM: shmobile: armadillo800eva: Fix maximum number of SCIF The r8a77740 has 9ch SCIF. It is not 8ch. Signed-off-by: Nobuhiro Iwamatsu Signed-off-by: Simon Horman diff --git a/arch/arm/configs/armadillo800eva_defconfig b/arch/arm/configs/armadillo800eva_defconfig index 0f2d80d..fae939d 100644 --- a/arch/arm/configs/armadillo800eva_defconfig +++ b/arch/arm/configs/armadillo800eva_defconfig @@ -86,7 +86,7 @@ CONFIG_TOUCHSCREEN_ST1232=y # CONFIG_SERIO is not set # CONFIG_LEGACY_PTYS is not set CONFIG_SERIAL_SH_SCI=y -CONFIG_SERIAL_SH_SCI_NR_UARTS=8 +CONFIG_SERIAL_SH_SCI_NR_UARTS=9 CONFIG_SERIAL_SH_SCI_CONSOLE=y # CONFIG_HW_RANDOM is not set CONFIG_I2C=y -- cgit v0.10.2 From f4b4ce8ed235d40240e1d446e612d96ab188b856 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Tue, 16 Apr 2013 22:18:11 -0700 Subject: ARM: shmobile: bockw: enable SDHI on defconfig Signed-off-by: Kuninori Morimoto Signed-off-by: Simon Horman diff --git a/arch/arm/configs/bockw_defconfig b/arch/arm/configs/bockw_defconfig index 6524cdf..b74a4d4 100644 --- a/arch/arm/configs/bockw_defconfig +++ b/arch/arm/configs/bockw_defconfig @@ -72,6 +72,8 @@ CONFIG_SERIAL_SH_SCI_CONSOLE=y # CONFIG_HW_RANDOM is not set # CONFIG_HWMON is not set # CONFIG_USB_SUPPORT is not set +CONFIG_MMC=y +CONFIG_MMC_SDHI=y CONFIG_UIO=y CONFIG_UIO_PDRV_GENIRQ=y # CONFIG_IOMMU_SUPPORT is not set -- cgit v0.10.2 From 5de156bbc79d3048561f6c117ea14e96e3b75cd0 Mon Sep 17 00:00:00 2001 From: Vladimir Barinov Date: Wed, 17 Apr 2013 22:47:27 +0400 Subject: ARM: shmobile: bockw: enable I2C in defconfig Enable I2C driver in 'bockw_defconfig'. Signed-off-by: Vladimir Barinov Signed-off-by: Sergei Shtylyov Acked-by: Kuninori Morimoto [ horms+renesas@verge.net.au: resolved trivial conflicts ] Signed-off-by: Simon Horman diff --git a/arch/arm/configs/bockw_defconfig b/arch/arm/configs/bockw_defconfig index b74a4d4..2c3f34e 100644 --- a/arch/arm/configs/bockw_defconfig +++ b/arch/arm/configs/bockw_defconfig @@ -71,6 +71,8 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=6 CONFIG_SERIAL_SH_SCI_CONSOLE=y # CONFIG_HW_RANDOM is not set # CONFIG_HWMON is not set +CONFIG_I2C=y +CONFIG_I2C_RCAR=y # CONFIG_USB_SUPPORT is not set CONFIG_MMC=y CONFIG_MMC_SDHI=y -- cgit v0.10.2 From 3308f0e7c9723f01a21cd727bd2e46d5f2af6358 Mon Sep 17 00:00:00 2001 From: Vladimir Barinov Date: Wed, 17 Apr 2013 03:03:45 +0400 Subject: ARM: shmobile: bockw: enable CONFIG_PM_RUNTIME in defconfig Enable CONFIG_PM_RUNTIME in 'bockw_defconfig' -- it's already used by TMU, SCI, I2C, and Ether drivers to control the clocks... Signed-off-by: Vladimir Barinov Signed-off-by: Sergei Shtylyov Signed-off-by: Simon Horman diff --git a/arch/arm/configs/bockw_defconfig b/arch/arm/configs/bockw_defconfig index 2c3f34e..a4bc76d 100644 --- a/arch/arm/configs/bockw_defconfig +++ b/arch/arm/configs/bockw_defconfig @@ -31,6 +31,7 @@ CONFIG_CMDLINE="console=ttySC0,115200 ignore_loglevel root=/dev/nfs ip=dhcp" CONFIG_CMDLINE_FORCE=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set # CONFIG_SUSPEND is not set +CONFIG_PM_RUNTIME=y CONFIG_NET=y CONFIG_UNIX=y CONFIG_INET=y -- cgit v0.10.2 From fadc6e3ba1d2e79e25918da73093038c19297f30 Mon Sep 17 00:00:00 2001 From: Sergei Shtylyov Date: Wed, 17 Apr 2013 01:35:09 +0400 Subject: ARM: shmobile: bockw: enable USB in defconfig Enable USB platform EHCI/OHCI and common PHY drivers in 'bockw_defconfig'. Enable USB storage driver and SCSI disk driver that it needs as well... Signed-off-by: Sergei Shtylyov Signed-off-by: Simon Horman diff --git a/arch/arm/configs/bockw_defconfig b/arch/arm/configs/bockw_defconfig index a4bc76d..d662608 100644 --- a/arch/arm/configs/bockw_defconfig +++ b/arch/arm/configs/bockw_defconfig @@ -49,6 +49,8 @@ CONFIG_DEVTMPFS_MOUNT=y # CONFIG_STANDALONE is not set # CONFIG_PREVENT_FIRMWARE_BUILD is not set # CONFIG_FW_LOADER is not set +CONFIG_SCSI=y +CONFIG_BLK_DEV_SD=y CONFIG_NETDEVICES=y # CONFIG_NET_CADENCE is not set # CONFIG_NET_VENDOR_BROADCOM is not set @@ -74,7 +76,14 @@ CONFIG_SERIAL_SH_SCI_CONSOLE=y # CONFIG_HWMON is not set CONFIG_I2C=y CONFIG_I2C_RCAR=y -# CONFIG_USB_SUPPORT is not set +CONFIG_USB=y +CONFIG_USB_ANNOUNCE_NEW_DEVICES=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_OHCI_HCD=y +CONFIG_USB_OHCI_HCD_PLATFORM=y +CONFIG_USB_EHCI_HCD_PLATFORM=y +CONFIG_USB_STORAGE=y +CONFIG_USB_RCAR_PHY=y CONFIG_MMC=y CONFIG_MMC_SDHI=y CONFIG_UIO=y -- cgit v0.10.2 From 76d415dfa7d53a2f92550484d766ae475a427daf Mon Sep 17 00:00:00 2001 From: Guennadi Liakhovetski Date: Wed, 3 Apr 2013 17:53:54 +0200 Subject: ARM: shmobile: kzm9g: enable AS3711 PMIC in defconfig An AS3711 PMIC is used on kzm9g to supply CPU power and LCD backlight. This patch enables it in board defconfig. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Simon Horman diff --git a/arch/arm/configs/kzm9g_defconfig b/arch/arm/configs/kzm9g_defconfig index f6e585b..1ad0280 100644 --- a/arch/arm/configs/kzm9g_defconfig +++ b/arch/arm/configs/kzm9g_defconfig @@ -84,9 +84,12 @@ CONFIG_I2C_CHARDEV=y CONFIG_I2C_SH_MOBILE=y CONFIG_GPIO_PCF857X=y # CONFIG_HWMON is not set +CONFIG_MFD_AS3711=y CONFIG_REGULATOR=y +CONFIG_REGULATOR_AS3711=y CONFIG_FB=y CONFIG_FB_SH_MOBILE_LCDC=y +CONFIG_BACKLIGHT_AS3711=y CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_LOGO=y CONFIG_FB_SH_MOBILE_MERAM=y -- cgit v0.10.2