Skip to content

Commit dc56e10

Browse files
arndbarndb
committed
Merge tag 'at91-dt-6.17' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into soc/dt
Microchip AT91 device tree updates for v6.17 This update includes: - controllers enabled for SAMA7D65 SoC (crypto controllers, PWM, CAN) - controllers enabled for SAM9X7 SoC (LCD, LVDS) - cache configuration updates for SAMA5D2, SAMA5D3, SAMA5D4, SAMA7G5, SAMA7D65 - cleanups * tag 'at91-dt-6.17' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux: (22 commits) ARM: dts: microchip: sama7g5: Add cache configuration for cpu node ARM: dts: microchip: sama7d65: Add cache configuration for cpu node ARM: dts: microchip: sama5d4: Update the cache configuration for CPU ARM: dts: microchip: sama5d3: Update the cache configuration for CPU ARM: dts: microchip: sama5d2: Update the cache configuration for CPU ARM: dts: microchip: sam9x7: Add LVDS controller ARM: dts: microchip: sama5d2_icp: rename spi-cs-setup-ns property to spi-cs-setup-delay-ns ARM: dts: microchip: sama5d27_wlsom1: rename spi-cs-setup-ns property to spi-cs-setup-delay-ns ARM: dts: microchip: sama5d27_som1: rename spi-cs-setup-ns property to spi-cs-setup-delay-ns ARM: dts: microchip: sam9x60ek: rename spi-cs-setup-ns property to spi-cs-setup-delay-ns ARM: dts: at91-sama5d27_wlsom1: Improve the Wifi compatible ARM: dts: microchip: gardena-smart-gateway: Fix power LED ARM: dts: microchip: sam9x7: Add clock name property ARM: dts: microchip: sama7d65: Add clock name property ARM: dts: microchip: sama7g5: Adjust clock xtal phandle ARM: dts: microchip: sam9x7: Add HLCD controller ARM: dts: microchip: sama7d65: Enable CAN bus ARM: dts: microchip: sama7d65: Clean up extra space ARM: dts: microchip: sama7d65: Add CAN bus support ARM: dts: microchip: sama7d65: Add PWM support ... Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 95e4ade + 314862e commit dc56e10

21 files changed

+272
-49
lines changed

‎arch/arm/boot/dts/microchip/at91-sam9x60ek.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -609,7 +609,7 @@
609609
compatible = "jedec,spi-nor";
610610
reg = <0>;
611611
spi-max-frequency = <104000000>;
612-
spi-cs-setup-ns = <7>;
612+
spi-cs-setup-delay-ns = <7>;
613613
spi-tx-bus-width = <4>;
614614
spi-rx-bus-width = <4>;
615615
m25p,fast-read;

‎arch/arm/boot/dts/microchip/at91-sama5d27_som1.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
compatible = "jedec,spi-nor";
4545
reg = <0>;
4646
spi-max-frequency = <104000000>;
47-
spi-cs-setup-ns = <7>;
47+
spi-cs-setup-delay-ns = <7>;
4848
spi-tx-bus-width = <4>;
4949
spi-rx-bus-width = <4>;
5050
m25p,fast-read;

‎arch/arm/boot/dts/microchip/at91-sama5d27_wlsom1.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@
234234
compatible = "jedec,spi-nor";
235235
reg = <0>;
236236
spi-max-frequency = <104000000>;
237-
spi-cs-setup-ns = <7>;
237+
spi-cs-setup-delay-ns = <7>;
238238
spi-rx-bus-width = <4>;
239239
spi-tx-bus-width = <4>;
240240
m25p,fast-read;
@@ -385,7 +385,7 @@
385385

386386
wilc: wifi@0 {
387387
reg = <0>;
388-
compatible = "microchip,wilc1000";
388+
compatible = "microchip,wilc3000", "microchip,wilc1000";
389389
pinctrl-names = "default";
390390
pinctrl-0 = <&pinctrl_wilc_default>;
391391
clocks = <&pmc PMC_TYPE_SYSTEM 9>;

‎arch/arm/boot/dts/microchip/at91-sama5d2_icp.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -714,7 +714,7 @@
714714
compatible = "jedec,spi-nor";
715715
reg = <0>;
716716
spi-max-frequency = <104000000>;
717-
spi-cs-setup-ns = <7>;
717+
spi-cs-setup-delay-ns = <7>;
718718
spi-tx-bus-width = <4>;
719719
spi-rx-bus-width = <4>;
720720
m25p,fast-read;

‎arch/arm/boot/dts/microchip/at91-sama7d65_curiosity.dts

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,24 @@
3838
regulator-max-microvolt = <5000000>;
3939
regulator-always-on;
4040
};
41+
};
42+
43+
&can1 {
44+
pinctrl-names = "default";
45+
pinctrl-0 = <&pinctrl_can1_default>;
46+
status = "okay";
47+
};
4148

49+
&can2 {
50+
pinctrl-names = "default";
51+
pinctrl-0 = <&pinctrl_can2_default>;
52+
status = "okay";
53+
};
54+
55+
&can3 {
56+
pinctrl-names = "default";
57+
pinctrl-0 = <&pinctrl_can3_default>;
58+
status = "okay";
4259
};
4360

4461
&dma0 {
@@ -278,6 +295,24 @@
278295
};
279296

280297
&pioa {
298+
pinctrl_can1_default: can1-default {
299+
pinmux = <PIN_PD10__CANTX1>,
300+
<PIN_PD11__CANRX1>;
301+
bias-disable;
302+
};
303+
304+
pinctrl_can2_default: can2-default {
305+
pinmux = <PIN_PD12__CANTX2>,
306+
<PIN_PD13__CANRX2>;
307+
bias-disable;
308+
};
309+
310+
pinctrl_can3_default: can3-default {
311+
pinmux = <PIN_PD14__CANTX3>,
312+
<PIN_PD15__CANRX3>;
313+
bias-disable;
314+
};
315+
281316
pinctrl_gmac0_default: gmac0-default {
282317
pinmux = <PIN_PA26__G0_TX0>,
283318
<PIN_PA27__G0_TX1>,

‎arch/arm/boot/dts/microchip/at91-sama7g5ek.dts

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,6 @@
3535
i2c2 = &i2c9;
3636
};
3737

38-
clocks {
39-
slow_xtal {
40-
clock-frequency = <32768>;
41-
};
42-
43-
main_xtal {
44-
clock-frequency = <24000000>;
45-
};
46-
};
47-
4838
gpio-keys {
4939
compatible = "gpio-keys";
5040

@@ -556,6 +546,10 @@
556546
pinctrl-0 = <&pinctrl_i2s0_default>;
557547
};
558548

549+
&main_xtal {
550+
clock-frequency = <24000000>;
551+
};
552+
559553
&pdmc0 {
560554
#sound-dai-cells = <0>;
561555
microchip,mic-pos = <MCHP_PDMC_DS0 MCHP_PDMC_CLK_NEGATIVE>, /* MIC 1 */
@@ -885,6 +879,10 @@
885879
};
886880
};
887881

882+
&slow_xtal {
883+
clock-frequency = <32768>;
884+
};
885+
888886
&spdifrx {
889887
pinctrl-names = "default";
890888
pinctrl-0 = <&pinctrl_spdifrx_default>;

‎arch/arm/boot/dts/microchip/at91rm9200.dtsi

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -714,9 +714,8 @@
714714

715715
i2c-gpio-0 {
716716
compatible = "i2c-gpio";
717-
gpios = <&pioA 25 GPIO_ACTIVE_HIGH /* sda */
718-
&pioA 26 GPIO_ACTIVE_HIGH /* scl */
719-
>;
717+
sda-gpios = <&pioA 25 GPIO_ACTIVE_HIGH>;
718+
scl-gpios = <&pioA 26 GPIO_ACTIVE_HIGH>;
720719
i2c-gpio,sda-open-drain;
721720
i2c-gpio,scl-open-drain;
722721
i2c-gpio,delay-us = <2>; /* ~100 kHz */

‎arch/arm/boot/dts/microchip/at91sam9260.dtsi

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -781,9 +781,8 @@
781781

782782
i2c_gpio0: i2c-gpio-0 {
783783
compatible = "i2c-gpio";
784-
gpios = <&pioA 23 GPIO_ACTIVE_HIGH /* sda */
785-
&pioA 24 GPIO_ACTIVE_HIGH /* scl */
786-
>;
784+
sda-gpios = <&pioA 23 GPIO_ACTIVE_HIGH>;
785+
scl-gpios = <&pioA 24 GPIO_ACTIVE_HIGH>;
787786
i2c-gpio,sda-open-drain;
788787
i2c-gpio,scl-open-drain;
789788
i2c-gpio,delay-us = <2>; /* ~100 kHz */

‎arch/arm/boot/dts/microchip/at91sam9261.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -655,8 +655,8 @@
655655
compatible = "i2c-gpio";
656656
pinctrl-names = "default";
657657
pinctrl-0 = <&pinctrl_i2c_bitbang>;
658-
gpios = <&pioA 7 GPIO_ACTIVE_HIGH>, /* sda */
659-
<&pioA 8 GPIO_ACTIVE_HIGH>; /* scl */
658+
sda-gpios = <&pioA 7 GPIO_ACTIVE_HIGH>;
659+
scl-gpios = <&pioA 8 GPIO_ACTIVE_HIGH>;
660660
i2c-gpio,sda-open-drain;
661661
i2c-gpio,scl-open-drain;
662662
i2c-gpio,delay-us = <2>; /* ~100 kHz */

‎arch/arm/boot/dts/microchip/at91sam9263.dtsi

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -826,9 +826,8 @@
826826

827827
i2c-gpio-0 {
828828
compatible = "i2c-gpio";
829-
gpios = <&pioB 4 GPIO_ACTIVE_HIGH /* sda */
830-
&pioB 5 GPIO_ACTIVE_HIGH /* scl */
831-
>;
829+
sda-gpios = <&pioB 4 GPIO_ACTIVE_HIGH>;
830+
scl-gpios = <&pioB 5 GPIO_ACTIVE_HIGH>;
832831
i2c-gpio,sda-open-drain;
833832
i2c-gpio,scl-open-drain;
834833
i2c-gpio,delay-us = <2>; /* ~100 kHz */

0 commit comments

Comments
 (0)