Commit b04544ac authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski
Browse files

ARM: dts: s5pv210: adjust node names to DT spec 



The Devicetree specification expects device node names to have a generic
name, representing the class of a device.  Also the convention for node
names is to use hyphens, not underscores.

No functional changes.

Signed-off-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
Link: https://lore.kernel.org/r/20201027170947.132725-10-krzk@kernel.org
parent 77c91853

arch/arm/boot/dts/s5pv210-aquila.dts

+6 −6
Original line number Original line Diff line number Diff line
@@ -277,37 +277,37 @@ 
			<&keypad_col0>, <&keypad_col1>, <&keypad_col2>;

			<&keypad_col0>, <&keypad_col1>, <&keypad_col2>;

	status = "okay";

	status = "okay";





	key_1 {

	key-1 {

		keypad,row = <0>;

		keypad,row = <0>;

		keypad,column = <1>;

		keypad,column = <1>;

		linux,code = <KEY_CONNECT>;

		linux,code = <KEY_CONNECT>;

	};

	};





	key_2 {

	key-2 {

		keypad,row = <0>;

		keypad,row = <0>;

		keypad,column = <2>;

		keypad,column = <2>;

		linux,code = <KEY_BACK>;

		linux,code = <KEY_BACK>;

	};

	};





	key_3 {

	key-3 {

		keypad,row = <1>;

		keypad,row = <1>;

		keypad,column = <1>;

		keypad,column = <1>;

		linux,code = <KEY_CAMERA_FOCUS>;

		linux,code = <KEY_CAMERA_FOCUS>;

	};

	};





	key_4 {

	key-4 {

		keypad,row = <1>;

		keypad,row = <1>;

		keypad,column = <2>;

		keypad,column = <2>;

		linux,code = <KEY_VOLUMEUP>;

		linux,code = <KEY_VOLUMEUP>;

	};

	};





	key_5 {

	key-5 {

		keypad,row = <2>;

		keypad,row = <2>;

		keypad,column = <1>;

		keypad,column = <1>;

		linux,code = <KEY_CAMERA>;

		linux,code = <KEY_CAMERA>;

	};

	};





	key_6 {

	key-6 {

		keypad,row = <2>;

		keypad,row = <2>;

		keypad,column = <2>;

		keypad,column = <2>;

		linux,code = <KEY_VOLUMEDOWN>;

		linux,code = <KEY_VOLUMEDOWN>;

arch/arm/boot/dts/s5pv210-aries.dtsi

+2 −2
Original line number Original line Diff line number Diff line
@@ -54,7 +54,7 @@ 
		clock-frequency = <32768>;

		clock-frequency = <32768>;

	};

	};





	bt_codec: bt_sco {

	bt_codec: bt-sco {

		compatible = "linux,bt-sco";

		compatible = "linux,bt-sco";

		#sound-dai-cells = <0>;

		#sound-dai-cells = <0>;

	};

	};
@@ -113,7 +113,7 @@ 
		pinctrl-names = "default";

		pinctrl-names = "default";

		pinctrl-0 = <&sound_i2c_pins>;

		pinctrl-0 = <&sound_i2c_pins>;





		wm8994: wm8994@1a {

		wm8994: audio-codec@1a {

			compatible = "wlf,wm8994";

			compatible = "wlf,wm8994";

			reg = <0x1a>;

			reg = <0x1a>;

arch/arm/boot/dts/s5pv210-goni.dts

+7 −7
Original line number Original line Diff line number Diff line
@@ -259,37 +259,37 @@ 
			<&keypad_col0>, <&keypad_col1>, <&keypad_col2>;

			<&keypad_col0>, <&keypad_col1>, <&keypad_col2>;

	status = "okay";

	status = "okay";





	key_1 {

	key-1 {

		keypad,row = <0>;

		keypad,row = <0>;

		keypad,column = <1>;

		keypad,column = <1>;

		linux,code = <KEY_CONNECT>;

		linux,code = <KEY_CONNECT>;

	};

	};





	key_2 {

	key-2 {

		keypad,row = <0>;

		keypad,row = <0>;

		keypad,column = <2>;

		keypad,column = <2>;

		linux,code = <KEY_BACK>;

		linux,code = <KEY_BACK>;

	};

	};





	key_3 {

	key-3 {

		keypad,row = <1>;

		keypad,row = <1>;

		keypad,column = <1>;

		keypad,column = <1>;

		linux,code = <KEY_CAMERA_FOCUS>;

		linux,code = <KEY_CAMERA_FOCUS>;

	};

	};





	key_4 {

	key-4 {

		keypad,row = <1>;

		keypad,row = <1>;

		keypad,column = <2>;

		keypad,column = <2>;

		linux,code = <KEY_VOLUMEUP>;

		linux,code = <KEY_VOLUMEUP>;

	};

	};





	key_5 {

	key-5 {

		keypad,row = <2>;

		keypad,row = <2>;

		keypad,column = <1>;

		keypad,column = <1>;

		linux,code = <KEY_CAMERA>;

		linux,code = <KEY_CAMERA>;

	};

	};





	key_6 {

	key-6 {

		keypad,row = <2>;

		keypad,row = <2>;

		keypad,column = <2>;

		keypad,column = <2>;

		linux,code = <KEY_VOLUMEDOWN>;

		linux,code = <KEY_VOLUMEDOWN>;
@@ -353,7 +353,7 @@ 
	samsung,i2c-slave-addr = <0x10>;

	samsung,i2c-slave-addr = <0x10>;

	status = "okay";

	status = "okay";





	tsp@4a {

	touchscreen@4a {

		compatible = "atmel,maxtouch";

		compatible = "atmel,maxtouch";

		reg = <0x4a>;

		reg = <0x4a>;

		interrupt-parent = <&gpj0>;

		interrupt-parent = <&gpj0>;

arch/arm/boot/dts/s5pv210-smdkv210.dts

+10 −10
Original line number Original line Diff line number Diff line
@@ -76,61 +76,61 @@ 
			<&keypad_col6>, <&keypad_col7>;

			<&keypad_col6>, <&keypad_col7>;

	status = "okay";

	status = "okay";





	key_1 {

	key-1 {

		keypad,row = <0>;

		keypad,row = <0>;

		keypad,column = <3>;

		keypad,column = <3>;

		linux,code = <KEY_1>;

		linux,code = <KEY_1>;

	};

	};





	key_2 {

	key-2 {

		keypad,row = <0>;

		keypad,row = <0>;

		keypad,column = <4>;

		keypad,column = <4>;

		linux,code = <KEY_2>;

		linux,code = <KEY_2>;

	};

	};





	key_3 {

	key-3 {

		keypad,row = <0>;

		keypad,row = <0>;

		keypad,column = <5>;

		keypad,column = <5>;

		linux,code = <KEY_3>;

		linux,code = <KEY_3>;

	};

	};





	key_4 {

	key-4 {

		keypad,row = <0>;

		keypad,row = <0>;

		keypad,column = <6>;

		keypad,column = <6>;

		linux,code = <KEY_4>;

		linux,code = <KEY_4>;

	};

	};





	key_5 {

	key-5 {

		keypad,row = <0

		keypad,row = <0

		>;

		>;

		keypad,column = <7>;

		keypad,column = <7>;

		linux,code = <KEY_5>;

		linux,code = <KEY_5>;

	};

	};





	key_6 {

	key-6 {

		keypad,row = <1>;

		keypad,row = <1>;

		keypad,column = <3>;

		keypad,column = <3>;

		linux,code = <KEY_A>;

		linux,code = <KEY_A>;

	};

	};

	key_7 {

	key-7 {

		keypad,row = <1>;

		keypad,row = <1>;

		keypad,column = <4>;

		keypad,column = <4>;

		linux,code = <KEY_B>;

		linux,code = <KEY_B>;

	};

	};





	key_8 {

	key-8 {

		keypad,row = <1>;

		keypad,row = <1>;

		keypad,column = <5>;

		keypad,column = <5>;

		linux,code = <KEY_C>;

		linux,code = <KEY_C>;

	};

	};





	key_9 {

	key-9 {

		keypad,row = <1>;

		keypad,row = <1>;

		keypad,column = <6>;

		keypad,column = <6>;

		linux,code = <KEY_D>;

		linux,code = <KEY_D>;

	};

	};





	key_10 {

	key-10 {

		keypad,row = <1>;

		keypad,row = <1>;

		keypad,column = <7>;

		keypad,column = <7>;

		linux,code = <KEY_E>;

		linux,code = <KEY_E>;