Commit 2bfdd113 authored by Fabio Estevam's avatar Fabio Estevam Committed by Shawn Guo

ARM: dts: imx: Fix the SPI chipselect polarity

The conversion of the spi-imx driver to use GPIO descriptors
in commit 8cdcd8ae ("spi: imx/fsl-lpspi: Convert to GPIO descriptors")
helped to detect the following SPI chipselect polarity mismatch on an
imx6q-sabresd:

[    4.854337] m25p80@0 enforce active low on chipselect handle

Prior to the above commit, the chipselect polarity passed via cs-gpios
property was ignored and considered active-low.

The reason for such mismatch is clearly explained in the comments inside
drivers/gpio/gpiolib-of.c:

 * SPI children have active low chip selects
 * by default. This can be specified negatively
 * by just omitting "spi-cs-high" in the
 * device node, or actively by tagging on
 * GPIO_ACTIVE_LOW as flag in the device
 * tree. If the line is simultaneously
 * tagged as active low in the device tree
 * and has the "spi-cs-high" set, we get a
 * conflict and the "spi-cs-high" flag will
 * take precedence.

To properly represent the SPI chipselect polarity, change it to active-low
when the "spi-cs-high" property is absent.
Signed-off-by: default avatarFabio Estevam <festevam@gmail.com>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent 0b784a7b
...@@ -18,8 +18,8 @@ memory@a0000000 { ...@@ -18,8 +18,8 @@ memory@a0000000 {
}; };
&cspi1 { &cspi1 {
cs-gpios = <&gpio4 28 GPIO_ACTIVE_HIGH>, cs-gpios = <&gpio4 28 GPIO_ACTIVE_LOW>,
<&gpio4 27 GPIO_ACTIVE_HIGH>; <&gpio4 27 GPIO_ACTIVE_LOW>;
status = "okay"; status = "okay";
}; };
......
...@@ -65,7 +65,7 @@ usbphy2: usbphy@2 { ...@@ -65,7 +65,7 @@ usbphy2: usbphy@2 {
&cspi1 { &cspi1 {
pinctrl-0 = <&pinctrl_cspi1>, <&pinctrl_cspi1cs1>; pinctrl-0 = <&pinctrl_cspi1>, <&pinctrl_cspi1cs1>;
cs-gpios = <&gpio4 28 GPIO_ACTIVE_HIGH>, cs-gpios = <&gpio4 28 GPIO_ACTIVE_LOW>,
<&gpio4 27 GPIO_ACTIVE_LOW>; <&gpio4 27 GPIO_ACTIVE_LOW>;
}; };
......
...@@ -20,7 +20,7 @@ memory@70000000 { ...@@ -20,7 +20,7 @@ memory@70000000 {
&cspi { &cspi {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_cspi>; pinctrl-0 = <&pinctrl_cspi>;
cs-gpios = <&gpio4 11 0>, <&gpio4 13 0>; cs-gpios = <&gpio4 11 GPIO_ACTIVE_LOW>, <&gpio4 13 GPIO_ACTIVE_LOW>;
status = "okay"; status = "okay";
flash: m25p32@1 { flash: m25p32@1 {
......
...@@ -74,8 +74,8 @@ user { ...@@ -74,8 +74,8 @@ user {
&ecspi1 { &ecspi1 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi1>; pinctrl-0 = <&pinctrl_ecspi1>;
cs-gpios = <&gpio4 24 GPIO_ACTIVE_HIGH>, cs-gpios = <&gpio4 24 GPIO_ACTIVE_LOW>,
<&gpio4 25 GPIO_ACTIVE_HIGH>; <&gpio4 25 GPIO_ACTIVE_LOW>;
status = "okay"; status = "okay";
}; };
......
...@@ -104,7 +104,7 @@ &clks { ...@@ -104,7 +104,7 @@ &clks {
&ecspi2 { &ecspi2 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi2>; pinctrl-0 = <&pinctrl_ecspi2>;
cs-gpios = <&gpio2 26 GPIO_ACTIVE_HIGH>, <&gpio2 27 GPIO_ACTIVE_HIGH>; cs-gpios = <&gpio2 26 GPIO_ACTIVE_LOW>, <&gpio2 27 GPIO_ACTIVE_LOW>;
status = "okay"; status = "okay";
spidev@0 { spidev@0 {
......
...@@ -58,7 +58,7 @@ &uart3 { ...@@ -58,7 +58,7 @@ &uart3 {
&ecspi1 { &ecspi1 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi1>; pinctrl-0 = <&pinctrl_ecspi1>;
cs-gpios = <&gpio2 30 0>, <&gpio3 19 0>; cs-gpios = <&gpio2 30 GPIO_ACTIVE_LOW>, <&gpio3 19 GPIO_ACTIVE_LOW>;
status = "okay"; status = "okay";
zigbee: mc1323@0 { zigbee: mc1323@0 {
......
...@@ -50,8 +50,8 @@ &uart3 { ...@@ -50,8 +50,8 @@ &uart3 {
&ecspi1 { &ecspi1 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi1>; pinctrl-0 = <&pinctrl_ecspi1>;
cs-gpios = <&gpio2 30 0>, <&gpio3 19 0>, cs-gpios = <&gpio2 30 GPIO_ACTIVE_LOW>, <&gpio3 19 GPIO_ACTIVE_LOW>,
<&gpio3 24 0>, <&gpio3 25 0>; <&gpio3 24 GPIO_ACTIVE_LOW>, <&gpio3 25 GPIO_ACTIVE_LOW>;
status = "disabled"; status = "disabled";
}; };
...@@ -251,8 +251,8 @@ &i2c3 { ...@@ -251,8 +251,8 @@ &i2c3 {
&cspi { &cspi {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_cspi>; pinctrl-0 = <&pinctrl_cspi>;
cs-gpios = <&gpio1 18 0>, <&gpio1 19 0>, cs-gpios = <&gpio1 18 GPIO_ACTIVE_LOW>, <&gpio1 19 GPIO_ACTIVE_LOW>,
<&gpio1 21 0>; <&gpio1 21 GPIO_ACTIVE_LOW>;
status = "disabled"; status = "disabled";
}; };
......
...@@ -119,7 +119,8 @@ MX53_PAD_PATA_DATA7__EMI_NANDF_D_7 0xa4 ...@@ -119,7 +119,8 @@ MX53_PAD_PATA_DATA7__EMI_NANDF_D_7 0xa4
&ecspi1 { &ecspi1 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi1>; pinctrl-0 = <&pinctrl_ecspi1>;
cs-gpios = <&gpio2 30 0>, <&gpio3 19 0>, <&gpio2 16 0>, <&gpio2 17 0>; cs-gpios = <&gpio2 30 GPIO_ACTIVE_LOW>, <&gpio3 19 GPIO_ACTIVE_LOW>,
<&gpio2 16 GPIO_ACTIVE_LOW>, <&gpio2 17 GPIO_ACTIVE_LOW>;
status = "okay"; status = "okay";
}; };
......
...@@ -61,7 +61,7 @@ display0_in: endpoint { ...@@ -61,7 +61,7 @@ display0_in: endpoint {
}; };
&ecspi2 { &ecspi2 {
cs-gpios = <&gpio3 24 GPIO_ACTIVE_HIGH>; cs-gpios = <&gpio3 24 GPIO_ACTIVE_LOW>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi2>; pinctrl-0 = <&pinctrl_ecspi2>;
status = "okay"; status = "okay";
......
...@@ -67,7 +67,7 @@ &can2 { ...@@ -67,7 +67,7 @@ &can2 {
&ecspi2 { &ecspi2 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi2>; pinctrl-0 = <&pinctrl_ecspi2>;
cs-gpios = <&gpio5 12 GPIO_ACTIVE_HIGH>; cs-gpios = <&gpio5 12 GPIO_ACTIVE_LOW>;
status = "okay"; status = "okay";
flash@0 { flash@0 {
...@@ -80,7 +80,7 @@ flash@0 { ...@@ -80,7 +80,7 @@ flash@0 {
&ecspi1 { &ecspi1 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi1>; pinctrl-0 = <&pinctrl_ecspi1>;
cs-gpios = <&gpio5 25 GPIO_ACTIVE_HIGH>; cs-gpios = <&gpio5 25 GPIO_ACTIVE_LOW>;
status = "okay"; status = "okay";
tpm@0 { tpm@0 {
......
...@@ -37,7 +37,7 @@ &can1 { ...@@ -37,7 +37,7 @@ &can1 {
}; };
&ecspi1 { &ecspi1 {
cs-gpios = <&gpio3 19 GPIO_ACTIVE_HIGH>; cs-gpios = <&gpio3 19 GPIO_ACTIVE_LOW>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi1>; pinctrl-0 = <&pinctrl_ecspi1>;
status = "okay"; status = "okay";
...@@ -52,7 +52,7 @@ flash@0 { ...@@ -52,7 +52,7 @@ flash@0 {
}; };
&ecspi3 { &ecspi3 {
cs-gpios = <&gpio4 24 GPIO_ACTIVE_HIGH>; cs-gpios = <&gpio4 24 GPIO_ACTIVE_LOW>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi3>; pinctrl-0 = <&pinctrl_ecspi3>;
status = "okay"; status = "okay";
......
...@@ -219,7 +219,7 @@ &clks { ...@@ -219,7 +219,7 @@ &clks {
}; };
&ecspi2 { &ecspi2 {
cs-gpios = <&gpio2 26 GPIO_ACTIVE_HIGH>; cs-gpios = <&gpio2 26 GPIO_ACTIVE_LOW>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi2>; pinctrl-0 = <&pinctrl_ecspi2>;
status = "okay"; status = "okay";
......
...@@ -134,7 +134,7 @@ &audmux { ...@@ -134,7 +134,7 @@ &audmux {
}; };
&ecspi1 { &ecspi1 {
cs-gpios = <&gpio2 30 GPIO_ACTIVE_HIGH>; cs-gpios = <&gpio2 30 GPIO_ACTIVE_LOW>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi1>; pinctrl-0 = <&pinctrl_ecspi1>;
status = "okay"; status = "okay";
......
...@@ -155,7 +155,7 @@ switchphy4: switchphy@4 { ...@@ -155,7 +155,7 @@ switchphy4: switchphy@4 {
}; };
&ecspi5 { &ecspi5 {
cs-gpios = <&gpio1 17 GPIO_ACTIVE_HIGH>; cs-gpios = <&gpio1 17 GPIO_ACTIVE_LOW>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi5>; pinctrl-0 = <&pinctrl_ecspi5>;
status = "okay"; status = "okay";
......
...@@ -255,7 +255,7 @@ &cpu3 { ...@@ -255,7 +255,7 @@ &cpu3 {
}; };
&ecspi1 { &ecspi1 {
cs-gpios = <&gpio2 30 GPIO_ACTIVE_HIGH>, <&gpio3 19 GPIO_ACTIVE_HIGH>; cs-gpios = <&gpio2 30 GPIO_ACTIVE_LOW>, <&gpio3 19 GPIO_ACTIVE_LOW>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi1>; pinctrl-0 = <&pinctrl_ecspi1>;
status = "okay"; status = "okay";
......
...@@ -59,7 +59,7 @@ &can2 { ...@@ -59,7 +59,7 @@ &can2 {
}; };
&ecspi1 { &ecspi1 {
cs-gpios = <&gpio2 30 GPIO_ACTIVE_HIGH>, <&gpio4 11 GPIO_ACTIVE_HIGH>; cs-gpios = <&gpio2 30 GPIO_ACTIVE_LOW>, <&gpio4 11 GPIO_ACTIVE_LOW>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi1>; pinctrl-0 = <&pinctrl_ecspi1>;
status = "okay"; status = "okay";
......
...@@ -99,7 +99,7 @@ &can1 { ...@@ -99,7 +99,7 @@ &can1 {
&ecspi5 { &ecspi5 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi5>; pinctrl-0 = <&pinctrl_ecspi5>;
cs-gpios = <&gpio1 12 0>; cs-gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
status = "okay"; status = "okay";
flash: m25p80@0 { flash: m25p80@0 {
......
...@@ -42,7 +42,7 @@ sound { ...@@ -42,7 +42,7 @@ sound {
}; };
&ecspi5 { &ecspi5 {
cs-gpios = <&gpio1 17 GPIO_ACTIVE_HIGH>; cs-gpios = <&gpio1 17 GPIO_ACTIVE_LOW>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi5>; pinctrl-0 = <&pinctrl_ecspi5>;
status = "okay"; status = "okay";
......
...@@ -132,7 +132,7 @@ &audmux { ...@@ -132,7 +132,7 @@ &audmux {
}; };
&ecspi1 { &ecspi1 {
cs-gpios = <&gpio3 19 GPIO_ACTIVE_HIGH>; cs-gpios = <&gpio3 19 GPIO_ACTIVE_LOW>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi1>; pinctrl-0 = <&pinctrl_ecspi1>;
status = "okay"; status = "okay";
......
...@@ -15,9 +15,9 @@ / { ...@@ -15,9 +15,9 @@ / {
/* Quad/Dual SoMs have 3 chip-select signals */ /* Quad/Dual SoMs have 3 chip-select signals */
&ecspi4 { &ecspi4 {
fsl,spi-num-chipselects = <3>; fsl,spi-num-chipselects = <3>;
cs-gpios = <&gpio3 24 GPIO_ACTIVE_HIGH>, cs-gpios = <&gpio3 24 GPIO_ACTIVE_LOW>,
<&gpio3 29 GPIO_ACTIVE_HIGH>, <&gpio3 29 GPIO_ACTIVE_LOW>,
<&gpio3 25 GPIO_ACTIVE_HIGH>; <&gpio3 25 GPIO_ACTIVE_LOW>;
}; };
&pinctrl_ecspi4 { &pinctrl_ecspi4 {
......
...@@ -158,7 +158,7 @@ &can2 { ...@@ -158,7 +158,7 @@ &can2 {
}; };
&ecspi1 { &ecspi1 {
cs-gpios = <&gpio3 19 GPIO_ACTIVE_HIGH>; cs-gpios = <&gpio3 19 GPIO_ACTIVE_LOW>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi1>; pinctrl-0 = <&pinctrl_ecspi1>;
status = "okay"; status = "okay";
...@@ -171,7 +171,7 @@ flash@0 { ...@@ -171,7 +171,7 @@ flash@0 {
}; };
&ecspi2 { &ecspi2 {
cs-gpios = <&gpio2 26 GPIO_ACTIVE_HIGH>, <&gpio4 25 GPIO_ACTIVE_HIGH>; cs-gpios = <&gpio2 26 GPIO_ACTIVE_LOW>, <&gpio4 25 GPIO_ACTIVE_LOW>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi2 &pinctrl_ecspi2_cs>; pinctrl-0 = <&pinctrl_ecspi2 &pinctrl_ecspi2_cs>;
status = "okay"; status = "okay";
...@@ -195,7 +195,7 @@ adc@1 { ...@@ -195,7 +195,7 @@ adc@1 {
}; };
&ecspi3 { &ecspi3 {
cs-gpios = <&gpio4 24 GPIO_ACTIVE_HIGH>; cs-gpios = <&gpio4 24 GPIO_ACTIVE_LOW>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi3>; pinctrl-0 = <&pinctrl_ecspi3>;
status = "okay"; status = "okay";
......
...@@ -144,8 +144,8 @@ &can1 { ...@@ -144,8 +144,8 @@ &can1 {
}; };
&ecspi1 { &ecspi1 {
cs-gpios = <&gpio4 9 GPIO_ACTIVE_HIGH>, cs-gpios = <&gpio4 9 GPIO_ACTIVE_LOW>,
<&gpio4 10 GPIO_ACTIVE_HIGH>; <&gpio4 10 GPIO_ACTIVE_LOW>;
status = "okay"; status = "okay";
}; };
......
...@@ -127,7 +127,7 @@ &can2 { ...@@ -127,7 +127,7 @@ &can2 {
/* Apalis SPI1 */ /* Apalis SPI1 */
&ecspi1 { &ecspi1 {
cs-gpios = <&gpio5 25 GPIO_ACTIVE_HIGH>; cs-gpios = <&gpio5 25 GPIO_ACTIVE_LOW>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi1>; pinctrl-0 = <&pinctrl_ecspi1>;
status = "disabled"; status = "disabled";
...@@ -135,7 +135,7 @@ &ecspi1 { ...@@ -135,7 +135,7 @@ &ecspi1 {
/* Apalis SPI2 */ /* Apalis SPI2 */
&ecspi2 { &ecspi2 {
cs-gpios = <&gpio2 26 GPIO_ACTIVE_HIGH>; cs-gpios = <&gpio2 26 GPIO_ACTIVE_LOW>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi2>; pinctrl-0 = <&pinctrl_ecspi2>;
status = "disabled"; status = "disabled";
......
...@@ -91,7 +91,7 @@ rtc@68 { ...@@ -91,7 +91,7 @@ rtc@68 {
}; };
&ecspi4 { &ecspi4 {
cs-gpios = <&gpio3 20 0>; cs-gpios = <&gpio3 20 GPIO_ACTIVE_LOW>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi4>; pinctrl-0 = <&pinctrl_ecspi4>;
status = "okay"; status = "okay";
......
...@@ -110,23 +110,23 @@ &can2 { ...@@ -110,23 +110,23 @@ &can2 {
}; };
&ecspi1 { &ecspi1 {
cs-gpios = <&gpio4 9 GPIO_ACTIVE_HIGH cs-gpios = <&gpio4 9 GPIO_ACTIVE_LOW
&gpio4 10 GPIO_ACTIVE_HIGH &gpio4 10 GPIO_ACTIVE_LOW
&gpio4 11 GPIO_ACTIVE_HIGH>; &gpio4 11 GPIO_ACTIVE_LOW>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi1>; pinctrl-0 = <&pinctrl_ecspi1>;
status = "okay"; status = "okay";
}; };
&ecspi2 { &ecspi2 {
cs-gpios = <&gpio2 26 GPIO_ACTIVE_HIGH &gpio2 27 GPIO_ACTIVE_HIGH>; cs-gpios = <&gpio2 26 GPIO_ACTIVE_LOW &gpio2 27 GPIO_ACTIVE_LOW>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi2>; pinctrl-0 = <&pinctrl_ecspi2>;
status = "okay"; status = "okay";
}; };
&ecspi4 { &ecspi4 {
cs-gpios = <&gpio3 29 GPIO_ACTIVE_HIGH &gpio5 2 GPIO_ACTIVE_HIGH>; cs-gpios = <&gpio3 29 GPIO_ACTIVE_LOW &gpio5 2 GPIO_ACTIVE_LOW>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi4>; pinctrl-0 = <&pinctrl_ecspi4>;
status = "okay"; status = "okay";
......
...@@ -94,7 +94,7 @@ &can2 { ...@@ -94,7 +94,7 @@ &can2 {
/* Colibri SSP */ /* Colibri SSP */
&ecspi4 { &ecspi4 {
cs-gpios = <&gpio5 2 GPIO_ACTIVE_HIGH>; cs-gpios = <&gpio5 2 GPIO_ACTIVE_LOW>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi4>; pinctrl-0 = <&pinctrl_ecspi4>;
status = "disabled"; status = "disabled";
......
...@@ -30,7 +30,7 @@ chosen { ...@@ -30,7 +30,7 @@ chosen {
}; };
&ecspi3 { &ecspi3 {
cs-gpios = <&gpio4 24 0>; cs-gpios = <&gpio4 24 GPIO_ACTIVE_LOW>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi3>; pinctrl-0 = <&pinctrl_ecspi3>;
status = "okay"; status = "okay";
......
...@@ -168,8 +168,8 @@ &can2 { ...@@ -168,8 +168,8 @@ &can2 {
&ecspi2 { &ecspi2 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi2>; pinctrl-0 = <&pinctrl_ecspi2>;
cs-gpios = <&gpio2 26 GPIO_ACTIVE_HIGH>, cs-gpios = <&gpio2 26 GPIO_ACTIVE_LOW>,
<&gpio2 27 GPIO_ACTIVE_HIGH>; <&gpio2 27 GPIO_ACTIVE_LOW>;
}; };
&ecspi4 { &ecspi4 {
......
...@@ -182,7 +182,7 @@ &clks { ...@@ -182,7 +182,7 @@ &clks {
}; };
&ecspi3 { &ecspi3 {
cs-gpios = <&gpio4 24 GPIO_ACTIVE_HIGH>; cs-gpios = <&gpio4 24 GPIO_ACTIVE_LOW>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi3>; pinctrl-0 = <&pinctrl_ecspi3>;
status = "okay"; status = "okay";
......
...@@ -212,7 +212,7 @@ &clks { ...@@ -212,7 +212,7 @@ &clks {
}; };
&ecspi2 { &ecspi2 {
cs-gpios = <&gpio2 26 GPIO_ACTIVE_HIGH>; cs-gpios = <&gpio2 26 GPIO_ACTIVE_LOW>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi2>; pinctrl-0 = <&pinctrl_ecspi2>;
status = "okay"; status = "okay";
......
...@@ -252,7 +252,7 @@ &audmux { ...@@ -252,7 +252,7 @@ &audmux {
}; };
&ecspi3 { &ecspi3 {
cs-gpios = <&gpio4 24 GPIO_ACTIVE_HIGH>; cs-gpios = <&gpio4 24 GPIO_ACTIVE_LOW>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi3>; pinctrl-0 = <&pinctrl_ecspi3>;
status = "okay"; status = "okay";
......
...@@ -134,7 +134,7 @@ reg_wl: regulator-wl { ...@@ -134,7 +134,7 @@ reg_wl: regulator-wl {
&ecspi3 { &ecspi3 {
cs-gpios = <&gpio4 24 GPIO_ACTIVE_HIGH>; cs-gpios = <&gpio4 24 GPIO_ACTIVE_LOW>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi3>; pinctrl-0 = <&pinctrl_ecspi3>;
status = "okay"; status = "okay";
......
...@@ -129,7 +129,7 @@ &can1 { ...@@ -129,7 +129,7 @@ &can1 {
}; };
&ecspi2 { &ecspi2 {
cs-gpios = <&gpio2 26 GPIO_ACTIVE_HIGH>; cs-gpios = <&gpio2 26 GPIO_ACTIVE_LOW>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi2>; pinctrl-0 = <&pinctrl_ecspi2>;
status = "okay"; status = "okay";
......
...@@ -203,7 +203,7 @@ IMX_AUDMUX_V2_PDCR_RXDSEL(0) ...@@ -203,7 +203,7 @@ IMX_AUDMUX_V2_PDCR_RXDSEL(0)
&ecspi2 { &ecspi2 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_hummingboard2_ecspi2>; pinctrl-0 = <&pinctrl_hummingboard2_ecspi2>;
cs-gpios = <&gpio2 26 0>; cs-gpios = <&gpio2 26 GPIO_ACTIVE_LOW>;
status = "okay"; status = "okay";
}; };
......
...@@ -245,16 +245,16 @@ &can2 { ...@@ -245,16 +245,16 @@ &can2 {
&ecspi2 { &ecspi2 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi2>; pinctrl-0 = <&pinctrl_ecspi2>;
cs-gpios = <&gpio2 26 GPIO_ACTIVE_HIGH>, cs-gpios = <&gpio2 26 GPIO_ACTIVE_LOW>,
<&gpio2 27 GPIO_ACTIVE_HIGH>; <&gpio2 27 GPIO_ACTIVE_LOW>;
}; };
/* SPI0 */ /* SPI0 */
&ecspi4 { &ecspi4 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi4>; pinctrl-0 = <&pinctrl_ecspi4>;
cs-gpios = <&gpio3 24 GPIO_ACTIVE_HIGH>, cs-gpios = <&gpio3 24 GPIO_ACTIVE_LOW>,
<&gpio3 29 GPIO_ACTIVE_HIGH>; <&gpio3 29 GPIO_ACTIVE_LOW>;
status = "okay"; status = "okay";
/* default boot source: workaround #1 for errata ERR006282 */ /* default boot source: workaround #1 for errata ERR006282 */
......
...@@ -316,7 +316,7 @@ &clks { ...@@ -316,7 +316,7 @@ &clks {
}; };
&ecspi1 { &ecspi1 {
cs-gpios = <&gpio3 19 GPIO_ACTIVE_HIGH>; cs-gpios = <&gpio3 19 GPIO_ACTIVE_LOW>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi1>; pinctrl-0 = <&pinctrl_ecspi1>;
status = "okay"; status = "okay";
......
...@@ -247,7 +247,7 @@ &clks { ...@@ -247,7 +247,7 @@ &clks {
}; };
&ecspi1 { &ecspi1 {
cs-gpios = <&gpio3 19 GPIO_ACTIVE_HIGH>; cs-gpios = <&gpio3 19 GPIO_ACTIVE_LOW>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi1>; pinctrl-0 = <&pinctrl_ecspi1>;
status = "okay"; status = "okay";
......
...@@ -232,7 +232,7 @@ &clks { ...@@ -232,7 +232,7 @@ &clks {
}; };
&ecspi1 { &ecspi1 {
cs-gpios = <&gpio3 19 0>; cs-gpios = <&gpio3 19 GPIO_ACTIVE_LOW>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi1>; pinctrl-0 = <&pinctrl_ecspi1>;
status = "okay"; status = "okay";
......
...@@ -71,7 +71,7 @@ &ecspi3 { ...@@ -71,7 +71,7 @@ &ecspi3 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi3>; pinctrl-0 = <&pinctrl_ecspi3>;
status = "okay"; status = "okay";
cs-gpios = <&gpio4 24 0>; cs-gpios = <&gpio4 24 GPIO_ACTIVE_LOW>;
som_flash: flash@0 { som_flash: flash@0 {
compatible = "m25p80", "jedec,spi-nor"; compatible = "m25p80", "jedec,spi-nor";
......
...@@ -167,7 +167,7 @@ &clks { ...@@ -167,7 +167,7 @@ &clks {
&ecspi2 { &ecspi2 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi2>; pinctrl-0 = <&pinctrl_ecspi2>;
cs-gpios = <&gpio2 27 GPIO_ACTIVE_HIGH>; cs-gpios = <&gpio2 27 GPIO_ACTIVE_LOW>;
status = "okay"; status = "okay";
}; };
......
...@@ -267,7 +267,7 @@ &clks { ...@@ -267,7 +267,7 @@ &clks {
}; };
&ecspi1 { &ecspi1 {
cs-gpios = <&gpio3 19 0>; cs-gpios = <&gpio3 19 GPIO_ACTIVE_LOW>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi1 &pinctrl_ecspi1_cs>; pinctrl-0 = <&pinctrl_ecspi1 &pinctrl_ecspi1_cs>;
status = "disabled"; /* pin conflict with WEIM NOR */ status = "disabled"; /* pin conflict with WEIM NOR */
......
...@@ -308,7 +308,7 @@ &clks { ...@@ -308,7 +308,7 @@ &clks {
}; };
&ecspi1 { &ecspi1 {
cs-gpios = <&gpio3 19 0>; cs-gpios = <&gpio3 19 GPIO_ACTIVE_LOW>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi1>; pinctrl-0 = <&pinctrl_ecspi1>;
status = "okay"; status = "okay";
......
...@@ -189,7 +189,7 @@ &clks { ...@@ -189,7 +189,7 @@ &clks {
}; };
&ecspi1 { &ecspi1 {
cs-gpios = <&gpio4 9 0>; cs-gpios = <&gpio4 9 GPIO_ACTIVE_LOW>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi1>; pinctrl-0 = <&pinctrl_ecspi1>;
status = "okay"; status = "okay";
......
...@@ -95,7 +95,7 @@ &can2 { ...@@ -95,7 +95,7 @@ &can2 {
}; };
&ecspi1 { &ecspi1 {
cs-gpios = <&gpio3 19 GPIO_ACTIVE_HIGH>; cs-gpios = <&gpio3 19 GPIO_ACTIVE_LOW>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi1>; pinctrl-0 = <&pinctrl_ecspi1>;
status = "okay"; status = "okay";
...@@ -108,7 +108,7 @@ n25q064: flash@0 { ...@@ -108,7 +108,7 @@ n25q064: flash@0 {
}; };
&ecspi2 { &ecspi2 {
cs-gpios = <&gpio6 2 GPIO_ACTIVE_HIGH>; cs-gpios = <&gpio6 2 GPIO_ACTIVE_LOW>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi2>; pinctrl-0 = <&pinctrl_ecspi2>;
status = "okay"; status = "okay";
......
...@@ -165,7 +165,7 @@ &can2 { ...@@ -165,7 +165,7 @@ &can2 {
}; };
&ecspi1 { &ecspi1 {
cs-gpios = <&gpio3 19 GPIO_ACTIVE_HIGH>; cs-gpios = <&gpio3 19 GPIO_ACTIVE_LOW>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi1>; pinctrl-0 = <&pinctrl_ecspi1>;
status = "okay"; status = "okay";
...@@ -179,9 +179,9 @@ n25q064: flash@0 { ...@@ -179,9 +179,9 @@ n25q064: flash@0 {
&ecspi2 { &ecspi2 {
cs-gpios = < cs-gpios = <
&gpio5 31 GPIO_ACTIVE_HIGH &gpio5 31 GPIO_ACTIVE_LOW
&gpio7 12 GPIO_ACTIVE_HIGH &gpio7 12 GPIO_ACTIVE_LOW
&gpio5 18 GPIO_ACTIVE_HIGH &gpio5 18 GPIO_ACTIVE_LOW
>; >;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi2>; pinctrl-0 = <&pinctrl_ecspi2>;
......
...@@ -316,7 +316,7 @@ eeprom@a4 { ...@@ -316,7 +316,7 @@ eeprom@a4 {
&ecspi1 { &ecspi1 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi1>; pinctrl-0 = <&pinctrl_ecspi1>;
cs-gpios = <&gpio2 30 GPIO_ACTIVE_HIGH>; cs-gpios = <&gpio2 30 GPIO_ACTIVE_LOW>;
status = "okay"; status = "okay";
flash@0 { flash@0 {
......
...@@ -129,7 +129,7 @@ &audmux { ...@@ -129,7 +129,7 @@ &audmux {
}; };
&ecspi1 { &ecspi1 {
cs-gpios = <&gpio4 11 0>; cs-gpios = <&gpio4 11 GPIO_ACTIVE_LOW>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi1>; pinctrl-0 = <&pinctrl_ecspi1>;
status = "okay"; status = "okay";
......
...@@ -93,7 +93,7 @@ &cpu0 { ...@@ -93,7 +93,7 @@ &cpu0 {
&ecspi4 { &ecspi4 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi4>; pinctrl-0 = <&pinctrl_ecspi4>;
cs-gpios = <&gpio7 4 GPIO_ACTIVE_HIGH>; cs-gpios = <&gpio7 4 GPIO_ACTIVE_LOW>;
status = "okay"; status = "okay";
}; };
......
...@@ -84,7 +84,7 @@ &can2 { ...@@ -84,7 +84,7 @@ &can2 {
}; };
&ecspi1 { &ecspi1 {
cs-gpios = <&gpio4 26 GPIO_ACTIVE_HIGH>; cs-gpios = <&gpio4 26 GPIO_ACTIVE_LOW>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi1>; pinctrl-0 = <&pinctrl_ecspi1>;
status = "okay"; status = "okay";
......
...@@ -14,7 +14,7 @@ chosen { ...@@ -14,7 +14,7 @@ chosen {
}; };
&ecspi2 { &ecspi2 {
cs-gpios = <&gpio4 22 GPIO_ACTIVE_HIGH>; cs-gpios = <&gpio4 22 GPIO_ACTIVE_LOW>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi2>; pinctrl-0 = <&pinctrl_ecspi2>;
status = "okay"; status = "okay";
......
...@@ -106,7 +106,7 @@ &clks { ...@@ -106,7 +106,7 @@ &clks {
&ecspi3 { &ecspi3 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi3>; pinctrl-0 = <&pinctrl_ecspi3>;
cs-gpios = <&gpio1 20 GPIO_ACTIVE_HIGH>; cs-gpios = <&gpio1 20 GPIO_ACTIVE_LOW>;
status = "disabled"; status = "disabled";
}; };
......
...@@ -68,7 +68,7 @@ &can2 { ...@@ -68,7 +68,7 @@ &can2 {
/* Colibri SPI */ /* Colibri SPI */
&ecspi1 { &ecspi1 {
cs-gpios = <&gpio3 26 GPIO_ACTIVE_HIGH>; cs-gpios = <&gpio3 26 GPIO_ACTIVE_LOW>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi1 &pinctrl_ecspi1_cs>; pinctrl-0 = <&pinctrl_ecspi1 &pinctrl_ecspi1_cs>;
}; };
......
...@@ -60,7 +60,7 @@ &cpu0 { ...@@ -60,7 +60,7 @@ &cpu0 {
&ecspi3 { &ecspi3 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi3 &pinctrl_ecspi3_cs>; pinctrl-0 = <&pinctrl_ecspi3 &pinctrl_ecspi3_cs>;
cs-gpios = <&gpio4 11 GPIO_ACTIVE_HIGH>; cs-gpios = <&gpio4 11 GPIO_ACTIVE_LOW>;
}; };
&fec1 { &fec1 {
......
...@@ -187,7 +187,7 @@ &cpu1 { ...@@ -187,7 +187,7 @@ &cpu1 {
&ecspi3 { &ecspi3 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi3>; pinctrl-0 = <&pinctrl_ecspi3>;
cs-gpios = <&gpio5 9 GPIO_ACTIVE_HIGH>; cs-gpios = <&gpio5 9 GPIO_ACTIVE_LOW>;
status = "okay"; status = "okay";
tsc2046@0 { tsc2046@0 {
......
...@@ -39,7 +39,7 @@ &cpu0 { ...@@ -39,7 +39,7 @@ &cpu0 {
&ecspi1 { &ecspi1 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi1>; pinctrl-0 = <&pinctrl_ecspi1>;
cs-gpios = <&gpio4 19 GPIO_ACTIVE_HIGH>; cs-gpios = <&gpio4 19 GPIO_ACTIVE_LOW>;
status = "okay"; status = "okay";
flash@0 { flash@0 {
......
...@@ -193,7 +193,7 @@ &clks { ...@@ -193,7 +193,7 @@ &clks {
&ecspi1 { &ecspi1 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi1>; pinctrl-0 = <&pinctrl_ecspi1>;
cs-gpios = <&gpio4 19 GPIO_ACTIVE_HIGH>; cs-gpios = <&gpio4 19 GPIO_ACTIVE_LOW>;
status = "okay"; status = "okay";
flash@0 { flash@0 {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment