Unverified Commit f86f3e40 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v5.16-rockchip-dts32-1' of... 

Merge tag 'v5.16-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/dt

ADC-keys for the mk808 board and a number of further cleanups
to make dt-schema happier.

* tag 'v5.16-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: swap timer clock-names
  ARM: dts: rockchip: add more angle brackets to operating-points property on rk3066a
  ARM: dts: rockchip: rename opp-table node names
  ARM: dts: rockchip: change rv1108 gmac nodename
  ARM: dts: rockchip: add adc-keys node to rk3066a-mk808

Link: https://lore.kernel.org/r/5121280.Lt9SDvczpP@phil


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 0ddc52da 3e6f8124

arch/arm/boot/dts/rk3036.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -416,8 +416,8 @@ timer: timer@20044000 { 
		compatible = "rockchip,rk3036-timer", "rockchip,rk3288-timer";

		reg = <0x20044000 0x20>;

		interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&xin24m>, <&cru PCLK_TIMER>;

		clock-names = "timer", "pclk";

		clocks = <&cru PCLK_TIMER>, <&xin24m>;

		clock-names = "pclk", "timer";

	};



	pwm0: pwm@20050000 {

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

+27 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
 */



/dts-v1/;

#include <dt-bindings/input/input.h>

#include "rk3066a.dtsi"



/ {
@@ -24,6 +25,20 @@ memory@60000000 { 
		device_type = "memory";

	};



	adc-keys {

		compatible = "adc-keys";

		io-channels = <&saradc 1>;

		io-channel-names = "buttons";

		keyup-threshold-microvolt = <2500000>;

		poll-interval = <100>;



		recovery {

			label = "recovery";

			linux,code = <KEY_VENDOR>;

			press-threshold-microvolt = <0>;

		};

	};



	gpio-leds {

		compatible = "gpio-leds";
@@ -46,6 +61,13 @@ hdmi_con_in: endpoint { 
		};

	};



	vcc_2v5: vcc-2v5 {

		compatible = "regulator-fixed";

		regulator-name = "vcc_2v5";

		regulator-min-microvolt = <2500000>;

		regulator-max-microvolt = <2500000>;

	};



	vcc_io: vcc-io {

		compatible = "regulator-fixed";

		regulator-name = "vcc_io";
@@ -164,6 +186,11 @@ wifi_pwr: wifi-pwr { 
	};

};



&saradc {

	vref-supply = <&vcc_2v5>;

	status = "okay";

};



&uart2 {

	status = "okay";

};

arch/arm/boot/dts/rk3066a.dtsi

+8 −9
Original line number Diff line number Diff line
@@ -23,16 +23,15 @@ cpu0: cpu@0 { 
			compatible = "arm,cortex-a9";

			next-level-cache = <&L2>;

			reg = <0x0>;

			operating-points = <

			operating-points =

				/* kHz    uV */

				1416000 1300000

				1200000 1175000

				1008000 1125000

				816000  1125000

				600000  1100000

				504000  1100000

				312000  1075000

			>;

				<1416000 1300000>,

				<1200000 1175000>,

				<1008000 1125000>,

				<816000  1125000>,

				<600000  1100000>,

				<504000  1100000>,

				<312000  1075000>;

			clock-latency = <40000>;

			clocks = <&cru ARMCLK>;

		};

arch/arm/boot/dts/rk3188.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ cpu3: cpu@3 { 
		};

	};



	cpu0_opp_table: opp_table0 {

	cpu0_opp_table: opp-table-0 {

		compatible = "operating-points-v2";

		opp-shared;

arch/arm/boot/dts/rk3229.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ / { 


	/delete-node/ opp-table0;



	cpu0_opp_table: opp_table0 {

	cpu0_opp_table: opp-table-0 {

		compatible = "operating-points-v2";

		opp-shared;