Skip to content

Commit db06650

Browse files
torvaldstorvalds
committed
Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC fixes from Olof Johansson: "A smallish set of fixes that we've been sitting on for a while now, flushing the queue here so they go in. Summary: A handful of fixes for OMAP, i.MX, Allwinner and Tegra: - A clock rate and a PHY setup fix for i.MX6Q/DL - A couple of fixes for the reduced serial bus (sunxi-rsb) on Allwinner - UART wakeirq fix for an OMAP4 board, timer config fixes for AM43XX. - Suspend fix for Tegra124 Chromebooks - Fix for missing implicit include that's different between ARM/ARM64" * tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: ARM: tegra: Fix suspend hang on Tegra124 Chromebooks bus: sunxi-rsb: Fix peripheral IC mapping runtime address bus: sunxi-rsb: Fix primary PMIC mapping hardware address ARM: dts: Fix UART wakeirq for omap4 duovero parlor ARM: OMAP2+: AM43xx: select ARM TWD timer ARM: OMAP2+: am43xx: enable GENERIC_CLOCKEVENTS_BROADCAST fsl-ifc: add missing include on ARM64 ARM: dts: imx6: Fix Ethernet PHY mode on Ventana boards ARM: dts: imx: Fix the assigned-clock mismatch issue on imx6q/dl bus: sunxi-rsb: unlock on error in sunxi_rsb_read() ARM: dts: sunxi: sun6i-a31s-primo81.dts: add touchscreen axis swapping property
2 parents 2c96961 + 80373d3 commit db06650

13 files changed

+27
-13
lines changed

‎arch/arm/boot/dts/imx6q-gw5400-a.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@
154154
&fec {
155155
pinctrl-names = "default";
156156
pinctrl-0 = <&pinctrl_enet>;
157-
phy-mode = "rgmii";
157+
phy-mode = "rgmii-id";
158158
phy-reset-gpios = <&gpio1 30 GPIO_ACTIVE_HIGH>;
159159
status = "okay";
160160
};

‎arch/arm/boot/dts/imx6qdl-gw51xx.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
&fec {
9595
pinctrl-names = "default";
9696
pinctrl-0 = <&pinctrl_enet>;
97-
phy-mode = "rgmii";
97+
phy-mode = "rgmii-id";
9898
phy-reset-gpios = <&gpio1 30 GPIO_ACTIVE_LOW>;
9999
status = "okay";
100100
};

‎arch/arm/boot/dts/imx6qdl-gw52xx.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@
154154
&fec {
155155
pinctrl-names = "default";
156156
pinctrl-0 = <&pinctrl_enet>;
157-
phy-mode = "rgmii";
157+
phy-mode = "rgmii-id";
158158
phy-reset-gpios = <&gpio1 30 GPIO_ACTIVE_LOW>;
159159
status = "okay";
160160
};

‎arch/arm/boot/dts/imx6qdl-gw53xx.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@
155155
&fec {
156156
pinctrl-names = "default";
157157
pinctrl-0 = <&pinctrl_enet>;
158-
phy-mode = "rgmii";
158+
phy-mode = "rgmii-id";
159159
phy-reset-gpios = <&gpio1 30 GPIO_ACTIVE_LOW>;
160160
status = "okay";
161161
};

‎arch/arm/boot/dts/imx6qdl-gw54xx.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@
145145
&fec {
146146
pinctrl-names = "default";
147147
pinctrl-0 = <&pinctrl_enet>;
148-
phy-mode = "rgmii";
148+
phy-mode = "rgmii-id";
149149
phy-reset-gpios = <&gpio1 30 GPIO_ACTIVE_LOW>;
150150
status = "okay";
151151
};

‎arch/arm/boot/dts/imx6qdl-sabreauto.dtsi

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,14 +113,14 @@
113113
&clks {
114114
assigned-clocks = <&clks IMX6QDL_PLL4_BYPASS_SRC>,
115115
<&clks IMX6QDL_PLL4_BYPASS>,
116-
<&clks IMX6QDL_CLK_PLL4_POST_DIV>,
117116
<&clks IMX6QDL_CLK_LDB_DI0_SEL>,
118-
<&clks IMX6QDL_CLK_LDB_DI1_SEL>;
117+
<&clks IMX6QDL_CLK_LDB_DI1_SEL>,
118+
<&clks IMX6QDL_CLK_PLL4_POST_DIV>;
119119
assigned-clock-parents = <&clks IMX6QDL_CLK_LVDS2_IN>,
120120
<&clks IMX6QDL_PLL4_BYPASS_SRC>,
121121
<&clks IMX6QDL_CLK_PLL3_USB_OTG>,
122122
<&clks IMX6QDL_CLK_PLL3_USB_OTG>;
123-
assigned-clock-rates = <0>, <0>, <24576000>;
123+
assigned-clock-rates = <0>, <0>, <0>, <0>, <24576000>;
124124
};
125125

126126
&ecspi1 {

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,3 +189,7 @@
189189
};
190190
};
191191

192+
&uart3 {
193+
interrupts-extended = <&wakeupgen GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH
194+
&omap4_pmx_core OMAP4_UART3_RX>;
195+
};

‎arch/arm/boot/dts/sun6i-a31s-primo81.dts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@
8383
reg = <0x5d>;
8484
interrupt-parent = <&pio>;
8585
interrupts = <0 3 IRQ_TYPE_LEVEL_HIGH>; /* PA3 */
86+
touchscreen-swapped-x-y;
8687
};
8788
};
8889

‎arch/arm/boot/dts/tegra124-nyan.dtsi

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

400400
/* CPU DFLL clock */
401401
clock@0,70110000 {
402-
status = "okay";
402+
status = "disabled";
403403
vdd-cpu-supply = <&vdd_cpu>;
404404
nvidia,i2c-fs-rate = <400000>;
405405
};

‎arch/arm/mach-omap2/Kconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ config SOC_AM43XX
6565
select MACH_OMAP_GENERIC
6666
select MIGHT_HAVE_CACHE_L2X0
6767
select HAVE_ARM_SCU
68+
select GENERIC_CLOCKEVENTS_BROADCAST
69+
select HAVE_ARM_TWD
6870

6971
config SOC_DRA7XX
7072
bool "TI DRA7XX"

‎arch/arm/mach-omap2/timer.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,12 @@ static int __init omap_dm_timer_init_one(struct omap_dm_timer *timer,
320320
return r;
321321
}
322322

323+
#if !defined(CONFIG_SMP) && defined(CONFIG_GENERIC_CLOCKEVENTS_BROADCAST)
324+
void tick_broadcast(const struct cpumask *mask)
325+
{
326+
}
327+
#endif
328+
323329
static void __init omap2_gp_clockevent_init(int gptimer_id,
324330
const char *fck_source,
325331
const char *property)

‎drivers/bus/sunxi-rsb.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -342,13 +342,13 @@ static int sunxi_rsb_read(struct sunxi_rsb *rsb, u8 rtaddr, u8 addr,
342342

343343
ret = _sunxi_rsb_run_xfer(rsb);
344344
if (ret)
345-
goto out;
345+
goto unlock;
346346

347347
*buf = readl(rsb->regs + RSB_DATA);
348348

349+
unlock:
349350
mutex_unlock(&rsb->lock);
350351

351-
out:
352352
return ret;
353353
}
354354

@@ -527,9 +527,9 @@ static int sunxi_rsb_init_device_mode(struct sunxi_rsb *rsb)
527527
*/
528528

529529
static const struct sunxi_rsb_addr_map sunxi_rsb_addr_maps[] = {
530-
{ 0x3e3, 0x2d }, /* Primary PMIC: AXP223, AXP809, AXP81X, ... */
530+
{ 0x3a3, 0x2d }, /* Primary PMIC: AXP223, AXP809, AXP81X, ... */
531531
{ 0x745, 0x3a }, /* Secondary PMIC: AXP806, ... */
532-
{ 0xe89, 0x45 }, /* Peripheral IC: AC100, ... */
532+
{ 0xe89, 0x4e }, /* Peripheral IC: AC100, ... */
533533
};
534534

535535
static u8 sunxi_rsb_get_rtaddr(u16 hwaddr)

‎drivers/memory/fsl_ifc.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include <linux/module.h>
2323
#include <linux/kernel.h>
2424
#include <linux/compiler.h>
25+
#include <linux/sched.h>
2526
#include <linux/spinlock.h>
2627
#include <linux/types.h>
2728
#include <linux/slab.h>

0 commit comments

Comments
 (0)