Skip to content

Commit 615b994

Browse files
committed
Merge tag 'armsoc-for-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC fixes from Arnd Bergmann: "Not much interesting going on fixes-wise for us this week, as it should be for an -rc7. I'm not expecting Olof to work much over Thanksgiving weekend, so I decided to take over again and push these out to you. Just four simple fixes this week: - one missing of_node_put() on armv7 based mvebu - forcing the USB host into the right mode on Chromebook (exynos5-snow) - enabling two important drivers for exynos_defconfig - fixing a noncritical bug for tegra that would cause a regression with common code patches queued for 3.19" * tag 'armsoc-for-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: ARM: tegra: irq: fix buggy usage of irq_data irq field ARM: exynos_defconfig: Enable max77802 rtc and clock drivers ARM: dts: Explicitly set dr_mode on exynos5250-snow ARM: mvebu: add missing of_node_put() call in coherency.c
2 parents e818d5e + 96ba18f commit 615b994

File tree

5 files changed

+20
-12
lines changed

5 files changed

+20
-12
lines changed

arch/arm/boot/dts/exynos5250-snow.dts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -624,4 +624,8 @@
624624
num-cs = <1>;
625625
};
626626

627+
&usbdrd_dwc3 {
628+
dr_mode = "host";
629+
};
630+
627631
#include "cros-ec-keyboard.dtsi"

arch/arm/boot/dts/exynos5250.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -555,7 +555,7 @@
555555
#size-cells = <1>;
556556
ranges;
557557

558-
dwc3 {
558+
usbdrd_dwc3: dwc3 {
559559
compatible = "synopsys,dwc3";
560560
reg = <0x12000000 0x10000>;
561561
interrupts = <0 72 0>;

arch/arm/configs/exynos_defconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,11 +142,13 @@ CONFIG_MMC_DW_IDMAC=y
142142
CONFIG_MMC_DW_EXYNOS=y
143143
CONFIG_RTC_CLASS=y
144144
CONFIG_RTC_DRV_MAX77686=y
145+
CONFIG_RTC_DRV_MAX77802=y
145146
CONFIG_RTC_DRV_S5M=y
146147
CONFIG_RTC_DRV_S3C=y
147148
CONFIG_DMADEVICES=y
148149
CONFIG_PL330_DMA=y
149150
CONFIG_COMMON_CLK_MAX77686=y
151+
CONFIG_COMMON_CLK_MAX77802=y
150152
CONFIG_COMMON_CLK_S2MPS11=y
151153
CONFIG_EXYNOS_IOMMU=y
152154
CONFIG_IIO=y

arch/arm/mach-mvebu/coherency.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -400,6 +400,8 @@ int __init coherency_init(void)
400400
type == COHERENCY_FABRIC_TYPE_ARMADA_380)
401401
armada_375_380_coherency_init(np);
402402

403+
of_node_put(np);
404+
403405
return 0;
404406
}
405407

arch/arm/mach-tegra/irq.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -99,50 +99,50 @@ static inline void tegra_irq_write_mask(unsigned int irq, unsigned long reg)
9999

100100
static void tegra_mask(struct irq_data *d)
101101
{
102-
if (d->irq < FIRST_LEGACY_IRQ)
102+
if (d->hwirq < FIRST_LEGACY_IRQ)
103103
return;
104104

105-
tegra_irq_write_mask(d->irq, ICTLR_CPU_IER_CLR);
105+
tegra_irq_write_mask(d->hwirq, ICTLR_CPU_IER_CLR);
106106
}
107107

108108
static void tegra_unmask(struct irq_data *d)
109109
{
110-
if (d->irq < FIRST_LEGACY_IRQ)
110+
if (d->hwirq < FIRST_LEGACY_IRQ)
111111
return;
112112

113-
tegra_irq_write_mask(d->irq, ICTLR_CPU_IER_SET);
113+
tegra_irq_write_mask(d->hwirq, ICTLR_CPU_IER_SET);
114114
}
115115

116116
static void tegra_ack(struct irq_data *d)
117117
{
118-
if (d->irq < FIRST_LEGACY_IRQ)
118+
if (d->hwirq < FIRST_LEGACY_IRQ)
119119
return;
120120

121-
tegra_irq_write_mask(d->irq, ICTLR_CPU_IEP_FIR_CLR);
121+
tegra_irq_write_mask(d->hwirq, ICTLR_CPU_IEP_FIR_CLR);
122122
}
123123

124124
static void tegra_eoi(struct irq_data *d)
125125
{
126-
if (d->irq < FIRST_LEGACY_IRQ)
126+
if (d->hwirq < FIRST_LEGACY_IRQ)
127127
return;
128128

129-
tegra_irq_write_mask(d->irq, ICTLR_CPU_IEP_FIR_CLR);
129+
tegra_irq_write_mask(d->hwirq, ICTLR_CPU_IEP_FIR_CLR);
130130
}
131131

132132
static int tegra_retrigger(struct irq_data *d)
133133
{
134-
if (d->irq < FIRST_LEGACY_IRQ)
134+
if (d->hwirq < FIRST_LEGACY_IRQ)
135135
return 0;
136136

137-
tegra_irq_write_mask(d->irq, ICTLR_CPU_IEP_FIR_SET);
137+
tegra_irq_write_mask(d->hwirq, ICTLR_CPU_IEP_FIR_SET);
138138

139139
return 1;
140140
}
141141

142142
#ifdef CONFIG_PM_SLEEP
143143
static int tegra_set_wake(struct irq_data *d, unsigned int enable)
144144
{
145-
u32 irq = d->irq;
145+
u32 irq = d->hwirq;
146146
u32 index, mask;
147147

148148
if (irq < FIRST_LEGACY_IRQ ||

0 commit comments

Comments
 (0)