ARM: dts: uses handles to reference nodes for changes (fcbbf965) · Commits · 戴 / test

arch/arm/boot/dts/rk3066a-bqcurie2.dts

+43 −48

Original line number	Diff line number	Diff line
		@@ -24,24 +24,6 @@
		reg = <0x60000000 0x40000000>;
		};

		uart0: serial@10124000 {
		status = "okay";
		};

		uart1: serial@10126000 {
		status = "okay";
		};

		uart2: serial@20064000 {
		pinctrl-names = "default";
		pinctrl-0 = <&uart2_xfer>;
		status = "okay";
		};

		uart3: serial@20068000 {
		status = "okay";
		};

		vcc_sd0: fixed-regulator {
		compatible = "regulator-fixed";
		regulator-name = "sdmmc-supply";
		@@ -51,12 +33,35 @@
		startup-delay-us = <100000>;
		};

		dwmmc@10214000 { /* sdmmc */
		gpio-keys {
		compatible = "gpio-keys";
		#address-cells = <1>;
		#size-cells = <0>;
		autorepeat;

		button@0 {
		gpios = <&gpio6 2 GPIO_ACTIVE_LOW>; /* GPIO6_A2 */
		linux,code = <116>;
		label = "GPIO Key Power";
		linux,input-type = <1>;
		gpio-key,wakeup = <1>;
		debounce-interval = <100>;
		};
		button@1 {
		gpios = <&gpio4 21 GPIO_ACTIVE_LOW>; /* GPIO4_C5 */
		linux,code = <104>;
		label = "GPIO Key Vol-";
		linux,input-type = <1>;
		gpio-key,wakeup = <0>;
		debounce-interval = <100>;
		};
		/* VOL+ comes somehow thru the ADC */
		};
		};

		&mmc0 { /* sdmmc */
		num-slots = <1>;
		status = "okay";

		pinctrl-names = "default";
		pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_cd &sd0_bus4>;
		vmmc-supply = <&vcc_sd0>;

		slot@0 {
		@@ -66,7 +71,7 @@
		};
		};

		dwmmc@10218000 { /* wifi */
		&mmc1 { /* wifi */
		num-slots = <1>;
		status = "okay";
		non-removable;
		@@ -81,28 +86,18 @@
		};
		};

		gpio-keys {
		compatible = "gpio-keys";
		#address-cells = <1>;
		#size-cells = <0>;
		autorepeat;

		button@0 {
		gpios = <&gpio6 2 GPIO_ACTIVE_LOW>; /* GPIO6_A2 */
		linux,code = <116>;
		label = "GPIO Key Power";
		linux,input-type = <1>;
		gpio-key,wakeup = <1>;
		debounce-interval = <100>;
		&uart0 {
		status = "okay";
		};
		button@1 {
		gpios = <&gpio4 21 GPIO_ACTIVE_LOW>; /* GPIO4_C5 */
		linux,code = <104>;
		label = "GPIO Key Vol-";
		linux,input-type = <1>;
		gpio-key,wakeup = <0>;
		debounce-interval = <100>;

		&uart1 {
		status = "okay";
		};
		/* VOL+ comes somehow thru the ADC */

		&uart2 {
		status = "okay";
		};

		&uart3 {
		status = "okay";
		};

arch/arm/boot/dts/rk3066a.dtsi

+30 −0

Original line number	Diff line number	Diff line
		@@ -291,3 +291,33 @@
		};
		};
		};

		&mmc0 {
		pinctrl-names = "default";
		pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_cd &sd0_bus4>;
		};

		&mmc1 {
		pinctrl-names = "default";
		pinctrl-0 = <&sd1_clk &sd1_cmd &sd1_cd &sd1_bus4>;
		};

		&uart0 {
		pinctrl-names = "default";
		pinctrl-0 = <&uart0_xfer>;
		};

		&uart1 {
		pinctrl-names = "default";
		pinctrl-0 = <&uart1_xfer>;
		};

		&uart2 {
		pinctrl-names = "default";
		pinctrl-0 = <&uart2_xfer>;
		};

		&uart3 {
		pinctrl-names = "default";
		pinctrl-0 = <&uart3_xfer>;
		};

arch/arm/boot/dts/rk3188-radxarock.dts

+18 −18

Original line number	Diff line number	Diff line
		@@ -23,24 +23,6 @@
		reg = <0x60000000 0x80000000>;
		};

		uart0: serial@10124000 {
		status = "okay";
		};

		uart1: serial@10126000 {
		status = "okay";
		};

		uart2: serial@20064000 {
		pinctrl-names = "default";
		pinctrl-0 = <&uart2_xfer>;
		status = "okay";
		};

		uart3: serial@20068000 {
		status = "okay";
		};

		gpio-keys {
		compatible = "gpio-keys";
		#address-cells = <1>;
		@@ -76,3 +58,21 @@
		};
		};
		};

		&uart0 {
		status = "okay";
		};

		&uart1 {
		status = "okay";
		};

		&uart2 {
		pinctrl-names = "default";
		pinctrl-0 = <&uart2_xfer>;
		status = "okay";
		};

		&uart3 {
		status = "okay";
		};

arch/arm/boot/dts/rk3188.dtsi

+28 −8

Original line number	Diff line number	Diff line
		@@ -52,14 +52,6 @@
		};
		};

		global-timer@1013c200 {
		interrupts = <GIC_PPI 11 0xf04>;
		};

		local-timer@1013c600 {
		interrupts = <GIC_PPI 13 0xf04>;
		};

		sram: sram@10080000 {
		compatible = "mmio-sram";
		reg = <0x10080000 0x8000>;
		@@ -271,3 +263,31 @@
		};
		};
		};

		&global_timer {
		interrupts = <GIC_PPI 11 0xf04>;
		};

		&local_timer {
		interrupts = <GIC_PPI 13 0xf04>;
		};

		&uart0 {
		pinctrl-names = "default";
		pinctrl-0 = <&uart0_xfer>;
		};

		&uart1 {
		pinctrl-names = "default";
		pinctrl-0 = <&uart1_xfer>;
		};

		&uart2 {
		pinctrl-names = "default";
		pinctrl-0 = <&uart2_xfer>;
		};

		&uart3 {
		pinctrl-names = "default";
		pinctrl-0 = <&uart3_xfer>;
		};

Admin message