Commit a9865ec3 authored by Stefan Wahren's avatar Stefan Wahren Committed by Florian Fainelli
Browse files

ARM: dts: bcm283x: Fix underscores in node names 



A lot pinctrl node names, regulators and local_intc do not follow the
node name convention to avoid underscore. So fix this by using hyphen
or a proper node name.

Signed-off-by: default avatarStefan Wahren <stefan.wahren@i2se.com>
Reviewed-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20221110173105.6633-2-stefan.wahren@i2se.com


Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
parent 2a5796e6

arch/arm/boot/dts/bcm2711-rpi-4-b.dts

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ led-pwr { 
		};

	};



	sd_io_1v8_reg: sd_io_1v8_reg {

	sd_io_1v8_reg: regulator-sd-io-1v8 {

		compatible = "regulator-gpio";

		regulator-name = "vdd-sd-io";

		regulator-min-microvolt = <1800000>;
@@ -41,7 +41,7 @@ sd_io_1v8_reg: sd_io_1v8_reg { 
		status = "okay";

	};



	sd_vcc_reg: sd_vcc_reg {

	sd_vcc_reg: regulator-sd-vcc {

		compatible = "regulator-fixed";

		regulator-name = "vcc-sd";

		regulator-min-microvolt = <3300000>;

arch/arm/boot/dts/bcm2711-rpi-cm4.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ chosen { 
		stdout-path = "serial1:115200n8";

	};



	sd_io_1v8_reg: sd_io_1v8_reg {

	sd_io_1v8_reg: regulator-sd-io-1v8 {

		compatible = "regulator-gpio";

		regulator-name = "vdd-sd-io";

		regulator-min-microvolt = <1800000>;
@@ -26,7 +26,7 @@ sd_io_1v8_reg: sd_io_1v8_reg { 
		status = "okay";

	};



	sd_vcc_reg: sd_vcc_reg {

	sd_vcc_reg: regulator-sd-vcc {

		compatible = "regulator-fixed";

		regulator-name = "vcc-sd";

		regulator-min-microvolt = <3300000>;

arch/arm/boot/dts/bcm2711.dtsi

+47 −47
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ soc { 
		 * This node is the provider for the enable-method for

		 * bringing up secondary cores.

		 */

		local_intc: local_intc@40000000 {

		local_intc: interrupt-controller@40000000 {

			compatible = "brcm,bcm2836-l1-intc";

			reg = <0x40000000 0x100>;

		};
@@ -647,21 +647,21 @@ &gpio { 


	gpio-ranges = <&gpio 0 0 58>;



	gpclk0_gpio49: gpclk0_gpio49 {

	gpclk0_gpio49: gpclk0-gpio49 {

		pin-gpclk {

			pins = "gpio49";

			function = "alt1";

			bias-disable;

		};

	};

	gpclk1_gpio50: gpclk1_gpio50 {

	gpclk1_gpio50: gpclk1-gpio50 {

		pin-gpclk {

			pins = "gpio50";

			function = "alt1";

			bias-disable;

		};

	};

	gpclk2_gpio51: gpclk2_gpio51 {

	gpclk2_gpio51: gpclk2-gpio51 {

		pin-gpclk {

			pins = "gpio51";

			function = "alt1";
@@ -669,7 +669,7 @@ pin-gpclk { 
		};

	};



	i2c0_gpio46: i2c0_gpio46 {

	i2c0_gpio46: i2c0-gpio46 {

		pin-sda {

			function = "alt0";

			pins = "gpio46";
@@ -681,7 +681,7 @@ pin-scl { 
			bias-disable;

		};

	};

	i2c1_gpio46: i2c1_gpio46 {

	i2c1_gpio46: i2c1-gpio46 {

		pin-sda {

			function = "alt1";

			pins = "gpio46";
@@ -693,7 +693,7 @@ pin-scl { 
			bias-disable;

		};

	};

	i2c3_gpio2: i2c3_gpio2 {

	i2c3_gpio2: i2c3-gpio2 {

		pin-sda {

			function = "alt5";

			pins = "gpio2";
@@ -705,7 +705,7 @@ pin-scl { 
			bias-disable;

		};

	};

	i2c3_gpio4: i2c3_gpio4 {

	i2c3_gpio4: i2c3-gpio4 {

		pin-sda {

			function = "alt5";

			pins = "gpio4";
@@ -717,7 +717,7 @@ pin-scl { 
			bias-disable;

		};

	};

	i2c4_gpio6: i2c4_gpio6 {

	i2c4_gpio6: i2c4-gpio6 {

		pin-sda {

			function = "alt5";

			pins = "gpio6";
@@ -729,7 +729,7 @@ pin-scl { 
			bias-disable;

		};

	};

	i2c4_gpio8: i2c4_gpio8 {

	i2c4_gpio8: i2c4-gpio8 {

		pin-sda {

			function = "alt5";

			pins = "gpio8";
@@ -741,7 +741,7 @@ pin-scl { 
			bias-disable;

		};

	};

	i2c5_gpio10: i2c5_gpio10 {

	i2c5_gpio10: i2c5-gpio10 {

		pin-sda {

			function = "alt5";

			pins = "gpio10";
@@ -753,7 +753,7 @@ pin-scl { 
			bias-disable;

		};

	};

	i2c5_gpio12: i2c5_gpio12 {

	i2c5_gpio12: i2c5-gpio12 {

		pin-sda {

			function = "alt5";

			pins = "gpio12";
@@ -765,7 +765,7 @@ pin-scl { 
			bias-disable;

		};

	};

	i2c6_gpio0: i2c6_gpio0 {

	i2c6_gpio0: i2c6-gpio0 {

		pin-sda {

			function = "alt5";

			pins = "gpio0";
@@ -777,7 +777,7 @@ pin-scl { 
			bias-disable;

		};

	};

	i2c6_gpio22: i2c6_gpio22 {

	i2c6_gpio22: i2c6-gpio22 {

		pin-sda {

			function = "alt5";

			pins = "gpio22";
@@ -789,7 +789,7 @@ pin-scl { 
			bias-disable;

		};

	};

	i2c_slave_gpio8: i2c_slave_gpio8 {

	i2c_slave_gpio8: i2c-slave-gpio8 {

		pins-i2c-slave {

			pins = "gpio8",

			       "gpio9",
@@ -799,7 +799,7 @@ pins-i2c-slave { 
		};

	};



	jtag_gpio48: jtag_gpio48 {

	jtag_gpio48: jtag-gpio48 {

		pins-jtag {

			pins = "gpio48",

			       "gpio49",
@@ -811,7 +811,7 @@ pins-jtag { 
		};

	};



	mii_gpio28: mii_gpio28 {

	mii_gpio28: mii-gpio28 {

		pins-mii {

			pins = "gpio28",

			       "gpio29",
@@ -820,7 +820,7 @@ pins-mii { 
			function = "alt4";

		};

	};

	mii_gpio36: mii_gpio36 {

	mii_gpio36: mii-gpio36 {

		pins-mii {

			pins = "gpio36",

			       "gpio37",
@@ -830,7 +830,7 @@ pins-mii { 
		};

	};



	pcm_gpio50: pcm_gpio50 {

	pcm_gpio50: pcm-gpio50 {

		pins-pcm {

			pins = "gpio50",

			       "gpio51",
@@ -840,63 +840,63 @@ pins-pcm { 
		};

	};



	pwm0_0_gpio12: pwm0_0_gpio12 {

	pwm0_0_gpio12: pwm0-0-gpio12 {

		pin-pwm {

			pins = "gpio12";

			function = "alt0";

			bias-disable;

		};

	};

	pwm0_0_gpio18: pwm0_0_gpio18 {

	pwm0_0_gpio18: pwm0-0-gpio18 {

		pin-pwm {

			pins = "gpio18";

			function = "alt5";

			bias-disable;

		};

	};

	pwm1_0_gpio40: pwm1_0_gpio40 {

	pwm1_0_gpio40: pwm1-0-gpio40 {

		pin-pwm {

			pins = "gpio40";

			function = "alt0";

			bias-disable;

		};

	};

	pwm0_1_gpio13: pwm0_1_gpio13 {

	pwm0_1_gpio13: pwm0-1-gpio13 {

		pin-pwm {

			pins = "gpio13";

			function = "alt0";

			bias-disable;

		};

	};

	pwm0_1_gpio19: pwm0_1_gpio19 {

	pwm0_1_gpio19: pwm0-1-gpio19 {

		pin-pwm {

			pins = "gpio19";

			function = "alt5";

			bias-disable;

		};

	};

	pwm1_1_gpio41: pwm1_1_gpio41 {

	pwm1_1_gpio41: pwm1-1-gpio41 {

		pin-pwm {

			pins = "gpio41";

			function = "alt0";

			bias-disable;

		};

	};

	pwm0_1_gpio45: pwm0_1_gpio45 {

	pwm0_1_gpio45: pwm0-1-gpio45 {

		pin-pwm {

			pins = "gpio45";

			function = "alt0";

			bias-disable;

		};

	};

	pwm0_0_gpio52: pwm0_0_gpio52 {

	pwm0_0_gpio52: pwm0-0-gpio52 {

		pin-pwm {

			pins = "gpio52";

			function = "alt1";

			bias-disable;

		};

	};

	pwm0_1_gpio53: pwm0_1_gpio53 {

	pwm0_1_gpio53: pwm0-1-gpio53 {

		pin-pwm {

			pins = "gpio53";

			function = "alt1";
@@ -904,7 +904,7 @@ pin-pwm { 
		};

	};



	rgmii_gpio35: rgmii_gpio35 {

	rgmii_gpio35: rgmii-gpio35 {

		pin-start-stop {

			pins = "gpio35";

			function = "alt4";
@@ -914,26 +914,26 @@ pin-rx-ok { 
			function = "alt4";

		};

	};

	rgmii_irq_gpio34: rgmii_irq_gpio34 {

	rgmii_irq_gpio34: rgmii-irq-gpio34 {

		pin-irq {

			pins = "gpio34";

			function = "alt5";

		};

	};

	rgmii_irq_gpio39: rgmii_irq_gpio39 {

	rgmii_irq_gpio39: rgmii-irq-gpio39 {

		pin-irq {

			pins = "gpio39";

			function = "alt4";

		};

	};

	rgmii_mdio_gpio28: rgmii_mdio_gpio28 {

	rgmii_mdio_gpio28: rgmii-mdio-gpio28 {

		pins-mdio {

			pins = "gpio28",

			       "gpio29";

			function = "alt5";

		};

	};

	rgmii_mdio_gpio37: rgmii_mdio_gpio37 {

	rgmii_mdio_gpio37: rgmii-mdio-gpio37 {

		pins-mdio {

			pins = "gpio37",

			       "gpio38";
@@ -941,7 +941,7 @@ pins-mdio { 
		};

	};



	spi0_gpio46: spi0_gpio46 {

	spi0_gpio46: spi0-gpio46 {

		pins-spi {

			pins = "gpio46",

			       "gpio47",
@@ -950,7 +950,7 @@ pins-spi { 
			function = "alt2";

		};

	};

	spi2_gpio46: spi2_gpio46 {

	spi2_gpio46: spi2-gpio46 {

		pins-spi {

			pins = "gpio46",

			       "gpio47",
@@ -960,7 +960,7 @@ pins-spi { 
			function = "alt5";

		};

	};

	spi3_gpio0: spi3_gpio0 {

	spi3_gpio0: spi3-gpio0 {

		pins-spi {

			pins = "gpio0",

			       "gpio1",
@@ -969,7 +969,7 @@ pins-spi { 
			function = "alt3";

		};

	};

	spi4_gpio4: spi4_gpio4 {

	spi4_gpio4: spi4-gpio4 {

		pins-spi {

			pins = "gpio4",

			       "gpio5",
@@ -978,7 +978,7 @@ pins-spi { 
			function = "alt3";

		};

	};

	spi5_gpio12: spi5_gpio12 {

	spi5_gpio12: spi5-gpio12 {

		pins-spi {

			pins = "gpio12",

			       "gpio13",
@@ -987,7 +987,7 @@ pins-spi { 
			function = "alt3";

		};

	};

	spi6_gpio18: spi6_gpio18 {

	spi6_gpio18: spi6-gpio18 {

		pins-spi {

			pins = "gpio18",

			       "gpio19",
@@ -997,7 +997,7 @@ pins-spi { 
		};

	};



	uart2_gpio0: uart2_gpio0 {

	uart2_gpio0: uart2-gpio0 {

		pin-tx {

			pins = "gpio0";

			function = "alt4";
@@ -1009,7 +1009,7 @@ pin-rx { 
			bias-pull-up;

		};

	};

	uart2_ctsrts_gpio2: uart2_ctsrts_gpio2 {

	uart2_ctsrts_gpio2: uart2-ctsrts-gpio2 {

		pin-cts {

			pins = "gpio2";

			function = "alt4";
@@ -1021,7 +1021,7 @@ pin-rts { 
			bias-disable;

		};

	};

	uart3_gpio4: uart3_gpio4 {

	uart3_gpio4: uart3-gpio4 {

		pin-tx {

			pins = "gpio4";

			function = "alt4";
@@ -1033,7 +1033,7 @@ pin-rx { 
			bias-pull-up;

		};

	};

	uart3_ctsrts_gpio6: uart3_ctsrts_gpio6 {

	uart3_ctsrts_gpio6: uart3-ctsrts-gpio6 {

		pin-cts {

			pins = "gpio6";

			function = "alt4";
@@ -1045,7 +1045,7 @@ pin-rts { 
			bias-disable;

		};

	};

	uart4_gpio8: uart4_gpio8 {

	uart4_gpio8: uart4-gpio8 {

		pin-tx {

			pins = "gpio8";

			function = "alt4";
@@ -1057,7 +1057,7 @@ pin-rx { 
			bias-pull-up;

		};

	};

	uart4_ctsrts_gpio10: uart4_ctsrts_gpio10 {

	uart4_ctsrts_gpio10: uart4-ctsrts-gpio10 {

		pin-cts {

			pins = "gpio10";

			function = "alt4";
@@ -1069,7 +1069,7 @@ pin-rts { 
			bias-disable;

		};

	};

	uart5_gpio12: uart5_gpio12 {

	uart5_gpio12: uart5-gpio12 {

		pin-tx {

			pins = "gpio12";

			function = "alt4";
@@ -1081,7 +1081,7 @@ pin-rx { 
			bias-pull-up;

		};

	};

	uart5_ctsrts_gpio14: uart5_ctsrts_gpio14 {

	uart5_ctsrts_gpio14: uart5-ctsrts-gpio14 {

		pin-cts {

			pins = "gpio14";

			function = "alt4";

arch/arm/boot/dts/bcm2835-common.dtsi

+9 −9
Original line number Diff line number Diff line
@@ -152,41 +152,41 @@ &cpu_thermal { 
};



&gpio {

	i2c_slave_gpio18: i2c_slave_gpio18 {

	i2c_slave_gpio18: i2c-slave-gpio18 {

		brcm,pins = <18 19 20 21>;

		brcm,function = <BCM2835_FSEL_ALT3>;

	};



	jtag_gpio4: jtag_gpio4 {

	jtag_gpio4: jtag-gpio4 {

		brcm,pins = <4 5 6 12 13>;

		brcm,function = <BCM2835_FSEL_ALT5>;

	};



	pwm0_gpio12: pwm0_gpio12 {

	pwm0_gpio12: pwm0-gpio12 {

		brcm,pins = <12>;

		brcm,function = <BCM2835_FSEL_ALT0>;

	};

	pwm0_gpio18: pwm0_gpio18 {

	pwm0_gpio18: pwm0-gpio18 {

		brcm,pins = <18>;

		brcm,function = <BCM2835_FSEL_ALT5>;

	};

	pwm0_gpio40: pwm0_gpio40 {

	pwm0_gpio40: pwm0-gpio40 {

		brcm,pins = <40>;

		brcm,function = <BCM2835_FSEL_ALT0>;

	};

	pwm1_gpio13: pwm1_gpio13 {

	pwm1_gpio13: pwm1-gpio13 {

		brcm,pins = <13>;

		brcm,function = <BCM2835_FSEL_ALT0>;

	};

	pwm1_gpio19: pwm1_gpio19 {

	pwm1_gpio19: pwm1-gpio19 {

		brcm,pins = <19>;

		brcm,function = <BCM2835_FSEL_ALT5>;

	};

	pwm1_gpio41: pwm1_gpio41 {

	pwm1_gpio41: pwm1-gpio41 {

		brcm,pins = <41>;

		brcm,function = <BCM2835_FSEL_ALT0>;

	};

	pwm1_gpio45: pwm1_gpio45 {

	pwm1_gpio45: pwm1-gpio45 {

		brcm,pins = <45>;

		brcm,function = <BCM2835_FSEL_ALT0>;

	};

arch/arm/boot/dts/bcm2836.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ soc { 
			 <0x40000000 0x40000000 0x00001000>;

		dma-ranges = <0xc0000000 0x00000000 0x3f000000>;



		local_intc: local_intc@40000000 {

		local_intc: interrupt-controller@40000000 {

			compatible = "brcm,bcm2836-l1-intc";

			reg = <0x40000000 0x100>;

			interrupt-controller;