Commit 1ddaaa42 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

More dts changes for omaps for v5.10 merge window

Some more dts changes that did not make it to the first set of
dts changes:

- Drop unnessary nokia,nvm-size property

- A series of changes to use "okay" instead of "ok"

- A series of changes to move boards to use new cpsw switch
  driver and drop the drop legacy cpsw dt node

- A series of changes to fix issues with the GPIO binding
  usage

* tag 'omap-for-v5.10/dt-part2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: am3874: iceboard: fix GPIO expander reset GPIOs
  ARM: dts: am335x: t335: align GPIO hog names with dtschema
  ARM: dts: am335x: lxm: fix PCA9539 GPIO expander properties
  ARM: dts: am437x-l4: drop legacy cpsw dt node
  ARM: dts: am437x: switch to new cpsw switch drv
  ARM: dts: am437x-l4: add dt node for new cpsw switchdev driver
  ARM: dts: dra7: drop legacy cpsw dt node
  ARM: dts: am57xx-cl-som-am57x: switch to new cpsw switch drv
  ARM: dts: dra7x-evm: switch to new cpsw switch drv
  ARM: dts: beagle-x15: switch to new cpsw switch drv
  ARM: dts: am57xx-idk: switch to new cpsw switch drv
  ARM: dts: am5729: beagleboneai: switch to new cpsw switch drv
  ARM: dts: am43xx: replace status value "ok" by "okay"
  ARM: dts: dra7xx: replace status value "ok" by "okay"
  ARM: dts: omap: replace status value "ok" by "okay"
  ARM: dts: n9, n950: Remove nokia,nvm-size property

Link: https://lore.kernel.org/r/pull-1601445968-476435@atomide.com-2


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 02d0bf1a 5e7998b8

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

+4 −0
Original line number Diff line number Diff line
@@ -160,11 +160,15 @@ 
	serial_config1: serial_config1@20 {

		compatible = "nxp,pca9539";

		reg = <0x20>;

		gpio-controller;

		#gpio-cells = <2>;

	};



	serial_config2: serial_config2@21 {

		compatible = "nxp,pca9539";

		reg = <0x21>;

		gpio-controller;

		#gpio-cells = <2>;

	};



	tps: tps@2d {

arch/arm/boot/dts/am335x-sbc-t335.dts

+2 −2
Original line number Diff line number Diff line
@@ -155,13 +155,13 @@ 
		gpio-controller;

		#gpio-cells = <2>;

		reg = <0x26>;

		dvi_ena {

		dvi-ena-hog {

			gpio-hog;

			gpios = <13 GPIO_ACTIVE_HIGH>;

			output-high;

			line-name = "dvi-enable";

		};

		lcd_ena {

		lcd-ena-hog {

			gpio-hog;

			gpios = <11 GPIO_ACTIVE_HIGH>;

			output-high;

arch/arm/boot/dts/am3517-evm-ui.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -183,14 +183,14 @@ 
};



&mcbsp1 {

	status = "ok";

	status = "okay";

	#sound-dai-cells = <0>;

	pinctrl-names = "default";

	pinctrl-0 = <&mcbsp1_pins>;

};



&mcbsp2 {

	status = "ok";

	status = "okay";

	#sound-dai-cells = <0>;

	pinctrl-names = "default";

	pinctrl-0 = <&mcbsp2_pins>;

arch/arm/boot/dts/am3517-evm.dts

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ 
};



&dss {

	status = "ok";

	status = "okay";



	pinctrl-names = "default";

	pinctrl-0 = <&dss_dpi_pins>;

arch/arm/boot/dts/am3874-iceboard.dts

+4 −4
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ 
					"FMCA_PG_C2M", "FMCA_PRSNT_M2C_L", "FMCA_CLK_DIR", "SFP_LOS",

					"FMCB_EN_12V0", "FMCB_EN_3V3", "FMCB_EN_VADJ", "FMCB_PG_M2C",

					"FMCB_PG_C2M", "FMCB_PRSNT_M2C_L", "FMCB_CLK_DIR", "SFP_ModPrsL";

				reset_gpios = <&gpio2 11 GPIO_ACTIVE_LOW>;

				reset-gpios = <&gpio2 11 GPIO_ACTIVE_LOW>;

			};



			u42: pca9575@21 {
@@ -208,7 +208,7 @@ 
					"QSFPA_LPMode", "QSFPB_ModPrsL", "QSFPB_IntL", "QSFPB_ResetL",

					"SFP_TxFault", "SFP_TxDisable", "SFP_RS0", "SFP_RS1",

					"QSFPB_ModSelL", "QSFPB_LPMode", "SEL_SFP", "ARM_MR";

				reset_gpios = <&gpio2 11 GPIO_ACTIVE_LOW>;

				reset-gpios = <&gpio2 11 GPIO_ACTIVE_LOW>;

			};



			u48: pca9575@22 {
@@ -227,7 +227,7 @@ 
					"GP_SW5", "GP_SW6", "GP_SW7", "GP_SW8",

					"GP_LED8", "GP_LED7", "GP_LED6", "GP_LED5",

					"GP_LED4", "GP_LED3", "GP_LED2", "GP_LED1";

				reset_gpios = <&gpio2 11 GPIO_ACTIVE_LOW>;

				reset-gpios = <&gpio2 11 GPIO_ACTIVE_LOW>;

			};



			u59: pca9575@23 {
@@ -240,7 +240,7 @@ 
					"GTX1V8PowerFault", "PHYAPowerFault", "PHYBPowerFault", "ArmPowerFault",

					"BP_SLOW_GPIO0", "BP_SLOW_GPIO1", "BP_SLOW_GPIO2", "BP_SLOW_GPIO3",

					"BP_SLOW_GPIO4", "BP_SLOW_GPIO5", "__unused_u59_p16", "__unused_u59_p17";

				reset_gpios = <&gpio2 11 GPIO_ACTIVE_LOW>;

				reset-gpios = <&gpio2 11 GPIO_ACTIVE_LOW>;

			};



			tmp100@48 { compatible = "ti,tmp100"; reg = <0x48>; };

CRA Git | Maintained and supported by SUSTech CRA and CCSE