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

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

Pull arm-soc board updates from Olof Johansson:
 "This branch contains board updates, mostly for shmobile, but also a
  couple for PXA.

  The shmobile platforms are still in the early stages of DT enablement,
  so there's a bit more updates here than we'd ideally want to see:
   - regulator updates to provide some fixed regulators on several
     boards
   - gpio support updates for multiple boards
   - misc updates for recently-introduced boards armadillo800eva and
     kzm9g
   - defconfig updates"

* tag 'boards2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (37 commits)
  ARM: shmobile: kzm9g: defconfig enable INOTIFY_USER
  ARM: mach-shmobile: armadillo800eva: defconfig Allow use of armhf userspace
  ARM: shmobile: armadillo800eva: A3SP domain includes USB
  ARM: shmobile: armadillo800eva: A4LC domain includes LCDC
  ARM: shmobile: armadillo800eva: USB Func enables external IRQ mode
  ARM: mach-shmobile: kzm9d: Add defconfig
  ARM: mach-shmobile: select the fixed regulator driver on several boards
  ARM: mach-shmobile: add SDHI2 to the 2.8V fixed regulator consumers on kzm9g
  ARM: pxa: hx4700: Use DEFINE_RES_* macros consistently
  ARM: pxa: remove eseries.h
  ARM: mach-shmobile: add fixed voltage regulators to marzen
  ARM: mach-shmobile: add fixed voltage regulators to kzm9g
  ARM: mach-shmobile: add fixed voltage regulators to kzm9d
  ARM: mach-shmobile: add fixed voltage regulators to kota2
  ARM: mach-shmobile: add fixed voltage regulators to g4evm
  ARM: mach-shmobile: add fixed voltage regulators to bonito
  ARM: mach-shmobile: add fixed voltage regulators to armadillo800eva
  ARM: mach-shmobile: add fixed voltage regulators to ap4evb
  ARM: mach-shmobile: add fixed voltage regulators to ag5evm
  ARM: mach-shmobile: add 3.3V and 1.8V fixed regulators to mackerel
  ...
parents b7574a22 43cb4a02

arch/arm/configs/armadillo800eva_defconfig

+15 −10
Original line number Diff line number Diff line
@@ -5,10 +5,7 @@ CONFIG_IKCONFIG_PROC=y 
CONFIG_LOG_BUF_SHIFT=16

# CONFIG_UTS_NS is not set

# CONFIG_IPC_NS is not set

# CONFIG_USER_NS is not set

# CONFIG_PID_NS is not set

CONFIG_SYSFS_DEPRECATED=y

CONFIG_SYSFS_DEPRECATED_V2=y

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

CONFIG_SLAB=y

CONFIG_MODULES=y
@@ -21,7 +18,7 @@ CONFIG_ARCH_SHMOBILE=y 
CONFIG_ARCH_R8A7740=y

CONFIG_MACH_ARMADILLO800EVA=y

# CONFIG_SH_TIMER_TMU is not set

# CONFIG_ARM_THUMB is not set

CONFIG_ARM_THUMB=y

CONFIG_CPU_BPREDICT_DISABLE=y

# CONFIG_CACHE_L2X0 is not set

CONFIG_ARM_ERRATA_430973=y
@@ -39,6 +36,7 @@ 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"

CONFIG_CMDLINE_FORCE=y

CONFIG_KEXEC=y

CONFIG_VFP=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

# CONFIG_SUSPEND is not set

CONFIG_NET=y
@@ -89,26 +87,32 @@ CONFIG_SERIAL_SH_SCI_CONSOLE=y 
CONFIG_I2C=y

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_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_MODE_HELPERS=y

CONFIG_FB_SH_MOBILE_LCDC=y

CONFIG_FB_SH_MOBILE_HDMI=y

CONFIG_LCD_CLASS_DEVICE=y

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y

CONFIG_LOGO=y

# CONFIG_LOGO_LINUX_MONO is not set

# CONFIG_LOGO_LINUX_VGA16 is not set

CONFIG_SOUND=y

CONFIG_SND=y

# CONFIG_SND_SUPPORT_OLD_API is not set

# CONFIG_SND_VERBOSE_PROCFS is not set

# CONFIG_SND_DRIVERS is not set

# CONFIG_SND_ARM is not set

CONFIG_SND_SOC=y

CONFIG_SND_SOC_SH4_FSI=y

# CONFIG_HID_SUPPORT is not set

CONFIG_USB=y

# CONFIG_USB_DEVICE_CLASS is not set

CONFIG_USB_RENESAS_USBHS=y

CONFIG_USB_GADGET=y

CONFIG_USB_RENESAS_USBHS_UDC=y
@@ -116,6 +120,8 @@ CONFIG_USB_ETH=m 
CONFIG_MMC=y

CONFIG_MMC_SDHI=y

CONFIG_MMC_SH_MMCIF=y

CONFIG_DMADEVICES=y

CONFIG_SH_DMAE=y

CONFIG_UIO=y

CONFIG_UIO_PDRV_GENIRQ=y

# CONFIG_DNOTIFY is not set
@@ -124,7 +130,6 @@ CONFIG_VFAT_FS=y 
CONFIG_TMPFS=y

# CONFIG_MISC_FILESYSTEMS is not set

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y

CONFIG_NFS_V3_ACL=y

CONFIG_NFS_V4=y

CONFIG_NFS_V4_1=y

arch/arm/configs/kzm9d_defconfig

0 → 100644
+89 −0
Original line number Diff line number Diff line 
# CONFIG_ARM_PATCH_PHYS_VIRT is not set

CONFIG_EXPERIMENTAL=y

CONFIG_SYSVIPC=y

CONFIG_NO_HZ=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=16

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

CONFIG_SYSCTL_SYSCALL=y

CONFIG_EMBEDDED=y

CONFIG_SLAB=y

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_CFQ is not set

CONFIG_ARCH_SHMOBILE=y

CONFIG_ARCH_EMEV2=y

CONFIG_MACH_KZM9D=y

CONFIG_MEMORY_START=0x40000000

CONFIG_MEMORY_SIZE=0x10000000

# CONFIG_SH_TIMER_TMU is not set

# CONFIG_SWP_EMULATE is not set

# CONFIG_CACHE_L2X0 is not set

CONFIG_SMP=y

CONFIG_NR_CPUS=2

CONFIG_HOTPLUG_CPU=y

# CONFIG_LOCAL_TIMERS is not set

CONFIG_AEABI=y

# CONFIG_OABI_COMPAT is not set

# CONFIG_CROSS_MEMORY_ATTACH is not set

CONFIG_FORCE_MAX_ZONEORDER=13

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_ARM_APPENDED_DTB=y

CONFIG_CMDLINE="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"

CONFIG_CMDLINE_FORCE=y

CONFIG_VFP=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

# CONFIG_SUSPEND is not set

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_INET=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

# CONFIG_INET_XFRM_MODE_TRANSPORT is not set

# CONFIG_INET_XFRM_MODE_TUNNEL is not set

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_INET_LRO is not set

# CONFIG_INET_DIAG is not set

# CONFIG_IPV6 is not set

# CONFIG_WIRELESS is not set

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

# CONFIG_BLK_DEV is not set

CONFIG_NETDEVICES=y

# CONFIG_NET_VENDOR_BROADCOM is not set

# CONFIG_NET_VENDOR_CHELSIO is not set

# CONFIG_NET_VENDOR_CIRRUS is not set

# CONFIG_NET_VENDOR_FARADAY is not set

# CONFIG_NET_VENDOR_INTEL is not set

# CONFIG_NET_VENDOR_MARVELL is not set

# CONFIG_NET_VENDOR_MICREL is not set

# CONFIG_NET_VENDOR_NATSEMI is not set

# CONFIG_NET_VENDOR_SEEQ is not set

CONFIG_SMSC911X=y

# CONFIG_NET_VENDOR_STMICRO is not set

# CONFIG_NET_VENDOR_WIZNET is not set

# CONFIG_WLAN is not set

# CONFIG_INPUT_MOUSEDEV is not set

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

# CONFIG_SERIO is not set

# CONFIG_LEGACY_PTYS is not set

# CONFIG_DEVKMEM is not set

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_8250_EM=y

# CONFIG_HW_RANDOM is not set

CONFIG_GPIOLIB=y

CONFIG_GPIO_EM=y

# CONFIG_HWMON is not set

# CONFIG_HID_SUPPORT is not set

# CONFIG_USB_SUPPORT is not set

# CONFIG_IOMMU_SUPPORT is not set

# CONFIG_DNOTIFY is not set

CONFIG_TMPFS=y

# CONFIG_MISC_FILESYSTEMS is not set

CONFIG_NFS_FS=y

CONFIG_ROOT_NFS=y

# CONFIG_FTRACE is not set

arch/arm/configs/kzm9g_defconfig

+7 −1
Original line number Diff line number Diff line
@@ -100,7 +100,12 @@ CONFIG_SND_SOC_SH4_FSI=y 
CONFIG_USB=y

CONFIG_USB_DEVICEFS=y

CONFIG_USB_R8A66597_HCD=y

CONFIG_USB_RENESAS_USBHS=y

CONFIG_USB_STORAGE=y

CONFIG_USB_GADGET=y

CONFIG_USB_RENESAS_USBHS_UDC=y

CONFIG_USB_ETH=m

CONFIG_USB_MASS_STORAGE=m

CONFIG_MMC=y

# CONFIG_MMC_BLOCK_BOUNCE is not set

CONFIG_MMC_SDHI=y
@@ -108,12 +113,13 @@ CONFIG_MMC_SH_MMCIF=y 
CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_RS5C372=y

CONFIG_DMADEVICES=y

CONFIG_SH_DMAE=y

CONFIG_ASYNC_TX_DMA=y

CONFIG_STAGING=y

# CONFIG_DNOTIFY is not set

# CONFIG_INOTIFY_USER is not set

CONFIG_INOTIFY_USER=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

# CONFIG_MISC_FILESYSTEMS is not set

arch/arm/mach-pxa/eseries.h

deleted100644 → 0
+0 −14
Original line number Diff line number Diff line 
void __init eseries_fixup(struct tag *tags, char **cmdline, struct meminfo *mi);



extern struct pxa2xx_udc_mach_info e7xx_udc_mach_info;

extern struct pxaficp_platform_data e7xx_ficp_platform_data;

extern int e7xx_irda_init(void);



extern int eseries_tmio_enable(struct platform_device *dev);

extern int eseries_tmio_disable(struct platform_device *dev);

extern int eseries_tmio_suspend(struct platform_device *dev);

extern int eseries_tmio_resume(struct platform_device *dev);

extern void eseries_get_tmio_gpios(void);

extern struct resource eseries_tmio_resources[];

extern struct platform_device e300_tc6387xb_device;

arch/arm/mach-pxa/hx4700.c

+12 −44
Original line number Diff line number Diff line
@@ -296,27 +296,11 @@ static struct asic3_led asic3_leds[ASIC3_NUM_LEDS] = { 


static struct resource asic3_resources[] = {

	/* GPIO part */

	[0] = {

		.start	= ASIC3_PHYS,

		.end	= ASIC3_PHYS + ASIC3_MAP_SIZE_16BIT - 1,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= PXA_GPIO_TO_IRQ(GPIO12_HX4700_ASIC3_IRQ),

		.end	= PXA_GPIO_TO_IRQ(GPIO12_HX4700_ASIC3_IRQ),

		.flags	= IORESOURCE_IRQ,

	},

	[0] = DEFINE_RES_MEM(ASIC3_PHYS, ASIC3_MAP_SIZE_16BIT),

	[1] = DEFINE_RES_IRQ(PXA_GPIO_TO_IRQ(GPIO12_HX4700_ASIC3_IRQ)),

	/* SD part */

	[2] = {

		.start	= ASIC3_SD_PHYS,

		.end	= ASIC3_SD_PHYS + ASIC3_MAP_SIZE_16BIT - 1,

		.flags	= IORESOURCE_MEM,

	},

	[3] = {

		.start	= PXA_GPIO_TO_IRQ(GPIO66_HX4700_ASIC3_nSDIO_IRQ),

		.end	= PXA_GPIO_TO_IRQ(GPIO66_HX4700_ASIC3_nSDIO_IRQ),

		.flags	= IORESOURCE_IRQ,

	},

	[2] = DEFINE_RES_MEM(ASIC3_SD_PHYS, ASIC3_MAP_SIZE_16BIT),

	[3] = DEFINE_RES_IRQ(PXA_GPIO_TO_IRQ(GPIO66_HX4700_ASIC3_nSDIO_IRQ)),

};



static struct asic3_platform_data asic3_platform_data = {
@@ -343,11 +327,7 @@ static struct platform_device asic3 = { 
 */



static struct resource egpio_resources[] = {

	[0] = {

		.start = PXA_CS5_PHYS,

		.end   = PXA_CS5_PHYS + 0x4 - 1,

		.flags = IORESOURCE_MEM,

	},

	[0] = DEFINE_RES_MEM(PXA_CS5_PHYS, 0x4),

};



static struct htc_egpio_chip egpio_chips[] = {
@@ -537,11 +517,7 @@ static struct w100fb_mach_info w3220_info = { 
};



static struct resource w3220_resources[] = {

	[0] = {

		.start	= ATI_W3220_PHYS,

		.end	= ATI_W3220_PHYS + 0x00ffffff,

		.flags	= IORESOURCE_MEM,

	},

	[0] = DEFINE_RES_MEM(ATI_W3220_PHYS, SZ_16M),

};



static struct platform_device w3220 = {
@@ -683,20 +659,12 @@ static struct pda_power_pdata power_supply_info = { 
};



static struct resource power_supply_resources[] = {

	[0] = {

		.name  = "ac",

		.flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE |

		         IORESOURCE_IRQ_LOWEDGE,

		.start = PXA_GPIO_TO_IRQ(GPIOD9_nAC_IN),

		.end   = PXA_GPIO_TO_IRQ(GPIOD9_nAC_IN),

	},

	[1] = {

		.name  = "usb",

		.flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE |

		         IORESOURCE_IRQ_LOWEDGE,

		.start = PXA_GPIO_TO_IRQ(GPIOD14_nUSBC_DETECT),

		.end   = PXA_GPIO_TO_IRQ(GPIOD14_nUSBC_DETECT),

	},

	[0] = DEFINE_RES_NAMED(PXA_GPIO_TO_IRQ(GPIOD9_nAC_IN), 1, "ac",

		IORESOURCE_IRQ |

		IORESOURCE_IRQ_HIGHEDGE | IORESOURCE_IRQ_LOWEDGE),

	[1] = DEFINE_RES_NAMED(PXA_GPIO_TO_IRQ(GPIOD14_nUSBC_DETECT), 1, "usb",

		IORESOURCE_IRQ |

		IORESOURCE_IRQ_HIGHEDGE | IORESOURCE_IRQ_LOWEDGE),

};



static struct platform_device power_supply = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE