Commit 1e548b67 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'samsung-dt-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/dt 

Samsung DTS ARM changes for v5.11

1. Many cleanups of DTS and alignments to dtschema. Most of them do not
   have any functional effect except passing dtschema checks or dtc W=2
   builds.
2. Fix USB 3.0 ports on Odroid XU board: wrong roles assigned to two
   ports, missing supply to the USB over-current and VBUS control pins
   and finally missing pin configuration for these pins.
3. Switch Exynos5422 DMC driver to monitoring/polling mode, instead of
   using interrupts.
4. Correct the usage of "opp-shared" properties which lead to disabling
   the bus frequency and voltage scaling.
5. Enable Bluetooth on few Exynos4210 and Exynos4412 boards.
6. Enable dual-role USB on Odroid U3+ board.
7. Add Ethernet description in multiple Odroid DTS allowing also easy
   MAC address filling by bootloader.
8. Add Ethernet to Artik 5 (Exynos3250) board.
9. Add interconnect properties to Exynos4412 to fix old Mixer issues.

* tag 'samsung-dt-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux: (36 commits)
  ARM: dts: exynos: use hyphens in MFC reserved memory node names
  ARM: dts: exynos: use hyphens in Exynos5 node names
  ARM: dts: exynos: use generic name for max77693 motor in Midas
  ARM: dts: exynos: use hyphens in Exynos4 node names
  ARM: dts: exynos: use hyphens in Exynos3250 node names
  ARM: dts: exynos: Add interconnects to Exynos4412 mixer
  ARM: dts: exynos: Add interconnect properties to Exynos4412 bus nodes
  ARM: dts: exynos: Add Ethernet to Artik 5 board
  ARM: dts: exynos: Add a placeholder for a MAC address
  ARM: dts: exynos: Add Ethernet interface description for Odroid X/X2
  ARM: dts: exynos: Add Ethernet interface description for Odroid U3
  ARM: dts: exynos: Add Ethernet interface description for Odroid XU
  ARM: dts: exynos: Add Ethernet interface description for Odroid XU3 Lite
  ARM: dts: exynos: Enable DWC2 dual-role support on OdroidU3+ boards
  ARM: dts: s5pv210: adjust node names to DT spec
  ARM: dts: exynos: adjust node names to DT spec in Exynos542x boards
  ARM: dts: exynos: adjust node names to DT spec in Odroid XU
  ARM: dts: exynos: adjust node names to DT spec in Exynos5250 boards
  ARM: dts: exynos: remove redundant status=okay in Exynos4412 boards
  ARM: dts: exynos: adjust node names to DT spec in Exynos4412 boards
  ...

Link: https://lore.kernel.org/r/20201113162211.10020-2-krzk@kernel.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 019d70bf 73f882a0

arch/arm/boot/dts/exynos-mfc-reserved-memory.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -11,14 +11,14 @@ reserved-memory { 
		#size-cells = <1>;

		ranges;



		mfc_left: region_mfc_left {

		mfc_left: region-mfc-left {

			compatible = "shared-dma-pool";

			no-map;

			size = <0x2400000>;

			alignment = <0x100000>;

		};



		mfc_right: region_mfc_right {

		mfc_right: region-mfc-right {

			compatible = "shared-dma-pool";

			no-map;

			size = <0x800000>;

arch/arm/boot/dts/exynos3250-artik5-eval.dts

+29 −0
Original line number Diff line number Diff line
@@ -37,3 +37,32 @@ &mshc_2 { 
&serial_2 {

	status = "okay";

};



&spi_0 {

	status = "okay";

	cs-gpios = <&gpx3 4 GPIO_ACTIVE_LOW>, <0>;



	assigned-clocks = <&cmu CLK_MOUT_MPLL>, <&cmu CLK_DIV_MPLL_PRE>,

			  <&cmu CLK_MOUT_SPI0>, <&cmu CLK_DIV_SPI0>,

			  <&cmu CLK_DIV_SPI0_PRE>, <&cmu CLK_SCLK_SPI0>;

	assigned-clock-parents = <&cmu CLK_FOUT_MPLL>,    /* for: CLK_MOUT_MPLL */

				 <&cmu CLK_MOUT_MPLL>,    /* for: CLK_DIV_MPLL_PRE */

				 <&cmu CLK_DIV_MPLL_PRE>, /* for: CLK_MOUT_SPI0 */

				 <&cmu CLK_MOUT_SPI0>,    /* for: CLK_DIV_SPI0 */

				 <&cmu CLK_DIV_SPI0>,     /* for: CLK_DIV_SPI0_PRE */

				 <&cmu CLK_DIV_SPI0_PRE>; /* for: CLK_SCLK_SPI0 */



	ethernet@0 {

		compatible = "asix,ax88796c";

		reg = <0x0>;

		local-mac-address = [00 00 00 00 00 00]; /* Filled in by a boot-loader */

		interrupt-parent = <&gpx2>;

		interrupts = <0 IRQ_TYPE_LEVEL_LOW>;

		spi-max-frequency = <40000000>;

		reset-gpios = <&gpe0 2 GPIO_ACTIVE_LOW>;



		controller-data {

			samsung,spi-feedback-delay = <2>;

		};

	};

};

arch/arm/boot/dts/exynos3250-artik5.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ &i2c_0 { 
	samsung,i2c-max-bus-freq = <100000>;

	status = "okay";



	s2mps14_pmic@66 {

	pmic@66 {

		compatible = "samsung,s2mps14-pmic";

		interrupt-parent = <&gpx3>;

		interrupts = <5 IRQ_TYPE_NONE>;

arch/arm/boot/dts/exynos3250-monk.dts

+4 −4
Original line number Diff line number Diff line
@@ -34,10 +34,10 @@ firmware@205f000 { 
		reg = <0x0205F000 0x1000>;

	};



	gpio_keys {

	gpio-keys {

		compatible = "gpio-keys";



		power_key {

		power-key {

			gpios = <&gpx2 7 GPIO_ACTIVE_LOW>;

			linux,code = <KEY_POWER>;

			label = "power key";
@@ -62,7 +62,7 @@ i2c_max77836: i2c-gpio-0 { 
		#address-cells = <1>;

		#size-cells = <0>;



		max77836: subpmic@25 {

		max77836: pmic@25 {

			compatible = "maxim,max77836";

			interrupt-parent = <&gpx1>;

			interrupts = <5 IRQ_TYPE_NONE>;
@@ -197,7 +197,7 @@ &i2c_0 { 
	samsung,i2c-max-bus-freq = <100000>;

	status = "okay";



	s2mps14_pmic@66 {

	pmic@66 {

		compatible = "samsung,s2mps14-pmic";

		interrupt-parent = <&gpx0>;

		interrupts = <7 IRQ_TYPE_NONE>;

arch/arm/boot/dts/exynos3250-rinato.dts

+4 −4
Original line number Diff line number Diff line
@@ -38,10 +38,10 @@ firmware@205f000 { 
		reg = <0x0205F000 0x1000>;

	};



	gpio_keys {

	gpio-keys {

		compatible = "gpio-keys";



		power_key {

		power-key {

			gpios = <&gpx2 7 GPIO_ACTIVE_LOW>;

			linux,code = <KEY_POWER>;

			label = "power key";
@@ -62,7 +62,7 @@ i2c_max77836: i2c-gpio-0 { 
		#address-cells = <1>;

		#size-cells = <0>;



		max77836: subpmic@25 {

		max77836: pmic@25 {

			compatible = "maxim,max77836";

			interrupt-parent = <&gpx1>;

			interrupts = <5 IRQ_TYPE_NONE>;
@@ -267,7 +267,7 @@ &i2c_0 { 
	samsung,i2c-max-bus-freq = <100000>;

	status = "okay";



	s2mps14_pmic@66 {

	pmic@66 {

		compatible = "samsung,s2mps14-pmic";

		interrupt-parent = <&gpx0>;

		interrupts = <7 IRQ_TYPE_NONE>;