Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d4b80d9a authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'next/late' with mainline 



* next/late: (25 commits)
  arm64: dts: exynos: Add regulators for Vbus and Vbus-Boost
  arm64: dts: exynos: Add USB 3.0 controller node for Exynos7
  arm64: dts: exynos: Use macros for pinctrl configuration on Exynos7
  pinctrl: dt-bindings: samsung: Add Exynos7 specific pinctrl macro definitions
  arm64: dts: exynos: Add initial configuration for DISP clocks for TM2/TM2e
  ARM64: dts: meson-gxbb-p200: add ADC laddered keys
  ARM64: dts: meson: meson-gx: add the SAR ADC
  ARM64: dts: meson-gxl: add the pwm_ao_b pin
  ARM64: dts: meson-gx: add the missing pwm_AO_ab node
  clk: gxbb: fix CLKID_ETH defined twice
  clk: samsung: exynos5433: Add data for 250MHz and 278MHz PLL rates
  clk: samsung: exynos5433: Add IDs for PHYCLK_MIPIDPHY0_* clocks
  ARM64: dts: meson-gxl: rename Nexbox A95x for consistency
  clk: gxbb: add the SAR ADC clocks and expose them
  dt-bindings: amlogic: Add WeTek boards
  ARM64: dts: meson-gxbb: Add support for WeTek Hub and Play
  dt-bindings: vendor-prefix: Add wetek vendor prefix
  ARM64: dts: meson-gxm: Rename q200 and q201 DT files for consistency
  ARM64: dts: meson-gx: Add HDMI HPD/DDC pinctrl nodes
  ARM64: dts: meson-gxbb-vega-s95: Add LED
  ...

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents b2e3c431 3e011039

Documentation/devicetree/bindings/arm/amlogic.txt

+2 −0
Original line number Diff line number Diff line
@@ -40,6 +40,8 @@ Board compatible values: 
  - "hardkernel,odroid-c2" (Meson gxbb)

  - "amlogic,p200" (Meson gxbb)

  - "amlogic,p201" (Meson gxbb)

  - "wetek,hub" (Meson gxbb)

  - "wetek,play2" (Meson gxbb)

  - "amlogic,p212" (Meson gxl s905x)

  - "amlogic,p230" (Meson gxl s905d)

  - "amlogic,p231" (Meson gxl s905d)

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -329,6 +329,7 @@ virtio Virtual I/O Device Specification, developed by the OASIS consortium 
vivante	Vivante Corporation

voipac	Voipac Technologies s.r.o.

wd	Western Digital Corp.

wetek	WeTek Electronics, limited.

wexler	Wexler

winbond Winbond Electronics corp.

wlf	Wolfson Microelectronics

arch/arm64/boot/dts/amlogic/Makefile

+5 −3
Original line number Diff line number Diff line
@@ -5,12 +5,14 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-p201.dtb 
dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-vega-s95-pro.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-vega-s95-meta.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-vega-s95-telos.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-wetek-hub.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-wetek-play2.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-p212.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-p230.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-p231.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxl-nexbox-a95x.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxm-s912-q200.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxm-s912-q201.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-nexbox-a95x.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxm-q200.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxm-q201.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxm-nexbox-a1.dtb



always		:= $(dtb-y)

arch/arm64/boot/dts/amlogic/meson-gx.dtsi

+68 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ 
			reg = <0x0 0x0>;

			enable-method = "psci";

			next-level-cache = <&l2>;

			clocks = <&scpi_dvfs 0>;

		};



		cpu1: cpu@1 {
@@ -91,6 +92,7 @@ 
			reg = <0x0 0x1>;

			enable-method = "psci";

			next-level-cache = <&l2>;

			clocks = <&scpi_dvfs 0>;

		};



		cpu2: cpu@2 {
@@ -99,6 +101,7 @@ 
			reg = <0x0 0x2>;

			enable-method = "psci";

			next-level-cache = <&l2>;

			clocks = <&scpi_dvfs 0>;

		};



		cpu3: cpu@3 {
@@ -107,6 +110,7 @@ 
			reg = <0x0 0x3>;

			enable-method = "psci";

			next-level-cache = <&l2>;

			clocks = <&scpi_dvfs 0>;

		};



		l2: l2-cache0 {
@@ -171,6 +175,28 @@ 
		};

	};



	scpi {

		compatible = "amlogic,meson-gxbb-scpi", "arm,scpi-pre-1.0";

		mboxes = <&mailbox 1 &mailbox 2>;

		shmem = <&cpu_scp_lpri &cpu_scp_hpri>;



		scpi_clocks: clocks {

			compatible = "arm,scpi-clocks";



			scpi_dvfs: scpi_clocks@0 {

				compatible = "arm,scpi-dvfs-clocks";

				#clock-cells = <1>;

				clock-indices = <0>;

				clock-output-names = "vcpu";

			};

		};



		scpi_sensors: sensors {

			compatible = "arm,scpi-sensors";

			#thermal-sensor-cells = <1>;

		};

	};



	soc {

		compatible = "simple-bus";

		#address-cells = <2>;
@@ -229,6 +255,14 @@ 
				status = "disabled";

			};



			saradc: adc@8680 {

				compatible = "amlogic,meson-saradc";

				reg = <0x0 0x8680 0x0 0x34>;

				#io-channel-cells = <1>;

				interrupts = <GIC_SPI 73 IRQ_TYPE_EDGE_RISING>;

				status = "disabled";

			};



			pwm_ef: pwm@86c0 {

				compatible = "amlogic,meson-gx-pwm", "amlogic,meson-gxbb-pwm";

				reg = <0x0 0x086c0 0x0 0x10>;
@@ -282,6 +316,25 @@ 
			#address-cells = <0>;

		};



		sram: sram@c8000000 {

			compatible = "amlogic,meson-gxbb-sram", "mmio-sram";

			reg = <0x0 0xc8000000 0x0 0x14000>;



			#address-cells = <1>;

			#size-cells = <1>;

			ranges = <0 0x0 0xc8000000 0x14000>;



			cpu_scp_lpri: scp-shmem@0 {

				compatible = "amlogic,meson-gxbb-scp-shmem";

				reg = <0x13000 0x400>;

			};



			cpu_scp_hpri: scp-shmem@200 {

				compatible = "amlogic,meson-gxbb-scp-shmem";

				reg = <0x13400 0x400>;

			};

		};



		aobus: aobus@c8100000 {

			compatible = "simple-bus";

			reg = <0x0 0xc8100000 0x0 0x100000>;
@@ -297,6 +350,21 @@ 
				status = "disabled";

			};



			uart_AO_B: serial@4e0 {

				compatible = "amlogic,meson-uart";

				reg = <0x0 0x004e0 0x0 0x14>;

				interrupts = <GIC_SPI 197 IRQ_TYPE_EDGE_RISING>;

				clocks = <&xtal>;

				status = "disabled";

			};



			pwm_AO_ab: pwm@550 {

				compatible = "amlogic,meson-gx-pwm", "amlogic,meson-gxbb-pwm";

				reg = <0x0 0x00550 0x0 0x10>;

				#pwm-cells = <3>;

				status = "disabled";

			};



			ir: ir@580 {

				compatible = "amlogic,meson-gxbb-ir";

				reg = <0x0 0x00580 0x0 0x40>;

arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts

+50 −0
Original line number Diff line number Diff line
@@ -45,10 +45,55 @@ 
/dts-v1/;



#include "meson-gxbb-p20x.dtsi"

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



/ {

	compatible = "amlogic,p200", "amlogic,meson-gxbb";

	model = "Amlogic Meson GXBB P200 Development Board";



	avdd18_usb_adc: regulator-avdd18_usb_adc {

		compatible = "regulator-fixed";

		regulator-name = "AVDD18_USB_ADC";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

	};



	adc_keys {

		compatible = "adc-keys";

		io-channels = <&saradc 0>;

		io-channel-names = "buttons";

		keyup-threshold-microvolt = <1800000>;



		button-home {

			label = "Home";

			linux,code = <KEY_HOME>;

			press-threshold-microvolt = <900000>; /* 50% */

		};



		button-esc {

			label = "Esc";

			linux,code = <KEY_ESC>;

			press-threshold-microvolt = <684000>; /* 38% */

		};



		button-up {

			label = "Volume Up";

			linux,code = <KEY_VOLUMEUP>;

			press-threshold-microvolt = <468000>; /* 26% */

		};



		button-down {

			label = "Volume Down";

			linux,code = <KEY_VOLUMEDOWN>;

			press-threshold-microvolt = <252000>; /* 14% */

		};



		button-menu {

			label = "Menu";

			linux,code = <KEY_MENU>;

			press-threshold-microvolt = <0>; /* 0% */

		};

	};

};



&i2c_B {
@@ -56,3 +101,8 @@ 
	pinctrl-0 = <&i2c_b_pins>;

	pinctrl-names = "default";

};



&saradc {

	status = "okay";

	vref-supply = <&avdd18_usb_adc>;

};