From 5f532a52cf55c225814c8a6fb736352f0ad5a55d Mon Sep 17 00:00:00 2001 From: Holger Assmann Date: Mon, 10 Aug 2020 17:27:29 +0200 Subject: platform-v7a: kernel version bump 5.6.2 -> 5.8 The latest kernel release now contains the device trees for the Linux Automation MC-1. We can thus drop them from the BSP. On the Kconfig front, we dropped CONFIG_MMC_OMAP(_HS) in favor of CONFIG_MMC_SDHCI_OMAP. For a while now, Linux has had a sdhci-omap driver for TI's OMAP SoCs making use of the SDHCI core library. This was in addition to the older omap-hsmmc driver, which didn't. Linux commit 0b4edf11187 ("ARM: dts: Move am33xx and am43xx mmc nodes tosdhci-omap driver") first included in v5.8 changes the device tree compatible of the mmc nodes on the am33xx and am43xx SoCs away from the omap-hsmmc to the SDHCI driver. Add the new compatibles, so we aren't broken by the change. Co-authored-by: Ahmad Fatoum Signed-off-by: Holger Assmann --- configs/platform-v7a/dts/stm32mp157c-lxa-mc1.dts | 362 ----------------------- configs/platform-v7a/dts/stm32mp15xx-osd32.dtsi | 229 -------------- 2 files changed, 591 deletions(-) delete mode 100644 configs/platform-v7a/dts/stm32mp157c-lxa-mc1.dts delete mode 100644 configs/platform-v7a/dts/stm32mp15xx-osd32.dtsi (limited to 'configs/platform-v7a/dts') diff --git a/configs/platform-v7a/dts/stm32mp157c-lxa-mc1.dts b/configs/platform-v7a/dts/stm32mp157c-lxa-mc1.dts deleted file mode 100644 index d65c823..0000000 --- a/configs/platform-v7a/dts/stm32mp157c-lxa-mc1.dts +++ /dev/null @@ -1,362 +0,0 @@ -/* SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) */ -/* - * Copyright (C) 2020 STMicroelectronics - All Rights Reserved - * Copyright (C) 2020 Ahmad Fatoum, Pengutronix - */ - -/dts-v1/; - -#include "stm32mp157.dtsi" -#include "stm32mp15xx-osd32.dtsi" -#include "stm32mp15xxac-pinctrl.dtsi" - -#include -#include - -/ { - model = "Linux Automation MC-1 board"; - compatible = "lxa,stm32mp157c-mc1", "st,stm32mp157"; - - aliases { - ethernet0 = ðernet0; - mmc0 = &sdmmc1; - mmc1 = &sdmmc2; - serial0 = &uart4; - }; - - backlight: backlight { - compatible = "pwm-backlight"; - pwms = <&backlight_pwm 1 100000 PWM_POLARITY_INVERTED>; - brightness-levels = <0 31 63 95 127 159 191 223 255>; - default-brightness-level = <7>; - power-supply = <®_5v2>; /* 3V3_BACKLIGHT */ - }; - - chosen { - stdout-path = &uart4; - }; - - led-act { - compatible = "gpio-leds"; - - led-green { - label = "mc1:green:act"; - gpios = <&gpioa 13 GPIO_ACTIVE_LOW>; - linux,default-trigger = "heartbeat"; - }; - }; - - led-rgb { - compatible = "pwm-leds"; - - led-red { - label = "mc1:red:rgb"; - pwms = <&leds_pwm 1 1000000 0>; - max-brightness = <255>; - active-low; - }; - - led-green { - label = "mc1:green:rgb"; - pwms = <&leds_pwm 2 1000000 0>; - max-brightness = <255>; - active-low; - }; - - led-blue { - label = "mc1:blue:rgb"; - pwms = <&leds_pwm 3 1000000 0>; - max-brightness = <255>; - active-low; - }; - }; - - panel: panel { - compatible = "edt,etm0700g0edh6", "simple-panel"; - backlight = <&backlight>; - enable-gpios = <&gpiod 4 GPIO_ACTIVE_HIGH>; - power-supply = <®_3v3>; - - port { - panel_input: endpoint { - remote-endpoint = <<dc_ep0_out>; - }; - }; - }; - - reg_3v3: regulator_3v3 { - compatible = "regulator-fixed"; - regulator-name = "3V3"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - regulator-always-on; - vin-supply = <&v3v3>; - }; - - /* supplied by either debug board or PoE */ - reg_5v2: regulator_5v2 { - compatible = "regulator-fixed"; - regulator-name = "5V2"; - regulator-min-microvolt = <5200000>; - regulator-max-microvolt = <5200000>; - regulator-always-on; - }; -}; - -ðernet0 { - pinctrl-names = "default"; - pinctrl-0 = <ðernet0_rgmii_mc1pins_b>; - phy-mode = "rgmii-id"; - phy-handle = <ðphy>; - status = "okay"; - - mdio0 { - compatible = "snps,dwmac-mdio"; - #address-cells = <1>; - #size-cells = <0>; - - ethphy: ethernet-phy@3 { /* KSZ9031RN */ - reg = <3>; - reset-gpios = <&gpiog 0 GPIO_ACTIVE_LOW>; /* ETH_RST# */ - interrupt-parent = <&gpioa>; - interrupts = <6 IRQ_TYPE_EDGE_FALLING>; /* ETH_MDINT# */ - rxc-skew-ps = <1860>; - txc-skew-ps = <1860>; - reset-assert-us = <10000>; - reset-deassert-us = <300>; - micrel,force-master; - }; - }; -}; - -&gpioz { - gpio-line-names = "HWID0", "HWID1", "HWID2", "HWID3", "", "", - "HWID4", "HWID5"; -}; - -&gpu { - status = "okay"; -}; - -&i2c5 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c5_mc1pins_b>; - clock-frequency = <400000>; - status = "okay"; - - touchscreen@38 { - compatible = "edt,edt-ft5x06"; - interrupt-parent = <&gpiod>; - interrupts = <11 IRQ_TYPE_EDGE_FALLING>; /* TOUCH_INT# */ - vcc-supply = <®_3v3>; - reg = <0x38>; - reset-gpios = <&gpiof 8 GPIO_ACTIVE_LOW>; /* TOUCH_RESET# */ - touchscreen-size-x = <1792>; - touchscreen-size-y = <1024>; - wakeup-source; - }; -}; - -<dc { - pinctrl-names = "default"; - pinctrl-0 = <<dc_mc1pins_c>; - status = "okay"; - - port { - #address-cells = <1>; - #size-cells = <0>; - ltdc_ep0_out: endpoint@0 { - reg = <0>; - remote-endpoint = <&panel_input>; - }; - }; -}; - -&pmic { - regulators { - buck4-supply = <®_5v2>; /* VIN */ - ldo2-supply = <®_5v2>; /* PMIC_LDO25IN */ - ldo5-supply = <®_5v2>; /* PMIC_LDO25IN */ - boost-supply = <®_5v2>; /* PMIC_BSTIN */ - pwr_sw2-supply = <&bst_out>; /* PMIC_SWIN */ - }; -}; - -&sdmmc1 { - pinctrl-names = "default", "opendrain"; - pinctrl-0 = <&sdmmc1_b4_pins_a>; - pinctrl-1 = <&sdmmc1_b4_od_pins_a>; - bus-width = <4>; - cd-gpios = <&gpioh 3 GPIO_ACTIVE_LOW>; - disable-wp; - no-1-8-v; - st,neg-edge; - vmmc-supply = <®_3v3>; - status = "okay"; -}; - -&sdmmc1_b4_pins_a { - /* - * board lacks external pull-ups on SDMMC lines. Class 10 SD refuses to - * work, thus enable internal pull-ups. - */ - pins1 { - /delete-property/ bias-disable; - bias-pull-up; - }; - pins2 { - /delete-property/ bias-disable; - bias-pull-up; - }; -}; - -&sdmmc2 { - pinctrl-names = "default", "opendrain"; - pinctrl-0 = <&sdmmc2_b4_pins_a &sdmmc2_d47_mc1pins_b>; - pinctrl-1 = <&sdmmc2_b4_od_pins_a &sdmmc2_d47_mc1pins_b>; - bus-width = <8>; - no-1-8-v; - no-sd; - no-sdio; - non-removable; - st,neg-edge; - vmmc-supply = <®_3v3>; - status = "okay"; -}; - -&timers3 { - status = "okay"; - - backlight_pwm: pwm { - pinctrl-names = "default"; - pinctrl-0 = <&pwm3_mc1pins_b>; - status = "okay"; - }; -}; - -&timers5 { - status = "okay"; - - leds_pwm: pwm { - pinctrl-names = "default"; - pinctrl-0 = <&pwm5_mc1pins_b>; - status = "okay"; - }; -}; - -&uart4 { - pinctrl-names = "default"; - pinctrl-0 = <&uart4_pins_a>; - status = "okay"; -}; - -&pinctrl { - ethernet0_rgmii_mc1pins_b: mc1-rgmii-1 { - pins1 { - pinmux = , /* ETH_RGMII_CLK125 */ - , /* ETH_RGMII_GTX_CLK */ - , /* ETH_RGMII_TXD0 */ - , /* ETH_RGMII_TXD1 */ - , /* ETH_RGMII_TXD2 */ - , /* ETH_RGMII_TXD3 */ - , /* ETH_RGMII_TX_CTL */ - ; /* ETH_MDC */ - bias-disable; - drive-push-pull; - slew-rate = <2>; - }; - pins2 { - pinmux = ; /* ETH_MDIO */ - bias-disable; - drive-push-pull; - slew-rate = <0>; - }; - pins3 { - pinmux = , /* ETH_RGMII_RXD0 */ - , /* ETH_RGMII_RXD1 */ - , /* ETH_RGMII_RXD2 */ - , /* ETH_RGMII_RXD3 */ - , /* ETH_RGMII_RX_CLK */ - ; /* ETH_RGMII_RX_CTL */ - bias-disable; - }; - }; - - i2c5_mc1pins_b: mc1-i2c5-1 { - pins { - pinmux = , /* I2C5_SCL */ - ; /* I2C5_SDA */ - bias-disable; - drive-open-drain; - slew-rate = <0>; - }; - }; - - ltdc_mc1pins_c: mc1-ltdc-2 { - pins1 { - pinmux = , /* LTDC_R6 */ - , /* LTDC_B7 */ - , /* LTDC_R5 */ - , /* LTDC_G7 */ - , /* LTDC_B2 */ - , /* LTDC_B3 */ - , /* LTDC_G3 */ - , /* LTDC_B4 */ - , /* LTDC_DE */ - , /* LTDC_R7 */ - , /* LTDC_G5 */ - , /* LTDC_R2 */ - , /* LTDC_R3 */ - , /* LTDC_R4 */ - , /* LTDC_G2 */ - , /* LTDC_G4 */ - , /* LTDC_G6 */ - , /* LTDC_B5 */ - , /* LTDC_B6 */ - , /* LTDC_VSYNC */ - ; /* LTDC_HSYNC */ - bias-disable; - drive-push-pull; - slew-rate = <0>; - }; - pins2 { - pinmux = ; /* LTDC_CLK */ - bias-disable; - drive-push-pull; - slew-rate = <1>; - }; - }; - - pwm3_mc1pins_b: mc1-pwm3-1 { - pins { - pinmux = ; /* TIM3_CH2 */ - bias-disable; - drive-push-pull; - slew-rate = <0>; - }; - }; - - pwm5_mc1pins_b: mc1-pwm5-1 { - pins { - pinmux = , /* TIM5_CH2 */ - , /* TIM5_CH3 */ - ; /* TIM5_CH4 */ - bias-disable; - drive-push-pull; - slew-rate = <0>; - }; - }; - - sdmmc2_d47_mc1pins_b: mc1-sdmmc2-d47-1 { - pins { - pinmux = , /* SDMMC2_D4 */ - , /* SDMMC2_D5 */ - , /* SDMMC2_D6 */ - ; /* SDMMC2_D7 */ - slew-rate = <1>; - drive-push-pull; - bias-disable; - }; - }; - -}; diff --git a/configs/platform-v7a/dts/stm32mp15xx-osd32.dtsi b/configs/platform-v7a/dts/stm32mp15xx-osd32.dtsi deleted file mode 100644 index cd0bbf0..0000000 --- a/configs/platform-v7a/dts/stm32mp15xx-osd32.dtsi +++ /dev/null @@ -1,229 +0,0 @@ -/* SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) */ -/* - * Copyright (C) 2020 STMicroelectronics - All Rights Reserved - * Copyright (C) 2020 Ahmad Fatoum, Pengutronix - */ - -#include "stm32mp15-pinctrl.dtsi" - -#include - -/ { - reserved-memory { - #address-cells = <1>; - #size-cells = <1>; - ranges; - - mcuram2: mcuram2@10000000 { - compatible = "shared-dma-pool"; - reg = <0x10000000 0x40000>; - no-map; - }; - - vdev0vring0: vdev0vring0@10040000 { - compatible = "shared-dma-pool"; - reg = <0x10040000 0x1000>; - no-map; - }; - - vdev0vring1: vdev0vring1@10041000 { - compatible = "shared-dma-pool"; - reg = <0x10041000 0x1000>; - no-map; - }; - - vdev0buffer: vdev0buffer@10042000 { - compatible = "shared-dma-pool"; - reg = <0x10042000 0x4000>; - no-map; - }; - - mcuram: mcuram@30000000 { - compatible = "shared-dma-pool"; - reg = <0x30000000 0x40000>; - no-map; - }; - - retram: retram@38000000 { - compatible = "shared-dma-pool"; - reg = <0x38000000 0x10000>; - no-map; - }; - }; - - reg_sip_eeprom: regulator_eeprom { - compatible = "regulator-fixed"; - regulator-name = "sip_eeprom"; - regulator-always-on; - }; -}; - -&i2c4 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c4_pins_a>; - clock-frequency = <400000>; - i2c-scl-rising-time-ns = <185>; - i2c-scl-falling-time-ns = <20>; - status = "okay"; - - pmic: stpmic@33 { - compatible = "st,stpmic1"; - reg = <0x33>; - interrupts-extended = <&gpioa 0 IRQ_TYPE_EDGE_FALLING>; - interrupt-controller; - #interrupt-cells = <2>; - - regulators { - compatible = "st,stpmic1-regulators"; - - ldo1-supply = <&v3v3>; - ldo6-supply = <&v3v3>; - pwr_sw1-supply = <&bst_out>; - - vddcore: buck1 { - regulator-name = "vddcore"; - regulator-min-microvolt = <1200000>; - regulator-max-microvolt = <1350000>; - regulator-always-on; - regulator-initial-mode = <0>; - regulator-over-current-protection; - }; - - vdd_ddr: buck2 { - regulator-name = "vdd_ddr"; - regulator-min-microvolt = <1350000>; - regulator-max-microvolt = <1350000>; - regulator-always-on; - regulator-initial-mode = <0>; - regulator-over-current-protection; - }; - - vdd: buck3 { - regulator-name = "vdd"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - regulator-always-on; - st,mask-reset; - regulator-initial-mode = <0>; - regulator-over-current-protection; - }; - - v3v3: buck4 { - regulator-name = "v3v3"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - regulator-always-on; - regulator-over-current-protection; - regulator-initial-mode = <0>; - }; - - v1v8_audio: ldo1 { - regulator-name = "v1v8_audio"; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - regulator-always-on; - interrupts = ; - - }; - - v3v3_hdmi: ldo2 { - regulator-name = "v3v3_hdmi"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - regulator-always-on; - interrupts = ; - - }; - - vtt_ddr: ldo3 { - regulator-name = "vtt_ddr"; - regulator-min-microvolt = <500000>; - regulator-max-microvolt = <750000>; - regulator-always-on; - regulator-over-current-protection; - }; - - vdd_usb: ldo4 { - regulator-name = "vdd_usb"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - interrupts = ; - }; - - vdda: ldo5 { - regulator-name = "vdda"; - regulator-min-microvolt = <2900000>; - regulator-max-microvolt = <2900000>; - interrupts = ; - regulator-boot-on; - }; - - v1v2_hdmi: ldo6 { - regulator-name = "v1v2_hdmi"; - regulator-min-microvolt = <1200000>; - regulator-max-microvolt = <1200000>; - regulator-always-on; - interrupts = ; - - }; - - vref_ddr: vref_ddr { - regulator-name = "vref_ddr"; - regulator-always-on; - regulator-over-current-protection; - }; - - bst_out: boost { - regulator-name = "bst_out"; - interrupts = ; - }; - - vbus_otg: pwr_sw1 { - regulator-name = "vbus_otg"; - interrupts = ; - regulator-active-discharge; - }; - - vbus_sw: pwr_sw2 { - regulator-name = "vbus_sw"; - interrupts = ; - regulator-active-discharge; - }; - }; - - onkey { - compatible = "st,stpmic1-onkey"; - interrupts = , ; - interrupt-names = "onkey-falling", "onkey-rising"; - }; - - pmic_watchdog: watchdog { - compatible = "st,stpmic1-wdt"; - status = "disabled"; - }; - }; - - sip_eeprom: eeprom@50 { - compatible = "atmel,24c32"; - vcc-supply = <®_sip_eeprom>; - reg = <0x50>; - }; -}; - -&ipcc { - status = "okay"; -}; - -&m4_rproc { - memory-region = <&retram>, <&mcuram>, <&mcuram2>, <&vdev0vring0>, - <&vdev0vring1>, <&vdev0buffer>; - mboxes = <&ipcc 0>, <&ipcc 1>, <&ipcc 2>; - mbox-names = "vq0", "vq1", "shutdown"; - interrupt-parent = <&exti>; - interrupts = <68 1>; - status = "okay"; -}; - -&rng1 { - status = "okay"; -}; -- cgit v1.2.3