5 files changed, 54 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/at91sam9260.dtsi b/arch/arm/boot/dts/at91sam9260.dtsi
index 425da936051d..0b72ae3d8250 100644
--- a/arch/arm/boot/dts/at91sam9260.dtsi
+++ b/arch/arm/boot/dts/at91sam9260.dtsi
@@ -104,6 +104,15 @@
                                compatible = "atmel,at91rm9200-pinctrl", "simple-bus";
                                ranges = <0xfffff400 0xfffff400 0x600>;
+                                atmel,mux-mask = <
+                                      /*    A         B     */
+                                       0xffffffff 0xffc00c3b  /* pioA */
+                                       0xffffffff 0x7fff3ccf  /* pioB */
+                                       0xffffffff 0x007fffff  /* pioC */
+                                      >;
+                                /* shared pinctrl settings */
                                pioA: gpio@fffff400 {
                                        compatible = "atmel,at91rm9200-gpio";
                                        reg = <0xfffff400 0x200>;
diff --git a/arch/arm/boot/dts/at91sam9263.dtsi b/arch/arm/boot/dts/at91sam9263.dtsi
index 5b619c9255bd..c8028fc9ec83 100644
--- a/arch/arm/boot/dts/at91sam9263.dtsi
+++ b/arch/arm/boot/dts/at91sam9263.dtsi
@@ -95,6 +95,17 @@
                                compatible = "atmel,at91rm9200-pinctrl", "simple-bus";
                                ranges = <0xfffff200 0xfffff200 0xa00>;
+                                atmel,mux-mask = <
+                                      /*    A         B     */
+                                       0xfffffffb 0xffffe07f  /* pioA */
+                                       0x0007ffff 0x39072fff  /* pioB */
+                                       0xffffffff 0x3ffffff8  /* pioC */
+                                       0xfffffbff 0xffffffff  /* pioD */
+                                       0xffe00fff 0xfbfcff00  /* pioE */
+                                      >;
+                                /* shared pinctrl settings */
                                pioA: gpio@fffff200 {
                                        compatible = "atmel,at91rm9200-gpio";
                                        reg = <0xfffff200 0x200>;
@@ -143,6 +154,7 @@
                                        gpio-controller;
                                        interrupt-controller;
                                        #interrupt-cells = <2>;
+                                };
                        };
                        dbgu: serial@ffffee00 {
diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi
index f2b0f93c0499..5222625b6ce0 100644
--- a/arch/arm/boot/dts/at91sam9g45.dtsi
+++ b/arch/arm/boot/dts/at91sam9g45.dtsi
@@ -114,6 +114,17 @@
                                compatible = "atmel,at91rm9200-pinctrl", "simple-bus";
                                ranges = <0xfffff200 0xfffff200 0xa00>;
+                                atmel,mux-mask = <
+                                      /*    A         B     */
+                                       0xffffffff 0xffc003ff  /* pioA */
+                                       0xffffffff 0x800f8f00  /* pioB */
+                                       0xffffffff 0x00000e00  /* pioC */
+                                       0xffffffff 0xff0c1381  /* pioD */
+                                       0xffffffff 0x81ffff81  /* pioE */
+                                      >;
+                                /* shared pinctrl settings */
                                pioA: gpio@fffff200 {
                                        compatible = "atmel,at91rm9200-gpio";
                                        reg = <0xfffff200 0x200>;
diff --git a/arch/arm/boot/dts/at91sam9n12.dtsi b/arch/arm/boot/dts/at91sam9n12.dtsi
index b061c0626025..8b5276499aaf 100644
--- a/arch/arm/boot/dts/at91sam9n12.dtsi
+++ b/arch/arm/boot/dts/at91sam9n12.dtsi
@@ -105,9 +105,19 @@
                        pinctrl@fffff400 {
                                #address-cells = <1>;
                                #size-cells = <1>;
-                                compatible = "atmel,at91rm9200-pinctrl", "simple-bus";
+                                compatible = "atmel,at91sam9x5-pinctrl", "atmel,at91rm9200-pinctrl", "simple-bus";
                                ranges = <0xfffff400 0xfffff400 0x800>;
+                                atmel,mux-mask = <
+                                      /*    A         B          C     */
+                                       0xffffffff 0xffe07983 0x00000000  /* pioA */
+                                       0x00040000 0x00047e0f 0x00000000  /* pioB */
+                                       0xfdffffff 0x07c00000 0xb83fffff  /* pioC */
+                                       0x003fffff 0x003f8000 0x00000000  /* pioD */
+                                      >;
+                                /* shared pinctrl settings */
                                pioA: gpio@fffff400 {
                                        compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
                                        reg = <0xfffff400 0x200>;
diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi
index 065698ac4deb..34d4d5c8c58d 100644
--- a/arch/arm/boot/dts/at91sam9x5.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5.dtsi
@@ -114,9 +114,19 @@
                        pinctrl@fffff200 {
                                #address-cells = <1>;
                                #size-cells = <1>;
-                                compatible = "atmel,at91rm9200-pinctrl", "simple-bus";
+                                compatible = "atmel,at91sam9x5-pinctrl", "atmel,at91rm9200-pinctrl", "simple-bus";
                                ranges = <0xfffff400 0xfffff400 0x800>;
+                                atmel,mux-mask = <
+                                      /*    A         B          C     */
+                                       0xffffffff 0xffe0399f 0xc000001c  /* pioA */
+                                       0xffffffff 0xffc003ff 0xffc003ff  /* pioB */
+                                       0xffffffff 0xffc003ff 0xffc003ff  /* pioC */
+                                       0xffffffff 0xffc003ff 0xffc003ff  /* pioD */
+                                      >;
+                                /* shared pinctrl settings */
                                pioA: gpio@fffff400 {
                                        compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
                                        reg = <0xfffff400 0x200>;

diff --git a/arch/arm/boot/dts/at91sam9260.dtsi b/arch/arm/boot/dts/at91sam9260.dtsi index 425da936051d..0b72ae3d8250 100644 --- a/arch/arm/boot/dts/at91sam9260.dtsi +++ b/arch/arm/boot/dts/at91sam9260.dtsi
@@ -104,6 +104,15 @@
104	compatible = "atmel,at91rm9200-pinctrl", "simple-bus";	104	compatible = "atmel,at91rm9200-pinctrl", "simple-bus";
105	ranges = <0xfffff400 0xfffff400 0x600>;	105	ranges = <0xfffff400 0xfffff400 0x600>;
106		106
		107	atmel,mux-mask = <
		108	/* A B */
		109	0xffffffff 0xffc00c3b /* pioA */
		110	0xffffffff 0x7fff3ccf /* pioB */
		111	0xffffffff 0x007fffff /* pioC */
		112	>;
		113
		114	/* shared pinctrl settings */
		115
107	pioA: gpio@fffff400 {	116	pioA: gpio@fffff400 {
108	compatible = "atmel,at91rm9200-gpio";	117	compatible = "atmel,at91rm9200-gpio";
109	reg = <0xfffff400 0x200>;	118	reg = <0xfffff400 0x200>;


diff --git a/arch/arm/boot/dts/at91sam9263.dtsi b/arch/arm/boot/dts/at91sam9263.dtsi index 5b619c9255bd..c8028fc9ec83 100644 --- a/arch/arm/boot/dts/at91sam9263.dtsi +++ b/arch/arm/boot/dts/at91sam9263.dtsi
@@ -95,6 +95,17 @@
95	compatible = "atmel,at91rm9200-pinctrl", "simple-bus";	95	compatible = "atmel,at91rm9200-pinctrl", "simple-bus";
96	ranges = <0xfffff200 0xfffff200 0xa00>;	96	ranges = <0xfffff200 0xfffff200 0xa00>;
97		97
		98	atmel,mux-mask = <
		99	/* A B */
		100	0xfffffffb 0xffffe07f /* pioA */
		101	0x0007ffff 0x39072fff /* pioB */
		102	0xffffffff 0x3ffffff8 /* pioC */
		103	0xfffffbff 0xffffffff /* pioD */
		104	0xffe00fff 0xfbfcff00 /* pioE */
		105	>;
		106
		107	/* shared pinctrl settings */
		108
98	pioA: gpio@fffff200 {	109	pioA: gpio@fffff200 {
99	compatible = "atmel,at91rm9200-gpio";	110	compatible = "atmel,at91rm9200-gpio";
100	reg = <0xfffff200 0x200>;	111	reg = <0xfffff200 0x200>;
@@ -143,6 +154,7 @@
143	gpio-controller;	154	gpio-controller;
144	interrupt-controller;	155	interrupt-controller;
145	#interrupt-cells = <2>;	156	#interrupt-cells = <2>;
		157	};
146	};	158	};
147		159
148	dbgu: serial@ffffee00 {	160	dbgu: serial@ffffee00 {


diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi index f2b0f93c0499..5222625b6ce0 100644 --- a/arch/arm/boot/dts/at91sam9g45.dtsi +++ b/arch/arm/boot/dts/at91sam9g45.dtsi
@@ -114,6 +114,17 @@
114	compatible = "atmel,at91rm9200-pinctrl", "simple-bus";	114	compatible = "atmel,at91rm9200-pinctrl", "simple-bus";
115	ranges = <0xfffff200 0xfffff200 0xa00>;	115	ranges = <0xfffff200 0xfffff200 0xa00>;
116		116
		117	atmel,mux-mask = <
		118	/* A B */
		119	0xffffffff 0xffc003ff /* pioA */
		120	0xffffffff 0x800f8f00 /* pioB */
		121	0xffffffff 0x00000e00 /* pioC */
		122	0xffffffff 0xff0c1381 /* pioD */
		123	0xffffffff 0x81ffff81 /* pioE */
		124	>;
		125
		126	/* shared pinctrl settings */
		127
117	pioA: gpio@fffff200 {	128	pioA: gpio@fffff200 {
118	compatible = "atmel,at91rm9200-gpio";	129	compatible = "atmel,at91rm9200-gpio";
119	reg = <0xfffff200 0x200>;	130	reg = <0xfffff200 0x200>;


diff --git a/arch/arm/boot/dts/at91sam9n12.dtsi b/arch/arm/boot/dts/at91sam9n12.dtsi index b061c0626025..8b5276499aaf 100644 --- a/arch/arm/boot/dts/at91sam9n12.dtsi +++ b/arch/arm/boot/dts/at91sam9n12.dtsi
@@ -105,9 +105,19 @@
105	pinctrl@fffff400 {	105	pinctrl@fffff400 {
106	#address-cells = <1>;	106	#address-cells = <1>;
107	#size-cells = <1>;	107	#size-cells = <1>;
108	compatible = "atmel,at91rm9200-pinctrl", "simple-bus";	108	compatible = "atmel,at91sam9x5-pinctrl", "atmel,at91rm9200-pinctrl", "simple-bus";
109	ranges = <0xfffff400 0xfffff400 0x800>;	109	ranges = <0xfffff400 0xfffff400 0x800>;
110		110
		111	atmel,mux-mask = <
		112	/* A B C */
		113	0xffffffff 0xffe07983 0x00000000 /* pioA */
		114	0x00040000 0x00047e0f 0x00000000 /* pioB */
		115	0xfdffffff 0x07c00000 0xb83fffff /* pioC */
		116	0x003fffff 0x003f8000 0x00000000 /* pioD */
		117	>;
		118
		119	/* shared pinctrl settings */
		120
111	pioA: gpio@fffff400 {	121	pioA: gpio@fffff400 {
112	compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";	122	compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
113	reg = <0xfffff400 0x200>;	123	reg = <0xfffff400 0x200>;


diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi index 065698ac4deb..34d4d5c8c58d 100644 --- a/arch/arm/boot/dts/at91sam9x5.dtsi +++ b/arch/arm/boot/dts/at91sam9x5.dtsi
@@ -114,9 +114,19 @@
114	pinctrl@fffff200 {	114	pinctrl@fffff200 {
115	#address-cells = <1>;	115	#address-cells = <1>;
116	#size-cells = <1>;	116	#size-cells = <1>;
117	compatible = "atmel,at91rm9200-pinctrl", "simple-bus";	117	compatible = "atmel,at91sam9x5-pinctrl", "atmel,at91rm9200-pinctrl", "simple-bus";
118	ranges = <0xfffff400 0xfffff400 0x800>;	118	ranges = <0xfffff400 0xfffff400 0x800>;
119		119
		120	atmel,mux-mask = <
		121	/* A B C */
		122	0xffffffff 0xffe0399f 0xc000001c /* pioA */
		123	0xffffffff 0xffc003ff 0xffc003ff /* pioB */
		124	0xffffffff 0xffc003ff 0xffc003ff /* pioC */
		125	0xffffffff 0xffc003ff 0xffc003ff /* pioD */
		126	>;
		127
		128	/* shared pinctrl settings */
		129
120	pioA: gpio@fffff400 {	130	pioA: gpio@fffff400 {
121	compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";	131	compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
122	reg = <0xfffff400 0x200>;	132	reg = <0xfffff400 0x200>;