Commit f84c9330 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v4.20/dt-signed-part2' of... 

Merge tag 'omap-for-v4.20/dt-signed-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt

More devicetree changes for omap variants

There's a patch for previously merged dts changes to remove the last
remaining use of legacy phy_id property.

For dra7, we have a non-urgent PCIe dts fix, enable a PCIe errata for
unaligned access.

For omap5, we enable omap5 USB OTG mode for DWC3 controller.

And we add support for am335x based Moxa UC-2100 series of industrial
computers.

* tag 'omap-for-v4.20/dt-signed-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  ARM: dts: am335x: Replace remaining legacy phy_id with phy-handle
  ARM: dts: am335x: add support for Moxa UC-2101 open platform
  ARM: dts: am335x: add common file for UC-2100 series
  ARM: dts: omap5: enable OTG role for DWC3 controller
  ARM: dts: dra7: Enable workaround for errata i870 in PCIe host mode
  ARM: dts: dra7: Fix up unaligned access setting for PCIe EP

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 8881ec52 5f681f41

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -711,6 +711,7 @@ dtb-$(CONFIG_SOC_AM33XX) += \ 
	am335x-evmsk.dtb \

	am335x-icev2.dtb \

	am335x-lxm.dtb \

	am335x-moxa-uc-2101.dtb \

	am335x-moxa-uc-8100-me-t.dtb \

	am335x-nano.dtb \

	am335x-pdu001.dtb \

arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi

0 → 100644
+249 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Copyright (C) 2018 MOXA Inc. - https://www.moxa.com/

 *

 * Authors: SZ Lin (林上智) <sz.lin@moxa.com>

 *          Wes Huang (黃淵河) <wes.huang@moxa.com>

 *          Fero JD Zhou (周俊達) <FeroJD.Zhou@moxa.com>

 */



#include "am33xx.dtsi"



/ {

	vbat: vbat-regulator {

		compatible = "regulator-fixed";

	};



	/* Power supply provides a fixed 3.3V @3A */

	vmmcsd_fixed: vmmcsd-regulator {

	      compatible = "regulator-fixed";

	      regulator-name = "vmmcsd_fixed";

	      regulator-min-microvolt = <3300000>;

	      regulator-max-microvolt = <3300000>;

	      regulator-boot-on;

	};



	buttons: push_button {

		compatible = "gpio-keys";

	};

};



&am33xx_pinmux {

	pinctrl-names = "default";



	i2c0_pins: pinmux_i2c0_pins {

		pinctrl-single,pins = <

			AM33XX_IOPAD(0x988, PIN_INPUT_PULLUP | MUX_MODE0)	/* i2c0_sda.i2c0_sda */

			AM33XX_IOPAD(0x98c, PIN_INPUT_PULLUP | MUX_MODE0)	/* i2c0_scl.i2c0_scl */

		>;

	};



	push_button_pins: pinmux_push_button {

		pinctrl-single,pins = <

			AM33XX_IOPAD(0x8e4, PIN_INPUT_PULLDOWN | MUX_MODE7)	/* lcd_hsync.gpio2_23 */

		>;

	};



	uart0_pins: pinmux_uart0_pins {

		pinctrl-single,pins = <

			AM33XX_IOPAD(0x970, PIN_INPUT_PULLUP | MUX_MODE0)	/* uart0_rxd.uart0_rxd */

			AM33XX_IOPAD(0x974, PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* uart0_txd.uart0_txd */

		>;

	};



	davinci_mdio_default: davinci_mdio_default {

		pinctrl-single,pins = <

			/* MDIO */

			AM33XX_IOPAD(0x948, PIN_INPUT_PULLUP | SLEWCTRL_FAST | MUX_MODE0)	/* mdio_data.mdio_data */

			AM33XX_IOPAD(0x94c, PIN_OUTPUT_PULLUP | MUX_MODE0)			/* mdio_clk.mdio_clk */

		>;

	};



	mmc1_pins_default: pinmux_mmc1_pins {

		pinctrl-single,pins = <

			/* eMMC */

			AM33XX_IOPAD(0x800, PIN_INPUT_PULLUP | MUX_MODE1)	/* gpmc_ad12.mmc1_dat0 */

			AM33XX_IOPAD(0x804, PIN_INPUT_PULLUP | MUX_MODE1)	/* gpmc_ad13.mmc1_dat1 */

			AM33XX_IOPAD(0x808, PIN_INPUT_PULLUP | MUX_MODE1)	/* gpmc_ad14.mmc1_dat2 */

			AM33XX_IOPAD(0x80c, PIN_INPUT_PULLUP | MUX_MODE1)	/* gpmc_ad15.mmc1_dat3 */

			AM33XX_IOPAD(0x810, PIN_INPUT_PULLUP | MUX_MODE1)	/* gpmc_ad8.mmc1_dat4 */

			AM33XX_IOPAD(0x814, PIN_INPUT_PULLUP | MUX_MODE1)	/* gpmc_ad9.mmc1_dat5 */

			AM33XX_IOPAD(0x818, PIN_INPUT_PULLUP | MUX_MODE1)	/* gpmc_ad10.mmc1_dat6 */

			AM33XX_IOPAD(0x81c, PIN_INPUT_PULLUP | MUX_MODE1)	/* gpmc_ad11.mmc1_dat7 */

			AM33XX_IOPAD(0x884, PIN_INPUT_PULLUP | MUX_MODE2)	/* gpmc_csn2.mmc1_cmd */

			AM33XX_IOPAD(0x880, PIN_INPUT_PULLUP | MUX_MODE2)	/* gpmc_csn1.mmc1_clk */

		>;

	};



	spi0_pins: pinmux_spi0 {

		pinctrl-single,pins = <

			AM33XX_IOPAD(0x950, PIN_INPUT_PULLUP | MUX_MODE0)	 /* spi0_sclk.spi0_sclk */

			AM33XX_IOPAD(0x95c, PIN_INPUT_PULLUP | MUX_MODE0)	 /* spi0_cs0.spi0_cs0 */

			AM33XX_IOPAD(0x954, PIN_INPUT_PULLUP | MUX_MODE0)	 /* spi0_d0.spi0_d0 */

			AM33XX_IOPAD(0x958, PIN_INPUT_PULLUP | MUX_MODE0)	 /* spi0_d1.spi0_d1 */

		>;

	};

};



&uart0 {

	/* Console */

	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_pins>;

};



&i2c0 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c0_pins>;



	status = "okay";

	clock-frequency = <400000>;



	eeprom: eeprom@50 {

		compatible = "atmel,24c16";

		pagesize = <16>;

		reg = <0x50>;

	};



	rtc_wdt: rtc_wdt@68 {

		compatible = "dallas,ds1374";

		reg = <0x68>;

	};

};



&usb {

	status = "okay";

};



&usb_ctrl_mod {

	status = "okay";

};



&usb0_phy {

	status = "okay";

};



&usb0 {

	status = "okay";

	dr_mode = "host";

};



&cppi41dma  {

	status = "okay";

};



/* Power */

&vbat {

	regulator-name = "vbat";

	regulator-min-microvolt = <5000000>;

	regulator-max-microvolt = <5000000>;

};



&mac {

	pinctrl-names = "default";

	pinctrl-0 = <&cpsw_default>;

	status = "okay";

};



&davinci_mdio {

	pinctrl-names = "default";

	pinctrl-0 = <&davinci_mdio_default>;

	status = "okay";

};



&cpsw_emac0 {

	status = "okay";

};



&cpsw_emac1 {

	status = "okay";

};



&phy_sel {

	reg= <0x44e10650 0xf5>;

	rmii-clock-ext;

};



&sham {

	status = "okay";

};



&aes {

	status = "okay";

};



&gpio0 {

	ti,no-reset-on-init;

};



&mmc2 {

	pinctrl-names = "default";

	vmmc-supply = <&vmmcsd_fixed>;

	bus-width = <8>;

	pinctrl-0 = <&mmc1_pins_default>;

	ti,non-removable;

	status = "okay";

};



&buttons {

	pinctrl-names = "default";

	pinctrl-0 = <&push_button_pins>;

	#address-cells = <1>;

	#size-cells = <0>;



	button@0 {

		label = "push_button";

		linux,code = <0x100>;

		gpios = <&gpio2 23 GPIO_ACTIVE_LOW>;

	};

};



/* SPI Busses */

&spi0 {

	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&spi0_pins>;



	m25p80@0 {

		compatible = "mx25l6405d";

		spi-max-frequency = <40000000>;



		reg = <0>;

		spi-cpol;

		spi-cpha;



		partitions {

			compatible = "fixed-partitions";

			#address-cells = <1>;

			#size-cells = <1>;



			/* reg : The partition's offset and size within the mtd bank. */

			partitions@0 {

				label = "MLO";

				reg = <0x0 0x80000>;

			};



			partitions@1 {

				label = "U-Boot";

				reg = <0x80000 0x100000>;

			};



			partitions@2 {

				label = "U-Boot Env";

				reg = <0x180000 0x40000>;

			};

		};

	};

};



&spi1 {

	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&spi1_pins>;



	tpm_spi_tis@0 {

		compatible = "tcg,tpm_tis-spi";

		reg = <0>;

		spi-max-frequency = <500000>;

	};

};

arch/arm/boot/dts/am335x-moxa-uc-2101.dts

0 → 100644
+69 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Copyright (C) 2018 MOXA Inc. - https://www.moxa.com/

 *

 * Authors: SZ Lin (林上智) <sz.lin@moxa.com>

 *          Wes Huang (黃淵河) <wes.huang@moxa.com>

 *          Fero JD Zhou (周俊達) <FeroJD.Zhou@moxa.com>

 */



/dts-v1/;



#include "am335x-moxa-uc-2100-common.dtsi"



/ {

	model = "Moxa UC-2101";

	compatible = "moxa,uc-2101", "ti,am33xx";



	leds {

		compatible = "gpio-leds";

		led1 {

			label = "UC2100:GREEN:USER";

			gpios = <&gpio3 10 GPIO_ACTIVE_HIGH>;

			default-state = "off";

		};

	};

};



&am33xx_pinmux {

	pinctrl-names = "default";



	cpsw_default: cpsw_default {

		pinctrl-single,pins = <

			/* Slave 1 */

			AM33XX_IOPAD(0x90c, PIN_INPUT_PULLDOWN | MUX_MODE1)	/* mii1_crs.rmii1_crs_dv */

			AM33XX_IOPAD(0x910, PIN_INPUT_PULLUP | MUX_MODE1)	/* mii1_rxerr.rmii1_rxerr */

			AM33XX_IOPAD(0x914, PIN_OUTPUT_PULLDOWN | MUX_MODE1)	/* mii1_txen.rmii1_txen */

			AM33XX_IOPAD(0x924, PIN_OUTPUT_PULLDOWN | MUX_MODE1)	/* mii1_txd1.rmii1_txd1 */

			AM33XX_IOPAD(0x928, PIN_OUTPUT_PULLDOWN | MUX_MODE1)	/* mii1_txd0.rmii1_txd0 */

			AM33XX_IOPAD(0x93c, PIN_INPUT_PULLUP | MUX_MODE1)	/* mii1_rxd1.rmii1_rxd1 */

			AM33XX_IOPAD(0x940, PIN_INPUT_PULLUP | MUX_MODE1)	/* mii1_rxd0.rmii1_rxd0 */

			AM33XX_IOPAD(0x944, PIN_INPUT_PULLDOWN | MUX_MODE0)	/* mii1_refclk.rmii1_refclk */

		>;

	};



	spi1_pins: pinmux_spi1 {

		pinctrl-single,pins = <

			AM33XX_IOPAD(0x964, PIN_INPUT_PULLUP | MUX_MODE4)	 /* ecap0_in_pwm0_out.spi1_sclk */

			AM33XX_IOPAD(0x978, PIN_INPUT_PULLUP | MUX_MODE4)	 /* uart1_ctsn.spi1_cs0 */

			AM33XX_IOPAD(0x968, PIN_INPUT_PULLUP | MUX_MODE4)	 /* uart0_ctsn.spi1_d0 */

			AM33XX_IOPAD(0x96c, PIN_INPUT_PULLUP | MUX_MODE4)	 /* uart0_rtsn.spi1_d1 */

		>;

	};

};



&davinci_mdio {

	phy0: ethernet-phy@4 {

		reg = <4>;

	};

};



&cpsw_emac0 {

	status = "okay";

	phy-handle = <&phy0>;

	phy-mode = "rmii";

};



&cpsw_emac1 {

	status = "disabled";

};

arch/arm/boot/dts/am335x-osd3358-sm-red.dts

+5 −1
Original line number Diff line number Diff line
@@ -424,7 +424,7 @@ 
};



&cpsw_emac0 {

	phy_id = <&davinci_mdio>, <4>;

	phy-handle = <&ethphy0>;

	phy-mode = "rgmii-txid";

};
@@ -441,6 +441,10 @@ 
	pinctrl-0 = <&davinci_mdio_default>;

	pinctrl-1 = <&davinci_mdio_sleep>;

	status = "okay";



	ethphy0: ethernet-phy@4 {

		reg = <4>;

	};

};



&mmc1 {

arch/arm/boot/dts/am335x-sancloud-bbe.dts

+5 −1
Original line number Diff line number Diff line
@@ -103,10 +103,14 @@ 
	pinctrl-0 = <&davinci_mdio_default>;

	pinctrl-1 = <&davinci_mdio_sleep>;

	status = "okay";



	ethphy0: ethernet-phy@0 {

		reg = <0>;

	};

};



&cpsw_emac0 {

	phy_id = <&davinci_mdio>, <0>;

	phy-handle = <&ethphy0>;

	phy-mode = "rgmii-txid";

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE