Skip to content

Commit e09d51a

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 few more fixes that have come in, and one revert of a previous fix. I was a bit too trigger happy to enable PREEMPT on multi_v7_defconfig, and it ended up regressing at least BeagleBone XM boards. While we get that debugged for next merge window, let's disable it again. Beyond that: - Stratix change to fix multicast filtering - Minor DT fixes for Renesas and i.MX - Ethernet fix for a Renesas board (switching main interfaces) - Ethernet phy regulator fix for i.MX6SX" * tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: arm64: dts: stratix10: fix multicast filtering ARM: defconfig: Disable PREEMPT again on multi_v7 arm64: dts: renesas: condor: switch from EtherAVB to GEther dt-bindings: arm: Fix RZ/G2E part number arm64: dts: renesas: r8a7795: add missing dma-names on hscif2 ARM: dts: imx6sx-sdb: Fix enet phy regulator ARM: dts: fsl: Fix improperly quoted stdout-path values ARM: dts: imx6sll: fix typo for fsl,imx6sll-i2c node
2 parents ecb4d52 + a89f84a commit e09d51a

File tree

9 files changed

+39
-31
lines changed

9 files changed

+39
-31
lines changed

‎Documentation/devicetree/bindings/arm/shmobile.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ SoCs:
2727
compatible = "renesas,r8a77470"
2828
- RZ/G2M (R8A774A1)
2929
compatible = "renesas,r8a774a1"
30-
- RZ/G2E (RA8774C0)
30+
- RZ/G2E (R8A774C0)
3131
compatible = "renesas,r8a774c0"
3232
- R-Car M1A (R8A77781)
3333
compatible = "renesas,r8a7778"

‎arch/arm/boot/dts/imx53-ppd.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
};
5656

5757
chosen {
58-
stdout-path = "&uart1:115200n8";
58+
stdout-path = "serial0:115200n8";
5959
};
6060

6161
memory@70000000 {

‎arch/arm/boot/dts/imx6sll.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -740,7 +740,7 @@
740740
i2c1: i2c@21a0000 {
741741
#address-cells = <1>;
742742
#size-cells = <0>;
743-
compatible = "fs,imx6sll-i2c", "fsl,imx21-i2c";
743+
compatible = "fsl,imx6sll-i2c", "fsl,imx21-i2c";
744744
reg = <0x021a0000 0x4000>;
745745
interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>;
746746
clocks = <&clks IMX6SLL_CLK_I2C1>;

‎arch/arm/boot/dts/imx6sx-sdb.dtsi

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,9 @@
117117
regulator-name = "enet_3v3";
118118
regulator-min-microvolt = <3300000>;
119119
regulator-max-microvolt = <3300000>;
120-
gpios = <&gpio2 6 GPIO_ACTIVE_LOW>;
120+
gpio = <&gpio2 6 GPIO_ACTIVE_LOW>;
121+
regulator-boot-on;
122+
regulator-always-on;
121123
};
122124

123125
reg_pcie_gpio: regulator-pcie-gpio {
@@ -180,6 +182,7 @@
180182
phy-supply = <&reg_enet_3v3>;
181183
phy-mode = "rgmii";
182184
phy-handle = <&ethphy1>;
185+
phy-reset-gpios = <&gpio2 7 GPIO_ACTIVE_LOW>;
183186
status = "okay";
184187

185188
mdio {
@@ -373,6 +376,8 @@
373376
MX6SX_PAD_RGMII1_RD3__ENET1_RX_DATA_3 0x3081
374377
MX6SX_PAD_RGMII1_RX_CTL__ENET1_RX_EN 0x3081
375378
MX6SX_PAD_ENET2_RX_CLK__ENET2_REF_CLK_25M 0x91
379+
/* phy reset */
380+
MX6SX_PAD_ENET2_CRS__GPIO2_IO_7 0x10b0
376381
>;
377382
};
378383

‎arch/arm/boot/dts/vf610m4-colibri.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@
5050
compatible = "fsl,vf610m4";
5151

5252
chosen {
53-
bootargs = "console=ttyLP2,115200 clk_ignore_unused init=/linuxrc rw";
54-
stdout-path = "&uart2";
53+
bootargs = "clk_ignore_unused init=/linuxrc rw";
54+
stdout-path = "serial2:115200";
5555
};
5656

5757
memory@8c000000 {

‎arch/arm/configs/multi_v7_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
CONFIG_SYSVIPC=y
22
CONFIG_NO_HZ=y
33
CONFIG_HIGH_RES_TIMERS=y
4-
CONFIG_PREEMPT=y
54
CONFIG_CGROUPS=y
65
CONFIG_BLK_DEV_INITRD=y
76
CONFIG_EMBEDDED=y

‎arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@
139139
clock-names = "stmmaceth";
140140
tx-fifo-depth = <16384>;
141141
rx-fifo-depth = <16384>;
142+
snps,multicast-filter-bins = <256>;
142143
status = "disabled";
143144
};
144145

@@ -154,6 +155,7 @@
154155
clock-names = "stmmaceth";
155156
tx-fifo-depth = <16384>;
156157
rx-fifo-depth = <16384>;
158+
snps,multicast-filter-bins = <256>;
157159
status = "disabled";
158160
};
159161

@@ -169,6 +171,7 @@
169171
clock-names = "stmmaceth";
170172
tx-fifo-depth = <16384>;
171173
rx-fifo-depth = <16384>;
174+
snps,multicast-filter-bins = <256>;
172175
status = "disabled";
173176
};
174177

‎arch/arm64/boot/dts/renesas/r8a7795.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -652,7 +652,7 @@
652652
clock-names = "fck", "brg_int", "scif_clk";
653653
dmas = <&dmac1 0x35>, <&dmac1 0x34>,
654654
<&dmac2 0x35>, <&dmac2 0x34>;
655-
dma-names = "tx", "rx";
655+
dma-names = "tx", "rx", "tx", "rx";
656656
power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
657657
resets = <&cpg 518>;
658658
status = "disabled";

‎arch/arm64/boot/dts/renesas/r8a77980-condor.dts

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
aliases {
1717
serial0 = &scif0;
18-
ethernet0 = &avb;
18+
ethernet0 = &gether;
1919
};
2020

2121
chosen {
@@ -97,23 +97,6 @@
9797
};
9898
};
9999

100-
&avb {
101-
pinctrl-0 = <&avb_pins>;
102-
pinctrl-names = "default";
103-
104-
phy-mode = "rgmii-id";
105-
phy-handle = <&phy0>;
106-
renesas,no-ether-link;
107-
status = "okay";
108-
109-
phy0: ethernet-phy@0 {
110-
rxc-skew-ps = <1500>;
111-
reg = <0>;
112-
interrupt-parent = <&gpio1>;
113-
interrupts = <17 IRQ_TYPE_LEVEL_LOW>;
114-
};
115-
};
116-
117100
&canfd {
118101
pinctrl-0 = <&canfd0_pins>;
119102
pinctrl-names = "default";
@@ -139,6 +122,23 @@
139122
clock-frequency = <32768>;
140123
};
141124

125+
&gether {
126+
pinctrl-0 = <&gether_pins>;
127+
pinctrl-names = "default";
128+
129+
phy-mode = "rgmii-id";
130+
phy-handle = <&phy0>;
131+
renesas,no-ether-link;
132+
status = "okay";
133+
134+
phy0: ethernet-phy@0 {
135+
rxc-skew-ps = <1500>;
136+
reg = <0>;
137+
interrupt-parent = <&gpio4>;
138+
interrupts = <23 IRQ_TYPE_LEVEL_LOW>;
139+
};
140+
};
141+
142142
&i2c0 {
143143
pinctrl-0 = <&i2c0_pins>;
144144
pinctrl-names = "default";
@@ -236,16 +236,17 @@
236236
};
237237

238238
&pfc {
239-
avb_pins: avb {
240-
groups = "avb_mdio", "avb_rgmii";
241-
function = "avb";
242-
};
243-
244239
canfd0_pins: canfd0 {
245240
groups = "canfd0_data_a";
246241
function = "canfd0";
247242
};
248243

244+
gether_pins: gether {
245+
groups = "gether_mdio_a", "gether_rgmii",
246+
"gether_txcrefclk", "gether_txcrefclk_mega";
247+
function = "gether";
248+
};
249+
249250
i2c0_pins: i2c0 {
250251
groups = "i2c0";
251252
function = "i2c0";

0 commit comments

Comments
 (0)