Unverified Commit c05188c8 authored Dec 07, 2022 by Arnd Bergmann

Merge tag 'socfpga_dts_updates_for_v6.2_part2' of...

Merge tag 'socfpga_dts_updates_for_v6.2_part2' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into soc/dt

SoCFPGA dts updates for v6.2, part 2
- Fix dtschema for LED node
- Fix dtschema for i2c-mux

* tag 'socfpga_dts_updates_for_v6.2_part2' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
  ARM: dts: socfpga: Fix pca9548 i2c-mux node name
  ARM: dts: socfpga: align LED node names with dtschema
  arm64: dts: altera: align LED node names with dtschema

Link: https://lore.kernel.org/r/20221206214006.590562-1-dinguyen@kernel.org


Signed-off-by: Arnd Bergmann <arnd@arndb.de>

parents 7b3e7df9 88615cfb

arch/arm/boot/dts/socfpga_arria5_socdk.dts

+4 −4

Original line number	Diff line number	Diff line
		@@ -29,22 +29,22 @@ aliases {

		leds {
		compatible = "gpio-leds";
		hps0 {
		led-hps0 {
		label = "hps_led0";
		gpios = <&porta 0 1>;
		};

		hps1 {
		led-hps1 {
		label = "hps_led1";
		gpios = <&portb 11 1>;
		};

		hps2 {
		led-hps2 {
		label = "hps_led2";
		gpios = <&porta 17 1>;
		};

		hps3 {
		led-hps3 {
		label = "hps_led3";
		gpios = <&porta 18 1>;
		};

arch/arm/boot/dts/socfpga_cyclone5_de0_nano_soc.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -33,7 +33,7 @@ regulator_3_3v: regulator {

		leds {
		compatible = "gpio-leds";
		hps0 {
		led-hps0 {
		label = "hps_led0";
		gpios = <&portb 24 0>;
		linux,default-trigger = "heartbeat";

arch/arm/boot/dts/socfpga_cyclone5_socdk.dts

+4 −4

Original line number	Diff line number	Diff line
		@@ -29,22 +29,22 @@ aliases {

		leds {
		compatible = "gpio-leds";
		hps0 {
		led-hps0 {
		label = "hps_led0";
		gpios = <&portb 15 1>;
		};

		hps1 {
		led-hps1 {
		label = "hps_led1";
		gpios = <&portb 14 1>;
		};

		hps2 {
		led-hps2 {
		label = "hps_led2";
		gpios = <&portb 13 1>;
		};

		hps3 {
		led-hps3 {
		label = "hps_led3";
		gpios = <&portb 12 1>;
		};

arch/arm/boot/dts/socfpga_cyclone5_vining_fpga.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -141,7 +141,7 @@ at24@50 {
		reg = <0x50>;
		};

		i2cswitch@70 {
		i2c-mux@70 {
		compatible = "nxp,pca9548";
		#address-cells = <1>;
		#size-cells = <0>;

arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts

+3 −3

Original line number	Diff line number	Diff line
		@@ -22,17 +22,17 @@ chosen {

		leds {
		compatible = "gpio-leds";
		hps0 {
		led-hps0 {
		label = "hps_led0";
		gpios = <&portb 20 GPIO_ACTIVE_HIGH>;
		};

		hps1 {
		led-hps1 {
		label = "hps_led1";
		gpios = <&portb 19 GPIO_ACTIVE_HIGH>;
		};

		hps2 {
		led-hps2 {
		label = "hps_led2";
		gpios = <&portb 21 GPIO_ACTIVE_HIGH>;
		};