Skip to content

Commit 049a40c

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: "Another batch of fixes for ARM SoC platforms. Most are smaller fixes. Two areas that are worth pointing out are: - OMAP had a handful of changes to voltage specs that caused a bit of churn, most of volume of change in this branch is due to this. - There are a couple of _rcuidle fixes from Paul that touch common code and came in through the OMAP tree since they were the ones who saw the problems. The rest is smaller changes across a handful of platforms" * tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (36 commits) ARM: dts: STi: stih407-family: Disable reserved-memory co-processor nodes ARM: dts: am437x-sk-evm: Reduce i2c0 bus speed for tps65218 ARM: OMAP2+: timer: add probe for clocksources ARM: OMAP1: fix ams-delta FIQ handler to work with sparse IRQ memory: omap-gpmc: Fix omap gpmc EXTRADELAY timing arm: Use _rcuidle for smp_cross_call() tracepoints MAINTAINERS: Add myself as reviewer of ARM FSL/NXP ARM: OMAP: DRA7: powerdomain data: Remove unused pwrsts_mem_ret ARM: OMAP: DRA7: powerdomain data: Remove unused pwrsts_logic_ret ARM: OMAP: DRA7: powerdomain data: Set L3init and L4per to ON ARM: imx6ul: Fix Micrel PHY mask ARM: OMAP2+: Select OMAP_INTERCONNECT for SOC_AM43XX ARM: dts: DRA74x: fix DSS PLL2 addresses ARM: OMAP2: Enable Errata 430973 for OMAP3 ARM: dts: socfpga: Add missing PHY phandle ARM: dts: exynos: Fix port nodes names for Exynos5420 Peach Pit board ARM: dts: exynos: Fix port nodes names for Exynos5250 Snow board ARM: dts: sun6i: yones-toptech-bs1078-v2: Drop constraints on dc1sw regulator ARM: dts: sun6i: primo81: Drop constraints on dc1sw regulator ARM: dts: sunxi: Add OLinuXino Lime2 eMMC to the Makefile ...
2 parents c141afd + 8fd0976 commit 049a40c

Some content is hidden

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

41 files changed

+252
-136
lines changed

‎MAINTAINERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1159,6 +1159,7 @@ F: arch/arm/mach-footbridge/
11591159
ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
11601160
M: Shawn Guo <[email protected]>
11611161
M: Sascha Hauer <[email protected]>
1162+
R: Fabio Estevam <[email protected]>
11621163
L: [email protected] (moderated for non-subscribers)
11631164
S: Maintained
11641165
T: git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git

‎arch/arm/boot/dts/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -741,6 +741,7 @@ dtb-$(CONFIG_MACH_SUN7I) += \
741741
sun7i-a20-olimex-som-evb.dtb \
742742
sun7i-a20-olinuxino-lime.dtb \
743743
sun7i-a20-olinuxino-lime2.dtb \
744+
sun7i-a20-olinuxino-lime2-emmc.dtb \
744745
sun7i-a20-olinuxino-micro.dtb \
745746
sun7i-a20-orangepi.dtb \
746747
sun7i-a20-orangepi-mini.dtb \

‎arch/arm/boot/dts/am437x-sk-evm.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@
418418
status = "okay";
419419
pinctrl-names = "default";
420420
pinctrl-0 = <&i2c0_pins>;
421-
clock-frequency = <400000>;
421+
clock-frequency = <100000>;
422422

423423
tps@24 {
424424
compatible = "ti,tps65218";

‎arch/arm/boot/dts/am57xx-idk-common.dtsi

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,26 @@
6060

6161
tps659038_pmic {
6262
compatible = "ti,tps659038-pmic";
63+
64+
smps12-in-supply = <&vmain>;
65+
smps3-in-supply = <&vmain>;
66+
smps45-in-supply = <&vmain>;
67+
smps6-in-supply = <&vmain>;
68+
smps7-in-supply = <&vmain>;
69+
smps8-in-supply = <&vmain>;
70+
smps9-in-supply = <&vmain>;
71+
ldo1-in-supply = <&vmain>;
72+
ldo2-in-supply = <&vmain>;
73+
ldo3-in-supply = <&vmain>;
74+
ldo4-in-supply = <&vmain>;
75+
ldo9-in-supply = <&vmain>;
76+
ldoln-in-supply = <&vmain>;
77+
ldousb-in-supply = <&vmain>;
78+
ldortc-in-supply = <&vmain>;
79+
6380
regulators {
6481
smps12_reg: smps12 {
6582
/* VDD_MPU */
66-
vin-supply = <&vmain>;
6783
regulator-name = "smps12";
6884
regulator-min-microvolt = <850000>;
6985
regulator-max-microvolt = <1250000>;
@@ -73,7 +89,6 @@
7389

7490
smps3_reg: smps3 {
7591
/* VDD_DDR EMIF1 EMIF2 */
76-
vin-supply = <&vmain>;
7792
regulator-name = "smps3";
7893
regulator-min-microvolt = <1350000>;
7994
regulator-max-microvolt = <1350000>;
@@ -84,7 +99,6 @@
8499
smps45_reg: smps45 {
85100
/* VDD_DSPEVE on AM572 */
86101
/* VDD_IVA + VDD_DSP on AM571 */
87-
vin-supply = <&vmain>;
88102
regulator-name = "smps45";
89103
regulator-min-microvolt = <850000>;
90104
regulator-max-microvolt = <1250000>;
@@ -94,7 +108,6 @@
94108

95109
smps6_reg: smps6 {
96110
/* VDD_GPU */
97-
vin-supply = <&vmain>;
98111
regulator-name = "smps6";
99112
regulator-min-microvolt = <850000>;
100113
regulator-max-microvolt = <1250000>;
@@ -104,7 +117,6 @@
104117

105118
smps7_reg: smps7 {
106119
/* VDD_CORE */
107-
vin-supply = <&vmain>;
108120
regulator-name = "smps7";
109121
regulator-min-microvolt = <850000>;
110122
regulator-max-microvolt = <1150000>;
@@ -115,13 +127,11 @@
115127
smps8_reg: smps8 {
116128
/* 5728 - VDD_IVAHD */
117129
/* 5718 - N.C. test point */
118-
vin-supply = <&vmain>;
119130
regulator-name = "smps8";
120131
};
121132

122133
smps9_reg: smps9 {
123134
/* VDD_3_3D */
124-
vin-supply = <&vmain>;
125135
regulator-name = "smps9";
126136
regulator-min-microvolt = <3300000>;
127137
regulator-max-microvolt = <3300000>;
@@ -132,7 +142,6 @@
132142
ldo1_reg: ldo1 {
133143
/* VDDSHV8 - VSDMMC */
134144
/* NOTE: on rev 1.3a, data supply */
135-
vin-supply = <&vmain>;
136145
regulator-name = "ldo1";
137146
regulator-min-microvolt = <1800000>;
138147
regulator-max-microvolt = <3300000>;
@@ -142,7 +151,6 @@
142151

143152
ldo2_reg: ldo2 {
144153
/* VDDSH18V */
145-
vin-supply = <&vmain>;
146154
regulator-name = "ldo2";
147155
regulator-min-microvolt = <1800000>;
148156
regulator-max-microvolt = <1800000>;
@@ -152,7 +160,6 @@
152160

153161
ldo3_reg: ldo3 {
154162
/* R1.3a 572x V1_8PHY_LDO3: USB, SATA */
155-
vin-supply = <&vmain>;
156163
regulator-name = "ldo3";
157164
regulator-min-microvolt = <1800000>;
158165
regulator-max-microvolt = <1800000>;
@@ -162,7 +169,6 @@
162169

163170
ldo4_reg: ldo4 {
164171
/* R1.3a 572x V1_8PHY_LDO4: PCIE, HDMI*/
165-
vin-supply = <&vmain>;
166172
regulator-name = "ldo4";
167173
regulator-min-microvolt = <1800000>;
168174
regulator-max-microvolt = <1800000>;
@@ -174,7 +180,6 @@
174180

175181
ldo9_reg: ldo9 {
176182
/* VDD_RTC */
177-
vin-supply = <&vmain>;
178183
regulator-name = "ldo9";
179184
regulator-min-microvolt = <840000>;
180185
regulator-max-microvolt = <1160000>;
@@ -184,7 +189,6 @@
184189

185190
ldoln_reg: ldoln {
186191
/* VDDA_1V8_PLL */
187-
vin-supply = <&vmain>;
188192
regulator-name = "ldoln";
189193
regulator-min-microvolt = <1800000>;
190194
regulator-max-microvolt = <1800000>;
@@ -194,7 +198,6 @@
194198

195199
ldousb_reg: ldousb {
196200
/* VDDA_3V_USB: VDDA_USBHS33 */
197-
vin-supply = <&vmain>;
198201
regulator-name = "ldousb";
199202
regulator-min-microvolt = <3300000>;
200203
regulator-max-microvolt = <3300000>;
@@ -204,7 +207,6 @@
204207

205208
ldortc_reg: ldortc {
206209
/* VDDA_RTC */
207-
vin-supply = <&vmain>;
208210
regulator-name = "ldortc";
209211
regulator-min-microvolt = <1800000>;
210212
regulator-max-microvolt = <1800000>;

‎arch/arm/boot/dts/dm8148-evm.dts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,10 @@
9393
};
9494
};
9595

96+
&mmc1 {
97+
status = "disabled";
98+
};
99+
96100
&mmc2 {
97101
pinctrl-names = "default";
98102
pinctrl-0 = <&sd1_pins>;
@@ -101,6 +105,10 @@
101105
cd-gpios = <&gpio2 6 GPIO_ACTIVE_LOW>;
102106
};
103107

108+
&mmc3 {
109+
status = "disabled";
110+
};
111+
104112
&pincntl {
105113
sd1_pins: pinmux_sd1_pins {
106114
pinctrl-single,pins = <

‎arch/arm/boot/dts/dm8148-t410.dts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,14 @@
4545
phy-mode = "rgmii";
4646
};
4747

48+
&mmc1 {
49+
status = "disabled";
50+
};
51+
52+
&mmc2 {
53+
status = "disabled";
54+
};
55+
4856
&mmc3 {
4957
pinctrl-names = "default";
5058
pinctrl-0 = <&sd2_pins>;
@@ -53,6 +61,7 @@
5361
dmas = <&edma_xbar 8 0 1 /* use SDTXEVT1 instead of MCASP0TX */
5462
&edma_xbar 9 0 2>; /* use SDRXEVT1 instead of MCASP0RX */
5563
dma-names = "tx", "rx";
64+
non-removable;
5665
};
5766

5867
&pincntl {

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1451,6 +1451,8 @@
14511451
ti,hwmods = "gpmc";
14521452
reg = <0x50000000 0x37c>; /* device IO registers */
14531453
interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
1454+
dmas = <&edma_xbar 4 0>;
1455+
dma-names = "rxtx";
14541456
gpmc,num-cs = <8>;
14551457
gpmc,num-waitpins = <2>;
14561458
#address-cells = <2>;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@
107107
reg = <0x58000000 0x80>,
108108
<0x58004054 0x4>,
109109
<0x58004300 0x20>,
110-
<0x58005054 0x4>,
111-
<0x58005300 0x20>;
110+
<0x58009054 0x4>,
111+
<0x58009300 0x20>;
112112
reg-names = "dss", "pll1_clkctrl", "pll1",
113113
"pll2_clkctrl", "pll2";
114114

‎arch/arm/boot/dts/exynos5250-snow-common.dtsi

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@
242242
hpd-gpios = <&gpx0 7 GPIO_ACTIVE_HIGH>;
243243

244244
ports {
245-
port0 {
245+
port {
246246
dp_out: endpoint {
247247
remote-endpoint = <&bridge_in>;
248248
};
@@ -485,13 +485,20 @@
485485
edid-emulation = <5>;
486486

487487
ports {
488-
port0 {
488+
#address-cells = <1>;
489+
#size-cells = <0>;
490+
491+
port@0 {
492+
reg = <0>;
493+
489494
bridge_out: endpoint {
490495
remote-endpoint = <&panel_in>;
491496
};
492497
};
493498

494-
port1 {
499+
port@1 {
500+
reg = <1>;
501+
495502
bridge_in: endpoint {
496503
remote-endpoint = <&dp_out>;
497504
};

‎arch/arm/boot/dts/exynos5420-peach-pit.dts

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@
163163
hpd-gpios = <&gpx2 6 GPIO_ACTIVE_HIGH>;
164164

165165
ports {
166-
port0 {
166+
port {
167167
dp_out: endpoint {
168168
remote-endpoint = <&bridge_in>;
169169
};
@@ -631,13 +631,20 @@
631631
use-external-pwm;
632632

633633
ports {
634-
port0 {
634+
#address-cells = <1>;
635+
#size-cells = <0>;
636+
637+
port@0 {
638+
reg = <0>;
639+
635640
bridge_out: endpoint {
636641
remote-endpoint = <&panel_in>;
637642
};
638643
};
639644

640-
port1 {
645+
port@1 {
646+
reg = <1>;
647+
641648
bridge_in: endpoint {
642649
remote-endpoint = <&dp_out>;
643650
};

‎arch/arm/boot/dts/omap3-evm-37xx.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
OMAP3_CORE1_IOPAD(0x2158, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_clk.sdmmc2_clk */
8686
OMAP3_CORE1_IOPAD(0x215a, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_cmd.sdmmc2_cmd */
8787
OMAP3_CORE1_IOPAD(0x215c, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat0.sdmmc2_dat0 */
88-
OMAP3_CORE1_IOPAD(0x215e, WAKEUP_EN | PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat1.sdmmc2_dat1 */
88+
OMAP3_CORE1_IOPAD(0x215e, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat1.sdmmc2_dat1 */
8989
OMAP3_CORE1_IOPAD(0x2160, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat2.sdmmc2_dat2 */
9090
OMAP3_CORE1_IOPAD(0x2162, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat3.sdmmc2_dat3 */
9191
>;

‎arch/arm/boot/dts/omap3-igep.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,7 @@
188188
vmmc-supply = <&vmmc1>;
189189
vmmc_aux-supply = <&vsim>;
190190
bus-width = <4>;
191+
cd-gpios = <&twl_gpio 0 GPIO_ACTIVE_LOW>;
191192
};
192193

193194
&mmc3 {

‎arch/arm/boot/dts/omap3-igep0020-common.dtsi

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,12 @@
194194
OMAP3630_CORE2_IOPAD(0x25f8, PIN_OUTPUT | MUX_MODE4) /* etk_d14.gpio_28 */
195195
>;
196196
};
197+
198+
mmc1_wp_pins: pinmux_mmc1_cd_pins {
199+
pinctrl-single,pins = <
200+
OMAP3630_CORE2_IOPAD(0x25fa, PIN_INPUT | MUX_MODE4) /* etk_d15.gpio_29 */
201+
>;
202+
};
197203
};
198204

199205
&i2c3 {
@@ -250,3 +256,8 @@
250256
};
251257
};
252258
};
259+
260+
&mmc1 {
261+
pinctrl-0 = <&mmc1_pins &mmc1_wp_pins>;
262+
wp-gpios = <&gpio1 29 GPIO_ACTIVE_LOW>; /* gpio_29 */
263+
};

‎arch/arm/boot/dts/omap3-n900.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@
288288
pinctrl-single,pins = <
289289
OMAP3_CORE1_IOPAD(0x2180, PIN_INPUT_PULLUP | MUX_MODE1) /* ssi1_rdy_tx */
290290
OMAP3_CORE1_IOPAD(0x217e, PIN_OUTPUT | MUX_MODE1) /* ssi1_flag_tx */
291-
OMAP3_CORE1_IOPAD(0x2182, PIN_INPUT | WAKEUP_EN | MUX_MODE4) /* ssi1_wake_tx (cawake) */
291+
OMAP3_CORE1_IOPAD(0x2182, PIN_INPUT | MUX_MODE4) /* ssi1_wake_tx (cawake) */
292292
OMAP3_CORE1_IOPAD(0x217c, PIN_OUTPUT | MUX_MODE1) /* ssi1_dat_tx */
293293
OMAP3_CORE1_IOPAD(0x2184, PIN_INPUT | MUX_MODE1) /* ssi1_dat_rx */
294294
OMAP3_CORE1_IOPAD(0x2186, PIN_INPUT | MUX_MODE1) /* ssi1_flag_rx */
@@ -300,7 +300,7 @@
300300
modem_pins: pinmux_modem {
301301
pinctrl-single,pins = <
302302
OMAP3_CORE1_IOPAD(0x20dc, PIN_OUTPUT | MUX_MODE4) /* gpio 70 => cmt_apeslpx */
303-
OMAP3_CORE1_IOPAD(0x20e0, PIN_INPUT | WAKEUP_EN | MUX_MODE4) /* gpio 72 => ape_rst_rq */
303+
OMAP3_CORE1_IOPAD(0x20e0, PIN_INPUT | MUX_MODE4) /* gpio 72 => ape_rst_rq */
304304
OMAP3_CORE1_IOPAD(0x20e2, PIN_OUTPUT | MUX_MODE4) /* gpio 73 => cmt_rst_rq */
305305
OMAP3_CORE1_IOPAD(0x20e4, PIN_OUTPUT | MUX_MODE4) /* gpio 74 => cmt_en */
306306
OMAP3_CORE1_IOPAD(0x20e6, PIN_OUTPUT | MUX_MODE4) /* gpio 75 => cmt_rst */

‎arch/arm/boot/dts/omap3-n950-n9.dtsi

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
OMAP3_CORE1_IOPAD(0x217c, PIN_OUTPUT | MUX_MODE1) /* ssi1_dat_tx */
9898
OMAP3_CORE1_IOPAD(0x217e, PIN_OUTPUT | MUX_MODE1) /* ssi1_flag_tx */
9999
OMAP3_CORE1_IOPAD(0x2180, PIN_INPUT_PULLUP | MUX_MODE1) /* ssi1_rdy_tx */
100-
OMAP3_CORE1_IOPAD(0x2182, PIN_INPUT | WAKEUP_EN | MUX_MODE4) /* ssi1_wake_tx (cawake) */
100+
OMAP3_CORE1_IOPAD(0x2182, PIN_INPUT | MUX_MODE4) /* ssi1_wake_tx (cawake) */
101101
OMAP3_CORE1_IOPAD(0x2184, PIN_INPUT | MUX_MODE1) /* ssi1_dat_rx */
102102
OMAP3_CORE1_IOPAD(0x2186, PIN_INPUT | MUX_MODE1) /* ssi1_flag_rx */
103103
OMAP3_CORE1_IOPAD(0x2188, PIN_OUTPUT | MUX_MODE1) /* ssi1_rdy_rx */
@@ -110,7 +110,7 @@
110110
OMAP3_CORE1_IOPAD(0x217c, PIN_OUTPUT | MUX_MODE7) /* ssi1_dat_tx */
111111
OMAP3_CORE1_IOPAD(0x217e, PIN_OUTPUT | MUX_MODE7) /* ssi1_flag_tx */
112112
OMAP3_CORE1_IOPAD(0x2180, PIN_INPUT_PULLDOWN | MUX_MODE7) /* ssi1_rdy_tx */
113-
OMAP3_CORE1_IOPAD(0x2182, PIN_INPUT | WAKEUP_EN | MUX_MODE4) /* ssi1_wake_tx (cawake) */
113+
OMAP3_CORE1_IOPAD(0x2182, PIN_INPUT | MUX_MODE4) /* ssi1_wake_tx (cawake) */
114114
OMAP3_CORE1_IOPAD(0x2184, PIN_INPUT | MUX_MODE7) /* ssi1_dat_rx */
115115
OMAP3_CORE1_IOPAD(0x2186, PIN_INPUT | MUX_MODE7) /* ssi1_flag_rx */
116116
OMAP3_CORE1_IOPAD(0x2188, PIN_OUTPUT | MUX_MODE4) /* ssi1_rdy_rx */
@@ -120,7 +120,7 @@
120120

121121
modem_pins1: pinmux_modem_core1_pins {
122122
pinctrl-single,pins = <
123-
OMAP3_CORE1_IOPAD(0x207a, PIN_INPUT | WAKEUP_EN | MUX_MODE4) /* gpio_34 (ape_rst_rq) */
123+
OMAP3_CORE1_IOPAD(0x207a, PIN_INPUT | MUX_MODE4) /* gpio_34 (ape_rst_rq) */
124124
OMAP3_CORE1_IOPAD(0x2100, PIN_OUTPUT | MUX_MODE4) /* gpio_88 (cmt_rst_rq) */
125125
OMAP3_CORE1_IOPAD(0x210a, PIN_OUTPUT | MUX_MODE4) /* gpio_93 (cmt_apeslpx) */
126126
>;

0 commit comments

Comments
 (0)