UC-8100A-ME is advanced of UC-8100-ME-T, and UC-8100-ME-T is deprecated. UC-8100A-ME provides larger RAM and eMMC, better input current than UC-8100-ME-T's, and it supports selectable LTE module for US/EU/APAC.
UC-8100A-ME computing platform is designed for embedded data acquisition industrial applications. Features of UC-8100A-ME series are: * eMMC * SPI flash * SD slot * 2x LAN * 2 RS-232/422/485 ports, software-selectable * Mini PCIe form factor with USB signal * USB host * EEPROM * TPM * Watchdog * RTC * User gpio-keys * User LEDs * User button Signed-off-by: Johnson Chen <[email protected]> Signed-off-by: Wes Huang <[email protected]> Signed-off-by: Fero JD Zhou <[email protected]> --- arch/arm/boot/dts/Makefile | 2 +- ...c-8100-me-t.dts => am335x-moxa-uc-8100a-me.dts} | 56 ++++++++++------------ 2 files changed, 27 insertions(+), 31 deletions(-) rename arch/arm/boot/dts/{am335x-moxa-uc-8100-me-t.dts => am335x-moxa-uc-8100a-me.dts} (93%) diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index e6a1cac0bfc7..f6ec58f1dd7e 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -793,7 +793,7 @@ dtb-$(CONFIG_SOC_AM33XX) += \ am335x-icev2.dtb \ am335x-lxm.dtb \ am335x-moxa-uc-2101.dtb \ - am335x-moxa-uc-8100-me-t.dtb \ + am335x-moxa-uc-8100a-me.dtb \ am335x-nano.dtb \ am335x-netcan-plus-1xx.dtb \ am335x-netcom-plus-2xx.dtb \ diff --git a/arch/arm/boot/dts/am335x-moxa-uc-8100-me-t.dts b/arch/arm/boot/dts/am335x-moxa-uc-8100a-me.dts similarity index 93% rename from arch/arm/boot/dts/am335x-moxa-uc-8100-me-t.dts rename to arch/arm/boot/dts/am335x-moxa-uc-8100a-me.dts index f03e72cada41..536bbfeaa6e1 100644 --- a/arch/arm/boot/dts/am335x-moxa-uc-8100-me-t.dts +++ b/arch/arm/boot/dts/am335x-moxa-uc-8100a-me.dts @@ -1,8 +1,6 @@ -// SPDX-License-Identifier: GPL-2.0-only +// SPDX-License-Identifier: GPL-2.0 /* - * Copyright (C) 2017 MOXA Inc. - https://www.moxa.com/ - * - * Author: SZ Lin (林上智) <[email protected]> + * Copyright (C) 2020 MOXA Inc. - https://www.moxa.com/ */ /dts-v1/; @@ -10,8 +8,8 @@ #include "am33xx.dtsi" / { - model = "Moxa UC-8100-ME-T"; - compatible = "moxa,uc-8100-me-t", "ti,am33xx"; + model = "Moxa UC-8100A-ME"; + compatible = "moxa,uc-8100a-me", "ti,am33xx"; cpus { cpu@0 { @@ -19,11 +17,6 @@ }; }; - memory { - device_type = "memory"; - reg = <0x80000000 0x20000000>; /* 512 MB */ - }; - vbat: vbat-regulator { compatible = "regulator-fixed"; }; @@ -40,51 +33,51 @@ leds { compatible = "gpio-leds"; led1 { - label = "uc8100me:CEL1"; + label = "UC-8100A-ME:RED:SGN1"; gpios = <&gpio_xten 8 0>; default-state = "off"; }; led2 { - label = "uc8100me:CEL2"; + label = "UC-8100A-ME:YELLOW:SGN2"; gpios = <&gpio_xten 9 0>; default-state = "off"; }; led3 { - label = "uc8100me:CEL3"; + label = "UC-8100A-ME:GREEN:SGN3"; gpios = <&gpio_xten 10 0>; default-state = "off"; }; led4 { - label = "uc8100me:DIA1"; + label = "UC-8100A-ME:RED:DIA1"; gpios = <&gpio_xten 11 0>; default-state = "off"; }; led5 { - label = "uc8100me:DIA2"; + label = "UC-8100A-ME:YELLOW:DIA2"; gpios = <&gpio_xten 12 0>; default-state = "off"; }; led6 { - label = "uc8100me:DIA3"; + label = "UC-8100A-ME:GREEN:DIA3"; gpios = <&gpio_xten 13 0>; default-state = "off"; }; led7 { - label = "uc8100me:SD"; + label = "UC-8100A-ME:GREEN:SD"; gpios = <&gpio_xten 14 0>; default-state = "off"; }; led8 { - label = "uc8100me:USB"; + label = "UC-8100A-ME:GREEN:USB"; gpios = <&gpio_xten 15 0>; default-state = "off"; }; led9 { - label = "uc8100me:USER"; - gpios = <&gpio0 20 GPIO_ACTIVE_HIGH>; + label = "UC-8100A-ME:GREEN:USER"; + gpios = <&gpio0 20 0>; default-state = "off"; }; }; @@ -219,6 +212,7 @@ pinctrl-single,pins = < AM33XX_PADCONF(AM335X_PIN_SPI0_SCLK, PIN_INPUT_PULLUP, MUX_MODE0) AM33XX_PADCONF(AM335X_PIN_SPI0_CS0, PIN_INPUT_PULLUP, MUX_MODE0) + AM33XX_PADCONF(AM335X_PIN_SPI0_CS1, PIN_INPUT_PULLUP, MUX_MODE0) AM33XX_PADCONF(AM335X_PIN_SPI0_D0, PIN_INPUT_PULLUP, MUX_MODE0) AM33XX_PADCONF(AM335X_PIN_SPI0_D1, PIN_INPUT_PULLUP, MUX_MODE0) >; @@ -254,11 +248,6 @@ status = "okay"; clock-frequency = <400000>; - tpm: tpm@20 { - compatible = "infineon,slb9645tt"; - reg = <0x20>; - }; - tps: tps@2d { compatible = "ti,tps65910"; reg = <0x2d>; @@ -322,8 +311,8 @@ vdd1_reg: regulator@2 { /* VDD_MPU voltage limits 0.95V - 1.26V with +/-4% tolerance */ regulator-name = "vdd_mpu"; - regulator-min-microvolt = <912500>; - regulator-max-microvolt = <1378000>; + regulator-min-microvolt = <600000>; + regulator-max-microvolt = <1500000>; regulator-boot-on; regulator-always-on; }; @@ -331,8 +320,8 @@ vdd2_reg: regulator@3 { /* VDD_CORE voltage limits 0.95V - 1.1V with +/-4% tolerance */ regulator-name = "vdd_core"; - regulator-min-microvolt = <912500>; - regulator-max-microvolt = <1150000>; + regulator-min-microvolt = <600000>; + regulator-max-microvolt = <1500000>; regulator-boot-on; regulator-always-on; }; @@ -481,6 +470,7 @@ reg = <0>; spi-cpol; spi-cpha; + #address-cells = <1>; #size-cells = <1>; @@ -500,4 +490,10 @@ reg = <0x180000 0x20000>; }; }; + + tpm_spi_tis@1{ + compatible = "tcg,tpm_tis-spi"; + reg = <1>; + spi-max-frequency = <500000>; + }; }; -- 2.11.0
