Unverified Commit e03e97d5 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v5.18/dt-signed' of... 

Merge tag 'omap-for-v5.18/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/dt

Devicetree changes for omaps for v5.18

Devicetree changes for omaps for v5.18:

- The devicetree node naming for pdu001 RTC name gets corrected

- For logicpd-torpedo baseboard, isp1763 USB controller gets added

- New board variant for SanCloud BBE Extended WiFi gets added

* tag 'omap-for-v5.18/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: am335x-sancloud-bbe-extended-wifi: New devicetree
  ARM: dts: logicpd-torpedo: Add isp1763 support to baseboard
  ARM: dts: am334x: pdu001: Use correct node name for RTC

Link: https://lore.kernel.org/r/pull-1645606669-127734@atomide.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 1b29d1c1 668e2f58

arch/arm/boot/dts/Makefile

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

	am335x-sancloud-bbe.dtb \

	am335x-sancloud-bbe-lite.dtb \

	am335x-sancloud-bbe-extended-wifi.dtb \

	am335x-shc.dtb \

	am335x-sbc-t335.dtb \

	am335x-sl50.dtb \

arch/arm/boot/dts/am335x-pdu001.dts

+1 −1
Original line number Diff line number Diff line
@@ -353,7 +353,7 @@ tft-panel@0 { 
		};

	};



	mcp79400: mcp79400@6f {

	mcp79400: rtc@6f {

		compatible = "microchip,mcp7940x";

		reg = <0x6f>;

	};

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

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

/*

 * Copyright (C) 2021 Sancloud Ltd

 * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/

 */

/dts-v1/;



#include "am33xx.dtsi"

#include "am335x-bone-common.dtsi"

#include "am335x-boneblack-common.dtsi"

#include "am335x-sancloud-bbe-common.dtsi"

#include <dt-bindings/interrupt-controller/irq.h>



/ {

	model = "SanCloud BeagleBone Enhanced Extended WiFi";

	compatible = "sancloud,am335x-boneenhanced",

		     "ti,am335x-bone-black",

		     "ti,am335x-bone",

		     "ti,am33xx";



	wlan_en_reg: fixedregulator@2 {

		compatible = "regulator-fixed";

		regulator-name = "wlan-en-regulator";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		startup-delay-us= <100000>;

	};

};



&am33xx_pinmux {

	mmc3_pins: pinmux_mmc3_pins {

		pinctrl-single,pins = <

			/* gpmc_a9.gpio1_25: RADIO_EN */

			AM33XX_PADCONF(AM335X_PIN_GPMC_A9, PIN_OUTPUT_PULLUP, MUX_MODE7)



			/* gpmc_ad12.mmc2_dat0 */

			AM33XX_PADCONF(AM335X_PIN_GPMC_AD12, PIN_INPUT_PULLUP, MUX_MODE3)



			/* gpmc_ad13.mmc2_dat1 */

			AM33XX_PADCONF(AM335X_PIN_GPMC_AD13, PIN_INPUT_PULLUP, MUX_MODE3)



			/* gpmc_ad14.mmc2_dat2 */

			AM33XX_PADCONF(AM335X_PIN_GPMC_AD14, PIN_INPUT_PULLUP, MUX_MODE3)



			/* gpmc_ad15.mmc2_dat3 */

			AM33XX_PADCONF(AM335X_PIN_GPMC_AD15, PIN_INPUT_PULLUP, MUX_MODE3)



			/* gpmc_csn3.mmc2_cmd */

			AM33XX_PADCONF(AM335X_PIN_GPMC_CSN3, PIN_INPUT_PULLUP, MUX_MODE3)



			/* gpmc_clk.mmc2_clk */

			AM33XX_PADCONF(AM335X_PIN_GPMC_CLK, PIN_INPUT_PULLUP, MUX_MODE3)

		>;

	};



	bluetooth_pins: pinmux_bluetooth_pins {

		pinctrl-single,pins = <

			/* event_intr0.gpio0_19 */

			AM33XX_PADCONF(AM335X_PIN_XDMA_EVENT_INTR0, PIN_INPUT_PULLUP, MUX_MODE7)

		>;

	};



	uart1_pins: pinmux_uart1_pins {

		pinctrl-single,pins = <

			/* uart1_rxd */

			AM33XX_PADCONF(AM335X_PIN_UART1_RXD, PIN_INPUT, MUX_MODE0)



			/* uart1_txd */

			AM33XX_PADCONF(AM335X_PIN_UART1_TXD, PIN_INPUT, MUX_MODE0)



			/* uart1_ctsn */

			AM33XX_PADCONF(AM335X_PIN_UART1_CTSN, PIN_INPUT_PULLDOWN, MUX_MODE0)



			/* uart1_rtsn */

			AM33XX_PADCONF(AM335X_PIN_UART1_RTSN, PIN_OUTPUT_PULLDOWN, MUX_MODE0)

		>;

	};

};



&i2c2 {

	status = "disabled";

};



&mmc3 {

	status = "okay";

	vmmc-supply = <&wlan_en_reg>;

	bus-width = <4>;

	non-removable;

	cap-power-off-card;

	ti,needs-special-hs-handling;

	keep-power-in-suspend;

	pinctrl-names = "default";

	pinctrl-0 = <&mmc3_pins>;

	dmas = <&edma_xbar 12 0 1

		&edma_xbar 13 0 2>;

	dma-names = "tx", "rx";

	clock-frequency = <50000000>;

	max-frequency = <50000000>;

};



&uart1 {

	status = "okay";



	bluetooth {

		pinctrl-names = "default";

		pinctrl-0 = <&uart1_pins &bluetooth_pins>;

		compatible = "qcom,qca6174-bt";

		enable-gpios = <&gpio1 25 GPIO_ACTIVE_HIGH>;

		clocks = <&l4ls_clkctrl AM3_L4LS_UART2_CLKCTRL 0>;

		interrupt-parent = <&gpio0>;

		interrupts = <19 IRQ_TYPE_EDGE_RISING>;

	};

};

arch/arm/boot/dts/logicpd-torpedo-35xx-devkit.dts

+8 −0
Original line number Diff line number Diff line
@@ -11,3 +11,11 @@ / { 
	model = "LogicPD Zoom OMAP35xx Torpedo Development Kit";

	compatible = "logicpd,dm3730-torpedo-devkit", "ti,omap3430", "ti,omap3";

};



&omap3_pmx_core {

	isp1763_pins: pinmux_isp1763_pins {

		pinctrl-single,pins = <

			OMAP3_CORE1_IOPAD(0x2154,  PIN_INPUT_PULLUP | MUX_MODE4)	/* sdmmc1_dat6.gpio_128 */

		>;

	};

};

arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts

+9 −0
Original line number Diff line number Diff line
@@ -85,3 +85,12 @@ OMAP3630_CORE2_IOPAD(0x25da, PIN_INPUT_PULLUP | MUX_MODE2) /* etk_ctl.sdmmc3_c 
		>;

	};

};



/* The gpio muxing between omap3530 and dm3730 is different for GPIO_128 */

&omap3_pmx_wkup {

	isp1763_pins: pinmux_isp1763_pins {

		pinctrl-single,pins = <

			OMAP3_WKUP_IOPAD(0x2a58, PIN_INPUT_PULLUP | MUX_MODE4)	/* reserved.gpio_128 */

		>;

	};

};