mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-08-30 13:23:02 -04:00
Merge tag 'arm-soc/for-7.2/devicetree' of https://github.com/Broadcom/stblinux into soc/dt
This pull request contains Broadcom ARM-based SoCs Device Tree changes for 7.2, please pull the following: - Rosen moves the Meraki MX6X pinctrl configuration to the PWM node where it belongs, also fixes the USB3 GPIO for the R6300v2 and EA6500v2 routers - Jinseok fixes a gpio label for the bcm2711 systems (Raspberry Pi 4) * tag 'arm-soc/for-7.2/devicetree' of https://github.com/Broadcom/stblinux: arm: dts: bcm2711: Fix typo in gpio-line-names ARM: dts: BCM5301X: EA6500v2: fix USB3 ARM: dts: BCM5301X: R6300v2: fix USB3 ARM: dts: NSP: Move MX6X pinctrl config to PWM node Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
@@ -110,7 +110,7 @@ &gpio {
|
||||
"GPIO26",
|
||||
"GPIO27",
|
||||
"RGMII_MDIO",
|
||||
"RGMIO_MDC",
|
||||
"RGMII_MDC",
|
||||
/* Used by BT module */
|
||||
"CTS0", /* 30 */
|
||||
"RTS0",
|
||||
|
||||
@@ -56,7 +56,7 @@ &gpio {
|
||||
"GPIO26",
|
||||
"GPIO27",
|
||||
"RGMII_MDIO",
|
||||
"RGMIO_MDC",
|
||||
"RGMII_MDC",
|
||||
/* Used by BT module */
|
||||
"CTS0",
|
||||
"RTS0",
|
||||
|
||||
@@ -43,3 +43,7 @@ button-restart {
|
||||
&usb3_phy {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&usb3 {
|
||||
vcc-gpio = <&chipcommon 10 GPIO_ACTIVE_HIGH>;
|
||||
};
|
||||
|
||||
@@ -86,3 +86,7 @@ &spi_nor {
|
||||
&usb3_phy {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&usb3 {
|
||||
vcc-gpio = <&chipcommon 0 GPIO_ACTIVE_HIGH>;
|
||||
};
|
||||
|
||||
@@ -121,9 +121,6 @@ &ohci0 {
|
||||
};
|
||||
|
||||
&pinctrl {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&pwm_leds>;
|
||||
|
||||
pwm_leds: pwm_leds {
|
||||
function = "pwm";
|
||||
groups = "pwm1_grp", "pwm2_grp", "pwm3_grp";
|
||||
@@ -131,6 +128,9 @@ pwm_leds: pwm_leds {
|
||||
};
|
||||
|
||||
&pwm {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&pwm_leds>;
|
||||
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user