Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC fixes from Olof Johansson:
"This is our first set of fixes from arm-soc for 3.11.
- A handful of build and warning fixes from Arnd
- A collection of OMAP fixes
- defconfig updates to make the default configs more useful for real
use (and testing) out of the box on hardware
And a couple of other small fixes. Some of these have been recently
applied but it's normally how we deal with fixes, with less bake time
in -next needed"
* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (32 commits)
arm: multi_v7_defconfig: Tweaks for omap and sunxi
arm: multi_v7_defconfig: add i.MX options and NFS root
ARM: omap2: add select of TI_PRIV_EDMA
ARM: exynos: select PM_GENERIC_DOMAINS only when used
ARM: ixp4xx: avoid circular header dependency
ARM: OMAP: omap_common_late_init may be unused
ARM: sti: move DEBUG_STI_UART into alphabetical order
ARM: OMAP: build mach-omap code only if needed
ARM: zynq: use DT_MACHINE_START
ARM: omap5: omap5 has SCU and TWD
ARM: OMAP2+: omap2plus_defconfig: Enable appended DTB support
ARM: OMAP2+: Enable TI_EDMA in omap2plus_defconfig
ARM: OMAP2+: omap2plus_defconfig: enable DRA752 thermal support by default
ARM: OMAP2+: omap2plus_defconfig: enable TI bandgap driver
ARM: OMAP2+: devices: remove duplicated include from devices.c
ARM: OMAP3: igep0020: Set DSS pins in correct mux mode.
ARM: OMAP2+: N900: enable N900-specific drivers even if device tree is enabled
ARM: OMAP2+: Cocci spatch "ptr_ret.spatch"
ARM: OMAP2+: Remove obsolete Makefile line
ARM: OMAP5: Enable Cortex A15 errata 798181
...
+316
-167
+10
-10
arch/arm/Kconfig.debug
+10
-10
arch/arm/Kconfig.debug
···
510
510
Say Y here if you want the debug print routines to direct
511
511
their output to the uart1 port on SiRFmarco devices.
512
512
513
+
config DEBUG_STI_UART
514
+
depends on ARCH_STI
515
+
bool "Use StiH415/416 ASC for low-level debug"
516
+
help
517
+
Say Y here if you want kernel low-level debugging support
518
+
on StiH415/416 based platforms like B2000, B2020.
519
+
It support UART2 and SBC_UART1.
520
+
521
+
If unsure, say N.
522
+
513
523
config DEBUG_U300_UART
514
524
bool "Kernel low-level debugging messages via U300 UART0"
515
525
depends on ARCH_U300
···
573
563
help
574
564
This option selects UART0 on VIA/Wondermedia System-on-a-chip
575
565
devices, including VT8500, WM8505, WM8650 and WM8850.
576
-
577
-
config DEBUG_STI_UART
578
-
depends on ARCH_STI
579
-
bool "Use StiH415/416 ASC for low-level debug"
580
-
help
581
-
Say Y here if you want kernel low-level debugging support
582
-
on StiH415/416 based platforms like B2000, B2020.
583
-
It support UART2 and SBC_UART1.
584
-
585
-
If unsure, say N.
586
566
587
567
config DEBUG_LL_UART_NONE
588
568
bool "No low-level debugging UART"
+1
arch/arm/boot/dts/tegra20-seaboard.dts
+1
arch/arm/boot/dts/tegra20-seaboard.dts
+1
arch/arm/boot/dts/tegra20-trimslice.dts
+1
arch/arm/boot/dts/tegra20-trimslice.dts
+2
arch/arm/boot/dts/tegra20-whistler.dts
+2
arch/arm/boot/dts/tegra20-whistler.dts
···
586
586
regulator-name = "vbus1";
587
587
regulator-min-microvolt = <5000000>;
588
588
regulator-max-microvolt = <5000000>;
589
+
enable-active-high;
589
590
gpio = <&tca6416 0 0>; /* GPIO_PMU0 */
590
591
};
591
592
···
596
595
regulator-name = "vbus3";
597
596
regulator-min-microvolt = <5000000>;
598
597
regulator-max-microvolt = <5000000>;
598
+
enable-active-high;
599
599
gpio = <&tca6416 1 0>; /* GPIO_PMU1 */
600
600
};
601
601
};
+106
-27
arch/arm/configs/multi_v7_defconfig
+106
-27
arch/arm/configs/multi_v7_defconfig
···
1
-
CONFIG_EXPERIMENTAL=y
1
+
CONFIG_IRQ_DOMAIN_DEBUG=y
2
2
CONFIG_NO_HZ=y
3
3
CONFIG_HIGH_RES_TIMERS=y
4
4
CONFIG_BLK_DEV_INITRD=y
5
5
CONFIG_ARCH_MVEBU=y
6
6
CONFIG_MACH_ARMADA_370=y
7
-
CONFIG_ARCH_SIRF=y
8
7
CONFIG_MACH_ARMADA_XP=y
8
+
CONFIG_ARCH_BCM=y
9
+
CONFIG_GPIO_PCA953X=y
9
10
CONFIG_ARCH_HIGHBANK=y
11
+
CONFIG_ARCH_KEYSTONE=y
12
+
CONFIG_ARCH_MXC=y
13
+
CONFIG_MACH_IMX51_DT=y
14
+
CONFIG_SOC_IMX53=y
15
+
CONFIG_SOC_IMX6Q=y
16
+
CONFIG_SOC_IMX6SL=y
17
+
CONFIG_SOC_VF610=y
18
+
CONFIG_ARCH_OMAP3=y
19
+
CONFIG_ARCH_OMAP4=y
20
+
CONFIG_SOC_OMAP5=y
21
+
CONFIG_SOC_AM33XX=y
22
+
CONFIG_SOC_AM43XX=y
23
+
CONFIG_ARCH_ROCKCHIP=y
10
24
CONFIG_ARCH_SOCFPGA=y
11
-
CONFIG_ARCH_SUNXI=y
12
-
CONFIG_ARCH_WM8850=y
13
-
# CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA is not set
14
-
CONFIG_ARCH_ZYNQ=y
15
-
CONFIG_ARM_ERRATA_754322=y
16
25
CONFIG_PLAT_SPEAR=y
17
26
CONFIG_ARCH_SPEAR13XX=y
18
27
CONFIG_MACH_SPEAR1310=y
19
28
CONFIG_MACH_SPEAR1340=y
29
+
CONFIG_ARCH_STI=y
30
+
CONFIG_ARCH_SUNXI=y
31
+
CONFIG_ARCH_SIRF=y
32
+
CONFIG_ARCH_TEGRA=y
33
+
CONFIG_ARCH_TEGRA_2x_SOC=y
34
+
CONFIG_ARCH_TEGRA_3x_SOC=y
35
+
CONFIG_ARCH_TEGRA_114_SOC=y
36
+
CONFIG_TEGRA_PCI=y
37
+
CONFIG_TEGRA_EMC_SCALING_ENABLE=y
38
+
CONFIG_ARCH_U8500=y
39
+
CONFIG_MACH_SNOWBALL=y
40
+
CONFIG_MACH_UX500_DT=y
41
+
CONFIG_ARCH_VEXPRESS=y
42
+
CONFIG_ARCH_VEXPRESS_CA9X4=y
43
+
CONFIG_ARCH_VIRT=y
44
+
CONFIG_ARCH_WM8850=y
45
+
CONFIG_ARCH_ZYNQ=y
20
46
CONFIG_SMP=y
21
-
CONFIG_ARM_ARCH_TIMER=y
22
-
CONFIG_AEABI=y
23
-
CONFIG_HIGHMEM=y
24
47
CONFIG_HIGHPTE=y
25
48
CONFIG_ARM_APPENDED_DTB=y
26
-
CONFIG_VFP=y
27
-
CONFIG_NEON=y
28
49
CONFIG_NET=y
50
+
CONFIG_UNIX=y
51
+
CONFIG_INET=y
52
+
CONFIG_IP_PNP=y
53
+
CONFIG_IP_PNP_DHCP=y
54
+
CONFIG_DEVTMPFS=y
55
+
CONFIG_DEVTMPFS_MOUNT=y
29
56
CONFIG_BLK_DEV_SD=y
30
57
CONFIG_ATA=y
58
+
CONFIG_SATA_AHCI_PLATFORM=y
31
59
CONFIG_SATA_HIGHBANK=y
32
60
CONFIG_SATA_MV=y
33
-
CONFIG_SATA_AHCI_PLATFORM=y
34
61
CONFIG_NETDEVICES=y
35
62
CONFIG_SUN4I_EMAC=y
36
63
CONFIG_NET_CALXEDA_XGMAC=y
37
64
CONFIG_SMSC911X=y
38
65
CONFIG_STMMAC_ETH=y
39
-
CONFIG_SERIO_AMBAKMI=y
40
66
CONFIG_MDIO_SUN4I=y
67
+
CONFIG_KEYBOARD_SPEAR=y
68
+
CONFIG_SERIO_AMBAKMI=y
41
69
CONFIG_SERIAL_8250=y
42
70
CONFIG_SERIAL_8250_CONSOLE=y
43
71
CONFIG_SERIAL_8250_DW=y
44
-
CONFIG_KEYBOARD_SPEAR=y
45
72
CONFIG_SERIAL_AMBA_PL011=y
46
73
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
47
-
CONFIG_SERIAL_OF_PLATFORM=y
48
74
CONFIG_SERIAL_SIRFSOC=y
49
75
CONFIG_SERIAL_SIRFSOC_CONSOLE=y
76
+
CONFIG_SERIAL_TEGRA=y
77
+
CONFIG_SERIAL_IMX=y
78
+
CONFIG_SERIAL_IMX_CONSOLE=y
50
79
CONFIG_SERIAL_VT8500=y
51
80
CONFIG_SERIAL_VT8500_CONSOLE=y
81
+
CONFIG_SERIAL_OF_PLATFORM=y
82
+
CONFIG_SERIAL_OMAP=y
83
+
CONFIG_SERIAL_OMAP_CONSOLE=y
52
84
CONFIG_SERIAL_XILINX_PS_UART=y
53
85
CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y
54
-
CONFIG_IPMI_HANDLER=y
55
-
CONFIG_IPMI_SI=y
56
-
CONFIG_I2C=y
86
+
CONFIG_SERIAL_FSL_LPUART=y
87
+
CONFIG_SERIAL_FSL_LPUART_CONSOLE=y
57
88
CONFIG_I2C_DESIGNWARE_PLATFORM=y
58
89
CONFIG_I2C_SIRF=y
90
+
CONFIG_I2C_TEGRA=y
59
91
CONFIG_SPI=y
60
92
CONFIG_SPI_PL022=y
61
93
CONFIG_SPI_SIRF=y
62
-
CONFIG_GPIO_PL061=y
63
-
CONFIG_FB=y
94
+
CONFIG_SPI_TEGRA114=y
95
+
CONFIG_SPI_TEGRA20_SLINK=y
96
+
CONFIG_PINCTRL_SINGLE=y
97
+
CONFIG_GPIO_GENERIC_PLATFORM=y
98
+
CONFIG_GPIO_TWL4030=y
99
+
CONFIG_REGULATOR_GPIO=y
100
+
CONFIG_REGULATOR_AB8500=y
101
+
CONFIG_REGULATOR_TPS51632=y
102
+
CONFIG_REGULATOR_TPS62360=y
103
+
CONFIG_REGULATOR_TWL4030=y
104
+
CONFIG_REGULATOR_VEXPRESS=y
105
+
CONFIG_DRM=y
106
+
CONFIG_TEGRA_HOST1X=y
107
+
CONFIG_DRM_TEGRA=y
64
108
CONFIG_FB_ARMCLCD=y
65
109
CONFIG_FB_WM8505=y
66
-
CONFIG_FRAMEBUFFER_CONSOLE=y
110
+
CONFIG_FB_SIMPLE=y
67
111
CONFIG_USB=y
112
+
CONFIG_USB_XHCI_HCD=y
113
+
CONFIG_USB_EHCI_HCD=y
114
+
CONFIG_USB_EHCI_MXC=y
115
+
CONFIG_USB_EHCI_TEGRA=y
116
+
CONFIG_USB_EHCI_HCD_PLATFORM=y
68
117
CONFIG_USB_ISP1760_HCD=y
69
118
CONFIG_USB_STORAGE=y
119
+
CONFIG_AB8500_USB=y
120
+
CONFIG_NOP_USB_XCEIV=y
121
+
CONFIG_OMAP_USB2=y
122
+
CONFIG_OMAP_USB3=y
123
+
CONFIG_SAMSUNG_USB2PHY=y
124
+
CONFIG_SAMSUNG_USB3PHY=y
125
+
CONFIG_USB_GPIO_VBUS=y
126
+
CONFIG_USB_ISP1301=y
127
+
CONFIG_USB_MXS_PHY=y
70
128
CONFIG_MMC=y
71
129
CONFIG_MMC_ARMMMCI=y
72
130
CONFIG_MMC_SDHCI=y
73
131
CONFIG_MMC_SDHCI_PLTFM=y
132
+
CONFIG_MMC_SDHCI_TEGRA=y
74
133
CONFIG_MMC_SDHCI_SPEAR=y
75
-
CONFIG_MMC_WMT=y
134
+
CONFIG_MMC_OMAP=y
135
+
CONFIG_MMC_OMAP_HS=y
76
136
CONFIG_EDAC=y
77
137
CONFIG_EDAC_MM_EDAC=y
78
138
CONFIG_EDAC_HIGHBANK_MC=y
79
139
CONFIG_EDAC_HIGHBANK_L2=y
80
140
CONFIG_RTC_CLASS=y
141
+
CONFIG_RTC_DRV_TWL4030=y
81
142
CONFIG_RTC_DRV_PL031=y
82
143
CONFIG_RTC_DRV_VT8500=y
144
+
CONFIG_RTC_DRV_TEGRA=y
145
+
CONFIG_DMADEVICES=y
146
+
CONFIG_DW_DMAC=y
147
+
CONFIG_TEGRA20_APB_DMA=y
148
+
CONFIG_STE_DMA40=y
149
+
CONFIG_SIRF_DMA=y
150
+
CONFIG_TI_EDMA=y
151
+
CONFIG_PL330_DMA=y
152
+
CONFIG_IMX_SDMA=y
153
+
CONFIG_IMX_DMA=y
154
+
CONFIG_MXS_DMA=y
155
+
CONFIG_DMA_OMAP=y
83
156
CONFIG_PWM=y
84
157
CONFIG_PWM_VT8500=y
85
-
CONFIG_DMADEVICES=y
86
-
CONFIG_PL330_DMA=y
87
-
CONFIG_SIRF_DMA=y
88
-
CONFIG_DW_DMAC=y
158
+
CONFIG_EXT4_FS=y
159
+
CONFIG_TMPFS=y
160
+
CONFIG_NFS_FS=y
161
+
CONFIG_NFS_V3_ACL=y
162
+
CONFIG_NFS_V4=y
163
+
CONFIG_ROOT_NFS=y
164
+
CONFIG_PRINTK_TIME=y
165
+
CONFIG_DEBUG_FS=y
166
+
CONFIG_DEBUG_KERNEL=y
167
+
CONFIG_LOCKUP_DETECTOR=y
+19
arch/arm/configs/omap2plus_defconfig
+19
arch/arm/configs/omap2plus_defconfig
···
22
22
# CONFIG_BLK_DEV_BSG is not set
23
23
CONFIG_ARCH_MULTI_V6=y
24
24
CONFIG_ARCH_OMAP2PLUS=y
25
+
CONFIG_ARCH_OMAP2=y
26
+
CONFIG_ARCH_OMAP3=y
27
+
CONFIG_ARCH_OMAP4=y
28
+
CONFIG_SOC_AM33XX=y
25
29
CONFIG_OMAP_RESET_CLOCKS=y
26
30
CONFIG_OMAP_MUX_DEBUG=y
27
31
CONFIG_ARCH_VEXPRESS_CA9X4=y
···
38
34
CONFIG_LEDS=y
39
35
CONFIG_ZBOOT_ROM_TEXT=0x0
40
36
CONFIG_ZBOOT_ROM_BSS=0x0
37
+
CONFIG_ARM_APPENDED_DTB=y
38
+
CONFIG_ARM_ATAG_DTB_COMPAT=y
41
39
CONFIG_CMDLINE="root=/dev/mmcblk0p2 rootwait console=ttyO2,115200"
42
40
CONFIG_KEXEC=y
43
41
CONFIG_FPE_NWFPE=y
···
158
152
CONFIG_POWER_SUPPLY=y
159
153
CONFIG_SENSORS_LM75=m
160
154
CONFIG_WATCHDOG=y
155
+
CONFIG_THERMAL=y
156
+
CONFIG_THERMAL_HWMON=y
157
+
CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
158
+
CONFIG_THERMAL_GOV_FAIR_SHARE=y
159
+
CONFIG_THERMAL_GOV_STEP_WISE=y
160
+
CONFIG_THERMAL_GOV_USER_SPACE=y
161
+
CONFIG_CPU_THERMAL=y
161
162
CONFIG_OMAP_WATCHDOG=y
162
163
CONFIG_TWL4030_WATCHDOG=y
163
164
CONFIG_MFD_TPS65217=y
···
251
238
CONFIG_RTC_DRV_TWL4030=y
252
239
CONFIG_RTC_DRV_OMAP=y
253
240
CONFIG_DMADEVICES=y
241
+
CONFIG_TI_EDMA=y
254
242
CONFIG_DMA_OMAP=y
243
+
CONFIG_TI_SOC_THERMAL=y
244
+
CONFIG_TI_THERMAL=y
245
+
CONFIG_OMAP4_THERMAL=y
246
+
CONFIG_OMAP5_THERMAL=y
247
+
CONFIG_DRA752_THERMAL=y
255
248
CONFIG_EXT2_FS=y
256
249
CONFIG_EXT3_FS=y
257
250
# CONFIG_EXT3_FS_XATTR is not set
+25
-19
arch/arm/configs/u8500_defconfig
+25
-19
arch/arm/configs/u8500_defconfig
···
1
-
CONFIG_EXPERIMENTAL=y
1
+
CONFIG_HIGHMEM=y
2
2
# CONFIG_SWAP is not set
3
3
CONFIG_SYSVIPC=y
4
+
CONFIG_NO_HZ=y
5
+
CONFIG_HIGH_RES_TIMERS=y
4
6
CONFIG_BLK_DEV_INITRD=y
5
7
CONFIG_KALLSYMS_ALL=y
6
8
CONFIG_MODULES=y
···
11
9
CONFIG_ARCH_U8500=y
12
10
CONFIG_MACH_HREFV60=y
13
11
CONFIG_MACH_SNOWBALL=y
14
-
CONFIG_MACH_U5500=y
15
12
CONFIG_MACH_UX500_DT=y
16
-
CONFIG_NO_HZ=y
17
-
CONFIG_HIGH_RES_TIMERS=y
18
13
CONFIG_SMP=y
19
14
CONFIG_NR_CPUS=2
20
15
CONFIG_PREEMPT=y
···
19
20
CONFIG_CMDLINE="root=/dev/ram0 console=ttyAMA2,115200n8"
20
21
CONFIG_CPU_FREQ=y
21
22
CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
23
+
CONFIG_CPU_IDLE=y
22
24
CONFIG_VFP=y
23
25
CONFIG_NEON=y
24
26
CONFIG_PM_RUNTIME=y
···
36
36
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
37
37
CONFIG_BLK_DEV_RAM=y
38
38
CONFIG_BLK_DEV_RAM_SIZE=65536
39
-
CONFIG_AB8500_PWM=y
40
39
CONFIG_SENSORS_BH1780=y
41
40
CONFIG_NETDEVICES=y
42
41
CONFIG_SMSC911X=y
···
59
60
CONFIG_SERIAL_AMBA_PL011=y
60
61
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
61
62
CONFIG_HW_RANDOM=y
62
-
CONFIG_HW_RANDOM_NOMADIK=y
63
63
CONFIG_SPI=y
64
64
CONFIG_SPI_PL022=y
65
65
CONFIG_GPIO_STMPE=y
66
66
CONFIG_GPIO_TC3589X=y
67
-
# CONFIG_POWER_SUPPLY is not set
68
-
# CONFIG_AB8500_BM is not set
69
-
# CONFIG_AB8500_BATTERY_THERM_ON_BATCTRL is not set
70
67
CONFIG_THERMAL=y
71
68
CONFIG_CPU_THERMAL=y
69
+
CONFIG_WATCHDOG=y
72
70
CONFIG_MFD_STMPE=y
73
71
CONFIG_MFD_TC3589X=y
74
-
CONFIG_AB5500_CORE=y
75
-
CONFIG_AB8500_CORE=y
76
-
CONFIG_REGULATOR=y
77
-
CONFIG_REGULATOR_AB8500=y
78
-
CONFIG_REGULATOR_FIXED_VOLTAGE=y
79
72
CONFIG_REGULATOR_GPIO=y
80
-
# CONFIG_HID_SUPPORT is not set
81
-
CONFIG_USB_GADGET=y
73
+
CONFIG_REGULATOR_AB8500=y
74
+
CONFIG_SOUND=y
75
+
CONFIG_SND=y
76
+
CONFIG_SND_SOC=y
77
+
CONFIG_SND_SOC_UX500=y
78
+
CONFIG_SND_SOC_UX500_MACH_MOP500=y
79
+
CONFIG_USB=y
80
+
CONFIG_USB_MUSB_HDRC=y
81
+
CONFIG_USB_MUSB_UX500=y
82
+
CONFIG_USB_PHY=y
82
83
CONFIG_AB8500_USB=y
84
+
CONFIG_USB_GADGET=y
85
+
CONFIG_USB_GADGET_MUSB_HDRC=y
86
+
CONFIG_USB_ETH=m
83
87
CONFIG_MMC=y
84
-
CONFIG_MMC_CLKGATE=y
88
+
CONFIG_MMC_UNSAFE_RESUME=y
89
+
# CONFIG_MMC_BLOCK_BOUNCE is not set
85
90
CONFIG_MMC_ARMMMCI=y
86
91
CONFIG_NEW_LEDS=y
87
92
CONFIG_LEDS_CLASS=y
88
93
CONFIG_LEDS_LM3530=y
89
-
CONFIG_LEDS_LP5521=y
90
94
CONFIG_LEDS_GPIO=y
95
+
CONFIG_LEDS_LP5521=y
91
96
CONFIG_LEDS_TRIGGERS=y
92
97
CONFIG_LEDS_TRIGGER_HEARTBEAT=y
93
98
CONFIG_RTC_CLASS=y
···
111
108
CONFIG_VFAT_FS=y
112
109
CONFIG_TMPFS=y
113
110
CONFIG_TMPFS_POSIX_ACL=y
114
-
CONFIG_CONFIGFS_FS=m
115
111
# CONFIG_MISC_FILESYSTEMS is not set
116
112
CONFIG_NFS_FS=y
117
113
CONFIG_ROOT_NFS=y
···
124
122
CONFIG_DEBUG_INFO=y
125
123
# CONFIG_FTRACE is not set
126
124
CONFIG_DEBUG_USER=y
125
+
CONFIG_CRYPTO_DEV_UX500=y
126
+
CONFIG_CRYPTO_DEV_UX500_CRYP=y
127
+
CONFIG_CRYPTO_DEV_UX500_HASH=y
128
+
CONFIG_CRYPTO_DEV_UX500_DEBUG=y
+12
-1
arch/arm/include/asm/smp_scu.h
+12
-1
arch/arm/include/asm/smp_scu.h
···
23
23
return pa;
24
24
}
25
25
26
+
#ifdef CONFIG_HAVE_ARM_SCU
26
27
unsigned int scu_get_core_count(void __iomem *);
27
28
int scu_power_mode(void __iomem *, unsigned int);
29
+
#else
30
+
static inline unsigned int scu_get_core_count(void __iomem *scu_base)
31
+
{
32
+
return 0;
33
+
}
34
+
static inline int scu_power_mode(void __iomem *scu_base, unsigned int mode)
35
+
{
36
+
return -EINVAL;
37
+
}
38
+
#endif
28
39
29
-
#ifdef CONFIG_SMP
40
+
#if defined(CONFIG_SMP) && defined(CONFIG_HAVE_ARM_SCU)
30
41
void scu_enable(void __iomem *scu_base);
31
42
#else
32
43
static inline void scu_enable(void __iomem *scu_base) {}
+1
-1
arch/arm/mach-exynos/Kconfig
+1
-1
arch/arm/mach-exynos/Kconfig
+1
arch/arm/mach-ixp4xx/dsmg600-setup.c
+1
arch/arm/mach-ixp4xx/dsmg600-setup.c
+1
-1
arch/arm/mach-ixp4xx/include/mach/timex.h
+1
-1
arch/arm/mach-ixp4xx/include/mach/timex.h
+2
arch/arm/mach-ixp4xx/omixp-setup.c
+2
arch/arm/mach-ixp4xx/omixp-setup.c
+84
-81
arch/arm/mach-omap2/Kconfig
+84
-81
arch/arm/mach-omap2/Kconfig
···
1
1
config ARCH_OMAP
2
2
bool
3
3
4
+
config ARCH_OMAP2
5
+
bool "TI OMAP2"
6
+
depends on ARCH_MULTI_V6
7
+
select ARCH_OMAP2PLUS
8
+
select CPU_V6
9
+
select MULTI_IRQ_HANDLER
10
+
select SOC_HAS_OMAP2_SDRC
11
+
select COMMON_CLK
12
+
13
+
config ARCH_OMAP3
14
+
bool "TI OMAP3"
15
+
depends on ARCH_MULTI_V7
16
+
select ARCH_OMAP2PLUS
17
+
select ARCH_HAS_OPP
18
+
select ARM_CPU_SUSPEND if PM
19
+
select CPU_V7
20
+
select MULTI_IRQ_HANDLER
21
+
select OMAP_INTERCONNECT
22
+
select PM_OPP if PM
23
+
select PM_RUNTIME if CPU_IDLE
24
+
select SOC_HAS_OMAP2_SDRC
25
+
select COMMON_CLK
26
+
select USB_ARCH_HAS_EHCI if USB_SUPPORT
27
+
28
+
config ARCH_OMAP4
29
+
bool "TI OMAP4"
30
+
depends on ARCH_MULTI_V7
31
+
select ARCH_OMAP2PLUS
32
+
select ARCH_HAS_OPP
33
+
select ARCH_NEEDS_CPU_IDLE_COUPLED if SMP
34
+
select ARM_CPU_SUSPEND if PM
35
+
select ARM_ERRATA_720789
36
+
select ARM_GIC
37
+
select CACHE_L2X0
38
+
select CPU_V7
39
+
select HAVE_ARM_SCU if SMP
40
+
select HAVE_ARM_TWD if LOCAL_TIMERS
41
+
select HAVE_SMP
42
+
select LOCAL_TIMERS if SMP
43
+
select OMAP_INTERCONNECT
44
+
select PL310_ERRATA_588369
45
+
select PL310_ERRATA_727915
46
+
select PM_OPP if PM
47
+
select PM_RUNTIME if CPU_IDLE
48
+
select USB_ARCH_HAS_EHCI if USB_SUPPORT
49
+
select COMMON_CLK
50
+
select ARM_ERRATA_754322
51
+
select ARM_ERRATA_775420
52
+
53
+
config SOC_OMAP5
54
+
bool "TI OMAP5"
55
+
depends on ARCH_MULTI_V7
56
+
select ARCH_OMAP2PLUS
57
+
select ARM_CPU_SUSPEND if PM
58
+
select ARM_GIC
59
+
select CPU_V7
60
+
select HAVE_ARM_SCU if SMP
61
+
select HAVE_ARM_TWD if LOCAL_TIMERS
62
+
select HAVE_SMP
63
+
select COMMON_CLK
64
+
select HAVE_ARM_ARCH_TIMER
65
+
select ARM_ERRATA_798181
66
+
67
+
config SOC_AM33XX
68
+
bool "AM33XX support"
69
+
depends on ARCH_MULTI_V7
70
+
select ARCH_OMAP2PLUS
71
+
select ARM_CPU_SUSPEND if PM
72
+
select CPU_V7
73
+
select MULTI_IRQ_HANDLER
74
+
select COMMON_CLK
75
+
76
+
config SOC_AM43XX
77
+
bool "TI AM43x"
78
+
depends on ARCH_MULTI_V7
79
+
select CPU_V7
80
+
select ARCH_OMAP2PLUS
81
+
select MULTI_IRQ_HANDLER
82
+
select ARM_GIC
83
+
select COMMON_CLK
84
+
select MACH_OMAP_GENERIC
85
+
4
86
config ARCH_OMAP2PLUS
5
-
bool "TI OMAP2/3/4/5 SoCs with device tree support" if (ARCH_MULTI_V6 || ARCH_MULTI_V7)
6
-
select ARCH_HAS_CPUFREQ
87
+
bool
7
88
select ARCH_HAS_BANDGAP
89
+
select ARCH_HAS_CPUFREQ
8
90
select ARCH_HAS_HOLES_MEMORYMODEL
9
91
select ARCH_OMAP
10
92
select ARCH_REQUIRE_GPIOLIB
···
135
53
depends on SOC_OMAP5
136
54
default y
137
55
138
-
config ARCH_OMAP2
139
-
bool "TI OMAP2"
140
-
depends on ARCH_OMAP2PLUS
141
-
depends on ARCH_MULTI_V6
142
-
default y
143
-
select CPU_V6
144
-
select MULTI_IRQ_HANDLER
145
-
select SOC_HAS_OMAP2_SDRC
146
-
select COMMON_CLK
147
-
148
-
config ARCH_OMAP3
149
-
bool "TI OMAP3"
150
-
depends on ARCH_OMAP2PLUS
151
-
depends on ARCH_MULTI_V7
152
-
default y
153
-
select ARCH_HAS_OPP
154
-
select ARM_CPU_SUSPEND if PM
155
-
select CPU_V7
156
-
select MULTI_IRQ_HANDLER
157
-
select OMAP_INTERCONNECT
158
-
select PM_OPP if PM
159
-
select PM_RUNTIME if CPU_IDLE
160
-
select SOC_HAS_OMAP2_SDRC
161
-
select COMMON_CLK
162
-
select USB_ARCH_HAS_EHCI if USB_SUPPORT
163
-
164
-
config ARCH_OMAP4
165
-
bool "TI OMAP4"
166
-
default y
167
-
depends on ARCH_OMAP2PLUS
168
-
depends on ARCH_MULTI_V7
169
-
select ARCH_HAS_OPP
170
-
select ARCH_NEEDS_CPU_IDLE_COUPLED if SMP
171
-
select ARM_CPU_SUSPEND if PM
172
-
select ARM_ERRATA_720789
173
-
select ARM_GIC
174
-
select CACHE_L2X0
175
-
select CPU_V7
176
-
select HAVE_ARM_SCU if SMP
177
-
select HAVE_ARM_TWD if LOCAL_TIMERS
178
-
select HAVE_SMP
179
-
select LOCAL_TIMERS if SMP
180
-
select OMAP_INTERCONNECT
181
-
select PL310_ERRATA_588369
182
-
select PL310_ERRATA_727915
183
-
select PM_OPP if PM
184
-
select PM_RUNTIME if CPU_IDLE
185
-
select USB_ARCH_HAS_EHCI if USB_SUPPORT
186
-
select COMMON_CLK
187
-
select ARM_ERRATA_754322
188
-
select ARM_ERRATA_775420
189
-
190
-
config SOC_OMAP5
191
-
bool "TI OMAP5"
192
-
depends on ARCH_MULTI_V7
193
-
select ARM_CPU_SUSPEND if PM
194
-
select ARM_GIC
195
-
select CPU_V7
196
-
select HAVE_SMP
197
-
select COMMON_CLK
198
-
select HAVE_ARM_ARCH_TIMER
199
-
200
56
comment "OMAP Core Type"
201
57
depends on ARCH_OMAP2
202
58
···
161
141
bool "TI81XX support"
162
142
depends on ARCH_OMAP3
163
143
default y
164
-
165
-
config SOC_AM33XX
166
-
bool "AM33XX support"
167
-
depends on ARCH_MULTI_V7
168
-
default y
169
-
select ARM_CPU_SUSPEND if PM
170
-
select CPU_V7
171
-
select MULTI_IRQ_HANDLER
172
-
select COMMON_CLK
173
-
174
-
config SOC_AM43XX
175
-
bool "TI AM43x"
176
-
select CPU_V7
177
-
select MULTI_IRQ_HANDLER
178
-
select ARM_GIC
179
-
select COMMON_CLK
180
-
select MACH_OMAP_GENERIC
181
144
182
145
config OMAP_PACKAGE_ZAF
183
146
bool
-4
arch/arm/mach-omap2/Makefile
-4
arch/arm/mach-omap2/Makefile
+31
arch/arm/mach-omap2/board-igep0020.c
+31
arch/arm/mach-omap2/board-igep0020.c
···
553
553
554
554
#ifdef CONFIG_OMAP_MUX
555
555
static struct omap_board_mux board_mux[] __initdata = {
556
+
/* Display Sub System */
557
+
OMAP3_MUX(DSS_PCLK, OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT),
558
+
OMAP3_MUX(DSS_HSYNC, OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT),
559
+
OMAP3_MUX(DSS_VSYNC, OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT),
560
+
OMAP3_MUX(DSS_ACBIAS, OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT),
561
+
OMAP3_MUX(DSS_DATA0, OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT),
562
+
OMAP3_MUX(DSS_DATA1, OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT),
563
+
OMAP3_MUX(DSS_DATA2, OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT),
564
+
OMAP3_MUX(DSS_DATA3, OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT),
565
+
OMAP3_MUX(DSS_DATA4, OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT),
566
+
OMAP3_MUX(DSS_DATA5, OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT),
567
+
OMAP3_MUX(DSS_DATA6, OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT),
568
+
OMAP3_MUX(DSS_DATA7, OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT),
569
+
OMAP3_MUX(DSS_DATA8, OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT),
570
+
OMAP3_MUX(DSS_DATA9, OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT),
571
+
OMAP3_MUX(DSS_DATA10, OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT),
572
+
OMAP3_MUX(DSS_DATA11, OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT),
573
+
OMAP3_MUX(DSS_DATA12, OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT),
574
+
OMAP3_MUX(DSS_DATA13, OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT),
575
+
OMAP3_MUX(DSS_DATA14, OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT),
576
+
OMAP3_MUX(DSS_DATA15, OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT),
577
+
OMAP3_MUX(DSS_DATA16, OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT),
578
+
OMAP3_MUX(DSS_DATA17, OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT),
579
+
OMAP3_MUX(DSS_DATA18, OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT),
580
+
OMAP3_MUX(DSS_DATA19, OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT),
581
+
OMAP3_MUX(DSS_DATA20, OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT),
582
+
OMAP3_MUX(DSS_DATA21, OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT),
583
+
OMAP3_MUX(DSS_DATA22, OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT),
584
+
OMAP3_MUX(DSS_DATA23, OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT),
585
+
/* TFP410 PanelBus DVI Transmitte (GPIO_170) */
586
+
OMAP3_MUX(HDQ_SIO, OMAP_MUX_MODE4 | OMAP_PIN_OUTPUT),
556
587
/* SMSC9221 LAN Controller ETH IRQ (GPIO_176) */
557
588
OMAP3_MUX(MCSPI1_CS2, OMAP_MUX_MODE4 | OMAP_PIN_INPUT),
558
589
{ .reg_offset = OMAP_MUX_TERMINATOR },
+1
-1
arch/arm/mach-omap2/board-rx51-video.c
+1
-1
arch/arm/mach-omap2/board-rx51-video.c
+2
-3
arch/arm/mach-omap2/devices.c
+2
-3
arch/arm/mach-omap2/devices.c
···
15
15
#include <linux/io.h>
16
16
#include <linux/clk.h>
17
17
#include <linux/err.h>
18
-
#include <linux/gpio.h>
19
18
#include <linux/slab.h>
20
19
#include <linux/of.h>
21
20
#include <linux/pinctrl/machine.h>
···
65
66
66
67
WARN(IS_ERR(pdev), "could not build omap_device for %s\n", oh_name);
67
68
68
-
return IS_ERR(pdev) ? PTR_ERR(pdev) : 0;
69
+
return PTR_RET(pdev);
69
70
}
70
71
omap_postcore_initcall(omap3_l3_init);
71
72
···
99
100
100
101
WARN(IS_ERR(pdev), "could not build omap_device for %s\n", oh_name);
101
102
102
-
return IS_ERR(pdev) ? PTR_ERR(pdev) : 0;
103
+
return PTR_RET(pdev);
103
104
}
104
105
omap_postcore_initcall(omap4_l3_init);
105
106
+1
-4
arch/arm/mach-omap2/fb.c
+1
-4
arch/arm/mach-omap2/fb.c
+1
-1
arch/arm/mach-omap2/gpmc.c
+1
-1
arch/arm/mach-omap2/gpmc.c
···
1734
1734
pdev = omap_device_build(DEVICE_NAME, -1, oh, NULL, 0);
1735
1735
WARN(IS_ERR(pdev), "could not build omap_device for %s\n", oh_name);
1736
1736
1737
-
return IS_ERR(pdev) ? PTR_ERR(pdev) : 0;
1737
+
return PTR_RET(pdev);
1738
1738
}
1739
1739
omap_postcore_initcall(omap_gpmc_init);
1740
1740
+1
-1
arch/arm/mach-omap2/io.c
+1
-1
arch/arm/mach-omap2/io.c
+1
-4
arch/arm/mach-omap2/pmu.c
+1
-4
arch/arm/mach-omap2/pmu.c
+5
-1
arch/arm/mach-omap2/sleep44xx.S
+5
-1
arch/arm/mach-omap2/sleep44xx.S
···
34
34
ppa_por_params:
35
35
.word 1, 0
36
36
37
+
#ifdef CONFIG_ARCH_OMAP4
38
+
37
39
/*
38
40
* =============================
39
41
* == CPU suspend finisher ==
···
328
326
329
327
b cpu_resume @ Jump to generic resume
330
328
ENDPROC(omap4_cpu_resume)
331
-
#endif
329
+
#endif /* CONFIG_ARCH_OMAP4 */
330
+
331
+
#endif /* defined(CONFIG_SMP) && defined(CONFIG_PM) */
332
332
333
333
#ifndef CONFIG_OMAP4_ERRATA_I688
334
334
ENTRY(omap_bus_sync)
+1
-1
arch/arm/mach-omap2/timer.c
+1
-1
arch/arm/mach-omap2/timer.c
+4
-4
arch/arm/mach-shmobile/setup-emev2.c
+4
-4
arch/arm/mach-shmobile/setup-emev2.c
···
287
287
static struct resource gio3_resources[] = {
288
288
[0] = {
289
289
.name = "GIO_096",
290
-
.start = 0xe0050100,
291
-
.end = 0xe005012b,
290
+
.start = 0xe0050180,
291
+
.end = 0xe00501ab,
292
292
.flags = IORESOURCE_MEM,
293
293
},
294
294
[1] = {
295
295
.name = "GIO_096",
296
-
.start = 0xe0050140,
297
-
.end = 0xe005015f,
296
+
.start = 0xe00501c0,
297
+
.end = 0xe00501df,
298
298
.flags = IORESOURCE_MEM,
299
299
},
300
300
[2] = {
+1
-1
arch/arm/mach-shmobile/setup-r8a73a4.c
+1
-1
arch/arm/mach-shmobile/setup-r8a73a4.c
···
62
62
static const struct plat_sci_port scif[] = {
63
63
SCIFA_DATA(SCIFA0, 0xe6c40000, gic_spi(144)), /* SCIFA0 */
64
64
SCIFA_DATA(SCIFA1, 0xe6c50000, gic_spi(145)), /* SCIFA1 */
65
-
SCIFB_DATA(SCIFB0, 0xe6c50000, gic_spi(145)), /* SCIFB0 */
65
+
SCIFB_DATA(SCIFB0, 0xe6c20000, gic_spi(148)), /* SCIFB0 */
66
66
SCIFB_DATA(SCIFB1, 0xe6c30000, gic_spi(149)), /* SCIFB1 */
67
67
SCIFB_DATA(SCIFB2, 0xe6ce0000, gic_spi(150)), /* SCIFB2 */
68
68
SCIFB_DATA(SCIFB3, 0xe6cf0000, gic_spi(151)), /* SCIFB3 */
+1
-1
arch/arm/mach-zynq/common.c
+1
-1
arch/arm/mach-zynq/common.c