diff options
author | David S. Miller <davem@davemloft.net> | 2014-05-12 13:19:14 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-05-12 13:19:14 -0400 |
commit | 5f013c9bc70214dcacd5fbed5a06c217d6ff9c59 (patch) | |
tree | 34c3a633000e03bca57d0ce55d8759f86edecc03 /arch/arm | |
parent | 51ee42efa0829cf9e46f8e1c0ab7a9ab6facf3f2 (diff) | |
parent | 1a466ae96e9f749d02a73315a3e66375e61a61dd (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/altera/altera_sgdma.c
net/netlink/af_netlink.c
net/sched/cls_api.c
net/sched/sch_api.c
The netlink conflict dealt with moving to netlink_capable() and
netlink_ns_capable() in the 'net' tree vs. supporting 'tc' operations
in non-init namespaces. These were simple transformations from
netlink_capable to netlink_ns_capable.
The Altera driver conflict was simply code removal overlapping some
void pointer cast cleanups in net-next.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/arm')
99 files changed, 558 insertions, 230 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index ab438cb5af55..db3c5414223e 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -30,9 +30,9 @@ config ARM | |||
30 | select HAVE_ARCH_SECCOMP_FILTER if (AEABI && !OABI_COMPAT) | 30 | select HAVE_ARCH_SECCOMP_FILTER if (AEABI && !OABI_COMPAT) |
31 | select HAVE_ARCH_TRACEHOOK | 31 | select HAVE_ARCH_TRACEHOOK |
32 | select HAVE_BPF_JIT | 32 | select HAVE_BPF_JIT |
33 | select HAVE_CC_STACKPROTECTOR | ||
33 | select HAVE_CONTEXT_TRACKING | 34 | select HAVE_CONTEXT_TRACKING |
34 | select HAVE_C_RECORDMCOUNT | 35 | select HAVE_C_RECORDMCOUNT |
35 | select HAVE_CC_STACKPROTECTOR | ||
36 | select HAVE_DEBUG_KMEMLEAK | 36 | select HAVE_DEBUG_KMEMLEAK |
37 | select HAVE_DMA_API_DEBUG | 37 | select HAVE_DMA_API_DEBUG |
38 | select HAVE_DMA_ATTRS | 38 | select HAVE_DMA_ATTRS |
@@ -311,6 +311,7 @@ config ARCH_MULTIPLATFORM | |||
311 | select ARM_HAS_SG_CHAIN | 311 | select ARM_HAS_SG_CHAIN |
312 | select ARM_PATCH_PHYS_VIRT | 312 | select ARM_PATCH_PHYS_VIRT |
313 | select AUTO_ZRELADDR | 313 | select AUTO_ZRELADDR |
314 | select CLKSRC_OF | ||
314 | select COMMON_CLK | 315 | select COMMON_CLK |
315 | select GENERIC_CLOCKEVENTS | 316 | select GENERIC_CLOCKEVENTS |
316 | select MULTI_IRQ_HANDLER | 317 | select MULTI_IRQ_HANDLER |
@@ -422,8 +423,8 @@ config ARCH_EFM32 | |||
422 | bool "Energy Micro efm32" | 423 | bool "Energy Micro efm32" |
423 | depends on !MMU | 424 | depends on !MMU |
424 | select ARCH_REQUIRE_GPIOLIB | 425 | select ARCH_REQUIRE_GPIOLIB |
425 | select AUTO_ZRELADDR | ||
426 | select ARM_NVIC | 426 | select ARM_NVIC |
427 | select AUTO_ZRELADDR | ||
427 | select CLKSRC_OF | 428 | select CLKSRC_OF |
428 | select COMMON_CLK | 429 | select COMMON_CLK |
429 | select CPU_V7M | 430 | select CPU_V7M |
@@ -511,8 +512,8 @@ config ARCH_IXP4XX | |||
511 | bool "IXP4xx-based" | 512 | bool "IXP4xx-based" |
512 | depends on MMU | 513 | depends on MMU |
513 | select ARCH_HAS_DMA_SET_COHERENT_MASK | 514 | select ARCH_HAS_DMA_SET_COHERENT_MASK |
514 | select ARCH_SUPPORTS_BIG_ENDIAN | ||
515 | select ARCH_REQUIRE_GPIOLIB | 515 | select ARCH_REQUIRE_GPIOLIB |
516 | select ARCH_SUPPORTS_BIG_ENDIAN | ||
516 | select CLKSRC_MMIO | 517 | select CLKSRC_MMIO |
517 | select CPU_XSCALE | 518 | select CPU_XSCALE |
518 | select DMABOUNCE if PCI | 519 | select DMABOUNCE if PCI |
@@ -1110,9 +1111,9 @@ config ARM_NR_BANKS | |||
1110 | default 8 | 1111 | default 8 |
1111 | 1112 | ||
1112 | config IWMMXT | 1113 | config IWMMXT |
1113 | bool "Enable iWMMXt support" if !CPU_PJ4 | 1114 | bool "Enable iWMMXt support" |
1114 | depends on CPU_XSCALE || CPU_XSC3 || CPU_MOHAWK || CPU_PJ4 | 1115 | depends on CPU_XSCALE || CPU_XSC3 || CPU_MOHAWK || CPU_PJ4 || CPU_PJ4B |
1115 | default y if PXA27x || PXA3xx || ARCH_MMP || CPU_PJ4 | 1116 | default y if PXA27x || PXA3xx || ARCH_MMP || CPU_PJ4 || CPU_PJ4B |
1116 | help | 1117 | help |
1117 | Enable support for iWMMXt context switching at run time if | 1118 | Enable support for iWMMXt context switching at run time if |
1118 | running on a CPU that supports it. | 1119 | running on a CPU that supports it. |
@@ -1575,8 +1576,8 @@ config BIG_LITTLE | |||
1575 | config BL_SWITCHER | 1576 | config BL_SWITCHER |
1576 | bool "big.LITTLE switcher support" | 1577 | bool "big.LITTLE switcher support" |
1577 | depends on BIG_LITTLE && MCPM && HOTPLUG_CPU | 1578 | depends on BIG_LITTLE && MCPM && HOTPLUG_CPU |
1578 | select CPU_PM | ||
1579 | select ARM_CPU_SUSPEND | 1579 | select ARM_CPU_SUSPEND |
1580 | select CPU_PM | ||
1580 | help | 1581 | help |
1581 | The big.LITTLE "switcher" provides the core functionality to | 1582 | The big.LITTLE "switcher" provides the core functionality to |
1582 | transparently handle transition between a cluster of A15's | 1583 | transparently handle transition between a cluster of A15's |
@@ -1920,9 +1921,9 @@ config XEN | |||
1920 | depends on CPU_V7 && !CPU_V6 | 1921 | depends on CPU_V7 && !CPU_V6 |
1921 | depends on !GENERIC_ATOMIC64 | 1922 | depends on !GENERIC_ATOMIC64 |
1922 | depends on MMU | 1923 | depends on MMU |
1924 | select ARCH_DMA_ADDR_T_64BIT | ||
1923 | select ARM_PSCI | 1925 | select ARM_PSCI |
1924 | select SWIOTLB_XEN | 1926 | select SWIOTLB_XEN |
1925 | select ARCH_DMA_ADDR_T_64BIT | ||
1926 | help | 1927 | help |
1927 | Say Y if you want to run Linux in a Virtual Machine on Xen on ARM. | 1928 | Say Y if you want to run Linux in a Virtual Machine on Xen on ARM. |
1928 | 1929 | ||
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index 4a2fc0bf6fc9..eab8ecbe69c1 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug | |||
@@ -1030,9 +1030,9 @@ config DEBUG_UART_PHYS | |||
1030 | default 0x40100000 if DEBUG_PXA_UART1 | 1030 | default 0x40100000 if DEBUG_PXA_UART1 |
1031 | default 0x42000000 if ARCH_GEMINI | 1031 | default 0x42000000 if ARCH_GEMINI |
1032 | default 0x7c0003f8 if FOOTBRIDGE | 1032 | default 0x7c0003f8 if FOOTBRIDGE |
1033 | default 0x80230000 if DEBUG_PICOXCELL_UART | ||
1034 | default 0x80070000 if DEBUG_IMX23_UART | 1033 | default 0x80070000 if DEBUG_IMX23_UART |
1035 | default 0x80074000 if DEBUG_IMX28_UART | 1034 | default 0x80074000 if DEBUG_IMX28_UART |
1035 | default 0x80230000 if DEBUG_PICOXCELL_UART | ||
1036 | default 0x808c0000 if ARCH_EP93XX | 1036 | default 0x808c0000 if ARCH_EP93XX |
1037 | default 0x90020000 if DEBUG_NSPIRE_CLASSIC_UART || DEBUG_NSPIRE_CX_UART | 1037 | default 0x90020000 if DEBUG_NSPIRE_CLASSIC_UART || DEBUG_NSPIRE_CX_UART |
1038 | default 0xb0090000 if DEBUG_VEXPRESS_UART0_CRX | 1038 | default 0xb0090000 if DEBUG_VEXPRESS_UART0_CRX |
@@ -1096,22 +1096,22 @@ config DEBUG_UART_VIRT | |||
1096 | default 0xfeb26000 if DEBUG_RK3X_UART1 | 1096 | default 0xfeb26000 if DEBUG_RK3X_UART1 |
1097 | default 0xfeb30c00 if DEBUG_KEYSTONE_UART0 | 1097 | default 0xfeb30c00 if DEBUG_KEYSTONE_UART0 |
1098 | default 0xfeb31000 if DEBUG_KEYSTONE_UART1 | 1098 | default 0xfeb31000 if DEBUG_KEYSTONE_UART1 |
1099 | default 0xfec12000 if DEBUG_MVEBU_UART || DEBUG_MVEBU_UART_ALTERNATE | ||
1100 | default 0xfed60000 if DEBUG_RK29_UART0 | ||
1101 | default 0xfed64000 if DEBUG_RK29_UART1 || DEBUG_RK3X_UART2 | ||
1102 | default 0xfed68000 if DEBUG_RK29_UART2 || DEBUG_RK3X_UART3 | ||
1103 | default 0xfec02000 if DEBUG_SOCFPGA_UART | 1099 | default 0xfec02000 if DEBUG_SOCFPGA_UART |
1100 | default 0xfec12000 if DEBUG_MVEBU_UART || DEBUG_MVEBU_UART_ALTERNATE | ||
1104 | default 0xfec20000 if DEBUG_DAVINCI_DMx_UART0 | 1101 | default 0xfec20000 if DEBUG_DAVINCI_DMx_UART0 |
1105 | default 0xfed0c000 if DEBUG_DAVINCI_DA8XX_UART1 | 1102 | default 0xfed0c000 if DEBUG_DAVINCI_DA8XX_UART1 |
1106 | default 0xfed0d000 if DEBUG_DAVINCI_DA8XX_UART2 | 1103 | default 0xfed0d000 if DEBUG_DAVINCI_DA8XX_UART2 |
1107 | default 0xfed12000 if ARCH_KIRKWOOD | 1104 | default 0xfed12000 if ARCH_KIRKWOOD |
1105 | default 0xfed60000 if DEBUG_RK29_UART0 | ||
1106 | default 0xfed64000 if DEBUG_RK29_UART1 || DEBUG_RK3X_UART2 | ||
1107 | default 0xfed68000 if DEBUG_RK29_UART2 || DEBUG_RK3X_UART3 | ||
1108 | default 0xfedc0000 if ARCH_EP93XX | 1108 | default 0xfedc0000 if ARCH_EP93XX |
1109 | default 0xfee003f8 if FOOTBRIDGE | 1109 | default 0xfee003f8 if FOOTBRIDGE |
1110 | default 0xfee20000 if DEBUG_NSPIRE_CLASSIC_UART || DEBUG_NSPIRE_CX_UART | 1110 | default 0xfee20000 if DEBUG_NSPIRE_CLASSIC_UART || DEBUG_NSPIRE_CX_UART |
1111 | default 0xfef36000 if DEBUG_HIGHBANK_UART | ||
1112 | default 0xfee82340 if ARCH_IOP13XX | 1111 | default 0xfee82340 if ARCH_IOP13XX |
1113 | default 0xfef00000 if ARCH_IXP4XX && !CPU_BIG_ENDIAN | 1112 | default 0xfef00000 if ARCH_IXP4XX && !CPU_BIG_ENDIAN |
1114 | default 0xfef00003 if ARCH_IXP4XX && CPU_BIG_ENDIAN | 1113 | default 0xfef00003 if ARCH_IXP4XX && CPU_BIG_ENDIAN |
1114 | default 0xfef36000 if DEBUG_HIGHBANK_UART | ||
1115 | default 0xfefff700 if ARCH_IOP33X | 1115 | default 0xfefff700 if ARCH_IOP33X |
1116 | default 0xff003000 if DEBUG_U300_UART | 1116 | default 0xff003000 if DEBUG_U300_UART |
1117 | default DEBUG_UART_PHYS if !MMU | 1117 | default DEBUG_UART_PHYS if !MMU |
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 35c146f31e46..377b7c364033 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile | |||
@@ -51,10 +51,9 @@ dtb-$(CONFIG_ARCH_AT91) += sama5d36ek.dtb | |||
51 | 51 | ||
52 | dtb-$(CONFIG_ARCH_ATLAS6) += atlas6-evb.dtb | 52 | dtb-$(CONFIG_ARCH_ATLAS6) += atlas6-evb.dtb |
53 | dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb | 53 | dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb |
54 | dtb-$(CONFIG_ARCH_BCM_5301X) += bcm4708-netgear-r6250.dtb | ||
54 | dtb-$(CONFIG_ARCH_BCM_MOBILE) += bcm28155-ap.dtb \ | 55 | dtb-$(CONFIG_ARCH_BCM_MOBILE) += bcm28155-ap.dtb \ |
55 | bcm21664-garnet.dtb | 56 | bcm21664-garnet.dtb |
56 | dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb | ||
57 | dtb-$(CONFIG_ARCH_BCM_5301X) += bcm4708-netgear-r6250.dtb | ||
58 | dtb-$(CONFIG_ARCH_BERLIN) += \ | 57 | dtb-$(CONFIG_ARCH_BERLIN) += \ |
59 | berlin2-sony-nsz-gs7.dtb \ | 58 | berlin2-sony-nsz-gs7.dtb \ |
60 | berlin2cd-google-chromecast.dtb | 59 | berlin2cd-google-chromecast.dtb |
@@ -246,6 +245,7 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \ | |||
246 | omap3-sbc-t3730.dtb \ | 245 | omap3-sbc-t3730.dtb \ |
247 | omap3-devkit8000.dtb \ | 246 | omap3-devkit8000.dtb \ |
248 | omap3-beagle-xm.dtb \ | 247 | omap3-beagle-xm.dtb \ |
248 | omap3-beagle-xm-ab.dtb \ | ||
249 | omap3-evm.dtb \ | 249 | omap3-evm.dtb \ |
250 | omap3-evm-37xx.dtb \ | 250 | omap3-evm-37xx.dtb \ |
251 | omap3-ldp.dtb \ | 251 | omap3-ldp.dtb \ |
@@ -294,13 +294,6 @@ dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb | |||
294 | dtb-$(CONFIG_ARCH_QCOM) += qcom-msm8660-surf.dtb \ | 294 | dtb-$(CONFIG_ARCH_QCOM) += qcom-msm8660-surf.dtb \ |
295 | qcom-msm8960-cdp.dtb \ | 295 | qcom-msm8960-cdp.dtb \ |
296 | qcom-apq8074-dragonboard.dtb | 296 | qcom-apq8074-dragonboard.dtb |
297 | dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \ | ||
298 | ste-hrefprev60-stuib.dtb \ | ||
299 | ste-hrefprev60-tvk.dtb \ | ||
300 | ste-hrefv60plus-stuib.dtb \ | ||
301 | ste-hrefv60plus-tvk.dtb \ | ||
302 | ste-ccu8540.dtb \ | ||
303 | ste-ccu9540.dtb | ||
304 | dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb | 297 | dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb |
305 | dtb-$(CONFIG_ARCH_S3C64XX) += s3c6410-mini6410.dtb \ | 298 | dtb-$(CONFIG_ARCH_S3C64XX) += s3c6410-mini6410.dtb \ |
306 | s3c6410-smdk6410.dtb | 299 | s3c6410-smdk6410.dtb |
@@ -369,9 +362,16 @@ dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \ | |||
369 | tegra30-cardhu-a04.dtb \ | 362 | tegra30-cardhu-a04.dtb \ |
370 | tegra114-dalmore.dtb \ | 363 | tegra114-dalmore.dtb \ |
371 | tegra124-venice2.dtb | 364 | tegra124-venice2.dtb |
365 | dtb-$(CONFIG_ARCH_U300) += ste-u300.dtb | ||
366 | dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \ | ||
367 | ste-hrefprev60-stuib.dtb \ | ||
368 | ste-hrefprev60-tvk.dtb \ | ||
369 | ste-hrefv60plus-stuib.dtb \ | ||
370 | ste-hrefv60plus-tvk.dtb \ | ||
371 | ste-ccu8540.dtb \ | ||
372 | ste-ccu9540.dtb | ||
372 | dtb-$(CONFIG_ARCH_VERSATILE) += versatile-ab.dtb \ | 373 | dtb-$(CONFIG_ARCH_VERSATILE) += versatile-ab.dtb \ |
373 | versatile-pb.dtb | 374 | versatile-pb.dtb |
374 | dtb-$(CONFIG_ARCH_U300) += ste-u300.dtb | ||
375 | dtb-$(CONFIG_ARCH_VEXPRESS) += vexpress-v2p-ca5s.dtb \ | 375 | dtb-$(CONFIG_ARCH_VEXPRESS) += vexpress-v2p-ca5s.dtb \ |
376 | vexpress-v2p-ca9.dtb \ | 376 | vexpress-v2p-ca9.dtb \ |
377 | vexpress-v2p-ca15-tc1.dtb \ | 377 | vexpress-v2p-ca15-tc1.dtb \ |
diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi index e3f27ec31718..2e7d932887b5 100644 --- a/arch/arm/boot/dts/am335x-bone-common.dtsi +++ b/arch/arm/boot/dts/am335x-bone-common.dtsi | |||
@@ -183,7 +183,7 @@ | |||
183 | &usb { | 183 | &usb { |
184 | status = "okay"; | 184 | status = "okay"; |
185 | 185 | ||
186 | control@44e10000 { | 186 | control@44e10620 { |
187 | status = "okay"; | 187 | status = "okay"; |
188 | }; | 188 | }; |
189 | 189 | ||
@@ -204,7 +204,7 @@ | |||
204 | dr_mode = "host"; | 204 | dr_mode = "host"; |
205 | }; | 205 | }; |
206 | 206 | ||
207 | dma-controller@07402000 { | 207 | dma-controller@47402000 { |
208 | status = "okay"; | 208 | status = "okay"; |
209 | }; | 209 | }; |
210 | }; | 210 | }; |
diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts index 28ae040e7c3d..6028217ace0f 100644 --- a/arch/arm/boot/dts/am335x-evm.dts +++ b/arch/arm/boot/dts/am335x-evm.dts | |||
@@ -301,8 +301,8 @@ | |||
301 | 301 | ||
302 | am335x_evm_audio_pins: am335x_evm_audio_pins { | 302 | am335x_evm_audio_pins: am335x_evm_audio_pins { |
303 | pinctrl-single,pins = < | 303 | pinctrl-single,pins = < |
304 | 0x10c (PIN_INPUT_PULLDOWN | MUX_MODE4) /* mii1_rx_dv.mcasp1_aclkx */ | 304 | 0x10c (PIN_INPUT_PULLDOWN | MUX_MODE4) /* mii1_crs.mcasp1_aclkx */ |
305 | 0x110 (PIN_INPUT_PULLDOWN | MUX_MODE4) /* mii1_txd3.mcasp1_fsx */ | 305 | 0x110 (PIN_INPUT_PULLDOWN | MUX_MODE4) /* mii1_rxerr.mcasp1_fsx */ |
306 | 0x108 (PIN_OUTPUT_PULLDOWN | MUX_MODE4) /* mii1_col.mcasp1_axr2 */ | 306 | 0x108 (PIN_OUTPUT_PULLDOWN | MUX_MODE4) /* mii1_col.mcasp1_axr2 */ |
307 | 0x144 (PIN_INPUT_PULLDOWN | MUX_MODE4) /* rmii1_ref_clk.mcasp1_axr3 */ | 307 | 0x144 (PIN_INPUT_PULLDOWN | MUX_MODE4) /* rmii1_ref_clk.mcasp1_axr3 */ |
308 | >; | 308 | >; |
@@ -331,7 +331,7 @@ | |||
331 | &usb { | 331 | &usb { |
332 | status = "okay"; | 332 | status = "okay"; |
333 | 333 | ||
334 | control@44e10000 { | 334 | control@44e10620 { |
335 | status = "okay"; | 335 | status = "okay"; |
336 | }; | 336 | }; |
337 | 337 | ||
@@ -352,7 +352,7 @@ | |||
352 | dr_mode = "host"; | 352 | dr_mode = "host"; |
353 | }; | 353 | }; |
354 | 354 | ||
355 | dma-controller@07402000 { | 355 | dma-controller@47402000 { |
356 | status = "okay"; | 356 | status = "okay"; |
357 | }; | 357 | }; |
358 | }; | 358 | }; |
diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts index ec08f6f677c3..ab238850a7b2 100644 --- a/arch/arm/boot/dts/am335x-evmsk.dts +++ b/arch/arm/boot/dts/am335x-evmsk.dts | |||
@@ -364,7 +364,7 @@ | |||
364 | &usb { | 364 | &usb { |
365 | status = "okay"; | 365 | status = "okay"; |
366 | 366 | ||
367 | control@44e10000 { | 367 | control@44e10620 { |
368 | status = "okay"; | 368 | status = "okay"; |
369 | }; | 369 | }; |
370 | 370 | ||
@@ -385,7 +385,7 @@ | |||
385 | dr_mode = "host"; | 385 | dr_mode = "host"; |
386 | }; | 386 | }; |
387 | 387 | ||
388 | dma-controller@07402000 { | 388 | dma-controller@47402000 { |
389 | status = "okay"; | 389 | status = "okay"; |
390 | }; | 390 | }; |
391 | }; | 391 | }; |
diff --git a/arch/arm/boot/dts/am335x-igep0033.dtsi b/arch/arm/boot/dts/am335x-igep0033.dtsi index 7063311a58d9..9f22c189f636 100644 --- a/arch/arm/boot/dts/am335x-igep0033.dtsi +++ b/arch/arm/boot/dts/am335x-igep0033.dtsi | |||
@@ -118,7 +118,6 @@ | |||
118 | reg = <0 0 0>; /* CS0, offset 0 */ | 118 | reg = <0 0 0>; /* CS0, offset 0 */ |
119 | nand-bus-width = <8>; | 119 | nand-bus-width = <8>; |
120 | ti,nand-ecc-opt = "bch8"; | 120 | ti,nand-ecc-opt = "bch8"; |
121 | gpmc,device-nand = "true"; | ||
122 | gpmc,device-width = <1>; | 121 | gpmc,device-width = <1>; |
123 | gpmc,sync-clk-ps = <0>; | 122 | gpmc,sync-clk-ps = <0>; |
124 | gpmc,cs-on-ns = <0>; | 123 | gpmc,cs-on-ns = <0>; |
@@ -202,7 +201,7 @@ | |||
202 | &usb { | 201 | &usb { |
203 | status = "okay"; | 202 | status = "okay"; |
204 | 203 | ||
205 | control@44e10000 { | 204 | control@44e10620 { |
206 | status = "okay"; | 205 | status = "okay"; |
207 | }; | 206 | }; |
208 | 207 | ||
@@ -223,7 +222,7 @@ | |||
223 | dr_mode = "host"; | 222 | dr_mode = "host"; |
224 | }; | 223 | }; |
225 | 224 | ||
226 | dma-controller@07402000 { | 225 | dma-controller@47402000 { |
227 | status = "okay"; | 226 | status = "okay"; |
228 | }; | 227 | }; |
229 | }; | 228 | }; |
diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi index d1e2b363f927..baf56cc92040 100644 --- a/arch/arm/boot/dts/am33xx.dtsi +++ b/arch/arm/boot/dts/am33xx.dtsi | |||
@@ -72,7 +72,7 @@ | |||
72 | }; | 72 | }; |
73 | 73 | ||
74 | /* | 74 | /* |
75 | * The soc node represents the soc top level view. It is uses for IPs | 75 | * The soc node represents the soc top level view. It is used for IPs |
76 | * that are not memory mapped in the MPU view or for the MPU itself. | 76 | * that are not memory mapped in the MPU view or for the MPU itself. |
77 | */ | 77 | */ |
78 | soc { | 78 | soc { |
@@ -94,8 +94,8 @@ | |||
94 | 94 | ||
95 | /* | 95 | /* |
96 | * XXX: Use a flat representation of the AM33XX interconnect. | 96 | * XXX: Use a flat representation of the AM33XX interconnect. |
97 | * The real AM33XX interconnect network is quite complex.Since | 97 | * The real AM33XX interconnect network is quite complex. Since |
98 | * that will not bring real advantage to represent that in DT | 98 | * it will not bring real advantage to represent that in DT |
99 | * for the moment, just use a fake OCP bus entry to represent | 99 | * for the moment, just use a fake OCP bus entry to represent |
100 | * the whole bus hierarchy. | 100 | * the whole bus hierarchy. |
101 | */ | 101 | */ |
@@ -804,7 +804,7 @@ | |||
804 | <0x46000000 0x400000>; | 804 | <0x46000000 0x400000>; |
805 | reg-names = "mpu", "dat"; | 805 | reg-names = "mpu", "dat"; |
806 | interrupts = <80>, <81>; | 806 | interrupts = <80>, <81>; |
807 | interrupts-names = "tx", "rx"; | 807 | interrupt-names = "tx", "rx"; |
808 | status = "disabled"; | 808 | status = "disabled"; |
809 | dmas = <&edma 8>, | 809 | dmas = <&edma 8>, |
810 | <&edma 9>; | 810 | <&edma 9>; |
@@ -818,7 +818,7 @@ | |||
818 | <0x46400000 0x400000>; | 818 | <0x46400000 0x400000>; |
819 | reg-names = "mpu", "dat"; | 819 | reg-names = "mpu", "dat"; |
820 | interrupts = <82>, <83>; | 820 | interrupts = <82>, <83>; |
821 | interrupts-names = "tx", "rx"; | 821 | interrupt-names = "tx", "rx"; |
822 | status = "disabled"; | 822 | status = "disabled"; |
823 | dmas = <&edma 10>, | 823 | dmas = <&edma 10>, |
824 | <&edma 11>; | 824 | <&edma 11>; |
diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi index c2779f653020..03a225505126 100644 --- a/arch/arm/boot/dts/am4372.dtsi +++ b/arch/arm/boot/dts/am4372.dtsi | |||
@@ -693,7 +693,7 @@ | |||
693 | <0x46000000 0x400000>; | 693 | <0x46000000 0x400000>; |
694 | reg-names = "mpu", "dat"; | 694 | reg-names = "mpu", "dat"; |
695 | interrupts = <80>, <81>; | 695 | interrupts = <80>, <81>; |
696 | interrupts-names = "tx", "rx"; | 696 | interrupt-names = "tx", "rx"; |
697 | status = "disabled"; | 697 | status = "disabled"; |
698 | dmas = <&edma 8>, | 698 | dmas = <&edma 8>, |
699 | <&edma 9>; | 699 | <&edma 9>; |
@@ -707,7 +707,7 @@ | |||
707 | <0x46400000 0x400000>; | 707 | <0x46400000 0x400000>; |
708 | reg-names = "mpu", "dat"; | 708 | reg-names = "mpu", "dat"; |
709 | interrupts = <82>, <83>; | 709 | interrupts = <82>, <83>; |
710 | interrupts-names = "tx", "rx"; | 710 | interrupt-names = "tx", "rx"; |
711 | status = "disabled"; | 711 | status = "disabled"; |
712 | dmas = <&edma 10>, | 712 | dmas = <&edma 10>, |
713 | <&edma 11>; | 713 | <&edma 11>; |
diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi index bbb40f62037d..bb77970c0b12 100644 --- a/arch/arm/boot/dts/armada-370-xp.dtsi +++ b/arch/arm/boot/dts/armada-370-xp.dtsi | |||
@@ -230,6 +230,7 @@ | |||
230 | #size-cells = <0>; | 230 | #size-cells = <0>; |
231 | compatible = "marvell,orion-mdio"; | 231 | compatible = "marvell,orion-mdio"; |
232 | reg = <0x72004 0x4>; | 232 | reg = <0x72004 0x4>; |
233 | clocks = <&gateclk 4>; | ||
233 | }; | 234 | }; |
234 | 235 | ||
235 | eth1: ethernet@74000 { | 236 | eth1: ethernet@74000 { |
diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi index a064f59da02d..ca8813bb99ba 100644 --- a/arch/arm/boot/dts/armada-38x.dtsi +++ b/arch/arm/boot/dts/armada-38x.dtsi | |||
@@ -336,6 +336,7 @@ | |||
336 | #size-cells = <0>; | 336 | #size-cells = <0>; |
337 | compatible = "marvell,orion-mdio"; | 337 | compatible = "marvell,orion-mdio"; |
338 | reg = <0x72004 0x4>; | 338 | reg = <0x72004 0x4>; |
339 | clocks = <&gateclk 4>; | ||
339 | }; | 340 | }; |
340 | 341 | ||
341 | coredivclk: clock@e4250 { | 342 | coredivclk: clock@e4250 { |
diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi index 1c0f8e1893ae..149b55099935 100644 --- a/arch/arm/boot/dts/dra7.dtsi +++ b/arch/arm/boot/dts/dra7.dtsi | |||
@@ -80,7 +80,7 @@ | |||
80 | }; | 80 | }; |
81 | 81 | ||
82 | /* | 82 | /* |
83 | * The soc node represents the soc top level view. It is uses for IPs | 83 | * The soc node represents the soc top level view. It is used for IPs |
84 | * that are not memory mapped in the MPU view or for the MPU itself. | 84 | * that are not memory mapped in the MPU view or for the MPU itself. |
85 | */ | 85 | */ |
86 | soc { | 86 | soc { |
@@ -94,7 +94,7 @@ | |||
94 | /* | 94 | /* |
95 | * XXX: Use a flat representation of the SOC interconnect. | 95 | * XXX: Use a flat representation of the SOC interconnect. |
96 | * The real OMAP interconnect network is quite complex. | 96 | * The real OMAP interconnect network is quite complex. |
97 | * Since that will not bring real advantage to represent that in DT for | 97 | * Since it will not bring real advantage to represent that in DT for |
98 | * the moment, just use a fake OCP bus entry to represent the whole bus | 98 | * the moment, just use a fake OCP bus entry to represent the whole bus |
99 | * hierarchy. | 99 | * hierarchy. |
100 | */ | 100 | */ |
diff --git a/arch/arm/boot/dts/dra7xx-clocks.dtsi b/arch/arm/boot/dts/dra7xx-clocks.dtsi index e96da9a898ad..cfb8fc753f50 100644 --- a/arch/arm/boot/dts/dra7xx-clocks.dtsi +++ b/arch/arm/boot/dts/dra7xx-clocks.dtsi | |||
@@ -1640,7 +1640,7 @@ | |||
1640 | #clock-cells = <0>; | 1640 | #clock-cells = <0>; |
1641 | compatible = "ti,mux-clock"; | 1641 | compatible = "ti,mux-clock"; |
1642 | clocks = <&abe_24m_fclk>, <&abe_sys_clk_div>, <&func_24m_clk>, <&atlclkin3_ck>, <&atl_clkin2_ck>, <&atl_clkin1_ck>, <&atl_clkin0_ck>, <&sys_clkin2>, <&ref_clkin0_ck>, <&ref_clkin1_ck>, <&ref_clkin2_ck>, <&ref_clkin3_ck>, <&mlb_clk>, <&mlbp_clk>; | 1642 | clocks = <&abe_24m_fclk>, <&abe_sys_clk_div>, <&func_24m_clk>, <&atlclkin3_ck>, <&atl_clkin2_ck>, <&atl_clkin1_ck>, <&atl_clkin0_ck>, <&sys_clkin2>, <&ref_clkin0_ck>, <&ref_clkin1_ck>, <&ref_clkin2_ck>, <&ref_clkin3_ck>, <&mlb_clk>, <&mlbp_clk>; |
1643 | ti,bit-shift = <28>; | 1643 | ti,bit-shift = <24>; |
1644 | reg = <0x1860>; | 1644 | reg = <0x1860>; |
1645 | }; | 1645 | }; |
1646 | 1646 | ||
diff --git a/arch/arm/boot/dts/imx25.dtsi b/arch/arm/boot/dts/imx25.dtsi index 32f760e24898..ea323f09dc78 100644 --- a/arch/arm/boot/dts/imx25.dtsi +++ b/arch/arm/boot/dts/imx25.dtsi | |||
@@ -56,6 +56,7 @@ | |||
56 | 56 | ||
57 | osc { | 57 | osc { |
58 | compatible = "fsl,imx-osc", "fixed-clock"; | 58 | compatible = "fsl,imx-osc", "fixed-clock"; |
59 | #clock-cells = <0>; | ||
59 | clock-frequency = <24000000>; | 60 | clock-frequency = <24000000>; |
60 | }; | 61 | }; |
61 | }; | 62 | }; |
diff --git a/arch/arm/boot/dts/imx27-apf27.dts b/arch/arm/boot/dts/imx27-apf27.dts index 09f57b39e3ef..73aae4f5e539 100644 --- a/arch/arm/boot/dts/imx27-apf27.dts +++ b/arch/arm/boot/dts/imx27-apf27.dts | |||
@@ -29,6 +29,7 @@ | |||
29 | 29 | ||
30 | osc26m { | 30 | osc26m { |
31 | compatible = "fsl,imx-osc26m", "fixed-clock"; | 31 | compatible = "fsl,imx-osc26m", "fixed-clock"; |
32 | #clock-cells = <0>; | ||
32 | clock-frequency = <0>; | 33 | clock-frequency = <0>; |
33 | }; | 34 | }; |
34 | }; | 35 | }; |
diff --git a/arch/arm/boot/dts/imx27.dtsi b/arch/arm/boot/dts/imx27.dtsi index 6279e0b4f768..137e010eab35 100644 --- a/arch/arm/boot/dts/imx27.dtsi +++ b/arch/arm/boot/dts/imx27.dtsi | |||
@@ -48,6 +48,7 @@ | |||
48 | 48 | ||
49 | osc26m { | 49 | osc26m { |
50 | compatible = "fsl,imx-osc26m", "fixed-clock"; | 50 | compatible = "fsl,imx-osc26m", "fixed-clock"; |
51 | #clock-cells = <0>; | ||
51 | clock-frequency = <26000000>; | 52 | clock-frequency = <26000000>; |
52 | }; | 53 | }; |
53 | }; | 54 | }; |
diff --git a/arch/arm/boot/dts/imx50.dtsi b/arch/arm/boot/dts/imx50.dtsi index 0c75fe3deb35..9c89d1ca97c2 100644 --- a/arch/arm/boot/dts/imx50.dtsi +++ b/arch/arm/boot/dts/imx50.dtsi | |||
@@ -53,21 +53,25 @@ | |||
53 | 53 | ||
54 | ckil { | 54 | ckil { |
55 | compatible = "fsl,imx-ckil", "fixed-clock"; | 55 | compatible = "fsl,imx-ckil", "fixed-clock"; |
56 | #clock-cells = <0>; | ||
56 | clock-frequency = <32768>; | 57 | clock-frequency = <32768>; |
57 | }; | 58 | }; |
58 | 59 | ||
59 | ckih1 { | 60 | ckih1 { |
60 | compatible = "fsl,imx-ckih1", "fixed-clock"; | 61 | compatible = "fsl,imx-ckih1", "fixed-clock"; |
62 | #clock-cells = <0>; | ||
61 | clock-frequency = <22579200>; | 63 | clock-frequency = <22579200>; |
62 | }; | 64 | }; |
63 | 65 | ||
64 | ckih2 { | 66 | ckih2 { |
65 | compatible = "fsl,imx-ckih2", "fixed-clock"; | 67 | compatible = "fsl,imx-ckih2", "fixed-clock"; |
68 | #clock-cells = <0>; | ||
66 | clock-frequency = <0>; | 69 | clock-frequency = <0>; |
67 | }; | 70 | }; |
68 | 71 | ||
69 | osc { | 72 | osc { |
70 | compatible = "fsl,imx-osc", "fixed-clock"; | 73 | compatible = "fsl,imx-osc", "fixed-clock"; |
74 | #clock-cells = <0>; | ||
71 | clock-frequency = <24000000>; | 75 | clock-frequency = <24000000>; |
72 | }; | 76 | }; |
73 | }; | 77 | }; |
diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi index 5f8216d08f6b..150bb4e2f744 100644 --- a/arch/arm/boot/dts/imx51.dtsi +++ b/arch/arm/boot/dts/imx51.dtsi | |||
@@ -50,21 +50,25 @@ | |||
50 | 50 | ||
51 | ckil { | 51 | ckil { |
52 | compatible = "fsl,imx-ckil", "fixed-clock"; | 52 | compatible = "fsl,imx-ckil", "fixed-clock"; |
53 | #clock-cells = <0>; | ||
53 | clock-frequency = <32768>; | 54 | clock-frequency = <32768>; |
54 | }; | 55 | }; |
55 | 56 | ||
56 | ckih1 { | 57 | ckih1 { |
57 | compatible = "fsl,imx-ckih1", "fixed-clock"; | 58 | compatible = "fsl,imx-ckih1", "fixed-clock"; |
59 | #clock-cells = <0>; | ||
58 | clock-frequency = <0>; | 60 | clock-frequency = <0>; |
59 | }; | 61 | }; |
60 | 62 | ||
61 | ckih2 { | 63 | ckih2 { |
62 | compatible = "fsl,imx-ckih2", "fixed-clock"; | 64 | compatible = "fsl,imx-ckih2", "fixed-clock"; |
65 | #clock-cells = <0>; | ||
63 | clock-frequency = <0>; | 66 | clock-frequency = <0>; |
64 | }; | 67 | }; |
65 | 68 | ||
66 | osc { | 69 | osc { |
67 | compatible = "fsl,imx-osc", "fixed-clock"; | 70 | compatible = "fsl,imx-osc", "fixed-clock"; |
71 | #clock-cells = <0>; | ||
68 | clock-frequency = <24000000>; | 72 | clock-frequency = <24000000>; |
69 | }; | 73 | }; |
70 | }; | 74 | }; |
diff --git a/arch/arm/boot/dts/imx53-m53evk.dts b/arch/arm/boot/dts/imx53-m53evk.dts index f6d3ac3e5587..d5d146a8b149 100644 --- a/arch/arm/boot/dts/imx53-m53evk.dts +++ b/arch/arm/boot/dts/imx53-m53evk.dts | |||
@@ -17,7 +17,8 @@ | |||
17 | compatible = "denx,imx53-m53evk", "fsl,imx53"; | 17 | compatible = "denx,imx53-m53evk", "fsl,imx53"; |
18 | 18 | ||
19 | memory { | 19 | memory { |
20 | reg = <0x70000000 0x20000000>; | 20 | reg = <0x70000000 0x20000000>, |
21 | <0xb0000000 0x20000000>; | ||
21 | }; | 22 | }; |
22 | 23 | ||
23 | soc { | 24 | soc { |
@@ -193,17 +194,17 @@ | |||
193 | irq-trigger = <0x1>; | 194 | irq-trigger = <0x1>; |
194 | 195 | ||
195 | stmpe_touchscreen { | 196 | stmpe_touchscreen { |
196 | compatible = "stmpe,ts"; | 197 | compatible = "st,stmpe-ts"; |
197 | reg = <0>; | 198 | reg = <0>; |
198 | ts,sample-time = <4>; | 199 | st,sample-time = <4>; |
199 | ts,mod-12b = <1>; | 200 | st,mod-12b = <1>; |
200 | ts,ref-sel = <0>; | 201 | st,ref-sel = <0>; |
201 | ts,adc-freq = <1>; | 202 | st,adc-freq = <1>; |
202 | ts,ave-ctrl = <3>; | 203 | st,ave-ctrl = <3>; |
203 | ts,touch-det-delay = <3>; | 204 | st,touch-det-delay = <3>; |
204 | ts,settling = <4>; | 205 | st,settling = <4>; |
205 | ts,fraction-z = <7>; | 206 | st,fraction-z = <7>; |
206 | ts,i-drive = <1>; | 207 | st,i-drive = <1>; |
207 | }; | 208 | }; |
208 | }; | 209 | }; |
209 | 210 | ||
diff --git a/arch/arm/boot/dts/imx53-qsb-common.dtsi b/arch/arm/boot/dts/imx53-qsb-common.dtsi index 3f825a6813da..ede04fa4161f 100644 --- a/arch/arm/boot/dts/imx53-qsb-common.dtsi +++ b/arch/arm/boot/dts/imx53-qsb-common.dtsi | |||
@@ -14,7 +14,8 @@ | |||
14 | 14 | ||
15 | / { | 15 | / { |
16 | memory { | 16 | memory { |
17 | reg = <0x70000000 0x40000000>; | 17 | reg = <0x70000000 0x20000000>, |
18 | <0xb0000000 0x20000000>; | ||
18 | }; | 19 | }; |
19 | 20 | ||
20 | display0: display@di0 { | 21 | display0: display@di0 { |
diff --git a/arch/arm/boot/dts/imx53-tx53-x03x.dts b/arch/arm/boot/dts/imx53-tx53-x03x.dts index 0217dde3b36b..3b73e81dc3f0 100644 --- a/arch/arm/boot/dts/imx53-tx53-x03x.dts +++ b/arch/arm/boot/dts/imx53-tx53-x03x.dts | |||
@@ -25,12 +25,17 @@ | |||
25 | soc { | 25 | soc { |
26 | display: display@di0 { | 26 | display: display@di0 { |
27 | compatible = "fsl,imx-parallel-display"; | 27 | compatible = "fsl,imx-parallel-display"; |
28 | crtcs = <&ipu 0>; | ||
29 | interface-pix-fmt = "rgb24"; | 28 | interface-pix-fmt = "rgb24"; |
30 | pinctrl-names = "default"; | 29 | pinctrl-names = "default"; |
31 | pinctrl-0 = <&pinctrl_rgb24_vga1>; | 30 | pinctrl-0 = <&pinctrl_rgb24_vga1>; |
32 | status = "okay"; | 31 | status = "okay"; |
33 | 32 | ||
33 | port { | ||
34 | display0_in: endpoint { | ||
35 | remote-endpoint = <&ipu_di0_disp0>; | ||
36 | }; | ||
37 | }; | ||
38 | |||
34 | display-timings { | 39 | display-timings { |
35 | VGA { | 40 | VGA { |
36 | clock-frequency = <25200000>; | 41 | clock-frequency = <25200000>; |
@@ -293,6 +298,10 @@ | |||
293 | }; | 298 | }; |
294 | }; | 299 | }; |
295 | 300 | ||
301 | &ipu_di0_disp0 { | ||
302 | remote-endpoint = <&display0_in>; | ||
303 | }; | ||
304 | |||
296 | &kpp { | 305 | &kpp { |
297 | pinctrl-names = "default"; | 306 | pinctrl-names = "default"; |
298 | pinctrl-0 = <&pinctrl_kpp>; | 307 | pinctrl-0 = <&pinctrl_kpp>; |
diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi index b57ab57740f6..9c2bff2252d0 100644 --- a/arch/arm/boot/dts/imx53.dtsi +++ b/arch/arm/boot/dts/imx53.dtsi | |||
@@ -70,21 +70,25 @@ | |||
70 | 70 | ||
71 | ckil { | 71 | ckil { |
72 | compatible = "fsl,imx-ckil", "fixed-clock"; | 72 | compatible = "fsl,imx-ckil", "fixed-clock"; |
73 | #clock-cells = <0>; | ||
73 | clock-frequency = <32768>; | 74 | clock-frequency = <32768>; |
74 | }; | 75 | }; |
75 | 76 | ||
76 | ckih1 { | 77 | ckih1 { |
77 | compatible = "fsl,imx-ckih1", "fixed-clock"; | 78 | compatible = "fsl,imx-ckih1", "fixed-clock"; |
79 | #clock-cells = <0>; | ||
78 | clock-frequency = <22579200>; | 80 | clock-frequency = <22579200>; |
79 | }; | 81 | }; |
80 | 82 | ||
81 | ckih2 { | 83 | ckih2 { |
82 | compatible = "fsl,imx-ckih2", "fixed-clock"; | 84 | compatible = "fsl,imx-ckih2", "fixed-clock"; |
85 | #clock-cells = <0>; | ||
83 | clock-frequency = <0>; | 86 | clock-frequency = <0>; |
84 | }; | 87 | }; |
85 | 88 | ||
86 | osc { | 89 | osc { |
87 | compatible = "fsl,imx-osc", "fixed-clock"; | 90 | compatible = "fsl,imx-osc", "fixed-clock"; |
91 | #clock-cells = <0>; | ||
88 | clock-frequency = <24000000>; | 92 | clock-frequency = <24000000>; |
89 | }; | 93 | }; |
90 | }; | 94 | }; |
@@ -430,7 +434,7 @@ | |||
430 | 434 | ||
431 | port { | 435 | port { |
432 | lvds1_in: endpoint { | 436 | lvds1_in: endpoint { |
433 | remote-endpoint = <&ipu_di0_lvds0>; | 437 | remote-endpoint = <&ipu_di1_lvds1>; |
434 | }; | 438 | }; |
435 | }; | 439 | }; |
436 | }; | 440 | }; |
diff --git a/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts b/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts index a63bbb3d46bb..e4ae38fd0269 100644 --- a/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts +++ b/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts | |||
@@ -19,7 +19,10 @@ | |||
19 | compatible = "dmo,imx6q-edmqmx6", "fsl,imx6q"; | 19 | compatible = "dmo,imx6q-edmqmx6", "fsl,imx6q"; |
20 | 20 | ||
21 | aliases { | 21 | aliases { |
22 | gpio7 = &stmpe_gpio; | 22 | gpio7 = &stmpe_gpio1; |
23 | gpio8 = &stmpe_gpio2; | ||
24 | stmpe-i2c0 = &stmpe1; | ||
25 | stmpe-i2c1 = &stmpe2; | ||
23 | }; | 26 | }; |
24 | 27 | ||
25 | memory { | 28 | memory { |
@@ -40,13 +43,15 @@ | |||
40 | regulator-always-on; | 43 | regulator-always-on; |
41 | }; | 44 | }; |
42 | 45 | ||
43 | reg_usb_otg_vbus: regulator@1 { | 46 | reg_usb_otg_switch: regulator@1 { |
44 | compatible = "regulator-fixed"; | 47 | compatible = "regulator-fixed"; |
45 | reg = <1>; | 48 | reg = <1>; |
46 | regulator-name = "usb_otg_vbus"; | 49 | regulator-name = "usb_otg_switch"; |
47 | regulator-min-microvolt = <5000000>; | 50 | regulator-min-microvolt = <5000000>; |
48 | regulator-max-microvolt = <5000000>; | 51 | regulator-max-microvolt = <5000000>; |
49 | gpio = <&gpio7 12 0>; | 52 | gpio = <&gpio7 12 0>; |
53 | regulator-boot-on; | ||
54 | regulator-always-on; | ||
50 | }; | 55 | }; |
51 | 56 | ||
52 | reg_usb_host1: regulator@2 { | 57 | reg_usb_host1: regulator@2 { |
@@ -65,23 +70,23 @@ | |||
65 | 70 | ||
66 | led-blue { | 71 | led-blue { |
67 | label = "blue"; | 72 | label = "blue"; |
68 | gpios = <&stmpe_gpio 8 GPIO_ACTIVE_HIGH>; | 73 | gpios = <&stmpe_gpio1 8 GPIO_ACTIVE_HIGH>; |
69 | linux,default-trigger = "heartbeat"; | 74 | linux,default-trigger = "heartbeat"; |
70 | }; | 75 | }; |
71 | 76 | ||
72 | led-green { | 77 | led-green { |
73 | label = "green"; | 78 | label = "green"; |
74 | gpios = <&stmpe_gpio 9 GPIO_ACTIVE_HIGH>; | 79 | gpios = <&stmpe_gpio1 9 GPIO_ACTIVE_HIGH>; |
75 | }; | 80 | }; |
76 | 81 | ||
77 | led-pink { | 82 | led-pink { |
78 | label = "pink"; | 83 | label = "pink"; |
79 | gpios = <&stmpe_gpio 10 GPIO_ACTIVE_HIGH>; | 84 | gpios = <&stmpe_gpio1 10 GPIO_ACTIVE_HIGH>; |
80 | }; | 85 | }; |
81 | 86 | ||
82 | led-red { | 87 | led-red { |
83 | label = "red"; | 88 | label = "red"; |
84 | gpios = <&stmpe_gpio 11 GPIO_ACTIVE_HIGH>; | 89 | gpios = <&stmpe_gpio1 11 GPIO_ACTIVE_HIGH>; |
85 | }; | 90 | }; |
86 | }; | 91 | }; |
87 | }; | 92 | }; |
@@ -99,7 +104,8 @@ | |||
99 | clock-frequency = <100000>; | 104 | clock-frequency = <100000>; |
100 | pinctrl-names = "default"; | 105 | pinctrl-names = "default"; |
101 | pinctrl-0 = <&pinctrl_i2c2 | 106 | pinctrl-0 = <&pinctrl_i2c2 |
102 | &pinctrl_stmpe>; | 107 | &pinctrl_stmpe1 |
108 | &pinctrl_stmpe2>; | ||
103 | status = "okay"; | 109 | status = "okay"; |
104 | 110 | ||
105 | pmic: pfuze100@08 { | 111 | pmic: pfuze100@08 { |
@@ -205,13 +211,25 @@ | |||
205 | }; | 211 | }; |
206 | }; | 212 | }; |
207 | 213 | ||
208 | stmpe: stmpe1601@40 { | 214 | stmpe1: stmpe1601@40 { |
209 | compatible = "st,stmpe1601"; | 215 | compatible = "st,stmpe1601"; |
210 | reg = <0x40>; | 216 | reg = <0x40>; |
211 | interrupts = <30 0>; | 217 | interrupts = <30 0>; |
212 | interrupt-parent = <&gpio3>; | 218 | interrupt-parent = <&gpio3>; |
213 | 219 | ||
214 | stmpe_gpio: stmpe_gpio { | 220 | stmpe_gpio1: stmpe_gpio { |
221 | #gpio-cells = <2>; | ||
222 | compatible = "st,stmpe-gpio"; | ||
223 | }; | ||
224 | }; | ||
225 | |||
226 | stmpe2: stmpe1601@44 { | ||
227 | compatible = "st,stmpe1601"; | ||
228 | reg = <0x44>; | ||
229 | interrupts = <2 0>; | ||
230 | interrupt-parent = <&gpio5>; | ||
231 | |||
232 | stmpe_gpio2: stmpe_gpio { | ||
215 | #gpio-cells = <2>; | 233 | #gpio-cells = <2>; |
216 | compatible = "st,stmpe-gpio"; | 234 | compatible = "st,stmpe-gpio"; |
217 | }; | 235 | }; |
@@ -273,10 +291,14 @@ | |||
273 | >; | 291 | >; |
274 | }; | 292 | }; |
275 | 293 | ||
276 | pinctrl_stmpe: stmpegrp { | 294 | pinctrl_stmpe1: stmpe1grp { |
277 | fsl,pins = <MX6QDL_PAD_EIM_D30__GPIO3_IO30 0x80000000>; | 295 | fsl,pins = <MX6QDL_PAD_EIM_D30__GPIO3_IO30 0x80000000>; |
278 | }; | 296 | }; |
279 | 297 | ||
298 | pinctrl_stmpe2: stmpe2grp { | ||
299 | fsl,pins = <MX6QDL_PAD_EIM_A25__GPIO5_IO02 0x80000000>; | ||
300 | }; | ||
301 | |||
280 | pinctrl_uart1: uart1grp { | 302 | pinctrl_uart1: uart1grp { |
281 | fsl,pins = < | 303 | fsl,pins = < |
282 | MX6QDL_PAD_SD3_DAT7__UART1_TX_DATA 0x1b0b1 | 304 | MX6QDL_PAD_SD3_DAT7__UART1_TX_DATA 0x1b0b1 |
@@ -293,7 +315,7 @@ | |||
293 | 315 | ||
294 | pinctrl_usbotg: usbotggrp { | 316 | pinctrl_usbotg: usbotggrp { |
295 | fsl,pins = < | 317 | fsl,pins = < |
296 | MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x17059 | 318 | MX6QDL_PAD_ENET_RX_ER__USB_OTG_ID 0x17059 |
297 | >; | 319 | >; |
298 | }; | 320 | }; |
299 | 321 | ||
@@ -344,11 +366,11 @@ | |||
344 | &usbh1 { | 366 | &usbh1 { |
345 | vbus-supply = <®_usb_host1>; | 367 | vbus-supply = <®_usb_host1>; |
346 | disable-over-current; | 368 | disable-over-current; |
369 | dr_mode = "host"; | ||
347 | status = "okay"; | 370 | status = "okay"; |
348 | }; | 371 | }; |
349 | 372 | ||
350 | &usbotg { | 373 | &usbotg { |
351 | vbus-supply = <®_usb_otg_vbus>; | ||
352 | pinctrl-names = "default"; | 374 | pinctrl-names = "default"; |
353 | pinctrl-0 = <&pinctrl_usbotg>; | 375 | pinctrl-0 = <&pinctrl_usbotg>; |
354 | disable-over-current; | 376 | disable-over-current; |
diff --git a/arch/arm/boot/dts/imx6q-gw5400-a.dts b/arch/arm/boot/dts/imx6q-gw5400-a.dts index 902f98310481..e51bb3f0fd56 100644 --- a/arch/arm/boot/dts/imx6q-gw5400-a.dts +++ b/arch/arm/boot/dts/imx6q-gw5400-a.dts | |||
@@ -487,9 +487,6 @@ | |||
487 | 487 | ||
488 | &ldb { | 488 | &ldb { |
489 | status = "okay"; | 489 | status = "okay"; |
490 | lvds-channel@0 { | ||
491 | crtcs = <&ipu1 0>, <&ipu1 1>, <&ipu2 0>, <&ipu2 1>; | ||
492 | }; | ||
493 | }; | 490 | }; |
494 | 491 | ||
495 | &pcie { | 492 | &pcie { |
diff --git a/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi index 8e99c9a9bc76..035d3a85c318 100644 --- a/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi +++ b/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | |||
@@ -436,9 +436,6 @@ | |||
436 | 436 | ||
437 | &ldb { | 437 | &ldb { |
438 | status = "okay"; | 438 | status = "okay"; |
439 | lvds-channel@0 { | ||
440 | crtcs = <&ipu1 0>, <&ipu1 1>; | ||
441 | }; | ||
442 | }; | 439 | }; |
443 | 440 | ||
444 | &pcie { | 441 | &pcie { |
diff --git a/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi b/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi index a3cb2fff8f61..d16066608e21 100644 --- a/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi +++ b/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi | |||
@@ -26,25 +26,25 @@ | |||
26 | /* GPIO16 -> AR8035 25MHz */ | 26 | /* GPIO16 -> AR8035 25MHz */ |
27 | MX6QDL_PAD_GPIO_16__ENET_REF_CLK 0xc0000000 | 27 | MX6QDL_PAD_GPIO_16__ENET_REF_CLK 0xc0000000 |
28 | MX6QDL_PAD_RGMII_TXC__RGMII_TXC 0x80000000 | 28 | MX6QDL_PAD_RGMII_TXC__RGMII_TXC 0x80000000 |
29 | MX6QDL_PAD_RGMII_TD0__RGMII_TD0 0x1b0b0 | 29 | MX6QDL_PAD_RGMII_TD0__RGMII_TD0 0x1b030 |
30 | MX6QDL_PAD_RGMII_TD1__RGMII_TD1 0x1b0b0 | 30 | MX6QDL_PAD_RGMII_TD1__RGMII_TD1 0x1b030 |
31 | MX6QDL_PAD_RGMII_TD2__RGMII_TD2 0x1b0b0 | 31 | MX6QDL_PAD_RGMII_TD2__RGMII_TD2 0x1b030 |
32 | MX6QDL_PAD_RGMII_TD3__RGMII_TD3 0x1b0b0 | 32 | MX6QDL_PAD_RGMII_TD3__RGMII_TD3 0x1b030 |
33 | MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL 0x1b0b0 | 33 | MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL 0x1b030 |
34 | /* AR8035 CLK_25M --> ENET_REF_CLK (V22) */ | 34 | /* AR8035 CLK_25M --> ENET_REF_CLK (V22) */ |
35 | MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x0a0b1 | 35 | MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x0a0b1 |
36 | /* AR8035 pin strapping: IO voltage: pull up */ | 36 | /* AR8035 pin strapping: IO voltage: pull up */ |
37 | MX6QDL_PAD_RGMII_RXC__RGMII_RXC 0x1b0b0 | 37 | MX6QDL_PAD_RGMII_RXC__RGMII_RXC 0x1b030 |
38 | /* AR8035 pin strapping: PHYADDR#0: pull down */ | 38 | /* AR8035 pin strapping: PHYADDR#0: pull down */ |
39 | MX6QDL_PAD_RGMII_RD0__RGMII_RD0 0x130b0 | 39 | MX6QDL_PAD_RGMII_RD0__RGMII_RD0 0x13030 |
40 | /* AR8035 pin strapping: PHYADDR#1: pull down */ | 40 | /* AR8035 pin strapping: PHYADDR#1: pull down */ |
41 | MX6QDL_PAD_RGMII_RD1__RGMII_RD1 0x130b0 | 41 | MX6QDL_PAD_RGMII_RD1__RGMII_RD1 0x13030 |
42 | /* AR8035 pin strapping: MODE#1: pull up */ | 42 | /* AR8035 pin strapping: MODE#1: pull up */ |
43 | MX6QDL_PAD_RGMII_RD2__RGMII_RD2 0x1b0b0 | 43 | MX6QDL_PAD_RGMII_RD2__RGMII_RD2 0x1b030 |
44 | /* AR8035 pin strapping: MODE#3: pull up */ | 44 | /* AR8035 pin strapping: MODE#3: pull up */ |
45 | MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1b0b0 | 45 | MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1b030 |
46 | /* AR8035 pin strapping: MODE#0: pull down */ | 46 | /* AR8035 pin strapping: MODE#0: pull down */ |
47 | MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x130b0 | 47 | MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x13030 |
48 | 48 | ||
49 | /* | 49 | /* |
50 | * As the RMII pins are also connected to RGMII | 50 | * As the RMII pins are also connected to RGMII |
diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi index 55cb926fa3f7..eca0971d4db1 100644 --- a/arch/arm/boot/dts/imx6qdl.dtsi +++ b/arch/arm/boot/dts/imx6qdl.dtsi | |||
@@ -10,6 +10,8 @@ | |||
10 | * http://www.gnu.org/copyleft/gpl.html | 10 | * http://www.gnu.org/copyleft/gpl.html |
11 | */ | 11 | */ |
12 | 12 | ||
13 | #include <dt-bindings/interrupt-controller/arm-gic.h> | ||
14 | |||
13 | #include "skeleton.dtsi" | 15 | #include "skeleton.dtsi" |
14 | 16 | ||
15 | / { | 17 | / { |
@@ -46,8 +48,6 @@ | |||
46 | intc: interrupt-controller@00a01000 { | 48 | intc: interrupt-controller@00a01000 { |
47 | compatible = "arm,cortex-a9-gic"; | 49 | compatible = "arm,cortex-a9-gic"; |
48 | #interrupt-cells = <3>; | 50 | #interrupt-cells = <3>; |
49 | #address-cells = <1>; | ||
50 | #size-cells = <1>; | ||
51 | interrupt-controller; | 51 | interrupt-controller; |
52 | reg = <0x00a01000 0x1000>, | 52 | reg = <0x00a01000 0x1000>, |
53 | <0x00a00100 0x100>; | 53 | <0x00a00100 0x100>; |
@@ -59,16 +59,19 @@ | |||
59 | 59 | ||
60 | ckil { | 60 | ckil { |
61 | compatible = "fsl,imx-ckil", "fixed-clock"; | 61 | compatible = "fsl,imx-ckil", "fixed-clock"; |
62 | #clock-cells = <0>; | ||
62 | clock-frequency = <32768>; | 63 | clock-frequency = <32768>; |
63 | }; | 64 | }; |
64 | 65 | ||
65 | ckih1 { | 66 | ckih1 { |
66 | compatible = "fsl,imx-ckih1", "fixed-clock"; | 67 | compatible = "fsl,imx-ckih1", "fixed-clock"; |
68 | #clock-cells = <0>; | ||
67 | clock-frequency = <0>; | 69 | clock-frequency = <0>; |
68 | }; | 70 | }; |
69 | 71 | ||
70 | osc { | 72 | osc { |
71 | compatible = "fsl,imx-osc", "fixed-clock"; | 73 | compatible = "fsl,imx-osc", "fixed-clock"; |
74 | #clock-cells = <0>; | ||
72 | clock-frequency = <24000000>; | 75 | clock-frequency = <24000000>; |
73 | }; | 76 | }; |
74 | }; | 77 | }; |
@@ -138,6 +141,12 @@ | |||
138 | 0x82000000 0 0x01000000 0x01000000 0 0x00f00000>; /* non-prefetchable memory */ | 141 | 0x82000000 0 0x01000000 0x01000000 0 0x00f00000>; /* non-prefetchable memory */ |
139 | num-lanes = <1>; | 142 | num-lanes = <1>; |
140 | interrupts = <0 123 IRQ_TYPE_LEVEL_HIGH>; | 143 | interrupts = <0 123 IRQ_TYPE_LEVEL_HIGH>; |
144 | #interrupt-cells = <1>; | ||
145 | interrupt-map-mask = <0 0 0 0x7>; | ||
146 | interrupt-map = <0 0 0 1 &intc GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>, | ||
147 | <0 0 0 2 &intc GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>, | ||
148 | <0 0 0 3 &intc GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>, | ||
149 | <0 0 0 4 &intc GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>; | ||
141 | clocks = <&clks 189>, <&clks 187>, <&clks 206>, <&clks 144>; | 150 | clocks = <&clks 189>, <&clks 187>, <&clks 206>, <&clks 144>; |
142 | clock-names = "pcie_ref_125m", "sata_ref_100m", "lvds_gate", "pcie_axi"; | 151 | clock-names = "pcie_ref_125m", "sata_ref_100m", "lvds_gate", "pcie_axi"; |
143 | status = "disabled"; | 152 | status = "disabled"; |
diff --git a/arch/arm/boot/dts/imx6sl-evk.dts b/arch/arm/boot/dts/imx6sl-evk.dts index 864d8dfb51ca..a8d9a93fab85 100644 --- a/arch/arm/boot/dts/imx6sl-evk.dts +++ b/arch/arm/boot/dts/imx6sl-evk.dts | |||
@@ -282,6 +282,7 @@ | |||
282 | MX6SL_PAD_ECSPI1_MISO__ECSPI1_MISO 0x100b1 | 282 | MX6SL_PAD_ECSPI1_MISO__ECSPI1_MISO 0x100b1 |
283 | MX6SL_PAD_ECSPI1_MOSI__ECSPI1_MOSI 0x100b1 | 283 | MX6SL_PAD_ECSPI1_MOSI__ECSPI1_MOSI 0x100b1 |
284 | MX6SL_PAD_ECSPI1_SCLK__ECSPI1_SCLK 0x100b1 | 284 | MX6SL_PAD_ECSPI1_SCLK__ECSPI1_SCLK 0x100b1 |
285 | MX6SL_PAD_ECSPI1_SS0__GPIO4_IO11 0x80000000 | ||
285 | >; | 286 | >; |
286 | }; | 287 | }; |
287 | 288 | ||
diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi index 3cb4941afeef..d26b099260a3 100644 --- a/arch/arm/boot/dts/imx6sl.dtsi +++ b/arch/arm/boot/dts/imx6sl.dtsi | |||
@@ -68,8 +68,6 @@ | |||
68 | intc: interrupt-controller@00a01000 { | 68 | intc: interrupt-controller@00a01000 { |
69 | compatible = "arm,cortex-a9-gic"; | 69 | compatible = "arm,cortex-a9-gic"; |
70 | #interrupt-cells = <3>; | 70 | #interrupt-cells = <3>; |
71 | #address-cells = <1>; | ||
72 | #size-cells = <1>; | ||
73 | interrupt-controller; | 71 | interrupt-controller; |
74 | reg = <0x00a01000 0x1000>, | 72 | reg = <0x00a01000 0x1000>, |
75 | <0x00a00100 0x100>; | 73 | <0x00a00100 0x100>; |
@@ -81,11 +79,13 @@ | |||
81 | 79 | ||
82 | ckil { | 80 | ckil { |
83 | compatible = "fixed-clock"; | 81 | compatible = "fixed-clock"; |
82 | #clock-cells = <0>; | ||
84 | clock-frequency = <32768>; | 83 | clock-frequency = <32768>; |
85 | }; | 84 | }; |
86 | 85 | ||
87 | osc { | 86 | osc { |
88 | compatible = "fixed-clock"; | 87 | compatible = "fixed-clock"; |
88 | #clock-cells = <0>; | ||
89 | clock-frequency = <24000000>; | 89 | clock-frequency = <24000000>; |
90 | }; | 90 | }; |
91 | }; | 91 | }; |
diff --git a/arch/arm/boot/dts/kirkwood-b3.dts b/arch/arm/boot/dts/kirkwood-b3.dts index 40791053106b..6becedebaa4e 100644 --- a/arch/arm/boot/dts/kirkwood-b3.dts +++ b/arch/arm/boot/dts/kirkwood-b3.dts | |||
@@ -75,7 +75,7 @@ | |||
75 | m25p16@0 { | 75 | m25p16@0 { |
76 | #address-cells = <1>; | 76 | #address-cells = <1>; |
77 | #size-cells = <1>; | 77 | #size-cells = <1>; |
78 | compatible = "m25p16"; | 78 | compatible = "st,m25p16"; |
79 | reg = <0>; | 79 | reg = <0>; |
80 | spi-max-frequency = <40000000>; | 80 | spi-max-frequency = <40000000>; |
81 | mode = <0>; | 81 | mode = <0>; |
diff --git a/arch/arm/boot/dts/kirkwood-cloudbox.dts b/arch/arm/boot/dts/kirkwood-cloudbox.dts index 0e06fd3cee4d..3b62aeeaa3a2 100644 --- a/arch/arm/boot/dts/kirkwood-cloudbox.dts +++ b/arch/arm/boot/dts/kirkwood-cloudbox.dts | |||
@@ -46,7 +46,7 @@ | |||
46 | flash@0 { | 46 | flash@0 { |
47 | #address-cells = <1>; | 47 | #address-cells = <1>; |
48 | #size-cells = <1>; | 48 | #size-cells = <1>; |
49 | compatible = "mx25l4005a"; | 49 | compatible = "mxicy,mx25l4005a"; |
50 | reg = <0>; | 50 | reg = <0>; |
51 | spi-max-frequency = <20000000>; | 51 | spi-max-frequency = <20000000>; |
52 | mode = <0>; | 52 | mode = <0>; |
diff --git a/arch/arm/boot/dts/kirkwood-dreamplug.dts b/arch/arm/boot/dts/kirkwood-dreamplug.dts index ef3463e0ae19..28b3ee369778 100644 --- a/arch/arm/boot/dts/kirkwood-dreamplug.dts +++ b/arch/arm/boot/dts/kirkwood-dreamplug.dts | |||
@@ -43,7 +43,7 @@ | |||
43 | m25p40@0 { | 43 | m25p40@0 { |
44 | #address-cells = <1>; | 44 | #address-cells = <1>; |
45 | #size-cells = <1>; | 45 | #size-cells = <1>; |
46 | compatible = "mx25l1606e"; | 46 | compatible = "mxicy,mx25l1606e"; |
47 | reg = <0>; | 47 | reg = <0>; |
48 | spi-max-frequency = <50000000>; | 48 | spi-max-frequency = <50000000>; |
49 | mode = <0>; | 49 | mode = <0>; |
diff --git a/arch/arm/boot/dts/kirkwood-laplug.dts b/arch/arm/boot/dts/kirkwood-laplug.dts index c9e82eff9bf2..6761ffa2c4ab 100644 --- a/arch/arm/boot/dts/kirkwood-laplug.dts +++ b/arch/arm/boot/dts/kirkwood-laplug.dts | |||
@@ -48,7 +48,7 @@ | |||
48 | status = "okay"; | 48 | status = "okay"; |
49 | 49 | ||
50 | eeprom@50 { | 50 | eeprom@50 { |
51 | compatible = "at,24c04"; | 51 | compatible = "atmel,24c04"; |
52 | pagesize = <16>; | 52 | pagesize = <16>; |
53 | reg = <0x50>; | 53 | reg = <0x50>; |
54 | }; | 54 | }; |
diff --git a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts index 2cb0dc529165..32c6fb4a1162 100644 --- a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts +++ b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | |||
@@ -56,7 +56,7 @@ | |||
56 | flash@0 { | 56 | flash@0 { |
57 | #address-cells = <1>; | 57 | #address-cells = <1>; |
58 | #size-cells = <1>; | 58 | #size-cells = <1>; |
59 | compatible = "mx25l12805d"; | 59 | compatible = "mxicy,mx25l12805d"; |
60 | reg = <0>; | 60 | reg = <0>; |
61 | spi-max-frequency = <50000000>; | 61 | spi-max-frequency = <50000000>; |
62 | mode = <0>; | 62 | mode = <0>; |
diff --git a/arch/arm/boot/dts/kirkwood-ns2-common.dtsi b/arch/arm/boot/dts/kirkwood-ns2-common.dtsi index 743152f31a81..e6e5ec4fe6b9 100644 --- a/arch/arm/boot/dts/kirkwood-ns2-common.dtsi +++ b/arch/arm/boot/dts/kirkwood-ns2-common.dtsi | |||
@@ -32,7 +32,7 @@ | |||
32 | flash@0 { | 32 | flash@0 { |
33 | #address-cells = <1>; | 33 | #address-cells = <1>; |
34 | #size-cells = <1>; | 34 | #size-cells = <1>; |
35 | compatible = "mx25l4005a"; | 35 | compatible = "mxicy,mx25l4005a"; |
36 | reg = <0>; | 36 | reg = <0>; |
37 | spi-max-frequency = <20000000>; | 37 | spi-max-frequency = <20000000>; |
38 | mode = <0>; | 38 | mode = <0>; |
@@ -50,7 +50,7 @@ | |||
50 | status = "okay"; | 50 | status = "okay"; |
51 | 51 | ||
52 | eeprom@50 { | 52 | eeprom@50 { |
53 | compatible = "at,24c04"; | 53 | compatible = "atmel,24c04"; |
54 | pagesize = <16>; | 54 | pagesize = <16>; |
55 | reg = <0x50>; | 55 | reg = <0x50>; |
56 | }; | 56 | }; |
diff --git a/arch/arm/boot/dts/kirkwood-nsa310.dts b/arch/arm/boot/dts/kirkwood-nsa310.dts index 03fa24cf3344..0a07af9d8e58 100644 --- a/arch/arm/boot/dts/kirkwood-nsa310.dts +++ b/arch/arm/boot/dts/kirkwood-nsa310.dts | |||
@@ -104,7 +104,7 @@ | |||
104 | status = "okay"; | 104 | status = "okay"; |
105 | 105 | ||
106 | adt7476: adt7476a@2e { | 106 | adt7476: adt7476a@2e { |
107 | compatible = "adt7476"; | 107 | compatible = "adi,adt7476"; |
108 | reg = <0x2e>; | 108 | reg = <0x2e>; |
109 | }; | 109 | }; |
110 | }; | 110 | }; |
diff --git a/arch/arm/boot/dts/kirkwood-nsa310a.dts b/arch/arm/boot/dts/kirkwood-nsa310a.dts index a5e779452867..27ca6a79c48a 100644 --- a/arch/arm/boot/dts/kirkwood-nsa310a.dts +++ b/arch/arm/boot/dts/kirkwood-nsa310a.dts | |||
@@ -94,7 +94,7 @@ | |||
94 | status = "okay"; | 94 | status = "okay"; |
95 | 95 | ||
96 | lm85: lm85@2e { | 96 | lm85: lm85@2e { |
97 | compatible = "lm85"; | 97 | compatible = "national,lm85"; |
98 | reg = <0x2e>; | 98 | reg = <0x2e>; |
99 | }; | 99 | }; |
100 | }; | 100 | }; |
diff --git a/arch/arm/boot/dts/kirkwood-openblocks_a6.dts b/arch/arm/boot/dts/kirkwood-openblocks_a6.dts index b88da9392c32..0650beafc1de 100644 --- a/arch/arm/boot/dts/kirkwood-openblocks_a6.dts +++ b/arch/arm/boot/dts/kirkwood-openblocks_a6.dts | |||
@@ -40,7 +40,7 @@ | |||
40 | pinctrl-names = "default"; | 40 | pinctrl-names = "default"; |
41 | 41 | ||
42 | s35390a: s35390a@30 { | 42 | s35390a: s35390a@30 { |
43 | compatible = "s35390a"; | 43 | compatible = "sii,s35390a"; |
44 | reg = <0x30>; | 44 | reg = <0x30>; |
45 | }; | 45 | }; |
46 | }; | 46 | }; |
diff --git a/arch/arm/boot/dts/kirkwood-openblocks_a7.dts b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts index b2f7cae06839..38520a287514 100644 --- a/arch/arm/boot/dts/kirkwood-openblocks_a7.dts +++ b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts | |||
@@ -52,7 +52,7 @@ | |||
52 | pinctrl-names = "default"; | 52 | pinctrl-names = "default"; |
53 | 53 | ||
54 | s24c02: s24c02@50 { | 54 | s24c02: s24c02@50 { |
55 | compatible = "24c02"; | 55 | compatible = "atmel,24c02"; |
56 | reg = <0x50>; | 56 | reg = <0x50>; |
57 | }; | 57 | }; |
58 | }; | 58 | }; |
diff --git a/arch/arm/boot/dts/omap3-beagle-xm-ab.dts b/arch/arm/boot/dts/omap3-beagle-xm-ab.dts new file mode 100644 index 000000000000..7ac3bcf59d59 --- /dev/null +++ b/arch/arm/boot/dts/omap3-beagle-xm-ab.dts | |||
@@ -0,0 +1,16 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/ | ||
3 | * | ||
4 | * This program is free software; you can redistribute it and/or modify | ||
5 | * it under the terms of the GNU General Public License version 2 as | ||
6 | * published by the Free Software Foundation. | ||
7 | */ | ||
8 | |||
9 | #include "omap3-beagle-xm.dts" | ||
10 | |||
11 | / { | ||
12 | /* HS USB Port 2 Power enable was inverted with the xM C */ | ||
13 | hsusb2_power: hsusb2_power_reg { | ||
14 | enable-active-high; | ||
15 | }; | ||
16 | }; | ||
diff --git a/arch/arm/boot/dts/omap3-devkit8000.dts b/arch/arm/boot/dts/omap3-devkit8000.dts index bf5a515a3247..da402f0fdab4 100644 --- a/arch/arm/boot/dts/omap3-devkit8000.dts +++ b/arch/arm/boot/dts/omap3-devkit8000.dts | |||
@@ -112,7 +112,6 @@ | |||
112 | reg = <0 0 0>; /* CS0, offset 0 */ | 112 | reg = <0 0 0>; /* CS0, offset 0 */ |
113 | nand-bus-width = <16>; | 113 | nand-bus-width = <16>; |
114 | 114 | ||
115 | gpmc,device-nand; | ||
116 | gpmc,sync-clk-ps = <0>; | 115 | gpmc,sync-clk-ps = <0>; |
117 | gpmc,cs-on-ns = <0>; | 116 | gpmc,cs-on-ns = <0>; |
118 | gpmc,cs-rd-off-ns = <44>; | 117 | gpmc,cs-rd-off-ns = <44>; |
diff --git a/arch/arm/boot/dts/omap3-lilly-a83x.dtsi b/arch/arm/boot/dts/omap3-lilly-a83x.dtsi index 6369d9f43ca2..cc1dce6978f5 100644 --- a/arch/arm/boot/dts/omap3-lilly-a83x.dtsi +++ b/arch/arm/boot/dts/omap3-lilly-a83x.dtsi | |||
@@ -368,7 +368,6 @@ | |||
368 | /* no elm on omap3 */ | 368 | /* no elm on omap3 */ |
369 | 369 | ||
370 | gpmc,mux-add-data = <0>; | 370 | gpmc,mux-add-data = <0>; |
371 | gpmc,device-nand; | ||
372 | gpmc,device-width = <2>; | 371 | gpmc,device-width = <2>; |
373 | gpmc,wait-pin = <0>; | 372 | gpmc,wait-pin = <0>; |
374 | gpmc,wait-monitoring-ns = <0>; | 373 | gpmc,wait-monitoring-ns = <0>; |
diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi index 5e5790f631eb..acb9019dc437 100644 --- a/arch/arm/boot/dts/omap3.dtsi +++ b/arch/arm/boot/dts/omap3.dtsi | |||
@@ -74,7 +74,7 @@ | |||
74 | /* | 74 | /* |
75 | * XXX: Use a flat representation of the OMAP3 interconnect. | 75 | * XXX: Use a flat representation of the OMAP3 interconnect. |
76 | * The real OMAP interconnect network is quite complex. | 76 | * The real OMAP interconnect network is quite complex. |
77 | * Since that will not bring real advantage to represent that in DT for | 77 | * Since it will not bring real advantage to represent that in DT for |
78 | * the moment, just use a fake OCP bus entry to represent the whole bus | 78 | * the moment, just use a fake OCP bus entry to represent the whole bus |
79 | * hierarchy. | 79 | * hierarchy. |
80 | */ | 80 | */ |
diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi index 27fcac874742..649b5cd38b40 100644 --- a/arch/arm/boot/dts/omap4.dtsi +++ b/arch/arm/boot/dts/omap4.dtsi | |||
@@ -72,7 +72,7 @@ | |||
72 | }; | 72 | }; |
73 | 73 | ||
74 | /* | 74 | /* |
75 | * The soc node represents the soc top level view. It is uses for IPs | 75 | * The soc node represents the soc top level view. It is used for IPs |
76 | * that are not memory mapped in the MPU view or for the MPU itself. | 76 | * that are not memory mapped in the MPU view or for the MPU itself. |
77 | */ | 77 | */ |
78 | soc { | 78 | soc { |
@@ -96,7 +96,7 @@ | |||
96 | /* | 96 | /* |
97 | * XXX: Use a flat representation of the OMAP4 interconnect. | 97 | * XXX: Use a flat representation of the OMAP4 interconnect. |
98 | * The real OMAP interconnect network is quite complex. | 98 | * The real OMAP interconnect network is quite complex. |
99 | * Since that will not bring real advantage to represent that in DT for | 99 | * Since it will not bring real advantage to represent that in DT for |
100 | * the moment, just use a fake OCP bus entry to represent the whole bus | 100 | * the moment, just use a fake OCP bus entry to represent the whole bus |
101 | * hierarchy. | 101 | * hierarchy. |
102 | */ | 102 | */ |
diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi index 6f3de22fb266..f8c9855ce587 100644 --- a/arch/arm/boot/dts/omap5.dtsi +++ b/arch/arm/boot/dts/omap5.dtsi | |||
@@ -93,7 +93,7 @@ | |||
93 | }; | 93 | }; |
94 | 94 | ||
95 | /* | 95 | /* |
96 | * The soc node represents the soc top level view. It is uses for IPs | 96 | * The soc node represents the soc top level view. It is used for IPs |
97 | * that are not memory mapped in the MPU view or for the MPU itself. | 97 | * that are not memory mapped in the MPU view or for the MPU itself. |
98 | */ | 98 | */ |
99 | soc { | 99 | soc { |
@@ -107,7 +107,7 @@ | |||
107 | /* | 107 | /* |
108 | * XXX: Use a flat representation of the OMAP3 interconnect. | 108 | * XXX: Use a flat representation of the OMAP3 interconnect. |
109 | * The real OMAP interconnect network is quite complex. | 109 | * The real OMAP interconnect network is quite complex. |
110 | * Since that will not bring real advantage to represent that in DT for | 110 | * Since it will not bring real advantage to represent that in DT for |
111 | * the moment, just use a fake OCP bus entry to represent the whole bus | 111 | * the moment, just use a fake OCP bus entry to represent the whole bus |
112 | * hierarchy. | 112 | * hierarchy. |
113 | */ | 113 | */ |
@@ -813,6 +813,12 @@ | |||
813 | <0x4a084c00 0x40>; | 813 | <0x4a084c00 0x40>; |
814 | reg-names = "phy_rx", "phy_tx", "pll_ctrl"; | 814 | reg-names = "phy_rx", "phy_tx", "pll_ctrl"; |
815 | ctrl-module = <&omap_control_usb3phy>; | 815 | ctrl-module = <&omap_control_usb3phy>; |
816 | clocks = <&usb_phy_cm_clk32k>, | ||
817 | <&sys_clkin>, | ||
818 | <&usb_otg_ss_refclk960m>; | ||
819 | clock-names = "wkupclk", | ||
820 | "sysclk", | ||
821 | "refclk"; | ||
816 | #phy-cells = <0>; | 822 | #phy-cells = <0>; |
817 | }; | 823 | }; |
818 | }; | 824 | }; |
diff --git a/arch/arm/boot/dts/r8a7740.dtsi b/arch/arm/boot/dts/r8a7740.dtsi index 8280884bfa59..2551e9438d35 100644 --- a/arch/arm/boot/dts/r8a7740.dtsi +++ b/arch/arm/boot/dts/r8a7740.dtsi | |||
@@ -28,7 +28,6 @@ | |||
28 | gic: interrupt-controller@c2800000 { | 28 | gic: interrupt-controller@c2800000 { |
29 | compatible = "arm,cortex-a9-gic"; | 29 | compatible = "arm,cortex-a9-gic"; |
30 | #interrupt-cells = <3>; | 30 | #interrupt-cells = <3>; |
31 | #address-cells = <1>; | ||
32 | interrupt-controller; | 31 | interrupt-controller; |
33 | reg = <0xc2800000 0x1000>, | 32 | reg = <0xc2800000 0x1000>, |
34 | <0xc2000000 0x1000>; | 33 | <0xc2000000 0x1000>; |
diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts index 6e99eb2df076..d01048ab3e77 100644 --- a/arch/arm/boot/dts/r8a7790-lager.dts +++ b/arch/arm/boot/dts/r8a7790-lager.dts | |||
@@ -141,12 +141,12 @@ | |||
141 | }; | 141 | }; |
142 | 142 | ||
143 | sdhi0_pins: sd0 { | 143 | sdhi0_pins: sd0 { |
144 | renesas,gpios = "sdhi0_data4", "sdhi0_ctrl"; | 144 | renesas,groups = "sdhi0_data4", "sdhi0_ctrl"; |
145 | renesas,function = "sdhi0"; | 145 | renesas,function = "sdhi0"; |
146 | }; | 146 | }; |
147 | 147 | ||
148 | sdhi2_pins: sd2 { | 148 | sdhi2_pins: sd2 { |
149 | renesas,gpios = "sdhi2_data4", "sdhi2_ctrl"; | 149 | renesas,groups = "sdhi2_data4", "sdhi2_ctrl"; |
150 | renesas,function = "sdhi2"; | 150 | renesas,function = "sdhi2"; |
151 | }; | 151 | }; |
152 | 152 | ||
diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts index bdd73e6657b2..de1b6977c69a 100644 --- a/arch/arm/boot/dts/r8a7791-koelsch.dts +++ b/arch/arm/boot/dts/r8a7791-koelsch.dts | |||
@@ -230,17 +230,17 @@ | |||
230 | }; | 230 | }; |
231 | 231 | ||
232 | sdhi0_pins: sd0 { | 232 | sdhi0_pins: sd0 { |
233 | renesas,gpios = "sdhi0_data4", "sdhi0_ctrl"; | 233 | renesas,groups = "sdhi0_data4", "sdhi0_ctrl"; |
234 | renesas,function = "sdhi0"; | 234 | renesas,function = "sdhi0"; |
235 | }; | 235 | }; |
236 | 236 | ||
237 | sdhi1_pins: sd1 { | 237 | sdhi1_pins: sd1 { |
238 | renesas,gpios = "sdhi1_data4", "sdhi1_ctrl"; | 238 | renesas,groups = "sdhi1_data4", "sdhi1_ctrl"; |
239 | renesas,function = "sdhi1"; | 239 | renesas,function = "sdhi1"; |
240 | }; | 240 | }; |
241 | 241 | ||
242 | sdhi2_pins: sd2 { | 242 | sdhi2_pins: sd2 { |
243 | renesas,gpios = "sdhi2_data4", "sdhi2_ctrl"; | 243 | renesas,groups = "sdhi2_data4", "sdhi2_ctrl"; |
244 | renesas,function = "sdhi2"; | 244 | renesas,function = "sdhi2"; |
245 | }; | 245 | }; |
246 | 246 | ||
diff --git a/arch/arm/boot/dts/rk3188.dtsi b/arch/arm/boot/dts/rk3188.dtsi index bb36596ea205..ed9a70af3e3f 100644 --- a/arch/arm/boot/dts/rk3188.dtsi +++ b/arch/arm/boot/dts/rk3188.dtsi | |||
@@ -149,7 +149,7 @@ | |||
149 | 149 | ||
150 | uart0 { | 150 | uart0 { |
151 | uart0_xfer: uart0-xfer { | 151 | uart0_xfer: uart0-xfer { |
152 | rockchip,pins = <RK_GPIO1 0 RK_FUNC_1 &pcfg_pull_none>, | 152 | rockchip,pins = <RK_GPIO1 0 RK_FUNC_1 &pcfg_pull_up>, |
153 | <RK_GPIO1 1 RK_FUNC_1 &pcfg_pull_none>; | 153 | <RK_GPIO1 1 RK_FUNC_1 &pcfg_pull_none>; |
154 | }; | 154 | }; |
155 | 155 | ||
@@ -164,7 +164,7 @@ | |||
164 | 164 | ||
165 | uart1 { | 165 | uart1 { |
166 | uart1_xfer: uart1-xfer { | 166 | uart1_xfer: uart1-xfer { |
167 | rockchip,pins = <RK_GPIO1 4 RK_FUNC_1 &pcfg_pull_none>, | 167 | rockchip,pins = <RK_GPIO1 4 RK_FUNC_1 &pcfg_pull_up>, |
168 | <RK_GPIO1 5 RK_FUNC_1 &pcfg_pull_none>; | 168 | <RK_GPIO1 5 RK_FUNC_1 &pcfg_pull_none>; |
169 | }; | 169 | }; |
170 | 170 | ||
@@ -179,7 +179,7 @@ | |||
179 | 179 | ||
180 | uart2 { | 180 | uart2 { |
181 | uart2_xfer: uart2-xfer { | 181 | uart2_xfer: uart2-xfer { |
182 | rockchip,pins = <RK_GPIO1 8 RK_FUNC_1 &pcfg_pull_none>, | 182 | rockchip,pins = <RK_GPIO1 8 RK_FUNC_1 &pcfg_pull_up>, |
183 | <RK_GPIO1 9 RK_FUNC_1 &pcfg_pull_none>; | 183 | <RK_GPIO1 9 RK_FUNC_1 &pcfg_pull_none>; |
184 | }; | 184 | }; |
185 | /* no rts / cts for uart2 */ | 185 | /* no rts / cts for uart2 */ |
@@ -187,7 +187,7 @@ | |||
187 | 187 | ||
188 | uart3 { | 188 | uart3 { |
189 | uart3_xfer: uart3-xfer { | 189 | uart3_xfer: uart3-xfer { |
190 | rockchip,pins = <RK_GPIO1 10 RK_FUNC_1 &pcfg_pull_none>, | 190 | rockchip,pins = <RK_GPIO1 10 RK_FUNC_1 &pcfg_pull_up>, |
191 | <RK_GPIO1 11 RK_FUNC_1 &pcfg_pull_none>; | 191 | <RK_GPIO1 11 RK_FUNC_1 &pcfg_pull_none>; |
192 | }; | 192 | }; |
193 | 193 | ||
diff --git a/arch/arm/boot/dts/sh73a0.dtsi b/arch/arm/boot/dts/sh73a0.dtsi index b7bd3b9a6753..5ecf552e1c00 100644 --- a/arch/arm/boot/dts/sh73a0.dtsi +++ b/arch/arm/boot/dts/sh73a0.dtsi | |||
@@ -34,7 +34,6 @@ | |||
34 | gic: interrupt-controller@f0001000 { | 34 | gic: interrupt-controller@f0001000 { |
35 | compatible = "arm,cortex-a9-gic"; | 35 | compatible = "arm,cortex-a9-gic"; |
36 | #interrupt-cells = <3>; | 36 | #interrupt-cells = <3>; |
37 | #address-cells = <1>; | ||
38 | interrupt-controller; | 37 | interrupt-controller; |
39 | reg = <0xf0001000 0x1000>, | 38 | reg = <0xf0001000 0x1000>, |
40 | <0xf0000100 0x100>; | 39 | <0xf0000100 0x100>; |
diff --git a/arch/arm/boot/dts/stih415-pinctrl.dtsi b/arch/arm/boot/dts/stih415-pinctrl.dtsi index f09fb10a3791..81df870e5ee6 100644 --- a/arch/arm/boot/dts/stih415-pinctrl.dtsi +++ b/arch/arm/boot/dts/stih415-pinctrl.dtsi | |||
@@ -49,7 +49,7 @@ | |||
49 | reg = <0xfe61f080 0x4>; | 49 | reg = <0xfe61f080 0x4>; |
50 | reg-names = "irqmux"; | 50 | reg-names = "irqmux"; |
51 | interrupts = <GIC_SPI 180 IRQ_TYPE_LEVEL_HIGH>; | 51 | interrupts = <GIC_SPI 180 IRQ_TYPE_LEVEL_HIGH>; |
52 | interrupts-names = "irqmux"; | 52 | interrupt-names = "irqmux"; |
53 | ranges = <0 0xfe610000 0x5000>; | 53 | ranges = <0 0xfe610000 0x5000>; |
54 | 54 | ||
55 | PIO0: gpio@fe610000 { | 55 | PIO0: gpio@fe610000 { |
@@ -187,7 +187,7 @@ | |||
187 | reg = <0xfee0f080 0x4>; | 187 | reg = <0xfee0f080 0x4>; |
188 | reg-names = "irqmux"; | 188 | reg-names = "irqmux"; |
189 | interrupts = <GIC_SPI 181 IRQ_TYPE_LEVEL_HIGH>; | 189 | interrupts = <GIC_SPI 181 IRQ_TYPE_LEVEL_HIGH>; |
190 | interrupts-names = "irqmux"; | 190 | interrupt-names = "irqmux"; |
191 | ranges = <0 0xfee00000 0x8000>; | 191 | ranges = <0 0xfee00000 0x8000>; |
192 | 192 | ||
193 | PIO5: gpio@fee00000 { | 193 | PIO5: gpio@fee00000 { |
@@ -282,7 +282,7 @@ | |||
282 | reg = <0xfe82f080 0x4>; | 282 | reg = <0xfe82f080 0x4>; |
283 | reg-names = "irqmux"; | 283 | reg-names = "irqmux"; |
284 | interrupts = <GIC_SPI 182 IRQ_TYPE_LEVEL_HIGH>; | 284 | interrupts = <GIC_SPI 182 IRQ_TYPE_LEVEL_HIGH>; |
285 | interrupts-names = "irqmux"; | 285 | interrupt-names = "irqmux"; |
286 | ranges = <0 0xfe820000 0x8000>; | 286 | ranges = <0 0xfe820000 0x8000>; |
287 | 287 | ||
288 | PIO13: gpio@fe820000 { | 288 | PIO13: gpio@fe820000 { |
@@ -423,7 +423,7 @@ | |||
423 | reg = <0xfd6bf080 0x4>; | 423 | reg = <0xfd6bf080 0x4>; |
424 | reg-names = "irqmux"; | 424 | reg-names = "irqmux"; |
425 | interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>; | 425 | interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>; |
426 | interrupts-names = "irqmux"; | 426 | interrupt-names = "irqmux"; |
427 | ranges = <0 0xfd6b0000 0x3000>; | 427 | ranges = <0 0xfd6b0000 0x3000>; |
428 | 428 | ||
429 | PIO100: gpio@fd6b0000 { | 429 | PIO100: gpio@fd6b0000 { |
@@ -460,7 +460,7 @@ | |||
460 | reg = <0xfd33f080 0x4>; | 460 | reg = <0xfd33f080 0x4>; |
461 | reg-names = "irqmux"; | 461 | reg-names = "irqmux"; |
462 | interrupts = <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>; | 462 | interrupts = <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>; |
463 | interrupts-names = "irqmux"; | 463 | interrupt-names = "irqmux"; |
464 | ranges = <0 0xfd330000 0x5000>; | 464 | ranges = <0 0xfd330000 0x5000>; |
465 | 465 | ||
466 | PIO103: gpio@fd330000 { | 466 | PIO103: gpio@fd330000 { |
diff --git a/arch/arm/boot/dts/stih416-pinctrl.dtsi b/arch/arm/boot/dts/stih416-pinctrl.dtsi index aeea304086eb..250d5ecc951e 100644 --- a/arch/arm/boot/dts/stih416-pinctrl.dtsi +++ b/arch/arm/boot/dts/stih416-pinctrl.dtsi | |||
@@ -53,7 +53,7 @@ | |||
53 | reg = <0xfe61f080 0x4>; | 53 | reg = <0xfe61f080 0x4>; |
54 | reg-names = "irqmux"; | 54 | reg-names = "irqmux"; |
55 | interrupts = <GIC_SPI 182 IRQ_TYPE_LEVEL_HIGH>; | 55 | interrupts = <GIC_SPI 182 IRQ_TYPE_LEVEL_HIGH>; |
56 | interrupts-names = "irqmux"; | 56 | interrupt-names = "irqmux"; |
57 | ranges = <0 0xfe610000 0x6000>; | 57 | ranges = <0 0xfe610000 0x6000>; |
58 | 58 | ||
59 | PIO0: gpio@fe610000 { | 59 | PIO0: gpio@fe610000 { |
@@ -201,7 +201,7 @@ | |||
201 | reg = <0xfee0f080 0x4>; | 201 | reg = <0xfee0f080 0x4>; |
202 | reg-names = "irqmux"; | 202 | reg-names = "irqmux"; |
203 | interrupts = <GIC_SPI 183 IRQ_TYPE_LEVEL_HIGH>; | 203 | interrupts = <GIC_SPI 183 IRQ_TYPE_LEVEL_HIGH>; |
204 | interrupts-names = "irqmux"; | 204 | interrupt-names = "irqmux"; |
205 | ranges = <0 0xfee00000 0x10000>; | 205 | ranges = <0 0xfee00000 0x10000>; |
206 | 206 | ||
207 | PIO5: gpio@fee00000 { | 207 | PIO5: gpio@fee00000 { |
@@ -333,7 +333,7 @@ | |||
333 | reg = <0xfe82f080 0x4>; | 333 | reg = <0xfe82f080 0x4>; |
334 | reg-names = "irqmux"; | 334 | reg-names = "irqmux"; |
335 | interrupts = <GIC_SPI 184 IRQ_TYPE_LEVEL_HIGH>; | 335 | interrupts = <GIC_SPI 184 IRQ_TYPE_LEVEL_HIGH>; |
336 | interrupts-names = "irqmux"; | 336 | interrupt-names = "irqmux"; |
337 | ranges = <0 0xfe820000 0x6000>; | 337 | ranges = <0 0xfe820000 0x6000>; |
338 | 338 | ||
339 | PIO13: gpio@fe820000 { | 339 | PIO13: gpio@fe820000 { |
@@ -461,7 +461,7 @@ | |||
461 | reg = <0xfd6bf080 0x4>; | 461 | reg = <0xfd6bf080 0x4>; |
462 | reg-names = "irqmux"; | 462 | reg-names = "irqmux"; |
463 | interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>; | 463 | interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>; |
464 | interrupts-names = "irqmux"; | 464 | interrupt-names = "irqmux"; |
465 | ranges = <0 0xfd6b0000 0x3000>; | 465 | ranges = <0 0xfd6b0000 0x3000>; |
466 | 466 | ||
467 | PIO100: gpio@fd6b0000 { | 467 | PIO100: gpio@fd6b0000 { |
@@ -498,7 +498,7 @@ | |||
498 | reg = <0xfd33f080 0x4>; | 498 | reg = <0xfd33f080 0x4>; |
499 | reg-names = "irqmux"; | 499 | reg-names = "irqmux"; |
500 | interrupts = <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>; | 500 | interrupts = <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>; |
501 | interrupts-names = "irqmux"; | 501 | interrupt-names = "irqmux"; |
502 | ranges = <0 0xfd330000 0x5000>; | 502 | ranges = <0 0xfd330000 0x5000>; |
503 | 503 | ||
504 | PIO103: gpio@fd330000 { | 504 | PIO103: gpio@fd330000 { |
diff --git a/arch/arm/boot/dts/tegra124.dtsi b/arch/arm/boot/dts/tegra124.dtsi index cf45a1a39483..6d540a025148 100644 --- a/arch/arm/boot/dts/tegra124.dtsi +++ b/arch/arm/boot/dts/tegra124.dtsi | |||
@@ -233,19 +233,6 @@ | |||
233 | status = "disabled"; | 233 | status = "disabled"; |
234 | }; | 234 | }; |
235 | 235 | ||
236 | serial@0,70006400 { | ||
237 | compatible = "nvidia,tegra124-uart", "nvidia,tegra20-uart"; | ||
238 | reg = <0x0 0x70006400 0x0 0x40>; | ||
239 | reg-shift = <2>; | ||
240 | interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>; | ||
241 | clocks = <&tegra_car TEGRA124_CLK_UARTE>; | ||
242 | resets = <&tegra_car 66>; | ||
243 | reset-names = "serial"; | ||
244 | dmas = <&apbdma 20>, <&apbdma 20>; | ||
245 | dma-names = "rx", "tx"; | ||
246 | status = "disabled"; | ||
247 | }; | ||
248 | |||
249 | pwm@0,7000a000 { | 236 | pwm@0,7000a000 { |
250 | compatible = "nvidia,tegra124-pwm", "nvidia,tegra20-pwm"; | 237 | compatible = "nvidia,tegra124-pwm", "nvidia,tegra20-pwm"; |
251 | reg = <0x0 0x7000a000 0x0 0x100>; | 238 | reg = <0x0 0x7000a000 0x0 0x100>; |
diff --git a/arch/arm/boot/dts/vf610-twr.dts b/arch/arm/boot/dts/vf610-twr.dts index 7dd1d6ede525..ded361075aab 100644 --- a/arch/arm/boot/dts/vf610-twr.dts +++ b/arch/arm/boot/dts/vf610-twr.dts | |||
@@ -25,11 +25,13 @@ | |||
25 | clocks { | 25 | clocks { |
26 | audio_ext { | 26 | audio_ext { |
27 | compatible = "fixed-clock"; | 27 | compatible = "fixed-clock"; |
28 | #clock-cells = <0>; | ||
28 | clock-frequency = <24576000>; | 29 | clock-frequency = <24576000>; |
29 | }; | 30 | }; |
30 | 31 | ||
31 | enet_ext { | 32 | enet_ext { |
32 | compatible = "fixed-clock"; | 33 | compatible = "fixed-clock"; |
34 | #clock-cells = <0>; | ||
33 | clock-frequency = <50000000>; | 35 | clock-frequency = <50000000>; |
34 | }; | 36 | }; |
35 | }; | 37 | }; |
diff --git a/arch/arm/boot/dts/vf610.dtsi b/arch/arm/boot/dts/vf610.dtsi index 804873367669..b8ce0aa7b157 100644 --- a/arch/arm/boot/dts/vf610.dtsi +++ b/arch/arm/boot/dts/vf610.dtsi | |||
@@ -45,11 +45,13 @@ | |||
45 | 45 | ||
46 | sxosc { | 46 | sxosc { |
47 | compatible = "fixed-clock"; | 47 | compatible = "fixed-clock"; |
48 | #clock-cells = <0>; | ||
48 | clock-frequency = <32768>; | 49 | clock-frequency = <32768>; |
49 | }; | 50 | }; |
50 | 51 | ||
51 | fxosc { | 52 | fxosc { |
52 | compatible = "fixed-clock"; | 53 | compatible = "fixed-clock"; |
54 | #clock-cells = <0>; | ||
53 | clock-frequency = <24000000>; | 55 | clock-frequency = <24000000>; |
54 | }; | 56 | }; |
55 | }; | 57 | }; |
@@ -72,8 +74,6 @@ | |||
72 | intc: interrupt-controller@40002000 { | 74 | intc: interrupt-controller@40002000 { |
73 | compatible = "arm,cortex-a9-gic"; | 75 | compatible = "arm,cortex-a9-gic"; |
74 | #interrupt-cells = <3>; | 76 | #interrupt-cells = <3>; |
75 | #address-cells = <1>; | ||
76 | #size-cells = <1>; | ||
77 | interrupt-controller; | 77 | interrupt-controller; |
78 | reg = <0x40003000 0x1000>, | 78 | reg = <0x40003000 0x1000>, |
79 | <0x40002100 0x100>; | 79 | <0x40002100 0x100>; |
diff --git a/arch/arm/boot/dts/zynq-7000.dtsi b/arch/arm/boot/dts/zynq-7000.dtsi index 511180769af5..c1176abc34d9 100644 --- a/arch/arm/boot/dts/zynq-7000.dtsi +++ b/arch/arm/boot/dts/zynq-7000.dtsi | |||
@@ -24,6 +24,7 @@ | |||
24 | device_type = "cpu"; | 24 | device_type = "cpu"; |
25 | reg = <0>; | 25 | reg = <0>; |
26 | clocks = <&clkc 3>; | 26 | clocks = <&clkc 3>; |
27 | clock-latency = <1000>; | ||
27 | operating-points = < | 28 | operating-points = < |
28 | /* kHz uV */ | 29 | /* kHz uV */ |
29 | 666667 1000000 | 30 | 666667 1000000 |
@@ -54,6 +55,28 @@ | |||
54 | interrupt-parent = <&intc>; | 55 | interrupt-parent = <&intc>; |
55 | ranges; | 56 | ranges; |
56 | 57 | ||
58 | i2c0: zynq-i2c@e0004000 { | ||
59 | compatible = "cdns,i2c-r1p10"; | ||
60 | status = "disabled"; | ||
61 | clocks = <&clkc 38>; | ||
62 | interrupt-parent = <&intc>; | ||
63 | interrupts = <0 25 4>; | ||
64 | reg = <0xe0004000 0x1000>; | ||
65 | #address-cells = <1>; | ||
66 | #size-cells = <0>; | ||
67 | }; | ||
68 | |||
69 | i2c1: zynq-i2c@e0005000 { | ||
70 | compatible = "cdns,i2c-r1p10"; | ||
71 | status = "disabled"; | ||
72 | clocks = <&clkc 39>; | ||
73 | interrupt-parent = <&intc>; | ||
74 | interrupts = <0 48 4>; | ||
75 | reg = <0xe0005000 0x1000>; | ||
76 | #address-cells = <1>; | ||
77 | #size-cells = <0>; | ||
78 | }; | ||
79 | |||
57 | intc: interrupt-controller@f8f01000 { | 80 | intc: interrupt-controller@f8f01000 { |
58 | compatible = "arm,cortex-a9-gic"; | 81 | compatible = "arm,cortex-a9-gic"; |
59 | #interrupt-cells = <3>; | 82 | #interrupt-cells = <3>; |
diff --git a/arch/arm/boot/dts/zynq-zc702.dts b/arch/arm/boot/dts/zynq-zc702.dts index c913f77a21eb..5e09cee33d42 100644 --- a/arch/arm/boot/dts/zynq-zc702.dts +++ b/arch/arm/boot/dts/zynq-zc702.dts | |||
@@ -34,6 +34,82 @@ | |||
34 | phy-mode = "rgmii"; | 34 | phy-mode = "rgmii"; |
35 | }; | 35 | }; |
36 | 36 | ||
37 | &i2c0 { | ||
38 | status = "okay"; | ||
39 | clock-frequency = <400000>; | ||
40 | |||
41 | i2cswitch@74 { | ||
42 | compatible = "nxp,pca9548"; | ||
43 | #address-cells = <1>; | ||
44 | #size-cells = <0>; | ||
45 | reg = <0x74>; | ||
46 | |||
47 | i2c@0 { | ||
48 | #address-cells = <1>; | ||
49 | #size-cells = <0>; | ||
50 | reg = <0>; | ||
51 | si570: clock-generator@5d { | ||
52 | #clock-cells = <0>; | ||
53 | compatible = "silabs,si570"; | ||
54 | temperature-stability = <50>; | ||
55 | reg = <0x5d>; | ||
56 | factory-fout = <156250000>; | ||
57 | clock-frequency = <148500000>; | ||
58 | }; | ||
59 | }; | ||
60 | |||
61 | i2c@2 { | ||
62 | #address-cells = <1>; | ||
63 | #size-cells = <0>; | ||
64 | reg = <2>; | ||
65 | eeprom@54 { | ||
66 | compatible = "at,24c08"; | ||
67 | reg = <0x54>; | ||
68 | }; | ||
69 | }; | ||
70 | |||
71 | i2c@3 { | ||
72 | #address-cells = <1>; | ||
73 | #size-cells = <0>; | ||
74 | reg = <3>; | ||
75 | gpio@21 { | ||
76 | compatible = "ti,tca6416"; | ||
77 | reg = <0x21>; | ||
78 | gpio-controller; | ||
79 | #gpio-cells = <2>; | ||
80 | }; | ||
81 | }; | ||
82 | |||
83 | i2c@4 { | ||
84 | #address-cells = <1>; | ||
85 | #size-cells = <0>; | ||
86 | reg = <4>; | ||
87 | rtc@51 { | ||
88 | compatible = "nxp,pcf8563"; | ||
89 | reg = <0x51>; | ||
90 | }; | ||
91 | }; | ||
92 | |||
93 | i2c@7 { | ||
94 | #address-cells = <1>; | ||
95 | #size-cells = <0>; | ||
96 | reg = <7>; | ||
97 | hwmon@52 { | ||
98 | compatible = "ti,ucd9248"; | ||
99 | reg = <52>; | ||
100 | }; | ||
101 | hwmon@53 { | ||
102 | compatible = "ti,ucd9248"; | ||
103 | reg = <53>; | ||
104 | }; | ||
105 | hwmon@54 { | ||
106 | compatible = "ti,ucd9248"; | ||
107 | reg = <54>; | ||
108 | }; | ||
109 | }; | ||
110 | }; | ||
111 | }; | ||
112 | |||
37 | &sdhci0 { | 113 | &sdhci0 { |
38 | status = "okay"; | 114 | status = "okay"; |
39 | }; | 115 | }; |
diff --git a/arch/arm/boot/dts/zynq-zc706.dts b/arch/arm/boot/dts/zynq-zc706.dts index 88f62c50382e..4cc9913078cd 100644 --- a/arch/arm/boot/dts/zynq-zc706.dts +++ b/arch/arm/boot/dts/zynq-zc706.dts | |||
@@ -35,6 +35,74 @@ | |||
35 | phy-mode = "rgmii"; | 35 | phy-mode = "rgmii"; |
36 | }; | 36 | }; |
37 | 37 | ||
38 | &i2c0 { | ||
39 | status = "okay"; | ||
40 | clock-frequency = <400000>; | ||
41 | |||
42 | i2cswitch@74 { | ||
43 | compatible = "nxp,pca9548"; | ||
44 | #address-cells = <1>; | ||
45 | #size-cells = <0>; | ||
46 | reg = <0x74>; | ||
47 | |||
48 | i2c@0 { | ||
49 | #address-cells = <1>; | ||
50 | #size-cells = <0>; | ||
51 | reg = <0>; | ||
52 | si570: clock-generator@5d { | ||
53 | #clock-cells = <0>; | ||
54 | compatible = "silabs,si570"; | ||
55 | temperature-stability = <50>; | ||
56 | reg = <0x5d>; | ||
57 | factory-fout = <156250000>; | ||
58 | clock-frequency = <148500000>; | ||
59 | }; | ||
60 | }; | ||
61 | |||
62 | i2c@2 { | ||
63 | #address-cells = <1>; | ||
64 | #size-cells = <0>; | ||
65 | reg = <2>; | ||
66 | eeprom@54 { | ||
67 | compatible = "at,24c08"; | ||
68 | reg = <0x54>; | ||
69 | }; | ||
70 | }; | ||
71 | |||
72 | i2c@3 { | ||
73 | #address-cells = <1>; | ||
74 | #size-cells = <0>; | ||
75 | reg = <3>; | ||
76 | gpio@21 { | ||
77 | compatible = "ti,tca6416"; | ||
78 | reg = <0x21>; | ||
79 | gpio-controller; | ||
80 | #gpio-cells = <2>; | ||
81 | }; | ||
82 | }; | ||
83 | |||
84 | i2c@4 { | ||
85 | #address-cells = <1>; | ||
86 | #size-cells = <0>; | ||
87 | reg = <4>; | ||
88 | rtc@51 { | ||
89 | compatible = "nxp,pcf8563"; | ||
90 | reg = <0x51>; | ||
91 | }; | ||
92 | }; | ||
93 | |||
94 | i2c@7 { | ||
95 | #address-cells = <1>; | ||
96 | #size-cells = <0>; | ||
97 | reg = <7>; | ||
98 | ucd90120@65 { | ||
99 | compatible = "ti,ucd90120"; | ||
100 | reg = <0x65>; | ||
101 | }; | ||
102 | }; | ||
103 | }; | ||
104 | }; | ||
105 | |||
38 | &sdhci0 { | 106 | &sdhci0 { |
39 | status = "okay"; | 107 | status = "okay"; |
40 | }; | 108 | }; |
diff --git a/arch/arm/common/bL_switcher.c b/arch/arm/common/bL_switcher.c index 5774b6ea7ad5..f01c0ee0c87e 100644 --- a/arch/arm/common/bL_switcher.c +++ b/arch/arm/common/bL_switcher.c | |||
@@ -797,10 +797,8 @@ static int __init bL_switcher_init(void) | |||
797 | { | 797 | { |
798 | int ret; | 798 | int ret; |
799 | 799 | ||
800 | if (MAX_NR_CLUSTERS != 2) { | 800 | if (!mcpm_is_available()) |
801 | pr_err("%s: only dual cluster systems are supported\n", __func__); | 801 | return -ENODEV; |
802 | return -EINVAL; | ||
803 | } | ||
804 | 802 | ||
805 | cpu_notifier(bL_switcher_hotplug_callback, 0); | 803 | cpu_notifier(bL_switcher_hotplug_callback, 0); |
806 | 804 | ||
diff --git a/arch/arm/common/mcpm_entry.c b/arch/arm/common/mcpm_entry.c index 1e361abc29eb..86fd60fefbc9 100644 --- a/arch/arm/common/mcpm_entry.c +++ b/arch/arm/common/mcpm_entry.c | |||
@@ -48,6 +48,11 @@ int __init mcpm_platform_register(const struct mcpm_platform_ops *ops) | |||
48 | return 0; | 48 | return 0; |
49 | } | 49 | } |
50 | 50 | ||
51 | bool mcpm_is_available(void) | ||
52 | { | ||
53 | return (platform_ops) ? true : false; | ||
54 | } | ||
55 | |||
51 | int mcpm_cpu_power_up(unsigned int cpu, unsigned int cluster) | 56 | int mcpm_cpu_power_up(unsigned int cpu, unsigned int cluster) |
52 | { | 57 | { |
53 | if (!platform_ops) | 58 | if (!platform_ops) |
diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig index a9667957b757..a4e8d017f25b 100644 --- a/arch/arm/configs/omap2plus_defconfig +++ b/arch/arm/configs/omap2plus_defconfig | |||
@@ -226,7 +226,7 @@ CONFIG_USB_DWC3=m | |||
226 | CONFIG_USB_TEST=y | 226 | CONFIG_USB_TEST=y |
227 | CONFIG_NOP_USB_XCEIV=y | 227 | CONFIG_NOP_USB_XCEIV=y |
228 | CONFIG_OMAP_USB2=y | 228 | CONFIG_OMAP_USB2=y |
229 | CONFIG_OMAP_USB3=y | 229 | CONFIG_TI_PIPE3=y |
230 | CONFIG_AM335X_PHY_USB=y | 230 | CONFIG_AM335X_PHY_USB=y |
231 | CONFIG_USB_GADGET=y | 231 | CONFIG_USB_GADGET=y |
232 | CONFIG_USB_GADGET_DEBUG=y | 232 | CONFIG_USB_GADGET_DEBUG=y |
diff --git a/arch/arm/configs/u300_defconfig b/arch/arm/configs/u300_defconfig index fd81a1b99cce..aaa95ab606a8 100644 --- a/arch/arm/configs/u300_defconfig +++ b/arch/arm/configs/u300_defconfig | |||
@@ -11,6 +11,7 @@ CONFIG_MODULES=y | |||
11 | CONFIG_MODULE_UNLOAD=y | 11 | CONFIG_MODULE_UNLOAD=y |
12 | # CONFIG_LBDAF is not set | 12 | # CONFIG_LBDAF is not set |
13 | # CONFIG_BLK_DEV_BSG is not set | 13 | # CONFIG_BLK_DEV_BSG is not set |
14 | CONFIG_PARTITION_ADVANCED=y | ||
14 | # CONFIG_IOSCHED_CFQ is not set | 15 | # CONFIG_IOSCHED_CFQ is not set |
15 | # CONFIG_ARCH_MULTI_V7 is not set | 16 | # CONFIG_ARCH_MULTI_V7 is not set |
16 | CONFIG_ARCH_U300=y | 17 | CONFIG_ARCH_U300=y |
@@ -21,7 +22,6 @@ CONFIG_ZBOOT_ROM_TEXT=0x0 | |||
21 | CONFIG_ZBOOT_ROM_BSS=0x0 | 22 | CONFIG_ZBOOT_ROM_BSS=0x0 |
22 | CONFIG_CMDLINE="root=/dev/ram0 rw rootfstype=rootfs console=ttyAMA0,115200n8 lpj=515072" | 23 | CONFIG_CMDLINE="root=/dev/ram0 rw rootfstype=rootfs console=ttyAMA0,115200n8 lpj=515072" |
23 | CONFIG_CPU_IDLE=y | 24 | CONFIG_CPU_IDLE=y |
24 | CONFIG_FPE_NWFPE=y | ||
25 | # CONFIG_SUSPEND is not set | 25 | # CONFIG_SUSPEND is not set |
26 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 26 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
27 | # CONFIG_PREVENT_FIRMWARE_BUILD is not set | 27 | # CONFIG_PREVENT_FIRMWARE_BUILD is not set |
@@ -64,8 +64,8 @@ CONFIG_TMPFS=y | |||
64 | CONFIG_NLS_CODEPAGE_437=y | 64 | CONFIG_NLS_CODEPAGE_437=y |
65 | CONFIG_NLS_ISO8859_1=y | 65 | CONFIG_NLS_ISO8859_1=y |
66 | CONFIG_PRINTK_TIME=y | 66 | CONFIG_PRINTK_TIME=y |
67 | CONFIG_DEBUG_INFO=y | ||
67 | CONFIG_DEBUG_FS=y | 68 | CONFIG_DEBUG_FS=y |
68 | # CONFIG_SCHED_DEBUG is not set | 69 | # CONFIG_SCHED_DEBUG is not set |
69 | CONFIG_TIMER_STATS=y | 70 | CONFIG_TIMER_STATS=y |
70 | # CONFIG_DEBUG_PREEMPT is not set | 71 | # CONFIG_DEBUG_PREEMPT is not set |
71 | CONFIG_DEBUG_INFO=y | ||
diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig index 65f77885c167..d219d6a43238 100644 --- a/arch/arm/configs/u8500_defconfig +++ b/arch/arm/configs/u8500_defconfig | |||
@@ -1,16 +1,16 @@ | |||
1 | # CONFIG_SWAP is not set | 1 | # CONFIG_SWAP is not set |
2 | CONFIG_SYSVIPC=y | 2 | CONFIG_SYSVIPC=y |
3 | CONFIG_NO_HZ=y | 3 | CONFIG_NO_HZ_IDLE=y |
4 | CONFIG_HIGH_RES_TIMERS=y | 4 | CONFIG_HIGH_RES_TIMERS=y |
5 | CONFIG_BLK_DEV_INITRD=y | 5 | CONFIG_BLK_DEV_INITRD=y |
6 | CONFIG_KALLSYMS_ALL=y | 6 | CONFIG_KALLSYMS_ALL=y |
7 | CONFIG_MODULES=y | 7 | CONFIG_MODULES=y |
8 | CONFIG_MODULE_UNLOAD=y | 8 | CONFIG_MODULE_UNLOAD=y |
9 | # CONFIG_BLK_DEV_BSG is not set | 9 | # CONFIG_BLK_DEV_BSG is not set |
10 | CONFIG_PARTITION_ADVANCED=y | ||
10 | CONFIG_ARCH_U8500=y | 11 | CONFIG_ARCH_U8500=y |
11 | CONFIG_MACH_HREFV60=y | 12 | CONFIG_MACH_HREFV60=y |
12 | CONFIG_MACH_SNOWBALL=y | 13 | CONFIG_MACH_SNOWBALL=y |
13 | CONFIG_MACH_UX500_DT=y | ||
14 | CONFIG_SMP=y | 14 | CONFIG_SMP=y |
15 | CONFIG_NR_CPUS=2 | 15 | CONFIG_NR_CPUS=2 |
16 | CONFIG_PREEMPT=y | 16 | CONFIG_PREEMPT=y |
@@ -34,16 +34,22 @@ CONFIG_IP_PNP=y | |||
34 | CONFIG_IP_PNP_DHCP=y | 34 | CONFIG_IP_PNP_DHCP=y |
35 | CONFIG_NETFILTER=y | 35 | CONFIG_NETFILTER=y |
36 | CONFIG_PHONET=y | 36 | CONFIG_PHONET=y |
37 | # CONFIG_WIRELESS is not set | 37 | CONFIG_CFG80211=y |
38 | CONFIG_CFG80211_DEBUGFS=y | ||
39 | CONFIG_MAC80211=y | ||
40 | CONFIG_MAC80211_LEDS=y | ||
38 | CONFIG_CAIF=y | 41 | CONFIG_CAIF=y |
39 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 42 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
43 | CONFIG_DEVTMPFS=y | ||
44 | CONFIG_DEVTMPFS_MOUNT=y | ||
40 | CONFIG_BLK_DEV_RAM=y | 45 | CONFIG_BLK_DEV_RAM=y |
41 | CONFIG_BLK_DEV_RAM_SIZE=65536 | 46 | CONFIG_BLK_DEV_RAM_SIZE=65536 |
42 | CONFIG_SENSORS_BH1780=y | 47 | CONFIG_SENSORS_BH1780=y |
43 | CONFIG_NETDEVICES=y | 48 | CONFIG_NETDEVICES=y |
44 | CONFIG_SMSC911X=y | 49 | CONFIG_SMSC911X=y |
45 | CONFIG_SMSC_PHY=y | 50 | CONFIG_SMSC_PHY=y |
46 | # CONFIG_WLAN is not set | 51 | CONFIG_CW1200=y |
52 | CONFIG_CW1200_WLAN_SDIO=y | ||
47 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set | 53 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set |
48 | CONFIG_INPUT_EVDEV=y | 54 | CONFIG_INPUT_EVDEV=y |
49 | # CONFIG_KEYBOARD_ATKBD is not set | 55 | # CONFIG_KEYBOARD_ATKBD is not set |
@@ -85,15 +91,12 @@ CONFIG_AB8500_USB=y | |||
85 | CONFIG_USB_GADGET=y | 91 | CONFIG_USB_GADGET=y |
86 | CONFIG_USB_ETH=m | 92 | CONFIG_USB_ETH=m |
87 | CONFIG_MMC=y | 93 | CONFIG_MMC=y |
88 | CONFIG_MMC_UNSAFE_RESUME=y | ||
89 | # CONFIG_MMC_BLOCK_BOUNCE is not set | ||
90 | CONFIG_MMC_ARMMMCI=y | 94 | CONFIG_MMC_ARMMMCI=y |
91 | CONFIG_NEW_LEDS=y | 95 | CONFIG_NEW_LEDS=y |
92 | CONFIG_LEDS_CLASS=y | 96 | CONFIG_LEDS_CLASS=y |
93 | CONFIG_LEDS_LM3530=y | 97 | CONFIG_LEDS_LM3530=y |
94 | CONFIG_LEDS_GPIO=y | 98 | CONFIG_LEDS_GPIO=y |
95 | CONFIG_LEDS_LP5521=y | 99 | CONFIG_LEDS_LP5521=y |
96 | CONFIG_LEDS_TRIGGERS=y | ||
97 | CONFIG_LEDS_TRIGGER_HEARTBEAT=y | 100 | CONFIG_LEDS_TRIGGER_HEARTBEAT=y |
98 | CONFIG_RTC_CLASS=y | 101 | CONFIG_RTC_CLASS=y |
99 | CONFIG_RTC_DRV_AB8500=y | 102 | CONFIG_RTC_DRV_AB8500=y |
@@ -103,6 +106,11 @@ CONFIG_STE_DMA40=y | |||
103 | CONFIG_STAGING=y | 106 | CONFIG_STAGING=y |
104 | CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=y | 107 | CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=y |
105 | CONFIG_HSEM_U8500=y | 108 | CONFIG_HSEM_U8500=y |
109 | CONFIG_IIO=y | ||
110 | CONFIG_IIO_ST_ACCEL_3AXIS=y | ||
111 | CONFIG_IIO_ST_GYRO_3AXIS=y | ||
112 | CONFIG_IIO_ST_MAGN_3AXIS=y | ||
113 | CONFIG_IIO_ST_PRESS=y | ||
106 | CONFIG_EXT2_FS=y | 114 | CONFIG_EXT2_FS=y |
107 | CONFIG_EXT2_FS_XATTR=y | 115 | CONFIG_EXT2_FS_XATTR=y |
108 | CONFIG_EXT2_FS_POSIX_ACL=y | 116 | CONFIG_EXT2_FS_POSIX_ACL=y |
@@ -110,8 +118,6 @@ CONFIG_EXT2_FS_SECURITY=y | |||
110 | CONFIG_EXT3_FS=y | 118 | CONFIG_EXT3_FS=y |
111 | CONFIG_EXT4_FS=y | 119 | CONFIG_EXT4_FS=y |
112 | CONFIG_VFAT_FS=y | 120 | CONFIG_VFAT_FS=y |
113 | CONFIG_DEVTMPFS=y | ||
114 | CONFIG_DEVTMPFS_MOUNT=y | ||
115 | CONFIG_TMPFS=y | 121 | CONFIG_TMPFS=y |
116 | CONFIG_TMPFS_POSIX_ACL=y | 122 | CONFIG_TMPFS_POSIX_ACL=y |
117 | # CONFIG_MISC_FILESYSTEMS is not set | 123 | # CONFIG_MISC_FILESYSTEMS is not set |
diff --git a/arch/arm/include/asm/cputype.h b/arch/arm/include/asm/cputype.h index c651e3b26ec7..4764344367d4 100644 --- a/arch/arm/include/asm/cputype.h +++ b/arch/arm/include/asm/cputype.h | |||
@@ -222,22 +222,22 @@ static inline int cpu_is_xsc3(void) | |||
222 | #endif | 222 | #endif |
223 | 223 | ||
224 | /* | 224 | /* |
225 | * Marvell's PJ4 core is based on V7 version. It has some modification | 225 | * Marvell's PJ4 and PJ4B cores are based on V7 version, |
226 | * for coprocessor setting. For this reason, we need a way to distinguish | 226 | * but require a specical sequence for enabling coprocessors. |
227 | * it. | 227 | * For this reason, we need a way to distinguish them. |
228 | */ | 228 | */ |
229 | #ifndef CONFIG_CPU_PJ4 | 229 | #if defined(CONFIG_CPU_PJ4) || defined(CONFIG_CPU_PJ4B) |
230 | #define cpu_is_pj4() 0 | ||
231 | #else | ||
232 | static inline int cpu_is_pj4(void) | 230 | static inline int cpu_is_pj4(void) |
233 | { | 231 | { |
234 | unsigned int id; | 232 | unsigned int id; |
235 | 233 | ||
236 | id = read_cpuid_id(); | 234 | id = read_cpuid_id(); |
237 | if ((id & 0xfffffff0) == 0x562f5840) | 235 | if ((id & 0xff0fff00) == 0x560f5800) |
238 | return 1; | 236 | return 1; |
239 | 237 | ||
240 | return 0; | 238 | return 0; |
241 | } | 239 | } |
240 | #else | ||
241 | #define cpu_is_pj4() 0 | ||
242 | #endif | 242 | #endif |
243 | #endif | 243 | #endif |
diff --git a/arch/arm/include/asm/div64.h b/arch/arm/include/asm/div64.h index 191ada6e4d2d..662c7bd06108 100644 --- a/arch/arm/include/asm/div64.h +++ b/arch/arm/include/asm/div64.h | |||
@@ -156,7 +156,7 @@ | |||
156 | /* Select the best insn combination to perform the */ \ | 156 | /* Select the best insn combination to perform the */ \ |
157 | /* actual __m * __n / (__p << 64) operation. */ \ | 157 | /* actual __m * __n / (__p << 64) operation. */ \ |
158 | if (!__c) { \ | 158 | if (!__c) { \ |
159 | asm ( "umull %Q0, %R0, %1, %Q2\n\t" \ | 159 | asm ( "umull %Q0, %R0, %Q1, %Q2\n\t" \ |
160 | "mov %Q0, #0" \ | 160 | "mov %Q0, #0" \ |
161 | : "=&r" (__res) \ | 161 | : "=&r" (__res) \ |
162 | : "r" (__m), "r" (__n) \ | 162 | : "r" (__m), "r" (__n) \ |
diff --git a/arch/arm/include/asm/mcpm.h b/arch/arm/include/asm/mcpm.h index 608516ebabfe..a5ff410dcdb6 100644 --- a/arch/arm/include/asm/mcpm.h +++ b/arch/arm/include/asm/mcpm.h | |||
@@ -54,6 +54,13 @@ void mcpm_set_early_poke(unsigned cpu, unsigned cluster, | |||
54 | */ | 54 | */ |
55 | 55 | ||
56 | /** | 56 | /** |
57 | * mcpm_is_available - returns whether MCPM is initialized and available | ||
58 | * | ||
59 | * This returns true or false accordingly. | ||
60 | */ | ||
61 | bool mcpm_is_available(void); | ||
62 | |||
63 | /** | ||
57 | * mcpm_cpu_power_up - make given CPU in given cluster runable | 64 | * mcpm_cpu_power_up - make given CPU in given cluster runable |
58 | * | 65 | * |
59 | * @cpu: CPU number within given cluster | 66 | * @cpu: CPU number within given cluster |
diff --git a/arch/arm/include/asm/tlb.h b/arch/arm/include/asm/tlb.h index 0baf7f0d9394..f1a0dace3efe 100644 --- a/arch/arm/include/asm/tlb.h +++ b/arch/arm/include/asm/tlb.h | |||
@@ -98,15 +98,25 @@ static inline void __tlb_alloc_page(struct mmu_gather *tlb) | |||
98 | } | 98 | } |
99 | } | 99 | } |
100 | 100 | ||
101 | static inline void tlb_flush_mmu(struct mmu_gather *tlb) | 101 | static inline void tlb_flush_mmu_tlbonly(struct mmu_gather *tlb) |
102 | { | 102 | { |
103 | tlb_flush(tlb); | 103 | tlb_flush(tlb); |
104 | } | ||
105 | |||
106 | static inline void tlb_flush_mmu_free(struct mmu_gather *tlb) | ||
107 | { | ||
104 | free_pages_and_swap_cache(tlb->pages, tlb->nr); | 108 | free_pages_and_swap_cache(tlb->pages, tlb->nr); |
105 | tlb->nr = 0; | 109 | tlb->nr = 0; |
106 | if (tlb->pages == tlb->local) | 110 | if (tlb->pages == tlb->local) |
107 | __tlb_alloc_page(tlb); | 111 | __tlb_alloc_page(tlb); |
108 | } | 112 | } |
109 | 113 | ||
114 | static inline void tlb_flush_mmu(struct mmu_gather *tlb) | ||
115 | { | ||
116 | tlb_flush_mmu_tlbonly(tlb); | ||
117 | tlb_flush_mmu_free(tlb); | ||
118 | } | ||
119 | |||
110 | static inline void | 120 | static inline void |
111 | tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm, unsigned long start, unsigned long end) | 121 | tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm, unsigned long start, unsigned long end) |
112 | { | 122 | { |
diff --git a/arch/arm/include/uapi/asm/unistd.h b/arch/arm/include/uapi/asm/unistd.h index fb5584d0cc05..ba94446c72d9 100644 --- a/arch/arm/include/uapi/asm/unistd.h +++ b/arch/arm/include/uapi/asm/unistd.h | |||
@@ -408,6 +408,7 @@ | |||
408 | #define __NR_finit_module (__NR_SYSCALL_BASE+379) | 408 | #define __NR_finit_module (__NR_SYSCALL_BASE+379) |
409 | #define __NR_sched_setattr (__NR_SYSCALL_BASE+380) | 409 | #define __NR_sched_setattr (__NR_SYSCALL_BASE+380) |
410 | #define __NR_sched_getattr (__NR_SYSCALL_BASE+381) | 410 | #define __NR_sched_getattr (__NR_SYSCALL_BASE+381) |
411 | #define __NR_renameat2 (__NR_SYSCALL_BASE+382) | ||
411 | 412 | ||
412 | /* | 413 | /* |
413 | * This may need to be greater than __NR_last_syscall+1 in order to | 414 | * This may need to be greater than __NR_last_syscall+1 in order to |
diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile index a766bcbaf8ad..040619c32d68 100644 --- a/arch/arm/kernel/Makefile +++ b/arch/arm/kernel/Makefile | |||
@@ -79,6 +79,7 @@ obj-$(CONFIG_CPU_XSCALE) += xscale-cp0.o | |||
79 | obj-$(CONFIG_CPU_XSC3) += xscale-cp0.o | 79 | obj-$(CONFIG_CPU_XSC3) += xscale-cp0.o |
80 | obj-$(CONFIG_CPU_MOHAWK) += xscale-cp0.o | 80 | obj-$(CONFIG_CPU_MOHAWK) += xscale-cp0.o |
81 | obj-$(CONFIG_CPU_PJ4) += pj4-cp0.o | 81 | obj-$(CONFIG_CPU_PJ4) += pj4-cp0.o |
82 | obj-$(CONFIG_CPU_PJ4B) += pj4-cp0.o | ||
82 | obj-$(CONFIG_IWMMXT) += iwmmxt.o | 83 | obj-$(CONFIG_IWMMXT) += iwmmxt.o |
83 | obj-$(CONFIG_PERF_EVENTS) += perf_regs.o | 84 | obj-$(CONFIG_PERF_EVENTS) += perf_regs.o |
84 | obj-$(CONFIG_HW_PERF_EVENTS) += perf_event.o perf_event_cpu.o | 85 | obj-$(CONFIG_HW_PERF_EVENTS) += perf_event.o perf_event_cpu.o |
diff --git a/arch/arm/kernel/calls.S b/arch/arm/kernel/calls.S index 166e945de832..8f51bdcdacbb 100644 --- a/arch/arm/kernel/calls.S +++ b/arch/arm/kernel/calls.S | |||
@@ -391,6 +391,7 @@ | |||
391 | CALL(sys_finit_module) | 391 | CALL(sys_finit_module) |
392 | /* 380 */ CALL(sys_sched_setattr) | 392 | /* 380 */ CALL(sys_sched_setattr) |
393 | CALL(sys_sched_getattr) | 393 | CALL(sys_sched_getattr) |
394 | CALL(sys_renameat2) | ||
394 | #ifndef syscalls_counted | 395 | #ifndef syscalls_counted |
395 | .equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls | 396 | .equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls |
396 | #define syscalls_counted | 397 | #define syscalls_counted |
diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S index f8c08839edf3..591d6e4a6492 100644 --- a/arch/arm/kernel/head.S +++ b/arch/arm/kernel/head.S | |||
@@ -587,7 +587,7 @@ __fixup_pv_table: | |||
587 | add r6, r6, r3 @ adjust __pv_phys_pfn_offset address | 587 | add r6, r6, r3 @ adjust __pv_phys_pfn_offset address |
588 | add r7, r7, r3 @ adjust __pv_offset address | 588 | add r7, r7, r3 @ adjust __pv_offset address |
589 | mov r0, r8, lsr #12 @ convert to PFN | 589 | mov r0, r8, lsr #12 @ convert to PFN |
590 | str r0, [r6, #LOW_OFFSET] @ save computed PHYS_OFFSET to __pv_phys_pfn_offset | 590 | str r0, [r6] @ save computed PHYS_OFFSET to __pv_phys_pfn_offset |
591 | strcc ip, [r7, #HIGH_OFFSET] @ save to __pv_offset high bits | 591 | strcc ip, [r7, #HIGH_OFFSET] @ save to __pv_offset high bits |
592 | mov r6, r3, lsr #24 @ constant for add/sub instructions | 592 | mov r6, r3, lsr #24 @ constant for add/sub instructions |
593 | teq r3, r6, lsl #24 @ must be 16MiB aligned | 593 | teq r3, r6, lsl #24 @ must be 16MiB aligned |
diff --git a/arch/arm/kernel/iwmmxt.S b/arch/arm/kernel/iwmmxt.S index a08783823b32..2452dd1bef53 100644 --- a/arch/arm/kernel/iwmmxt.S +++ b/arch/arm/kernel/iwmmxt.S | |||
@@ -19,12 +19,16 @@ | |||
19 | #include <asm/thread_info.h> | 19 | #include <asm/thread_info.h> |
20 | #include <asm/asm-offsets.h> | 20 | #include <asm/asm-offsets.h> |
21 | 21 | ||
22 | #if defined(CONFIG_CPU_PJ4) | 22 | #if defined(CONFIG_CPU_PJ4) || defined(CONFIG_CPU_PJ4B) |
23 | #define PJ4(code...) code | 23 | #define PJ4(code...) code |
24 | #define XSC(code...) | 24 | #define XSC(code...) |
25 | #else | 25 | #elif defined(CONFIG_CPU_MOHAWK) || \ |
26 | defined(CONFIG_CPU_XSC3) || \ | ||
27 | defined(CONFIG_CPU_XSCALE) | ||
26 | #define PJ4(code...) | 28 | #define PJ4(code...) |
27 | #define XSC(code...) code | 29 | #define XSC(code...) code |
30 | #else | ||
31 | #error "Unsupported iWMMXt architecture" | ||
28 | #endif | 32 | #endif |
29 | 33 | ||
30 | #define MMX_WR0 (0x00) | 34 | #define MMX_WR0 (0x00) |
diff --git a/arch/arm/kernel/machine_kexec.c b/arch/arm/kernel/machine_kexec.c index f0d180d8b29f..8cf0996aa1a8 100644 --- a/arch/arm/kernel/machine_kexec.c +++ b/arch/arm/kernel/machine_kexec.c | |||
@@ -184,3 +184,10 @@ void machine_kexec(struct kimage *image) | |||
184 | 184 | ||
185 | soft_restart(reboot_entry_phys); | 185 | soft_restart(reboot_entry_phys); |
186 | } | 186 | } |
187 | |||
188 | void arch_crash_save_vmcoreinfo(void) | ||
189 | { | ||
190 | #ifdef CONFIG_ARM_LPAE | ||
191 | VMCOREINFO_CONFIG(ARM_LPAE); | ||
192 | #endif | ||
193 | } | ||
diff --git a/arch/arm/kernel/pj4-cp0.c b/arch/arm/kernel/pj4-cp0.c index fc7208636284..8153e36b2491 100644 --- a/arch/arm/kernel/pj4-cp0.c +++ b/arch/arm/kernel/pj4-cp0.c | |||
@@ -45,7 +45,7 @@ static int iwmmxt_do(struct notifier_block *self, unsigned long cmd, void *t) | |||
45 | return NOTIFY_DONE; | 45 | return NOTIFY_DONE; |
46 | } | 46 | } |
47 | 47 | ||
48 | static struct notifier_block iwmmxt_notifier_block = { | 48 | static struct notifier_block __maybe_unused iwmmxt_notifier_block = { |
49 | .notifier_call = iwmmxt_do, | 49 | .notifier_call = iwmmxt_do, |
50 | }; | 50 | }; |
51 | 51 | ||
@@ -72,6 +72,33 @@ static void __init pj4_cp_access_write(u32 value) | |||
72 | : "=r" (temp) : "r" (value)); | 72 | : "=r" (temp) : "r" (value)); |
73 | } | 73 | } |
74 | 74 | ||
75 | static int __init pj4_get_iwmmxt_version(void) | ||
76 | { | ||
77 | u32 cp_access, wcid; | ||
78 | |||
79 | cp_access = pj4_cp_access_read(); | ||
80 | pj4_cp_access_write(cp_access | 0xf); | ||
81 | |||
82 | /* check if coprocessor 0 and 1 are available */ | ||
83 | if ((pj4_cp_access_read() & 0xf) != 0xf) { | ||
84 | pj4_cp_access_write(cp_access); | ||
85 | return -ENODEV; | ||
86 | } | ||
87 | |||
88 | /* read iWMMXt coprocessor id register p1, c0 */ | ||
89 | __asm__ __volatile__ ("mrc p1, 0, %0, c0, c0, 0\n" : "=r" (wcid)); | ||
90 | |||
91 | pj4_cp_access_write(cp_access); | ||
92 | |||
93 | /* iWMMXt v1 */ | ||
94 | if ((wcid & 0xffffff00) == 0x56051000) | ||
95 | return 1; | ||
96 | /* iWMMXt v2 */ | ||
97 | if ((wcid & 0xffffff00) == 0x56052000) | ||
98 | return 2; | ||
99 | |||
100 | return -EINVAL; | ||
101 | } | ||
75 | 102 | ||
76 | /* | 103 | /* |
77 | * Disable CP0/CP1 on boot, and let call_fpe() and the iWMMXt lazy | 104 | * Disable CP0/CP1 on boot, and let call_fpe() and the iWMMXt lazy |
@@ -79,17 +106,26 @@ static void __init pj4_cp_access_write(u32 value) | |||
79 | */ | 106 | */ |
80 | static int __init pj4_cp0_init(void) | 107 | static int __init pj4_cp0_init(void) |
81 | { | 108 | { |
82 | u32 cp_access; | 109 | u32 __maybe_unused cp_access; |
110 | int vers; | ||
83 | 111 | ||
84 | if (!cpu_is_pj4()) | 112 | if (!cpu_is_pj4()) |
85 | return 0; | 113 | return 0; |
86 | 114 | ||
115 | vers = pj4_get_iwmmxt_version(); | ||
116 | if (vers < 0) | ||
117 | return 0; | ||
118 | |||
119 | #ifndef CONFIG_IWMMXT | ||
120 | pr_info("PJ4 iWMMXt coprocessor detected, but kernel support is missing.\n"); | ||
121 | #else | ||
87 | cp_access = pj4_cp_access_read() & ~0xf; | 122 | cp_access = pj4_cp_access_read() & ~0xf; |
88 | pj4_cp_access_write(cp_access); | 123 | pj4_cp_access_write(cp_access); |
89 | 124 | ||
90 | printk(KERN_INFO "PJ4 iWMMXt coprocessor enabled.\n"); | 125 | pr_info("PJ4 iWMMXt v%d coprocessor enabled.\n", vers); |
91 | elf_hwcap |= HWCAP_IWMMXT; | 126 | elf_hwcap |= HWCAP_IWMMXT; |
92 | thread_register_notifier(&iwmmxt_notifier_block); | 127 | thread_register_notifier(&iwmmxt_notifier_block); |
128 | #endif | ||
93 | 129 | ||
94 | return 0; | 130 | return 0; |
95 | } | 131 | } |
diff --git a/arch/arm/kernel/sys_oabi-compat.c b/arch/arm/kernel/sys_oabi-compat.c index 702bd329d9d0..e90a3148f385 100644 --- a/arch/arm/kernel/sys_oabi-compat.c +++ b/arch/arm/kernel/sys_oabi-compat.c | |||
@@ -203,9 +203,9 @@ asmlinkage long sys_oabi_fcntl64(unsigned int fd, unsigned int cmd, | |||
203 | int ret; | 203 | int ret; |
204 | 204 | ||
205 | switch (cmd) { | 205 | switch (cmd) { |
206 | case F_GETLKP: | 206 | case F_OFD_GETLK: |
207 | case F_SETLKP: | 207 | case F_OFD_SETLK: |
208 | case F_SETLKPW: | 208 | case F_OFD_SETLKW: |
209 | case F_GETLK64: | 209 | case F_GETLK64: |
210 | case F_SETLK64: | 210 | case F_SETLK64: |
211 | case F_SETLKW64: | 211 | case F_SETLKW64: |
diff --git a/arch/arm/kvm/Kconfig b/arch/arm/kvm/Kconfig index 466bd299b1a8..4be5bb150bdd 100644 --- a/arch/arm/kvm/Kconfig +++ b/arch/arm/kvm/Kconfig | |||
@@ -23,7 +23,7 @@ config KVM | |||
23 | select HAVE_KVM_CPU_RELAX_INTERCEPT | 23 | select HAVE_KVM_CPU_RELAX_INTERCEPT |
24 | select KVM_MMIO | 24 | select KVM_MMIO |
25 | select KVM_ARM_HOST | 25 | select KVM_ARM_HOST |
26 | depends on ARM_VIRT_EXT && ARM_LPAE | 26 | depends on ARM_VIRT_EXT && ARM_LPAE && !CPU_BIG_ENDIAN |
27 | ---help--- | 27 | ---help--- |
28 | Support hosting virtualized guest machines. You will also | 28 | Support hosting virtualized guest machines. You will also |
29 | need to select one or more of the processor modules below. | 29 | need to select one or more of the processor modules below. |
diff --git a/arch/arm/kvm/mmu.c b/arch/arm/kvm/mmu.c index 80bb1e6c2c29..16f804938b8f 100644 --- a/arch/arm/kvm/mmu.c +++ b/arch/arm/kvm/mmu.c | |||
@@ -42,6 +42,8 @@ static unsigned long hyp_idmap_start; | |||
42 | static unsigned long hyp_idmap_end; | 42 | static unsigned long hyp_idmap_end; |
43 | static phys_addr_t hyp_idmap_vector; | 43 | static phys_addr_t hyp_idmap_vector; |
44 | 44 | ||
45 | #define pgd_order get_order(PTRS_PER_PGD * sizeof(pgd_t)) | ||
46 | |||
45 | #define kvm_pmd_huge(_x) (pmd_huge(_x) || pmd_trans_huge(_x)) | 47 | #define kvm_pmd_huge(_x) (pmd_huge(_x) || pmd_trans_huge(_x)) |
46 | 48 | ||
47 | static void kvm_tlb_flush_vmid_ipa(struct kvm *kvm, phys_addr_t ipa) | 49 | static void kvm_tlb_flush_vmid_ipa(struct kvm *kvm, phys_addr_t ipa) |
@@ -293,14 +295,14 @@ void free_boot_hyp_pgd(void) | |||
293 | if (boot_hyp_pgd) { | 295 | if (boot_hyp_pgd) { |
294 | unmap_range(NULL, boot_hyp_pgd, hyp_idmap_start, PAGE_SIZE); | 296 | unmap_range(NULL, boot_hyp_pgd, hyp_idmap_start, PAGE_SIZE); |
295 | unmap_range(NULL, boot_hyp_pgd, TRAMPOLINE_VA, PAGE_SIZE); | 297 | unmap_range(NULL, boot_hyp_pgd, TRAMPOLINE_VA, PAGE_SIZE); |
296 | kfree(boot_hyp_pgd); | 298 | free_pages((unsigned long)boot_hyp_pgd, pgd_order); |
297 | boot_hyp_pgd = NULL; | 299 | boot_hyp_pgd = NULL; |
298 | } | 300 | } |
299 | 301 | ||
300 | if (hyp_pgd) | 302 | if (hyp_pgd) |
301 | unmap_range(NULL, hyp_pgd, TRAMPOLINE_VA, PAGE_SIZE); | 303 | unmap_range(NULL, hyp_pgd, TRAMPOLINE_VA, PAGE_SIZE); |
302 | 304 | ||
303 | kfree(init_bounce_page); | 305 | free_page((unsigned long)init_bounce_page); |
304 | init_bounce_page = NULL; | 306 | init_bounce_page = NULL; |
305 | 307 | ||
306 | mutex_unlock(&kvm_hyp_pgd_mutex); | 308 | mutex_unlock(&kvm_hyp_pgd_mutex); |
@@ -330,7 +332,7 @@ void free_hyp_pgds(void) | |||
330 | for (addr = VMALLOC_START; is_vmalloc_addr((void*)addr); addr += PGDIR_SIZE) | 332 | for (addr = VMALLOC_START; is_vmalloc_addr((void*)addr); addr += PGDIR_SIZE) |
331 | unmap_range(NULL, hyp_pgd, KERN_TO_HYP(addr), PGDIR_SIZE); | 333 | unmap_range(NULL, hyp_pgd, KERN_TO_HYP(addr), PGDIR_SIZE); |
332 | 334 | ||
333 | kfree(hyp_pgd); | 335 | free_pages((unsigned long)hyp_pgd, pgd_order); |
334 | hyp_pgd = NULL; | 336 | hyp_pgd = NULL; |
335 | } | 337 | } |
336 | 338 | ||
@@ -1024,7 +1026,7 @@ int kvm_mmu_init(void) | |||
1024 | size_t len = __hyp_idmap_text_end - __hyp_idmap_text_start; | 1026 | size_t len = __hyp_idmap_text_end - __hyp_idmap_text_start; |
1025 | phys_addr_t phys_base; | 1027 | phys_addr_t phys_base; |
1026 | 1028 | ||
1027 | init_bounce_page = kmalloc(PAGE_SIZE, GFP_KERNEL); | 1029 | init_bounce_page = (void *)__get_free_page(GFP_KERNEL); |
1028 | if (!init_bounce_page) { | 1030 | if (!init_bounce_page) { |
1029 | kvm_err("Couldn't allocate HYP init bounce page\n"); | 1031 | kvm_err("Couldn't allocate HYP init bounce page\n"); |
1030 | err = -ENOMEM; | 1032 | err = -ENOMEM; |
@@ -1050,8 +1052,9 @@ int kvm_mmu_init(void) | |||
1050 | (unsigned long)phys_base); | 1052 | (unsigned long)phys_base); |
1051 | } | 1053 | } |
1052 | 1054 | ||
1053 | hyp_pgd = kzalloc(PTRS_PER_PGD * sizeof(pgd_t), GFP_KERNEL); | 1055 | hyp_pgd = (pgd_t *)__get_free_pages(GFP_KERNEL | __GFP_ZERO, pgd_order); |
1054 | boot_hyp_pgd = kzalloc(PTRS_PER_PGD * sizeof(pgd_t), GFP_KERNEL); | 1056 | boot_hyp_pgd = (pgd_t *)__get_free_pages(GFP_KERNEL | __GFP_ZERO, pgd_order); |
1057 | |||
1055 | if (!hyp_pgd || !boot_hyp_pgd) { | 1058 | if (!hyp_pgd || !boot_hyp_pgd) { |
1056 | kvm_err("Hyp mode PGD not allocated\n"); | 1059 | kvm_err("Hyp mode PGD not allocated\n"); |
1057 | err = -ENOMEM; | 1060 | err = -ENOMEM; |
diff --git a/arch/arm/mach-at91/at91sam9260_devices.c b/arch/arm/mach-at91/at91sam9260_devices.c index 8b1b0a870025..a0282928e9c1 100644 --- a/arch/arm/mach-at91/at91sam9260_devices.c +++ b/arch/arm/mach-at91/at91sam9260_devices.c | |||
@@ -1296,7 +1296,7 @@ static struct resource adc_resources[] = { | |||
1296 | }; | 1296 | }; |
1297 | 1297 | ||
1298 | static struct platform_device at91_adc_device = { | 1298 | static struct platform_device at91_adc_device = { |
1299 | .name = "at91_adc", | 1299 | .name = "at91sam9260-adc", |
1300 | .id = -1, | 1300 | .id = -1, |
1301 | .dev = { | 1301 | .dev = { |
1302 | .platform_data = &adc_data, | 1302 | .platform_data = &adc_data, |
diff --git a/arch/arm/mach-at91/at91sam9g45_devices.c b/arch/arm/mach-at91/at91sam9g45_devices.c index 77b04c2edd78..dab362c06487 100644 --- a/arch/arm/mach-at91/at91sam9g45_devices.c +++ b/arch/arm/mach-at91/at91sam9g45_devices.c | |||
@@ -1204,7 +1204,7 @@ static struct resource adc_resources[] = { | |||
1204 | }; | 1204 | }; |
1205 | 1205 | ||
1206 | static struct platform_device at91_adc_device = { | 1206 | static struct platform_device at91_adc_device = { |
1207 | .name = "at91_adc", | 1207 | .name = "at91sam9g45-adc", |
1208 | .id = -1, | 1208 | .id = -1, |
1209 | .dev = { | 1209 | .dev = { |
1210 | .platform_data = &adc_data, | 1210 | .platform_data = &adc_data, |
diff --git a/arch/arm/mach-imx/clk-imx6q.c b/arch/arm/mach-imx/clk-imx6q.c index b0e7f9d2c245..2b4d6acfa34a 100644 --- a/arch/arm/mach-imx/clk-imx6q.c +++ b/arch/arm/mach-imx/clk-imx6q.c | |||
@@ -208,8 +208,8 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node) | |||
208 | * the "output_enable" bit as a gate, even though it's really just | 208 | * the "output_enable" bit as a gate, even though it's really just |
209 | * enabling clock output. | 209 | * enabling clock output. |
210 | */ | 210 | */ |
211 | clk[lvds1_gate] = imx_clk_gate("lvds1_gate", "dummy", base + 0x160, 10); | 211 | clk[lvds1_gate] = imx_clk_gate("lvds1_gate", "lvds1_sel", base + 0x160, 10); |
212 | clk[lvds2_gate] = imx_clk_gate("lvds2_gate", "dummy", base + 0x160, 11); | 212 | clk[lvds2_gate] = imx_clk_gate("lvds2_gate", "lvds2_sel", base + 0x160, 11); |
213 | 213 | ||
214 | /* name parent_name reg idx */ | 214 | /* name parent_name reg idx */ |
215 | clk[pll2_pfd0_352m] = imx_clk_pfd("pll2_pfd0_352m", "pll2_bus", base + 0x100, 0); | 215 | clk[pll2_pfd0_352m] = imx_clk_pfd("pll2_pfd0_352m", "pll2_bus", base + 0x100, 0); |
@@ -258,14 +258,14 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node) | |||
258 | clk[ipu2_sel] = imx_clk_mux("ipu2_sel", base + 0x3c, 14, 2, ipu_sels, ARRAY_SIZE(ipu_sels)); | 258 | clk[ipu2_sel] = imx_clk_mux("ipu2_sel", base + 0x3c, 14, 2, ipu_sels, ARRAY_SIZE(ipu_sels)); |
259 | clk[ldb_di0_sel] = imx_clk_mux_flags("ldb_di0_sel", base + 0x2c, 9, 3, ldb_di_sels, ARRAY_SIZE(ldb_di_sels), CLK_SET_RATE_PARENT); | 259 | clk[ldb_di0_sel] = imx_clk_mux_flags("ldb_di0_sel", base + 0x2c, 9, 3, ldb_di_sels, ARRAY_SIZE(ldb_di_sels), CLK_SET_RATE_PARENT); |
260 | clk[ldb_di1_sel] = imx_clk_mux_flags("ldb_di1_sel", base + 0x2c, 12, 3, ldb_di_sels, ARRAY_SIZE(ldb_di_sels), CLK_SET_RATE_PARENT); | 260 | clk[ldb_di1_sel] = imx_clk_mux_flags("ldb_di1_sel", base + 0x2c, 12, 3, ldb_di_sels, ARRAY_SIZE(ldb_di_sels), CLK_SET_RATE_PARENT); |
261 | clk[ipu1_di0_pre_sel] = imx_clk_mux("ipu1_di0_pre_sel", base + 0x34, 6, 3, ipu_di_pre_sels, ARRAY_SIZE(ipu_di_pre_sels)); | 261 | clk[ipu1_di0_pre_sel] = imx_clk_mux_flags("ipu1_di0_pre_sel", base + 0x34, 6, 3, ipu_di_pre_sels, ARRAY_SIZE(ipu_di_pre_sels), CLK_SET_RATE_PARENT); |
262 | clk[ipu1_di1_pre_sel] = imx_clk_mux("ipu1_di1_pre_sel", base + 0x34, 15, 3, ipu_di_pre_sels, ARRAY_SIZE(ipu_di_pre_sels)); | 262 | clk[ipu1_di1_pre_sel] = imx_clk_mux_flags("ipu1_di1_pre_sel", base + 0x34, 15, 3, ipu_di_pre_sels, ARRAY_SIZE(ipu_di_pre_sels), CLK_SET_RATE_PARENT); |
263 | clk[ipu2_di0_pre_sel] = imx_clk_mux("ipu2_di0_pre_sel", base + 0x38, 6, 3, ipu_di_pre_sels, ARRAY_SIZE(ipu_di_pre_sels)); | 263 | clk[ipu2_di0_pre_sel] = imx_clk_mux_flags("ipu2_di0_pre_sel", base + 0x38, 6, 3, ipu_di_pre_sels, ARRAY_SIZE(ipu_di_pre_sels), CLK_SET_RATE_PARENT); |
264 | clk[ipu2_di1_pre_sel] = imx_clk_mux("ipu2_di1_pre_sel", base + 0x38, 15, 3, ipu_di_pre_sels, ARRAY_SIZE(ipu_di_pre_sels)); | 264 | clk[ipu2_di1_pre_sel] = imx_clk_mux_flags("ipu2_di1_pre_sel", base + 0x38, 15, 3, ipu_di_pre_sels, ARRAY_SIZE(ipu_di_pre_sels), CLK_SET_RATE_PARENT); |
265 | clk[ipu1_di0_sel] = imx_clk_mux("ipu1_di0_sel", base + 0x34, 0, 3, ipu1_di0_sels, ARRAY_SIZE(ipu1_di0_sels)); | 265 | clk[ipu1_di0_sel] = imx_clk_mux_flags("ipu1_di0_sel", base + 0x34, 0, 3, ipu1_di0_sels, ARRAY_SIZE(ipu1_di0_sels), CLK_SET_RATE_PARENT); |
266 | clk[ipu1_di1_sel] = imx_clk_mux("ipu1_di1_sel", base + 0x34, 9, 3, ipu1_di1_sels, ARRAY_SIZE(ipu1_di1_sels)); | 266 | clk[ipu1_di1_sel] = imx_clk_mux_flags("ipu1_di1_sel", base + 0x34, 9, 3, ipu1_di1_sels, ARRAY_SIZE(ipu1_di1_sels), CLK_SET_RATE_PARENT); |
267 | clk[ipu2_di0_sel] = imx_clk_mux("ipu2_di0_sel", base + 0x38, 0, 3, ipu2_di0_sels, ARRAY_SIZE(ipu2_di0_sels)); | 267 | clk[ipu2_di0_sel] = imx_clk_mux_flags("ipu2_di0_sel", base + 0x38, 0, 3, ipu2_di0_sels, ARRAY_SIZE(ipu2_di0_sels), CLK_SET_RATE_PARENT); |
268 | clk[ipu2_di1_sel] = imx_clk_mux("ipu2_di1_sel", base + 0x38, 9, 3, ipu2_di1_sels, ARRAY_SIZE(ipu2_di1_sels)); | 268 | clk[ipu2_di1_sel] = imx_clk_mux_flags("ipu2_di1_sel", base + 0x38, 9, 3, ipu2_di1_sels, ARRAY_SIZE(ipu2_di1_sels), CLK_SET_RATE_PARENT); |
269 | clk[hsi_tx_sel] = imx_clk_mux("hsi_tx_sel", base + 0x30, 28, 1, hsi_tx_sels, ARRAY_SIZE(hsi_tx_sels)); | 269 | clk[hsi_tx_sel] = imx_clk_mux("hsi_tx_sel", base + 0x30, 28, 1, hsi_tx_sels, ARRAY_SIZE(hsi_tx_sels)); |
270 | clk[pcie_axi_sel] = imx_clk_mux("pcie_axi_sel", base + 0x18, 10, 1, pcie_axi_sels, ARRAY_SIZE(pcie_axi_sels)); | 270 | clk[pcie_axi_sel] = imx_clk_mux("pcie_axi_sel", base + 0x18, 10, 1, pcie_axi_sels, ARRAY_SIZE(pcie_axi_sels)); |
271 | clk[ssi1_sel] = imx_clk_fixup_mux("ssi1_sel", base + 0x1c, 10, 2, ssi_sels, ARRAY_SIZE(ssi_sels), imx_cscmr1_fixup); | 271 | clk[ssi1_sel] = imx_clk_fixup_mux("ssi1_sel", base + 0x1c, 10, 2, ssi_sels, ARRAY_SIZE(ssi_sels), imx_cscmr1_fixup); |
@@ -445,6 +445,15 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node) | |||
445 | clk_set_parent(clk[ldb_di1_sel], clk[pll5_video_div]); | 445 | clk_set_parent(clk[ldb_di1_sel], clk[pll5_video_div]); |
446 | } | 446 | } |
447 | 447 | ||
448 | clk_set_parent(clk[ipu1_di0_pre_sel], clk[pll5_video_div]); | ||
449 | clk_set_parent(clk[ipu1_di1_pre_sel], clk[pll5_video_div]); | ||
450 | clk_set_parent(clk[ipu2_di0_pre_sel], clk[pll5_video_div]); | ||
451 | clk_set_parent(clk[ipu2_di1_pre_sel], clk[pll5_video_div]); | ||
452 | clk_set_parent(clk[ipu1_di0_sel], clk[ipu1_di0_pre]); | ||
453 | clk_set_parent(clk[ipu1_di1_sel], clk[ipu1_di1_pre]); | ||
454 | clk_set_parent(clk[ipu2_di0_sel], clk[ipu2_di0_pre]); | ||
455 | clk_set_parent(clk[ipu2_di1_sel], clk[ipu2_di1_pre]); | ||
456 | |||
448 | /* | 457 | /* |
449 | * The gpmi needs 100MHz frequency in the EDO/Sync mode, | 458 | * The gpmi needs 100MHz frequency in the EDO/Sync mode, |
450 | * We can not get the 100MHz from the pll2_pfd0_352m. | 459 | * We can not get the 100MHz from the pll2_pfd0_352m. |
diff --git a/arch/arm/mach-omap2/board-rx51-video.c b/arch/arm/mach-omap2/board-rx51-video.c index 43a90c8d6837..9cfebc5c7455 100644 --- a/arch/arm/mach-omap2/board-rx51-video.c +++ b/arch/arm/mach-omap2/board-rx51-video.c | |||
@@ -48,7 +48,7 @@ static struct omap_dss_board_info rx51_dss_board_info = { | |||
48 | 48 | ||
49 | static int __init rx51_video_init(void) | 49 | static int __init rx51_video_init(void) |
50 | { | 50 | { |
51 | if (!machine_is_nokia_rx51() && !of_machine_is_compatible("nokia,omap3-n900")) | 51 | if (!machine_is_nokia_rx51()) |
52 | return 0; | 52 | return 0; |
53 | 53 | ||
54 | if (omap_mux_init_gpio(RX51_LCD_RESET_GPIO, OMAP_PIN_OUTPUT)) { | 54 | if (omap_mux_init_gpio(RX51_LCD_RESET_GPIO, OMAP_PIN_OUTPUT)) { |
diff --git a/arch/arm/mach-omap2/clkt_dpll.c b/arch/arm/mach-omap2/clkt_dpll.c index 2649ce445845..332af927f4d3 100644 --- a/arch/arm/mach-omap2/clkt_dpll.c +++ b/arch/arm/mach-omap2/clkt_dpll.c | |||
@@ -209,7 +209,7 @@ u8 omap2_init_dpll_parent(struct clk_hw *hw) | |||
209 | if (v == OMAP3XXX_EN_DPLL_LPBYPASS || | 209 | if (v == OMAP3XXX_EN_DPLL_LPBYPASS || |
210 | v == OMAP3XXX_EN_DPLL_FRBYPASS) | 210 | v == OMAP3XXX_EN_DPLL_FRBYPASS) |
211 | return 1; | 211 | return 1; |
212 | } else if (soc_is_am33xx() || cpu_is_omap44xx()) { | 212 | } else if (soc_is_am33xx() || cpu_is_omap44xx() || soc_is_am43xx()) { |
213 | if (v == OMAP4XXX_EN_DPLL_LPBYPASS || | 213 | if (v == OMAP4XXX_EN_DPLL_LPBYPASS || |
214 | v == OMAP4XXX_EN_DPLL_FRBYPASS || | 214 | v == OMAP4XXX_EN_DPLL_FRBYPASS || |
215 | v == OMAP4XXX_EN_DPLL_MNBYPASS) | 215 | v == OMAP4XXX_EN_DPLL_MNBYPASS) |
@@ -255,7 +255,7 @@ unsigned long omap2_get_dpll_rate(struct clk_hw_omap *clk) | |||
255 | if (v == OMAP3XXX_EN_DPLL_LPBYPASS || | 255 | if (v == OMAP3XXX_EN_DPLL_LPBYPASS || |
256 | v == OMAP3XXX_EN_DPLL_FRBYPASS) | 256 | v == OMAP3XXX_EN_DPLL_FRBYPASS) |
257 | return __clk_get_rate(dd->clk_bypass); | 257 | return __clk_get_rate(dd->clk_bypass); |
258 | } else if (soc_is_am33xx() || cpu_is_omap44xx()) { | 258 | } else if (soc_is_am33xx() || cpu_is_omap44xx() || soc_is_am43xx()) { |
259 | if (v == OMAP4XXX_EN_DPLL_LPBYPASS || | 259 | if (v == OMAP4XXX_EN_DPLL_LPBYPASS || |
260 | v == OMAP4XXX_EN_DPLL_FRBYPASS || | 260 | v == OMAP4XXX_EN_DPLL_FRBYPASS || |
261 | v == OMAP4XXX_EN_DPLL_MNBYPASS) | 261 | v == OMAP4XXX_EN_DPLL_MNBYPASS) |
diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c index ab43755364f5..9fe8c949305c 100644 --- a/arch/arm/mach-omap2/gpmc.c +++ b/arch/arm/mach-omap2/gpmc.c | |||
@@ -501,7 +501,7 @@ static int gpmc_cs_delete_mem(int cs) | |||
501 | int r; | 501 | int r; |
502 | 502 | ||
503 | spin_lock(&gpmc_mem_lock); | 503 | spin_lock(&gpmc_mem_lock); |
504 | r = release_resource(&gpmc_cs_mem[cs]); | 504 | r = release_resource(res); |
505 | res->start = 0; | 505 | res->start = 0; |
506 | res->end = 0; | 506 | res->end = 0; |
507 | spin_unlock(&gpmc_mem_lock); | 507 | spin_unlock(&gpmc_mem_lock); |
@@ -527,6 +527,14 @@ static int gpmc_cs_remap(int cs, u32 base) | |||
527 | pr_err("%s: requested chip-select is disabled\n", __func__); | 527 | pr_err("%s: requested chip-select is disabled\n", __func__); |
528 | return -ENODEV; | 528 | return -ENODEV; |
529 | } | 529 | } |
530 | |||
531 | /* | ||
532 | * Make sure we ignore any device offsets from the GPMC partition | ||
533 | * allocated for the chip select and that the new base confirms | ||
534 | * to the GPMC 16MB minimum granularity. | ||
535 | */ | ||
536 | base &= ~(SZ_16M - 1); | ||
537 | |||
530 | gpmc_cs_get_memconf(cs, &old_base, &size); | 538 | gpmc_cs_get_memconf(cs, &old_base, &size); |
531 | if (base == old_base) | 539 | if (base == old_base) |
532 | return 0; | 540 | return 0; |
@@ -586,6 +594,8 @@ EXPORT_SYMBOL(gpmc_cs_request); | |||
586 | 594 | ||
587 | void gpmc_cs_free(int cs) | 595 | void gpmc_cs_free(int cs) |
588 | { | 596 | { |
597 | struct resource *res = &gpmc_cs_mem[cs]; | ||
598 | |||
589 | spin_lock(&gpmc_mem_lock); | 599 | spin_lock(&gpmc_mem_lock); |
590 | if (cs >= gpmc_cs_num || cs < 0 || !gpmc_cs_reserved(cs)) { | 600 | if (cs >= gpmc_cs_num || cs < 0 || !gpmc_cs_reserved(cs)) { |
591 | printk(KERN_ERR "Trying to free non-reserved GPMC CS%d\n", cs); | 601 | printk(KERN_ERR "Trying to free non-reserved GPMC CS%d\n", cs); |
@@ -594,7 +604,8 @@ void gpmc_cs_free(int cs) | |||
594 | return; | 604 | return; |
595 | } | 605 | } |
596 | gpmc_cs_disable_mem(cs); | 606 | gpmc_cs_disable_mem(cs); |
597 | release_resource(&gpmc_cs_mem[cs]); | 607 | if (res->flags) |
608 | release_resource(res); | ||
598 | gpmc_cs_set_reserved(cs, 0); | 609 | gpmc_cs_set_reserved(cs, 0); |
599 | spin_unlock(&gpmc_mem_lock); | 610 | spin_unlock(&gpmc_mem_lock); |
600 | } | 611 | } |
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c index 1f33f5db10d5..66c60fe1104c 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c | |||
@@ -2546,11 +2546,12 @@ static int __init _init(struct omap_hwmod *oh, void *data) | |||
2546 | return -EINVAL; | 2546 | return -EINVAL; |
2547 | } | 2547 | } |
2548 | 2548 | ||
2549 | if (np) | 2549 | if (np) { |
2550 | if (of_find_property(np, "ti,no-reset-on-init", NULL)) | 2550 | if (of_find_property(np, "ti,no-reset-on-init", NULL)) |
2551 | oh->flags |= HWMOD_INIT_NO_RESET; | 2551 | oh->flags |= HWMOD_INIT_NO_RESET; |
2552 | if (of_find_property(np, "ti,no-idle-on-init", NULL)) | 2552 | if (of_find_property(np, "ti,no-idle-on-init", NULL)) |
2553 | oh->flags |= HWMOD_INIT_NO_IDLE; | 2553 | oh->flags |= HWMOD_INIT_NO_IDLE; |
2554 | } | ||
2554 | 2555 | ||
2555 | oh->_state = _HWMOD_STATE_INITIALIZED; | 2556 | oh->_state = _HWMOD_STATE_INITIALIZED; |
2556 | 2557 | ||
diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c index a123ff0070bd..71ac7d5f3385 100644 --- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | |||
@@ -1964,7 +1964,7 @@ static struct omap_hwmod_irq_info omap3xxx_usb_host_hs_irqs[] = { | |||
1964 | static struct omap_hwmod omap3xxx_usb_host_hs_hwmod = { | 1964 | static struct omap_hwmod omap3xxx_usb_host_hs_hwmod = { |
1965 | .name = "usb_host_hs", | 1965 | .name = "usb_host_hs", |
1966 | .class = &omap3xxx_usb_host_hs_hwmod_class, | 1966 | .class = &omap3xxx_usb_host_hs_hwmod_class, |
1967 | .clkdm_name = "l3_init_clkdm", | 1967 | .clkdm_name = "usbhost_clkdm", |
1968 | .mpu_irqs = omap3xxx_usb_host_hs_irqs, | 1968 | .mpu_irqs = omap3xxx_usb_host_hs_irqs, |
1969 | .main_clk = "usbhost_48m_fck", | 1969 | .main_clk = "usbhost_48m_fck", |
1970 | .prcm = { | 1970 | .prcm = { |
@@ -2047,7 +2047,7 @@ static struct omap_hwmod_irq_info omap3xxx_usb_tll_hs_irqs[] = { | |||
2047 | static struct omap_hwmod omap3xxx_usb_tll_hs_hwmod = { | 2047 | static struct omap_hwmod omap3xxx_usb_tll_hs_hwmod = { |
2048 | .name = "usb_tll_hs", | 2048 | .name = "usb_tll_hs", |
2049 | .class = &omap3xxx_usb_tll_hs_hwmod_class, | 2049 | .class = &omap3xxx_usb_tll_hs_hwmod_class, |
2050 | .clkdm_name = "l3_init_clkdm", | 2050 | .clkdm_name = "core_l4_clkdm", |
2051 | .mpu_irqs = omap3xxx_usb_tll_hs_irqs, | 2051 | .mpu_irqs = omap3xxx_usb_tll_hs_irqs, |
2052 | .main_clk = "usbtll_fck", | 2052 | .main_clk = "usbtll_fck", |
2053 | .prcm = { | 2053 | .prcm = { |
diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c index 1f3770a8a728..87099bb6de69 100644 --- a/arch/arm/mach-omap2/pm34xx.c +++ b/arch/arm/mach-omap2/pm34xx.c | |||
@@ -330,10 +330,6 @@ void omap_sram_idle(void) | |||
330 | omap3_sram_restore_context(); | 330 | omap3_sram_restore_context(); |
331 | omap2_sms_restore_context(); | 331 | omap2_sms_restore_context(); |
332 | } | 332 | } |
333 | if (core_next_state == PWRDM_POWER_OFF) | ||
334 | omap2_prm_clear_mod_reg_bits(OMAP3430_AUTO_OFF_MASK, | ||
335 | OMAP3430_GR_MOD, | ||
336 | OMAP3_PRM_VOLTCTRL_OFFSET); | ||
337 | } | 333 | } |
338 | omap3_intc_resume_idle(); | 334 | omap3_intc_resume_idle(); |
339 | 335 | ||
diff --git a/arch/arm/mach-pxa/include/mach/hx4700.h b/arch/arm/mach-pxa/include/mach/hx4700.h index 8bc02913517c..0e1bb46264f9 100644 --- a/arch/arm/mach-pxa/include/mach/hx4700.h +++ b/arch/arm/mach-pxa/include/mach/hx4700.h | |||
@@ -14,6 +14,7 @@ | |||
14 | 14 | ||
15 | #include <linux/gpio.h> | 15 | #include <linux/gpio.h> |
16 | #include <linux/mfd/asic3.h> | 16 | #include <linux/mfd/asic3.h> |
17 | #include "irqs.h" /* PXA_NR_BUILTIN_GPIO */ | ||
17 | 18 | ||
18 | #define HX4700_ASIC3_GPIO_BASE PXA_NR_BUILTIN_GPIO | 19 | #define HX4700_ASIC3_GPIO_BASE PXA_NR_BUILTIN_GPIO |
19 | #define HX4700_EGPIO_BASE (HX4700_ASIC3_GPIO_BASE + ASIC3_NUM_GPIOS) | 20 | #define HX4700_EGPIO_BASE (HX4700_ASIC3_GPIO_BASE + ASIC3_NUM_GPIOS) |
diff --git a/arch/arm/mach-rockchip/platsmp.c b/arch/arm/mach-rockchip/platsmp.c index dbfa5a26cfff..072842f6491b 100644 --- a/arch/arm/mach-rockchip/platsmp.c +++ b/arch/arm/mach-rockchip/platsmp.c | |||
@@ -152,7 +152,7 @@ static void __init rockchip_smp_prepare_cpus(unsigned int max_cpus) | |||
152 | 152 | ||
153 | node = of_find_compatible_node(NULL, NULL, "rockchip,rk3066-pmu"); | 153 | node = of_find_compatible_node(NULL, NULL, "rockchip,rk3066-pmu"); |
154 | if (!node) { | 154 | if (!node) { |
155 | pr_err("%s: could not find sram dt node\n", __func__); | 155 | pr_err("%s: could not find pmu dt node\n", __func__); |
156 | return; | 156 | return; |
157 | } | 157 | } |
158 | 158 | ||
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c index 2858f380beae..486063db2a2f 100644 --- a/arch/arm/mach-shmobile/board-armadillo800eva.c +++ b/arch/arm/mach-shmobile/board-armadillo800eva.c | |||
@@ -992,6 +992,7 @@ static struct asoc_simple_card_info fsi_wm8978_info = { | |||
992 | .platform = "sh_fsi2", | 992 | .platform = "sh_fsi2", |
993 | .daifmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBM_CFM, | 993 | .daifmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBM_CFM, |
994 | .cpu_dai = { | 994 | .cpu_dai = { |
995 | .fmt = SND_SOC_DAIFMT_IB_NF, | ||
995 | .name = "fsia-dai", | 996 | .name = "fsia-dai", |
996 | }, | 997 | }, |
997 | .codec_dai = { | 998 | .codec_dai = { |
diff --git a/arch/arm/mach-shmobile/board-lager.c b/arch/arm/mach-shmobile/board-lager.c index f0104bfe544e..18c7e0311aa6 100644 --- a/arch/arm/mach-shmobile/board-lager.c +++ b/arch/arm/mach-shmobile/board-lager.c | |||
@@ -588,14 +588,12 @@ static struct asoc_simple_card_info rsnd_card_info = { | |||
588 | .card = "SSI01-AK4643", | 588 | .card = "SSI01-AK4643", |
589 | .codec = "ak4642-codec.2-0012", | 589 | .codec = "ak4642-codec.2-0012", |
590 | .platform = "rcar_sound", | 590 | .platform = "rcar_sound", |
591 | .daifmt = SND_SOC_DAIFMT_LEFT_J, | 591 | .daifmt = SND_SOC_DAIFMT_LEFT_J | SND_SOC_DAIFMT_CBM_CFM, |
592 | .cpu_dai = { | 592 | .cpu_dai = { |
593 | .name = "rcar_sound", | 593 | .name = "rcar_sound", |
594 | .fmt = SND_SOC_DAIFMT_CBS_CFS, | ||
595 | }, | 594 | }, |
596 | .codec_dai = { | 595 | .codec_dai = { |
597 | .name = "ak4642-hifi", | 596 | .name = "ak4642-hifi", |
598 | .fmt = SND_SOC_DAIFMT_CBM_CFM, | ||
599 | .sysclk = 11289600, | 597 | .sysclk = 11289600, |
600 | }, | 598 | }, |
601 | }; | 599 | }; |
diff --git a/arch/arm/mach-shmobile/clock-r8a7778.c b/arch/arm/mach-shmobile/clock-r8a7778.c index 2009a9bc6356..9989b1b06ffd 100644 --- a/arch/arm/mach-shmobile/clock-r8a7778.c +++ b/arch/arm/mach-shmobile/clock-r8a7778.c | |||
@@ -170,7 +170,7 @@ static struct clk mstp_clks[MSTP_NR] = { | |||
170 | [MSTP010] = SH_CLK_MSTP32(&p_clk, MSTPCR0, 10, 0), /* SSI2 */ | 170 | [MSTP010] = SH_CLK_MSTP32(&p_clk, MSTPCR0, 10, 0), /* SSI2 */ |
171 | [MSTP009] = SH_CLK_MSTP32(&p_clk, MSTPCR0, 9, 0), /* SSI3 */ | 171 | [MSTP009] = SH_CLK_MSTP32(&p_clk, MSTPCR0, 9, 0), /* SSI3 */ |
172 | [MSTP008] = SH_CLK_MSTP32(&p_clk, MSTPCR0, 8, 0), /* SRU */ | 172 | [MSTP008] = SH_CLK_MSTP32(&p_clk, MSTPCR0, 8, 0), /* SRU */ |
173 | [MSTP007] = SH_CLK_MSTP32(&p_clk, MSTPCR0, 7, 0), /* HSPI */ | 173 | [MSTP007] = SH_CLK_MSTP32(&s_clk, MSTPCR0, 7, 0), /* HSPI */ |
174 | }; | 174 | }; |
175 | 175 | ||
176 | static struct clk_lookup lookups[] = { | 176 | static struct clk_lookup lookups[] = { |
diff --git a/arch/arm/mach-spear/time.c b/arch/arm/mach-spear/time.c index 64790353951f..26fda4ed4d51 100644 --- a/arch/arm/mach-spear/time.c +++ b/arch/arm/mach-spear/time.c | |||
@@ -71,7 +71,7 @@ static void clockevent_set_mode(enum clock_event_mode mode, | |||
71 | static int clockevent_next_event(unsigned long evt, | 71 | static int clockevent_next_event(unsigned long evt, |
72 | struct clock_event_device *clk_event_dev); | 72 | struct clock_event_device *clk_event_dev); |
73 | 73 | ||
74 | static void spear_clocksource_init(void) | 74 | static void __init spear_clocksource_init(void) |
75 | { | 75 | { |
76 | u32 tick_rate; | 76 | u32 tick_rate; |
77 | u16 val; | 77 | u16 val; |
diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig index 92d660f9610f..55b305d51669 100644 --- a/arch/arm/mach-tegra/Kconfig +++ b/arch/arm/mach-tegra/Kconfig | |||
@@ -70,7 +70,4 @@ config TEGRA_AHB | |||
70 | which controls AHB bus master arbitration and some | 70 | which controls AHB bus master arbitration and some |
71 | performance parameters(priority, prefech size). | 71 | performance parameters(priority, prefech size). |
72 | 72 | ||
73 | config TEGRA_EMC_SCALING_ENABLE | ||
74 | bool "Enable scaling the memory frequency" | ||
75 | |||
76 | endmenu | 73 | endmenu |
diff --git a/arch/arm/mach-vexpress/dcscb.c b/arch/arm/mach-vexpress/dcscb.c index 788495d35cf9..30b993399ed7 100644 --- a/arch/arm/mach-vexpress/dcscb.c +++ b/arch/arm/mach-vexpress/dcscb.c | |||
@@ -51,12 +51,14 @@ static int dcscb_allcpus_mask[2]; | |||
51 | static int dcscb_power_up(unsigned int cpu, unsigned int cluster) | 51 | static int dcscb_power_up(unsigned int cpu, unsigned int cluster) |
52 | { | 52 | { |
53 | unsigned int rst_hold, cpumask = (1 << cpu); | 53 | unsigned int rst_hold, cpumask = (1 << cpu); |
54 | unsigned int all_mask = dcscb_allcpus_mask[cluster]; | 54 | unsigned int all_mask; |
55 | 55 | ||
56 | pr_debug("%s: cpu %u cluster %u\n", __func__, cpu, cluster); | 56 | pr_debug("%s: cpu %u cluster %u\n", __func__, cpu, cluster); |
57 | if (cpu >= 4 || cluster >= 2) | 57 | if (cpu >= 4 || cluster >= 2) |
58 | return -EINVAL; | 58 | return -EINVAL; |
59 | 59 | ||
60 | all_mask = dcscb_allcpus_mask[cluster]; | ||
61 | |||
60 | /* | 62 | /* |
61 | * Since this is called with IRQs enabled, and no arch_spin_lock_irq | 63 | * Since this is called with IRQs enabled, and no arch_spin_lock_irq |
62 | * variant exists, we need to disable IRQs manually here. | 64 | * variant exists, we need to disable IRQs manually here. |
@@ -101,11 +103,12 @@ static void dcscb_power_down(void) | |||
101 | cpu = MPIDR_AFFINITY_LEVEL(mpidr, 0); | 103 | cpu = MPIDR_AFFINITY_LEVEL(mpidr, 0); |
102 | cluster = MPIDR_AFFINITY_LEVEL(mpidr, 1); | 104 | cluster = MPIDR_AFFINITY_LEVEL(mpidr, 1); |
103 | cpumask = (1 << cpu); | 105 | cpumask = (1 << cpu); |
104 | all_mask = dcscb_allcpus_mask[cluster]; | ||
105 | 106 | ||
106 | pr_debug("%s: cpu %u cluster %u\n", __func__, cpu, cluster); | 107 | pr_debug("%s: cpu %u cluster %u\n", __func__, cpu, cluster); |
107 | BUG_ON(cpu >= 4 || cluster >= 2); | 108 | BUG_ON(cpu >= 4 || cluster >= 2); |
108 | 109 | ||
110 | all_mask = dcscb_allcpus_mask[cluster]; | ||
111 | |||
109 | __mcpm_cpu_going_down(cpu, cluster); | 112 | __mcpm_cpu_going_down(cpu, cluster); |
110 | 113 | ||
111 | arch_spin_lock(&dcscb_lock); | 114 | arch_spin_lock(&dcscb_lock); |
diff --git a/arch/arm/mach-vexpress/spc.c b/arch/arm/mach-vexpress/spc.c index c26ef5b92ca7..2c2754e79cb3 100644 --- a/arch/arm/mach-vexpress/spc.c +++ b/arch/arm/mach-vexpress/spc.c | |||
@@ -392,7 +392,7 @@ static irqreturn_t ve_spc_irq_handler(int irq, void *data) | |||
392 | * +--------------------------+ | 392 | * +--------------------------+ |
393 | * | 31 20 | 19 0 | | 393 | * | 31 20 | 19 0 | |
394 | * +--------------------------+ | 394 | * +--------------------------+ |
395 | * | u_volt | freq(kHz) | | 395 | * | m_volt | freq(kHz) | |
396 | * +--------------------------+ | 396 | * +--------------------------+ |
397 | */ | 397 | */ |
398 | #define MULT_FACTOR 20 | 398 | #define MULT_FACTOR 20 |
@@ -414,7 +414,7 @@ static int ve_spc_populate_opps(uint32_t cluster) | |||
414 | ret = ve_spc_read_sys_cfg(SYSCFG_SCC, off, &data); | 414 | ret = ve_spc_read_sys_cfg(SYSCFG_SCC, off, &data); |
415 | if (!ret) { | 415 | if (!ret) { |
416 | opps->freq = (data & FREQ_MASK) * MULT_FACTOR; | 416 | opps->freq = (data & FREQ_MASK) * MULT_FACTOR; |
417 | opps->u_volt = data >> VOLT_SHIFT; | 417 | opps->u_volt = (data >> VOLT_SHIFT) * 1000; |
418 | } else { | 418 | } else { |
419 | break; | 419 | break; |
420 | } | 420 | } |
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig index f5ad9ee70426..5bf7c3c3b301 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig | |||
@@ -420,29 +420,29 @@ config CPU_32v3 | |||
420 | bool | 420 | bool |
421 | select CPU_USE_DOMAINS if MMU | 421 | select CPU_USE_DOMAINS if MMU |
422 | select NEEDS_SYSCALL_FOR_CMPXCHG if SMP | 422 | select NEEDS_SYSCALL_FOR_CMPXCHG if SMP |
423 | select TLS_REG_EMUL if SMP || !MMU | ||
424 | select NEED_KUSER_HELPERS | 423 | select NEED_KUSER_HELPERS |
424 | select TLS_REG_EMUL if SMP || !MMU | ||
425 | 425 | ||
426 | config CPU_32v4 | 426 | config CPU_32v4 |
427 | bool | 427 | bool |
428 | select CPU_USE_DOMAINS if MMU | 428 | select CPU_USE_DOMAINS if MMU |
429 | select NEEDS_SYSCALL_FOR_CMPXCHG if SMP | 429 | select NEEDS_SYSCALL_FOR_CMPXCHG if SMP |
430 | select TLS_REG_EMUL if SMP || !MMU | ||
431 | select NEED_KUSER_HELPERS | 430 | select NEED_KUSER_HELPERS |
431 | select TLS_REG_EMUL if SMP || !MMU | ||
432 | 432 | ||
433 | config CPU_32v4T | 433 | config CPU_32v4T |
434 | bool | 434 | bool |
435 | select CPU_USE_DOMAINS if MMU | 435 | select CPU_USE_DOMAINS if MMU |
436 | select NEEDS_SYSCALL_FOR_CMPXCHG if SMP | 436 | select NEEDS_SYSCALL_FOR_CMPXCHG if SMP |
437 | select TLS_REG_EMUL if SMP || !MMU | ||
438 | select NEED_KUSER_HELPERS | 437 | select NEED_KUSER_HELPERS |
438 | select TLS_REG_EMUL if SMP || !MMU | ||
439 | 439 | ||
440 | config CPU_32v5 | 440 | config CPU_32v5 |
441 | bool | 441 | bool |
442 | select CPU_USE_DOMAINS if MMU | 442 | select CPU_USE_DOMAINS if MMU |
443 | select NEEDS_SYSCALL_FOR_CMPXCHG if SMP | 443 | select NEEDS_SYSCALL_FOR_CMPXCHG if SMP |
444 | select TLS_REG_EMUL if SMP || !MMU | ||
445 | select NEED_KUSER_HELPERS | 444 | select NEED_KUSER_HELPERS |
445 | select TLS_REG_EMUL if SMP || !MMU | ||
446 | 446 | ||
447 | config CPU_32v6 | 447 | config CPU_32v6 |
448 | bool | 448 | bool |
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index f62aa0677e5c..6b00be1f971e 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c | |||
@@ -1963,8 +1963,8 @@ arm_iommu_create_mapping(struct bus_type *bus, dma_addr_t base, size_t size) | |||
1963 | mapping->nr_bitmaps = 1; | 1963 | mapping->nr_bitmaps = 1; |
1964 | mapping->extensions = extensions; | 1964 | mapping->extensions = extensions; |
1965 | mapping->base = base; | 1965 | mapping->base = base; |
1966 | mapping->size = bitmap_size << PAGE_SHIFT; | ||
1967 | mapping->bits = BITS_PER_BYTE * bitmap_size; | 1966 | mapping->bits = BITS_PER_BYTE * bitmap_size; |
1967 | mapping->size = mapping->bits << PAGE_SHIFT; | ||
1968 | 1968 | ||
1969 | spin_lock_init(&mapping->lock); | 1969 | spin_lock_init(&mapping->lock); |
1970 | 1970 | ||
diff --git a/arch/arm/vfp/vfpdouble.c b/arch/arm/vfp/vfpdouble.c index 6cac43bd1d86..423f56dd4028 100644 --- a/arch/arm/vfp/vfpdouble.c +++ b/arch/arm/vfp/vfpdouble.c | |||
@@ -866,6 +866,8 @@ vfp_double_multiply_accumulate(int dd, int dn, int dm, u32 fpscr, u32 negate, ch | |||
866 | vdp.sign = vfp_sign_negate(vdp.sign); | 866 | vdp.sign = vfp_sign_negate(vdp.sign); |
867 | 867 | ||
868 | vfp_double_unpack(&vdn, vfp_get_double(dd)); | 868 | vfp_double_unpack(&vdn, vfp_get_double(dd)); |
869 | if (vdn.exponent == 0 && vdn.significand) | ||
870 | vfp_double_normalise_denormal(&vdn); | ||
869 | if (negate & NEG_SUBTRACT) | 871 | if (negate & NEG_SUBTRACT) |
870 | vdn.sign = vfp_sign_negate(vdn.sign); | 872 | vdn.sign = vfp_sign_negate(vdn.sign); |
871 | 873 | ||
diff --git a/arch/arm/vfp/vfpsingle.c b/arch/arm/vfp/vfpsingle.c index b252631b406b..4f96c1617aae 100644 --- a/arch/arm/vfp/vfpsingle.c +++ b/arch/arm/vfp/vfpsingle.c | |||
@@ -915,6 +915,8 @@ vfp_single_multiply_accumulate(int sd, int sn, s32 m, u32 fpscr, u32 negate, cha | |||
915 | v = vfp_get_float(sd); | 915 | v = vfp_get_float(sd); |
916 | pr_debug("VFP: s%u = %08x\n", sd, v); | 916 | pr_debug("VFP: s%u = %08x\n", sd, v); |
917 | vfp_single_unpack(&vsn, v); | 917 | vfp_single_unpack(&vsn, v); |
918 | if (vsn.exponent == 0 && vsn.significand) | ||
919 | vfp_single_normalise_denormal(&vsn); | ||
918 | if (negate & NEG_SUBTRACT) | 920 | if (negate & NEG_SUBTRACT) |
919 | vsn.sign = vfp_sign_negate(vsn.sign); | 921 | vsn.sign = vfp_sign_negate(vsn.sign); |
920 | 922 | ||