Skip to content

Commit 9fb52fa

Browse files
otaviootavio
authored
Merge pull request Freescale#91 from zandrey/5.4-1.0.0-imx
Update 5.4-1.0.0-imx to v5.4.51 from stable
2 parents 72b904d + c7abb12 commit 9fb52fa

File tree

807 files changed

+7231
-3744
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

807 files changed

+7231
-3744
lines changed

‎Documentation/devicetree/bindings/display/mediatek/mediatek,dpi.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ Required properties:
1616
Documentation/devicetree/bindings/graph.txt. This port should be connected
1717
to the input port of an attached HDMI or LVDS encoder chip.
1818

19+
Optional properties:
20+
- pinctrl-names: Contain "default" and "sleep".
21+
1922
Example:
2023

2124
dpi0: dpi@1401d000 {
@@ -26,6 +29,9 @@ dpi0: dpi@1401d000 {
2629
<&mmsys CLK_MM_DPI_ENGINE>,
2730
<&apmixedsys CLK_APMIXED_TVDPLL>;
2831
clock-names = "pixel", "engine", "pll";
32+
pinctrl-names = "default", "sleep";
33+
pinctrl-0 = <&dpi_pin_func>;
34+
pinctrl-1 = <&dpi_pin_idle>;
2935

3036
port {
3137
dpi0_out: endpoint {

‎Documentation/virt/kvm/api.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4444,9 +4444,11 @@ EOI was received.
44444444
#define KVM_EXIT_HYPERV_SYNIC 1
44454445
#define KVM_EXIT_HYPERV_HCALL 2
44464446
__u32 type;
4447+
__u32 pad1;
44474448
union {
44484449
struct {
44494450
__u32 msr;
4451+
__u32 pad2;
44504452
__u64 control;
44514453
__u64 evt_page;
44524454
__u64 msg_page;

‎Makefile

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22
VERSION = 5
33
PATCHLEVEL = 4
4-
SUBLEVEL = 47
4+
SUBLEVEL = 51
55
EXTRAVERSION =
66
NAME = Kleptomaniac Octopus
77

@@ -587,12 +587,8 @@ KBUILD_MODULES :=
587587
KBUILD_BUILTIN := 1
588588

589589
# If we have only "make modules", don't compile built-in objects.
590-
# When we're building modules with modversions, we need to consider
591-
# the built-in objects during the descend as well, in order to
592-
# make sure the checksums are up to date before we record them.
593-
594590
ifeq ($(MAKECMDGOALS),modules)
595-
KBUILD_BUILTIN := $(if $(CONFIG_MODVERSIONS),1)
591+
KBUILD_BUILTIN :=
596592
endif
597593

598594
# If we have "make <whatever> modules", compile modules
@@ -1282,6 +1278,13 @@ ifdef CONFIG_MODULES
12821278

12831279
all: modules
12841280

1281+
# When we're building modules with modversions, we need to consider
1282+
# the built-in objects during the descend as well, in order to
1283+
# make sure the checksums are up to date before we record them.
1284+
ifdef CONFIG_MODVERSIONS
1285+
KBUILD_BUILTIN := 1
1286+
endif
1287+
12851288
# Build modules
12861289
#
12871290
# A module can be listed more than once in obj-m resulting in

‎arch/alpha/include/asm/io.h

Lines changed: 59 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -322,14 +322,18 @@ static inline int __is_mmio(const volatile void __iomem *addr)
322322
#if IO_CONCAT(__IO_PREFIX,trivial_io_bw)
323323
extern inline unsigned int ioread8(void __iomem *addr)
324324
{
325-
unsigned int ret = IO_CONCAT(__IO_PREFIX,ioread8)(addr);
325+
unsigned int ret;
326+
mb();
327+
ret = IO_CONCAT(__IO_PREFIX,ioread8)(addr);
326328
mb();
327329
return ret;
328330
}
329331

330332
extern inline unsigned int ioread16(void __iomem *addr)
331333
{
332-
unsigned int ret = IO_CONCAT(__IO_PREFIX,ioread16)(addr);
334+
unsigned int ret;
335+
mb();
336+
ret = IO_CONCAT(__IO_PREFIX,ioread16)(addr);
333337
mb();
334338
return ret;
335339
}
@@ -370,7 +374,9 @@ extern inline void outw(u16 b, unsigned long port)
370374
#if IO_CONCAT(__IO_PREFIX,trivial_io_lq)
371375
extern inline unsigned int ioread32(void __iomem *addr)
372376
{
373-
unsigned int ret = IO_CONCAT(__IO_PREFIX,ioread32)(addr);
377+
unsigned int ret;
378+
mb();
379+
ret = IO_CONCAT(__IO_PREFIX,ioread32)(addr);
374380
mb();
375381
return ret;
376382
}
@@ -415,14 +421,18 @@ extern inline void __raw_writew(u16 b, volatile void __iomem *addr)
415421

416422
extern inline u8 readb(const volatile void __iomem *addr)
417423
{
418-
u8 ret = __raw_readb(addr);
424+
u8 ret;
425+
mb();
426+
ret = __raw_readb(addr);
419427
mb();
420428
return ret;
421429
}
422430

423431
extern inline u16 readw(const volatile void __iomem *addr)
424432
{
425-
u16 ret = __raw_readw(addr);
433+
u16 ret;
434+
mb();
435+
ret = __raw_readw(addr);
426436
mb();
427437
return ret;
428438
}
@@ -463,14 +473,18 @@ extern inline void __raw_writeq(u64 b, volatile void __iomem *addr)
463473

464474
extern inline u32 readl(const volatile void __iomem *addr)
465475
{
466-
u32 ret = __raw_readl(addr);
476+
u32 ret;
477+
mb();
478+
ret = __raw_readl(addr);
467479
mb();
468480
return ret;
469481
}
470482

471483
extern inline u64 readq(const volatile void __iomem *addr)
472484
{
473-
u64 ret = __raw_readq(addr);
485+
u64 ret;
486+
mb();
487+
ret = __raw_readq(addr);
474488
mb();
475489
return ret;
476490
}
@@ -499,14 +513,44 @@ extern inline void writeq(u64 b, volatile void __iomem *addr)
499513
#define outb_p outb
500514
#define outw_p outw
501515
#define outl_p outl
502-
#define readb_relaxed(addr) __raw_readb(addr)
503-
#define readw_relaxed(addr) __raw_readw(addr)
504-
#define readl_relaxed(addr) __raw_readl(addr)
505-
#define readq_relaxed(addr) __raw_readq(addr)
506-
#define writeb_relaxed(b, addr) __raw_writeb(b, addr)
507-
#define writew_relaxed(b, addr) __raw_writew(b, addr)
508-
#define writel_relaxed(b, addr) __raw_writel(b, addr)
509-
#define writeq_relaxed(b, addr) __raw_writeq(b, addr)
516+
517+
extern u8 readb_relaxed(const volatile void __iomem *addr);
518+
extern u16 readw_relaxed(const volatile void __iomem *addr);
519+
extern u32 readl_relaxed(const volatile void __iomem *addr);
520+
extern u64 readq_relaxed(const volatile void __iomem *addr);
521+
522+
#if IO_CONCAT(__IO_PREFIX,trivial_io_bw)
523+
extern inline u8 readb_relaxed(const volatile void __iomem *addr)
524+
{
525+
mb();
526+
return __raw_readb(addr);
527+
}
528+
529+
extern inline u16 readw_relaxed(const volatile void __iomem *addr)
530+
{
531+
mb();
532+
return __raw_readw(addr);
533+
}
534+
#endif
535+
536+
#if IO_CONCAT(__IO_PREFIX,trivial_io_lq)
537+
extern inline u32 readl_relaxed(const volatile void __iomem *addr)
538+
{
539+
mb();
540+
return __raw_readl(addr);
541+
}
542+
543+
extern inline u64 readq_relaxed(const volatile void __iomem *addr)
544+
{
545+
mb();
546+
return __raw_readq(addr);
547+
}
548+
#endif
549+
550+
#define writeb_relaxed writeb
551+
#define writew_relaxed writew
552+
#define writel_relaxed writel
553+
#define writeq_relaxed writeq
510554

511555
/*
512556
* String version of IO memory access ops:

‎arch/alpha/kernel/io.c

Lines changed: 53 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,27 @@
1616
unsigned int
1717
ioread8(void __iomem *addr)
1818
{
19-
unsigned int ret = IO_CONCAT(__IO_PREFIX,ioread8)(addr);
19+
unsigned int ret;
20+
mb();
21+
ret = IO_CONCAT(__IO_PREFIX,ioread8)(addr);
2022
mb();
2123
return ret;
2224
}
2325

2426
unsigned int ioread16(void __iomem *addr)
2527
{
26-
unsigned int ret = IO_CONCAT(__IO_PREFIX,ioread16)(addr);
28+
unsigned int ret;
29+
mb();
30+
ret = IO_CONCAT(__IO_PREFIX,ioread16)(addr);
2731
mb();
2832
return ret;
2933
}
3034

3135
unsigned int ioread32(void __iomem *addr)
3236
{
33-
unsigned int ret = IO_CONCAT(__IO_PREFIX,ioread32)(addr);
37+
unsigned int ret;
38+
mb();
39+
ret = IO_CONCAT(__IO_PREFIX,ioread32)(addr);
3440
mb();
3541
return ret;
3642
}
@@ -148,28 +154,36 @@ EXPORT_SYMBOL(__raw_writeq);
148154

149155
u8 readb(const volatile void __iomem *addr)
150156
{
151-
u8 ret = __raw_readb(addr);
157+
u8 ret;
158+
mb();
159+
ret = __raw_readb(addr);
152160
mb();
153161
return ret;
154162
}
155163

156164
u16 readw(const volatile void __iomem *addr)
157165
{
158-
u16 ret = __raw_readw(addr);
166+
u16 ret;
167+
mb();
168+
ret = __raw_readw(addr);
159169
mb();
160170
return ret;
161171
}
162172

163173
u32 readl(const volatile void __iomem *addr)
164174
{
165-
u32 ret = __raw_readl(addr);
175+
u32 ret;
176+
mb();
177+
ret = __raw_readl(addr);
166178
mb();
167179
return ret;
168180
}
169181

170182
u64 readq(const volatile void __iomem *addr)
171183
{
172-
u64 ret = __raw_readq(addr);
184+
u64 ret;
185+
mb();
186+
ret = __raw_readq(addr);
173187
mb();
174188
return ret;
175189
}
@@ -207,6 +221,38 @@ EXPORT_SYMBOL(writew);
207221
EXPORT_SYMBOL(writel);
208222
EXPORT_SYMBOL(writeq);
209223

224+
/*
225+
* The _relaxed functions must be ordered w.r.t. each other, but they don't
226+
* have to be ordered w.r.t. other memory accesses.
227+
*/
228+
u8 readb_relaxed(const volatile void __iomem *addr)
229+
{
230+
mb();
231+
return __raw_readb(addr);
232+
}
233+
234+
u16 readw_relaxed(const volatile void __iomem *addr)
235+
{
236+
mb();
237+
return __raw_readw(addr);
238+
}
239+
240+
u32 readl_relaxed(const volatile void __iomem *addr)
241+
{
242+
mb();
243+
return __raw_readl(addr);
244+
}
245+
246+
u64 readq_relaxed(const volatile void __iomem *addr)
247+
{
248+
mb();
249+
return __raw_readq(addr);
250+
}
251+
252+
EXPORT_SYMBOL(readb_relaxed);
253+
EXPORT_SYMBOL(readw_relaxed);
254+
EXPORT_SYMBOL(readl_relaxed);
255+
EXPORT_SYMBOL(readq_relaxed);
210256

211257
/*
212258
* Read COUNT 8-bit bytes from port PORT into memory starting at SRC.

‎arch/arm/boot/dts/am335x-pocketbeagle.dts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@
8888
AM33XX_PADCONF(AM335X_PIN_MMC0_DAT3, PIN_INPUT_PULLUP, MUX_MODE0)
8989
AM33XX_PADCONF(AM335X_PIN_MMC0_CMD, PIN_INPUT_PULLUP, MUX_MODE0)
9090
AM33XX_PADCONF(AM335X_PIN_MMC0_CLK, PIN_INPUT_PULLUP, MUX_MODE0)
91-
AM33XX_PADCONF(AM335X_PIN_MCASP0_ACLKR, PIN_INPUT, MUX_MODE4) /* (B12) mcasp0_aclkr.mmc0_sdwp */
9291
>;
9392
};
9493

‎arch/arm/boot/dts/at91-sama5d2_ptc_ek.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040

4141
ahb {
4242
usb0: gadget@300000 {
43-
atmel,vbus-gpio = <&pioA PIN_PA27 GPIO_ACTIVE_HIGH>;
43+
atmel,vbus-gpio = <&pioA PIN_PB11 GPIO_ACTIVE_HIGH>;
4444
pinctrl-names = "default";
4545
pinctrl-0 = <&pinctrl_usba_vbus>;
4646
status = "okay";

‎arch/arm/boot/dts/bcm-nsp.dtsi

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -257,10 +257,10 @@
257257
status = "disabled";
258258
};
259259

260-
mailbox: mailbox@25000 {
260+
mailbox: mailbox@25c00 {
261261
compatible = "brcm,iproc-fa2-mbox";
262-
reg = <0x25000 0x445>;
263-
interrupts = <GIC_SPI 150 IRQ_TYPE_LEVEL_HIGH>;
262+
reg = <0x25c00 0x400>;
263+
interrupts = <GIC_SPI 151 IRQ_TYPE_LEVEL_HIGH>;
264264
#mbox-cells = <1>;
265265
brcm,rx-status-len = <32>;
266266
brcm,use-bcm-hdr;

‎arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868

6969
i2c_cm36651: i2c-gpio-2 {
7070
compatible = "i2c-gpio";
71-
gpios = <&gpf0 0 GPIO_ACTIVE_LOW>, <&gpf0 1 GPIO_ACTIVE_LOW>;
71+
gpios = <&gpf0 0 GPIO_ACTIVE_HIGH>, <&gpf0 1 GPIO_ACTIVE_HIGH>;
7272
i2c-gpio,delay-us = <2>;
7373
#address-cells = <1>;
7474
#size-cells = <0>;

‎arch/arm/boot/dts/omap4-duovero-parlor.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@
139139
ethernet@gpmc {
140140
reg = <5 0 0xff>;
141141
interrupt-parent = <&gpio2>;
142-
interrupts = <12 IRQ_TYPE_EDGE_FALLING>; /* gpio_44 */
142+
interrupts = <12 IRQ_TYPE_LEVEL_LOW>; /* gpio_44 */
143143

144144
phy-mode = "mii";
145145

0 commit comments

Comments
 (0)