Commit f90f453a authored by Michael Welling's avatar Michael Welling
Browse files

SoM-9x25 on SoM-150 device tree updates.



Switches to using macros for pinctrl definitions.
Signed-off-by: default avatarMichael Welling <mwelling@emacinc.com>
parent bd4ee52b
...@@ -27,85 +27,100 @@ ...@@ -27,85 +27,100 @@
}; };
}; };
regulators {
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <0>;
vref: regulator@0 {
compatible = "regulator-fixed";
reg = <0>;
regulator-name = "vref";
regulator-min-microvolt = <2500000>;
regulator-max-microvolt = <2500000>;
regulator-always-on;
};
};
ahb { ahb {
apb { apb {
pinctrl@fffff400 { pinctrl@fffff400 {
adc0 { adc0 {
pinctrl_adc0: adc0-board { pinctrl_adc0: adc0-board {
atmel,pins = atmel,pins =
<1 11 AT91_PERIPH_A 0x0 /* PB11 periph A AD0 */ <AT91_PIOB 11 AT91_PERIPH_GPIO AT91_PINCTRL_NONE
1 12 AT91_PERIPH_A 0x0 /* PB12 periph A AD1 */ AT91_PIOB 12 AT91_PERIPH_GPIO AT91_PINCTRL_NONE
1 13 AT91_PERIPH_A 0x0 /* PB13 periph A AD2 */ AT91_PIOB 13 AT91_PERIPH_GPIO AT91_PINCTRL_NONE
1 14 AT91_PERIPH_A 0x0>; /* PB14 periph A AD3 */ AT91_PIOB 14 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
}; };
}; };
pwm0 { pwm0 {
pinctrl_pwm0: pwm0-board { pinctrl_pwm0: pwm0-board {
atmel,pins = atmel,pins =
<1 11 AT91_PERIPH_B 0x0 /* PB11 periph B PWM0 */ <AT91_PIOB 11 AT91_PERIPH_B AT91_PINCTRL_NONE
1 12 AT91_PERIPH_B 0x0 /* PB12 periph B PWM1 */ AT91_PIOB 12 AT91_PERIPH_B AT91_PINCTRL_NONE
1 13 AT91_PERIPH_B 0x0 /* PB13 periph B PWM2 */ AT91_PIOB 13 AT91_PERIPH_B AT91_PINCTRL_NONE
1 14 AT91_PERIPH_B 0x0 >; /* PB14 periph B PWM3 */ AT91_PIOB 14 AT91_PERIPH_B AT91_PINCTRL_NONE>;
}; };
}; };
mmc0 { mmc0 {
pinctrl_board_mmc0: mmc0-board { pinctrl_board_mmc0: mmc0-board {
atmel,pins = atmel,pins =
<2 4 0x0 0x5>; /* PC4 gpio CD pin pull up and deglitch */ <AT91_PIOC 4 AT91_PERIPH_GPIO (AT91_PINCTRL_PULL_UP|AT91_PINCTRL_DEGLITCH)>;
}; };
}; };
smc05 { smc05 {
pinctrl_smc: smc05-board { pinctrl_smc: smc05-board {
atmel,pins = atmel,pins =
<3 19 0x2 0x1 <AT91_PIOD 19 AT91_PERIPH_B AT91_PINCTRL_PULL_UP
3 20 0x2 0x1 AT91_PIOD 20 AT91_PERIPH_B AT91_PINCTRL_PULL_UP
3 21 0x2 0x1>; AT91_PIOD 21 AT91_PERIPH_B AT91_PINCTRL_PULL_UP>;
}; };
}; };
spi0 { spi0 {
pinctrl_sspi0: spi0-board { pinctrl_sspi0: spi0-board {
atmel,pins = atmel,pins =
<0 11 0x1 0x0 <AT91_PIOA 11 AT91_PERIPH_A AT91_PINCTRL_NONE
0 12 0x1 0x0 AT91_PIOA 12 AT91_PERIPH_A AT91_PINCTRL_NONE
0 13 0x1 0x0 AT91_PIOA 13 AT91_PERIPH_A AT91_PINCTRL_NONE
0 14 0x0 0x1 AT91_PIOA 14 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP
1 3 0x0 0x1 AT91_PIOB 3 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP
1 4 0x0 0x1 AT91_PIOB 4 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP
1 5 0x0 0x1>; AT91_PIOB 5 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>;
}; };
}; };
som { som {
pinctrl_som: som-board { pinctrl_som: som-board {
atmel,pins = atmel,pins =
<1 17 0x0 0x0 <AT91_PIOB 17 AT91_PERIPH_GPIO AT91_PINCTRL_NONE
1 16 0x0 0x0 AT91_PIOB 16 AT91_PERIPH_GPIO AT91_PINCTRL_NONE
1 9 0x0 0x0 AT91_PIOB 9 AT91_PERIPH_GPIO AT91_PINCTRL_NONE
0 28 0x0 0x0 AT91_PIOA 28 AT91_PERIPH_GPIO AT91_PINCTRL_NONE
0 21 0x0 0x0 AT91_PIOA 21 AT91_PERIPH_GPIO AT91_PINCTRL_NONE
0 22 0x0 0x0 AT91_PIOA 22 AT91_PERIPH_GPIO AT91_PINCTRL_NONE
0 23 0x0 0x0 AT91_PIOA 23 AT91_PERIPH_GPIO AT91_PINCTRL_NONE
0 31 0x0 0x0>; AT91_PIOA 31 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
}; };
}; };
i2c_gpio { i2c_gpio {
pinctrl_i2c_gpio: i2c_gpio-0 { pinctrl_i2c_gpio: i2c_gpio-0 {
atmel,pins = atmel,pins =
<2 0 0x0 0x2 /* PC0 gpio multidrive I2C1 data */ <AT91_PIOC 0 AT91_PERIPH_GPIO AT91_PINCTRL_MULTI_DRIVE
2 1 0x0 0x2>; /* PC1 gpio multidrive I2C1 clock */ AT91_PIOC 1 AT91_PERIPH_GPIO AT91_PINCTRL_MULTI_DRIVE>;
}; };
}; };
wdt_gpio { wdt_gpio {
pinctrl_wdt: wdt-board { pinctrl_wdt: wdt-board {
atmel,pins = atmel,pins =
<2 6 0x0 0x1 <AT91_PIOC 6 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP
2 7 0x0 0x1>; AT91_PIOC 7 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>;
}; };
}; };
keypad_gpio { keypad_gpio {
pinctrl_keypad: keypad-board { pinctrl_keypad: keypad-board {
atmel,pins = atmel,pins =
<1 1 0x0 (AT91_PINCTRL_DEBOUNCE|AT91_PINCTRL_DEBOUNCE_VA(0xff)) <AT91_PIOB 1 0x0 (AT91_PINCTRL_DEBOUNCE|AT91_PINCTRL_DEBOUNCE_VA(0xff))
2 5 AT91_PERIPH_C 0x0>; AT91_PIOC 5 AT91_PERIPH_C AT91_PINCTRL_NONE>;
}; };
}; };
}; };
...@@ -151,7 +166,7 @@ ...@@ -151,7 +166,7 @@
slot@0 { slot@0 {
reg = <0>; reg = <0>;
bus-width = <4>; bus-width = <4>;
/* cd-gpios = <&pioC 4 0>; */ cd-gpios = <&pioC 4 0>;
}; };
}; };
macb1: ethernet@f8030000 { macb1: ethernet@f8030000 {
...@@ -214,6 +229,7 @@ ...@@ -214,6 +229,7 @@
spi-cpol; spi-cpol;
spi-cpha; spi-cpha;
reg = <1>; reg = <1>;
vref = <&vref>;
status = "okay"; status = "okay";
}; };
cs4271: cs4271@2 { cs4271: cs4271@2 {
...@@ -250,7 +266,6 @@ ...@@ -250,7 +266,6 @@
}; };
cpld: ecoreex@60000000 { cpld: ecoreex@60000000 {
compatible = "ecoreex"; compatible = "ecoreex";
pinctrl-0 = <&pinctrl_smc>;
pinctrl-names = "default"; pinctrl-names = "default";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
...@@ -348,6 +363,7 @@ ...@@ -348,6 +363,7 @@
&pioC 7 0 /* WD_PULSE */ &pioC 7 0 /* WD_PULSE */
>; >;
}; };
pwmtcb { pwmtcb {
compatible = "atmel,tcb-pwm"; compatible = "atmel,tcb-pwm";
#pwm-cells = <3>; #pwm-cells = <3>;
......
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