mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-07 00:59:06 +00:00
ARM: mxs: Update DENX M28 machine and dts file
Update the mach-mxs machine by removing the enet_clkout(). The new revision of the board doesn't need that. Also, update the DTS file with all the new drivers pulled in the mainline recently, that is, SPI, LRADC, USB. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
This commit is contained in:
parent
bb2f1261c2
commit
91ed4938ce
2 changed files with 74 additions and 8 deletions
|
@ -23,6 +23,8 @@ memory {
|
||||||
apb@80000000 {
|
apb@80000000 {
|
||||||
apbh@80000000 {
|
apbh@80000000 {
|
||||||
gpmi-nand@8000c000 {
|
gpmi-nand@8000c000 {
|
||||||
|
#address-cells = <1>;
|
||||||
|
#size-cells = <1>;
|
||||||
pinctrl-names = "default";
|
pinctrl-names = "default";
|
||||||
pinctrl-0 = <&gpmi_pins_a &gpmi_status_cfg>;
|
pinctrl-0 = <&gpmi_pins_a &gpmi_status_cfg>;
|
||||||
status = "okay";
|
status = "okay";
|
||||||
|
@ -62,9 +64,27 @@ &mmc0_cd_cfg
|
||||||
&mmc0_sck_cfg>;
|
&mmc0_sck_cfg>;
|
||||||
bus-width = <8>;
|
bus-width = <8>;
|
||||||
wp-gpios = <&gpio3 10 1>;
|
wp-gpios = <&gpio3 10 1>;
|
||||||
|
vmmc-supply = <®_vddio_sd0>;
|
||||||
status = "okay";
|
status = "okay";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
ssp2: ssp@80014000 {
|
||||||
|
#address-cells = <1>;
|
||||||
|
#size-cells = <0>;
|
||||||
|
compatible = "fsl,imx28-spi";
|
||||||
|
pinctrl-names = "default";
|
||||||
|
pinctrl-0 = <&spi2_pins_a>;
|
||||||
|
status = "okay";
|
||||||
|
|
||||||
|
flash: m25p80@0 {
|
||||||
|
#address-cells = <1>;
|
||||||
|
#size-cells = <1>;
|
||||||
|
compatible = "m25p80";
|
||||||
|
spi-max-frequency = <40000000>;
|
||||||
|
reg = <0>;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
pinctrl@80018000 {
|
pinctrl@80018000 {
|
||||||
pinctrl-names = "default";
|
pinctrl-names = "default";
|
||||||
pinctrl-0 = <&hog_pins_a>;
|
pinctrl-0 = <&hog_pins_a>;
|
||||||
|
@ -72,8 +92,11 @@ pinctrl@80018000 {
|
||||||
hog_pins_a: hog@0 {
|
hog_pins_a: hog@0 {
|
||||||
reg = <0>;
|
reg = <0>;
|
||||||
fsl,pinmux-ids = <
|
fsl,pinmux-ids = <
|
||||||
|
0x31c3 /* MX28_PAD_PWM3__GPIO_3_28 */
|
||||||
0x30a3 /* MX28_PAD_AUART2_CTS__GPIO_3_10 */
|
0x30a3 /* MX28_PAD_AUART2_CTS__GPIO_3_10 */
|
||||||
0x30b3 /* MX28_PAD_AUART2_RTS__GPIO_3_11 */
|
0x30b3 /* MX28_PAD_AUART2_RTS__GPIO_3_11 */
|
||||||
|
0x30c3 /* MX28_PAD_AUART3_RX__GPIO_3_12 */
|
||||||
|
0x30d3 /* MX28_PAD_AUART3_TX__GPIO_3_13 */
|
||||||
>;
|
>;
|
||||||
fsl,drive-strength = <0>;
|
fsl,drive-strength = <0>;
|
||||||
fsl,voltage = <1>;
|
fsl,voltage = <1>;
|
||||||
|
@ -129,6 +152,7 @@ saif1: saif@80046000 {
|
||||||
i2c0: i2c@80058000 {
|
i2c0: i2c@80058000 {
|
||||||
pinctrl-names = "default";
|
pinctrl-names = "default";
|
||||||
pinctrl-0 = <&i2c0_pins_a>;
|
pinctrl-0 = <&i2c0_pins_a>;
|
||||||
|
clock-frequency = <400000>;
|
||||||
status = "okay";
|
status = "okay";
|
||||||
|
|
||||||
sgtl5000: codec@0a {
|
sgtl5000: codec@0a {
|
||||||
|
@ -151,32 +175,51 @@ rtc: rtc@68 {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
lradc@80050000 {
|
||||||
|
status = "okay";
|
||||||
|
};
|
||||||
|
|
||||||
duart: serial@80074000 {
|
duart: serial@80074000 {
|
||||||
pinctrl-names = "default";
|
pinctrl-names = "default";
|
||||||
pinctrl-0 = <&duart_pins_a>;
|
pinctrl-0 = <&duart_pins_a>;
|
||||||
status = "okay";
|
status = "okay";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
usbphy0: usbphy@8007c000 {
|
||||||
|
status = "okay";
|
||||||
|
};
|
||||||
|
|
||||||
|
usbphy1: usbphy@8007e000 {
|
||||||
|
status = "okay";
|
||||||
|
};
|
||||||
|
|
||||||
auart0: serial@8006a000 {
|
auart0: serial@8006a000 {
|
||||||
pinctrl-names = "default";
|
pinctrl-names = "default";
|
||||||
pinctrl-0 = <&auart0_2pins_a>;
|
pinctrl-0 = <&auart0_2pins_a>;
|
||||||
status = "okay";
|
status = "okay";
|
||||||
};
|
};
|
||||||
|
|
||||||
auart3: serial@80070000 {
|
|
||||||
pinctrl-names = "default";
|
|
||||||
pinctrl-0 = <&auart3_pins_a>;
|
|
||||||
status = "okay";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
ahb@80080000 {
|
ahb@80080000 {
|
||||||
|
usb0: usb@80080000 {
|
||||||
|
vbus-supply = <®_usb0_vbus>;
|
||||||
|
pinctrl-names = "default";
|
||||||
|
pinctrl-0 = <&usbphy0_pins_a>;
|
||||||
|
status = "okay";
|
||||||
|
};
|
||||||
|
|
||||||
|
usb1: usb@80090000 {
|
||||||
|
vbus-supply = <®_usb1_vbus>;
|
||||||
|
pinctrl-names = "default";
|
||||||
|
pinctrl-0 = <&usbphy1_pins_a>;
|
||||||
|
status = "okay";
|
||||||
|
};
|
||||||
|
|
||||||
mac0: ethernet@800f0000 {
|
mac0: ethernet@800f0000 {
|
||||||
phy-mode = "rmii";
|
phy-mode = "rmii";
|
||||||
pinctrl-names = "default";
|
pinctrl-names = "default";
|
||||||
pinctrl-0 = <&mac0_pins_a>;
|
pinctrl-0 = <&mac0_pins_a>;
|
||||||
phy-reset-gpios = <&gpio3 11 0>;
|
|
||||||
status = "okay";
|
status = "okay";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -198,6 +241,30 @@ reg_3p3v: 3p3v {
|
||||||
regulator-max-microvolt = <3300000>;
|
regulator-max-microvolt = <3300000>;
|
||||||
regulator-always-on;
|
regulator-always-on;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
reg_vddio_sd0: vddio-sd0 {
|
||||||
|
compatible = "regulator-fixed";
|
||||||
|
regulator-name = "vddio-sd0";
|
||||||
|
regulator-min-microvolt = <3300000>;
|
||||||
|
regulator-max-microvolt = <3300000>;
|
||||||
|
gpio = <&gpio3 28 0>;
|
||||||
|
};
|
||||||
|
|
||||||
|
reg_usb0_vbus: usb0_vbus {
|
||||||
|
compatible = "regulator-fixed";
|
||||||
|
regulator-name = "usb0_vbus";
|
||||||
|
regulator-min-microvolt = <5000000>;
|
||||||
|
regulator-max-microvolt = <5000000>;
|
||||||
|
gpio = <&gpio3 12 0>;
|
||||||
|
};
|
||||||
|
|
||||||
|
reg_usb1_vbus: usb1_vbus {
|
||||||
|
compatible = "regulator-fixed";
|
||||||
|
regulator-name = "usb1_vbus";
|
||||||
|
regulator-min-microvolt = <5000000>;
|
||||||
|
regulator-max-microvolt = <5000000>;
|
||||||
|
gpio = <&gpio3 13 0>;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
sound {
|
sound {
|
||||||
|
|
|
@ -288,7 +288,6 @@ static void __init imx28_evk_post_init(void)
|
||||||
|
|
||||||
static void __init m28evk_init(void)
|
static void __init m28evk_init(void)
|
||||||
{
|
{
|
||||||
enable_clk_enet_out();
|
|
||||||
update_fec_mac_prop(OUI_DENX);
|
update_fec_mac_prop(OUI_DENX);
|
||||||
|
|
||||||
mxsfb_pdata.mode_list = m28evk_video_modes;
|
mxsfb_pdata.mode_list = m28evk_video_modes;
|
||||||
|
|
Loading…
Reference in a new issue