Skip to content

Commit f340a59

Browse files
arndbarndb
committed
Merge tag 'imx-fixes-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into fixes
Pull "i.MX fixes for 3.16" from Shawn Guo: - Use GPIO for card CD/WP on imx51-babbage and eukrea-mbimxsd51, because controller base CD/WP is not working in esdhc driver due to runtime PM support - A couple of random ventana gw5xxx board fixes - Add IMX_IPUV3_CORE back to defconfig, which gets lost when moving IPUv3 driver out of staging tree - Fix enet/fec clock selection on imx6sl - Fix display node on imx53-m53evk board - A couple of Cubox-i updates from Russell, which were omitted from the merge window due to dependency * tag 'imx-fixes-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: ARM: dts: imx51-eukrea-mbimxsd51-baseboard: unbreak esdhc. ARM: dts: imx51-babbage: Fix esdhc setup ARM: dts: mx5: Move the display out of soc {} node ARM: dts: mx5: Fix IPU port node placement ARM: imx_v6_v7_defconfig: Enable CONFIG_IMX_IPUV3_CORE ARM: dts: hummingboard/cubox-i: move usb otg configuration to platform level ARM: dts: cubox-i: add support for PWM-driven front panel LED ARM: dts: imx6: ventana: correct gw52xx sgtl5000 clock source ARM: dts: imx6qdl-gw5xxx: Fix Linear Technology vendor prefix ARM: dts: imx6: ventana: fix include typo ARM: dts: imx6sl: correct the fec ipg clock source ARM: imx6sl: add missing enet clock for imx6sl
2 parents 9cbf3d2 + 7d278f2 commit f340a59

14 files changed

+73
-48
lines changed

‎arch/arm/boot/dts/imx51-babbage.dts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -315,15 +315,15 @@
315315
&esdhc1 {
316316
pinctrl-names = "default";
317317
pinctrl-0 = <&pinctrl_esdhc1>;
318-
fsl,cd-controller;
319-
fsl,wp-controller;
318+
cd-gpios = <&gpio1 0 GPIO_ACTIVE_LOW>;
319+
wp-gpios = <&gpio1 1 GPIO_ACTIVE_HIGH>;
320320
status = "okay";
321321
};
322322

323323
&esdhc2 {
324324
pinctrl-names = "default";
325325
pinctrl-0 = <&pinctrl_esdhc2>;
326-
cd-gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>;
326+
cd-gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
327327
wp-gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>;
328328
status = "okay";
329329
};
@@ -468,8 +468,8 @@
468468
MX51_PAD_SD1_DATA1__SD1_DATA1 0x20d5
469469
MX51_PAD_SD1_DATA2__SD1_DATA2 0x20d5
470470
MX51_PAD_SD1_DATA3__SD1_DATA3 0x20d5
471-
MX51_PAD_GPIO1_0__SD1_CD 0x20d5
472-
MX51_PAD_GPIO1_1__SD1_WP 0x20d5
471+
MX51_PAD_GPIO1_0__GPIO1_0 0x100
472+
MX51_PAD_GPIO1_1__GPIO1_1 0x100
473473
>;
474474
};
475475

‎arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
&esdhc1 {
108108
pinctrl-names = "default";
109109
pinctrl-0 = <&pinctrl_esdhc1 &pinctrl_esdhc1_cd>;
110-
fsl,cd-controller;
110+
cd-gpios = <&gpio1 0 GPIO_ACTIVE_LOW>;
111111
status = "okay";
112112
};
113113

@@ -206,7 +206,7 @@
206206

207207
pinctrl_esdhc1_cd: esdhc1_cd {
208208
fsl,pins = <
209-
MX51_PAD_GPIO1_0__SD1_CD 0x20d5
209+
MX51_PAD_GPIO1_0__GPIO1_0 0xd5
210210
>;
211211
};
212212

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

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -21,27 +21,25 @@
2121
<0xb0000000 0x20000000>;
2222
};
2323

24-
soc {
25-
display1: display@di1 {
26-
compatible = "fsl,imx-parallel-display";
27-
interface-pix-fmt = "bgr666";
28-
pinctrl-names = "default";
29-
pinctrl-0 = <&pinctrl_ipu_disp1>;
30-
31-
display-timings {
32-
800x480p60 {
33-
native-mode;
34-
clock-frequency = <31500000>;
35-
hactive = <800>;
36-
vactive = <480>;
37-
hfront-porch = <40>;
38-
hback-porch = <88>;
39-
hsync-len = <128>;
40-
vback-porch = <33>;
41-
vfront-porch = <9>;
42-
vsync-len = <3>;
43-
vsync-active = <1>;
44-
};
24+
display1: display@di1 {
25+
compatible = "fsl,imx-parallel-display";
26+
interface-pix-fmt = "bgr666";
27+
pinctrl-names = "default";
28+
pinctrl-0 = <&pinctrl_ipu_disp1>;
29+
30+
display-timings {
31+
800x480p60 {
32+
native-mode;
33+
clock-frequency = <31500000>;
34+
hactive = <800>;
35+
vactive = <480>;
36+
hfront-porch = <40>;
37+
hback-porch = <88>;
38+
hsync-len = <128>;
39+
vback-porch = <33>;
40+
vfront-porch = <9>;
41+
vsync-len = <3>;
42+
vsync-active = <1>;
4543
};
4644
};
4745

‎arch/arm/boot/dts/imx6dl-hummingboard.dts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,14 @@
143143
fsl,pins = <MX6QDL_PAD_GPIO_0__GPIO1_IO00 0x1b0b0>;
144144
};
145145

146+
pinctrl_hummingboard_usbotg_id: hummingboard-usbotg-id {
147+
/*
148+
* Similar to pinctrl_usbotg_2, but we want it
149+
* pulled down for a fixed host connection.
150+
*/
151+
fsl,pins = <MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x13059>;
152+
};
153+
146154
pinctrl_hummingboard_usbotg_vbus: hummingboard-usbotg-vbus {
147155
fsl,pins = <MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x1b0b0>;
148156
};
@@ -178,6 +186,8 @@
178186
};
179187

180188
&usbotg {
189+
pinctrl-names = "default";
190+
pinctrl-0 = <&pinctrl_hummingboard_usbotg_id>;
181191
vbus-supply = <&reg_usbotg_vbus>;
182192
status = "okay";
183193
};

‎arch/arm/boot/dts/imx6q-gw51xx.dts

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

1212
/dts-v1/;
1313
#include "imx6q.dtsi"
14-
#include "imx6qdl-gw54xx.dtsi"
14+
#include "imx6qdl-gw51xx.dtsi"
1515

1616
/ {
1717
model = "Gateworks Ventana i.MX6 Quad GW51XX";

‎arch/arm/boot/dts/imx6qdl-cubox-i.dtsi

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,19 @@
1212
pinctrl-0 = <&pinctrl_cubox_i_ir>;
1313
};
1414

15+
pwmleds {
16+
compatible = "pwm-leds";
17+
pinctrl-names = "default";
18+
pinctrl-0 = <&pinctrl_cubox_i_pwm1>;
19+
20+
front {
21+
active-low;
22+
label = "imx6:red:front";
23+
max-brightness = <248>;
24+
pwms = <&pwm1 0 50000>;
25+
};
26+
};
27+
1528
regulators {
1629
compatible = "simple-bus";
1730

@@ -109,6 +122,10 @@
109122
>;
110123
};
111124

125+
pinctrl_cubox_i_pwm1: cubox-i-pwm1-front-led {
126+
fsl,pins = <MX6QDL_PAD_DISP0_DAT8__PWM1_OUT 0x1b0b0>;
127+
};
128+
112129
pinctrl_cubox_i_spdif: cubox-i-spdif {
113130
fsl,pins = <MX6QDL_PAD_GPIO_17__SPDIF_OUT 0x13091>;
114131
};
@@ -117,6 +134,14 @@
117134
fsl,pins = <MX6QDL_PAD_GPIO_0__GPIO1_IO00 0x4001b0b0>;
118135
};
119136

137+
pinctrl_cubox_i_usbotg_id: cubox-i-usbotg-id {
138+
/*
139+
* The Cubox-i pulls this low, but as it's pointless
140+
* leaving it as a pull-up, even if it is just 10uA.
141+
*/
142+
fsl,pins = <MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x13059>;
143+
};
144+
120145
pinctrl_cubox_i_usbotg_vbus: cubox-i-usbotg-vbus {
121146
fsl,pins = <MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x4001b0b0>;
122147
};
@@ -153,6 +178,8 @@
153178
};
154179

155180
&usbotg {
181+
pinctrl-names = "default";
182+
pinctrl-0 = <&pinctrl_cubox_i_usbotg_id>;
156183
vbus-supply = <&reg_usbotg_vbus>;
157184
status = "okay";
158185
};

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@
161161
status = "okay";
162162

163163
pmic: ltc3676@3c {
164-
compatible = "ltc,ltc3676";
164+
compatible = "lltc,ltc3676";
165165
reg = <0x3c>;
166166

167167
regulators {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@
220220
};
221221

222222
pmic: ltc3676@3c {
223-
compatible = "ltc,ltc3676";
223+
compatible = "lltc,ltc3676";
224224
reg = <0x3c>;
225225

226226
regulators {
@@ -288,7 +288,7 @@
288288
codec: sgtl5000@0a {
289289
compatible = "fsl,sgtl5000";
290290
reg = <0x0a>;
291-
clocks = <&clks 169>;
291+
clocks = <&clks 201>;
292292
VDDA-supply = <&reg_1p8v>;
293293
VDDIO-supply = <&reg_3p3v>;
294294
};

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@
234234
};
235235

236236
pmic: ltc3676@3c {
237-
compatible = "ltc,ltc3676";
237+
compatible = "lltc,ltc3676";
238238
reg = <0x3c>;
239239

240240
regulators {

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,6 @@
1010
MX6QDL_PAD_CSI0_DAT11__UART1_RX_DATA 0x1b0b1
1111
>;
1212
};
13-
14-
pinctrl_microsom_usbotg: microsom-usbotg {
15-
/*
16-
* Similar to pinctrl_usbotg_2, but we want it
17-
* pulled down for a fixed host connection.
18-
*/
19-
fsl,pins = <MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x13059>;
20-
};
2113
};
2214
};
2315

@@ -26,8 +18,3 @@
2618
pinctrl-0 = <&pinctrl_microsom_uart1>;
2719
status = "okay";
2820
};
29-
30-
&usbotg {
31-
pinctrl-names = "default";
32-
pinctrl-0 = <&pinctrl_microsom_usbotg>;
33-
};

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -686,7 +686,7 @@
686686
compatible = "fsl,imx6sl-fec", "fsl,imx25-fec";
687687
reg = <0x02188000 0x4000>;
688688
interrupts = <0 114 IRQ_TYPE_LEVEL_HIGH>;
689-
clocks = <&clks IMX6SL_CLK_ENET_REF>,
689+
clocks = <&clks IMX6SL_CLK_ENET>,
690690
<&clks IMX6SL_CLK_ENET_REF>;
691691
clock-names = "ipg", "ahb";
692692
status = "disabled";

‎arch/arm/configs/imx_v6_v7_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,7 @@ CONFIG_VIDEO_MX3=y
186186
CONFIG_V4L_MEM2MEM_DRIVERS=y
187187
CONFIG_VIDEO_CODA=y
188188
CONFIG_SOC_CAMERA_OV2640=y
189+
CONFIG_IMX_IPUV3_CORE=y
189190
CONFIG_DRM=y
190191
CONFIG_DRM_PANEL_SIMPLE=y
191192
CONFIG_BACKLIGHT_LCD_SUPPORT=y

‎arch/arm/mach-imx/clk-imx6sl.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,7 @@ static void __init imx6sl_clocks_init(struct device_node *ccm_node)
312312
clks[IMX6SL_CLK_ECSPI2] = imx_clk_gate2("ecspi2", "ecspi_root", base + 0x6c, 2);
313313
clks[IMX6SL_CLK_ECSPI3] = imx_clk_gate2("ecspi3", "ecspi_root", base + 0x6c, 4);
314314
clks[IMX6SL_CLK_ECSPI4] = imx_clk_gate2("ecspi4", "ecspi_root", base + 0x6c, 6);
315+
clks[IMX6SL_CLK_ENET] = imx_clk_gate2("enet", "ipg", base + 0x6c, 10);
315316
clks[IMX6SL_CLK_EPIT1] = imx_clk_gate2("epit1", "perclk", base + 0x6c, 12);
316317
clks[IMX6SL_CLK_EPIT2] = imx_clk_gate2("epit2", "perclk", base + 0x6c, 14);
317318
clks[IMX6SL_CLK_EXTERN_AUDIO] = imx_clk_gate2("extern_audio", "extern_audio_podf", base + 0x6c, 16);

‎include/dt-bindings/clock/imx6sl-clock.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@
145145
#define IMX6SL_CLK_USDHC4 132
146146
#define IMX6SL_CLK_PLL4_AUDIO_DIV 133
147147
#define IMX6SL_CLK_SPBA 134
148-
#define IMX6SL_CLK_END 135
148+
#define IMX6SL_CLK_ENET 135
149+
#define IMX6SL_CLK_END 136
149150

150151
#endif /* __DT_BINDINGS_CLOCK_IMX6SL_H */

0 commit comments

Comments
 (0)