From 03a22a8091a4679c9d7a0dbacabf9bd223689d4b Mon Sep 17 00:00:00 2001 From: Vincent BENOIT Date: Tue, 24 Jan 2023 11:02:25 +0000 Subject: [PATCH] changement du devicetree --- conf/machine/pengwyn.conf | 2 +- recipes-kernel/dts/files/am335x-pengwyn.dts | 112 ++++++++++++++------ 2 files changed, 78 insertions(+), 36 deletions(-) diff --git a/conf/machine/pengwyn.conf b/conf/machine/pengwyn.conf index 237003b..d859260 100644 --- a/conf/machine/pengwyn.conf +++ b/conf/machine/pengwyn.conf @@ -65,4 +65,4 @@ PREFERRED_VERSION_dtb ?= "1.0%" MACHINE_FEATURES = "usbgadget usbhost vfat" -IMAGE_BOOT_FILES = "MLO u-boot.${UBOOT_SUFFIX} uImage devicetree/am335x-pengwyn.dtb" +IMAGE_BOOT_FILES = "MLO u-boot.${UBOOT_SUFFIX} uEnv.txt uImage devicetree/am335x-pengwyn.dtb" diff --git a/recipes-kernel/dts/files/am335x-pengwyn.dts b/recipes-kernel/dts/files/am335x-pengwyn.dts index 676d5fe..c1c63f2 100644 --- a/recipes-kernel/dts/files/am335x-pengwyn.dts +++ b/recipes-kernel/dts/files/am335x-pengwyn.dts @@ -60,10 +60,19 @@ >; }; - i2c1_pins: pinmux_i2c1_pins { + //i2c1_pins: pinmux_i2c1_pins { + // pinctrl-single,pins = < + // AM33XX_PADCONF(AM335X_PIN_SPI0_D1, PIN_INPUT_PULLUP, MUX_MODE2) /* spi0_d1.i2c1_sda */ + // AM33XX_PADCONF(AM335X_PIN_SPI0_CS0, PIN_INPUT_PULLUP, MUX_MODE2) /* spi0_cs0.i2c1_scl */ + // >; + //}; + + spi0_pins: pinmux_spi0_pins { pinctrl-single,pins = < - AM33XX_PADCONF(AM335X_PIN_SPI0_D1, PIN_INPUT_PULLUP, MUX_MODE2) /* spi0_d1.i2c1_sda */ - AM33XX_PADCONF(AM335X_PIN_SPI0_CS0, PIN_INPUT_PULLUP, MUX_MODE2) /* spi0_cs0.i2c1_scl */ + AM33XX_PADCONF(AM335X_PIN_SPI0_CS0, PIN_OUTPUT, MUX_MODE0) + AM33XX_PADCONF(AM335X_PIN_SPI0_D0, PIN_OUTPUT, MUX_MODE0) /* spi0_d0_mosi */ + AM33XX_PADCONF(AM335X_PIN_SPI0_D1, PIN_INPUT_PULLUP, MUX_MODE0) /* spi0_d1_miso */ + AM33XX_PADCONF(AM335X_PIN_SPI0_SCLK, PIN_INPUT, MUX_MODE0) >; }; @@ -156,24 +165,26 @@ cpsw_default: cpsw_default { pinctrl-single,pins = < /* Slave 1 */ - AM33XX_PADCONF(AM335X_PIN_MII1_TX_EN, PIN_OUTPUT_PULLDOWN, MUX_MODE2) /* mii1_txen.rgmii1_tctl */ - AM33XX_PADCONF(AM335X_PIN_MII1_RX_DV, PIN_INPUT_PULLDOWN, MUX_MODE2) /* mii1_rxdv.rgmii1_rctl */ - AM33XX_PADCONF(AM335X_PIN_MII1_TXD3, PIN_OUTPUT_PULLDOWN, MUX_MODE2) /* mii1_txd3.rgmii1_td3 */ - AM33XX_PADCONF(AM335X_PIN_MII1_TXD2, PIN_OUTPUT_PULLDOWN, MUX_MODE2) /* mii1_txd2.rgmii1_td2 */ - AM33XX_PADCONF(AM335X_PIN_MII1_TXD1, PIN_OUTPUT_PULLDOWN, MUX_MODE2) /* mii1_txd1.rgmii1_td1 */ - AM33XX_PADCONF(AM335X_PIN_MII1_TXD0, PIN_OUTPUT_PULLDOWN, MUX_MODE2) /* mii1_txd0.rgmii1_td0 */ - AM33XX_PADCONF(AM335X_PIN_MII1_TX_CLK, PIN_OUTPUT_PULLDOWN, MUX_MODE2) /* mii1_txclk.rgmii1_tclk */ - AM33XX_PADCONF(AM335X_PIN_MII1_RX_CLK, PIN_INPUT_PULLDOWN, MUX_MODE2) /* mii1_rxclk.rgmii1_rclk */ - AM33XX_PADCONF(AM335X_PIN_MII1_RXD3, PIN_INPUT_PULLDOWN, MUX_MODE2) /* mii1_rxd3.rgmii1_rd3 */ - AM33XX_PADCONF(AM335X_PIN_MII1_RXD2, PIN_INPUT_PULLDOWN, MUX_MODE2) /* mii1_rxd2.rgmii1_rd2 */ - AM33XX_PADCONF(AM335X_PIN_MII1_RXD1, PIN_INPUT_PULLDOWN, MUX_MODE2) /* mii1_rxd1.rgmii1_rd1 */ - AM33XX_PADCONF(AM335X_PIN_MII1_RXD0, PIN_INPUT_PULLDOWN, MUX_MODE2) /* mii1_rxd0.rgmii1_rd0 */ + AM33XX_PADCONF(AM335X_PIN_MII1_RX_ER, PIN_INPUT_PULLUP, MUX_MODE0) + AM33XX_PADCONF(AM335X_PIN_MII1_TX_EN, PIN_OUTPUT_PULLDOWN, MUX_MODE0) + AM33XX_PADCONF(AM335X_PIN_MII1_RX_DV, PIN_INPUT_PULLUP, MUX_MODE0) + AM33XX_PADCONF(AM335X_PIN_MII1_TXD3, PIN_OUTPUT_PULLDOWN, MUX_MODE0) + AM33XX_PADCONF(AM335X_PIN_MII1_TXD2, PIN_OUTPUT_PULLDOWN, MUX_MODE0) + AM33XX_PADCONF(AM335X_PIN_MII1_TXD1, PIN_OUTPUT_PULLDOWN, MUX_MODE0) + AM33XX_PADCONF(AM335X_PIN_MII1_TXD0, PIN_OUTPUT_PULLDOWN, MUX_MODE0) + AM33XX_PADCONF(AM335X_PIN_MII1_TX_CLK, PIN_INPUT_PULLUP, MUX_MODE0) + AM33XX_PADCONF(AM335X_PIN_MII1_RX_CLK, PIN_INPUT_PULLUP, MUX_MODE0) + AM33XX_PADCONF(AM335X_PIN_MII1_RXD3, PIN_INPUT_PULLUP, MUX_MODE0) + AM33XX_PADCONF(AM335X_PIN_MII1_RXD2, PIN_INPUT_PULLUP, MUX_MODE0) + AM33XX_PADCONF(AM335X_PIN_MII1_RXD1, PIN_INPUT_PULLUP, MUX_MODE0) + AM33XX_PADCONF(AM335X_PIN_MII1_RXD0, PIN_INPUT_PULLUP, MUX_MODE0) >; }; cpsw_sleep: cpsw_sleep { pinctrl-single,pins = < /* Slave 1 reset value */ + AM33XX_PADCONF(AM335X_PIN_MII1_RX_ER, PIN_INPUT_PULLUP, MUX_MODE7) AM33XX_PADCONF(AM335X_PIN_MII1_TX_EN, PIN_INPUT_PULLDOWN, MUX_MODE7) AM33XX_PADCONF(AM335X_PIN_MII1_RX_DV, PIN_INPUT_PULLDOWN, MUX_MODE7) AM33XX_PADCONF(AM335X_PIN_MII1_TXD3, PIN_INPUT_PULLDOWN, MUX_MODE7) @@ -246,6 +257,16 @@ AM33XX_PADCONF(AM335X_PIN_RMII1_REF_CLK, PIN_INPUT_PULLDOWN, MUX_MODE7) >; }; + + usb_pins: usb_pins { + pinctrl-single,pins = < + /* USB0 */ + AM33XX_PADCONF(AM335X_PIN_USB0_DRVVBUS, PIN_OUTPUT, MUX_MODE0) /* gpmc_a9.gpio0_18 */ + /* USB1 */ + AM33XX_PADCONF(AM335X_PIN_USB1_DRVVBUS, PIN_OUTPUT, MUX_MODE0) /* usb1_drvvbus.gpio3_13 */ + >; + }; + }; &uart0 { @@ -274,28 +295,41 @@ }; }; +&usb { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&usb_pins>; +}; + +&usb_ctrl_mod { + status = "okay"; +}; + +&usb0_phy { + status = "okay"; +}; + +&usb1_phy { + status = "okay"; +}; + +&usb0 { + status = "okay"; + //dr_mode = "peripheral"; + //interrupts-extended = <&intc 18 &tps 0>; + //interrupt-names = "mc", "vbus"; +}; + &usb1 { + status = "okay"; dr_mode = "host"; }; -&i2c1 { +&spi0 { pinctrl-names = "default"; - pinctrl-0 = <&i2c1_pins>; + pinctrl-0 = <&spi0_pins>; status = "okay"; - clock-frequency = <100000>; - - // TSL2550 : Ambient light sensor with I2C Interface - tsl2550: tsl2550@39 { - compatible = "taos,tsl2550"; - reg = <0x39>; - }; - - // TMP275 : Temperature Sensor With I2C Interface - tmp275: tmp275@48 { - compatible = "ti,tmp275"; - reg = <0x48>; - }; }; &elm { @@ -463,11 +497,11 @@ }; &mac { + slaves = <1>; pinctrl-names = "default", "sleep"; pinctrl-0 = <&cpsw_default>; pinctrl-1 = <&cpsw_sleep>; status = "okay"; - slaves = <1>; }; &davinci_mdio { @@ -476,16 +510,24 @@ pinctrl-1 = <&davinci_mdio_sleep>; status = "okay"; - ethphy0: ethernet-phy@0 { - reg = <0>; + ethphy0: ethernet-phy@1 { + reg = <1>; }; + //ethphy1: ethernet-phy@1 { + // reg = <1>; + //}; }; &cpsw_emac0 { phy-handle = <ðphy0>; - phy-mode = "rgmii-id"; + phy-mode = "mii"; }; +//&cpsw_emac1 { +// phy-handle = <ðphy1>; +// phy-mode = "mii"; +//}; + &tscadc { status = "okay"; tsc { @@ -519,7 +561,7 @@ pinctrl-names = "default"; pinctrl-0 = <&mmc1_pins>; cd-gpios = <&gpio3 14 GPIO_ACTIVE_LOW>; // specify GPIOs for card detection - wp-gpios = <&gpio3 18 GPIO_ACTIVE_LOW>; /* GPIO1_28 */ + wp-gpios = <&gpio3 18 GPIO_ACTIVE_HIGH>; /* GPIO1_28 */ }; &sham {