Commit 333524bc authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'samsung-dt64-4.21' of... 

Merge tag 'samsung-dt64-4.21' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/dt

Samsung DTS ARM64 changes for v4.21

1. Update DWC3 hardware modules to Exynos5433 specific variant.
2. Update cooling maps to include all CPU devices in multiple DTS files.

* tag 'samsung-dt64-4.21' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux

:
  arm64: dts: exynos: Add all CPUs in cooling maps
  arm64: dts: exynos: Update DWC3 modules on Exynos5433 SoCs

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents df6aeaef 9deffb5e

arch/arm64/boot/dts/exynos/exynos5433-tmu.dtsi

+24 −12
Original line number Diff line number Diff line
@@ -55,37 +55,44 @@ thermal-zones { 
			map0 {

				/* Set maximum frequency as 1800MHz  */

				trip = <&atlas0_alert_0>;

				cooling-device = <&cpu4 1 2>;

				cooling-device = <&cpu4 1 2>, <&cpu5 1 2>,

						 <&cpu6 1 2>, <&cpu7 1 2>;

			};

			map1 {

				/* Set maximum frequency as 1700MHz  */

				trip = <&atlas0_alert_1>;

				cooling-device = <&cpu4 2 3>;

				cooling-device = <&cpu4 2 3>, <&cpu5 2 3>,

						 <&cpu6 2 3>, <&cpu7 2 3>;

			};

			map2 {

				/* Set maximum frequency as 1600MHz  */

				trip = <&atlas0_alert_2>;

				cooling-device = <&cpu4 3 4>;

				cooling-device = <&cpu4 3 4>, <&cpu5 3 4>,

						 <&cpu6 3 4>, <&cpu7 3 4>;

			};

			map3 {

				/* Set maximum frequency as 1500MHz  */

				trip = <&atlas0_alert_3>;

				cooling-device = <&cpu4 4 5>;

				cooling-device = <&cpu4 4 5>, <&cpu5 4 5>,

						 <&cpu6 4 5>, <&cpu7 4 5>;

			};

			map4 {

				/* Set maximum frequency as 1400MHz  */

				trip = <&atlas0_alert_4>;

				cooling-device = <&cpu4 5 7>;

				cooling-device = <&cpu4 5 7>, <&cpu5 5 7>,

						 <&cpu6 5 7>, <&cpu7 5 7>;

			};

			map5 {

				/* Set maximum frequencyas 1200MHz  */

				trip = <&atlas0_alert_5>;

				cooling-device = <&cpu4 7 9>;

				cooling-device = <&cpu4 7 9>, <&cpu5 7 9>,

						 <&cpu6 7 9>, <&cpu7 7 9>;

			};

			map6 {

				/* Set maximum frequency as 1000MHz  */

				trip = <&atlas0_alert_6>;

				cooling-device = <&cpu4 9 14>;

				cooling-device = <&cpu4 9 14>, <&cpu5 9 14>,

						 <&cpu6 9 14>, <&cpu7 9 14>;

			};

		};

	};
@@ -222,27 +229,32 @@ thermal-zones { 
			map0 {

				/* Set maximum frequency as 1200MHz  */

				trip = <&apollo_alert_2>;

				cooling-device = <&cpu0 1 2>;

				cooling-device = <&cpu0 1 2>, <&cpu1 1 2>,

						 <&cpu2 1 2>, <&cpu3 1 2>;

			};

			map1 {

				/* Set maximum frequency as 1100MHz  */

				trip = <&apollo_alert_3>;

				cooling-device = <&cpu0 2 3>;

				cooling-device = <&cpu0 2 3>, <&cpu1 2 3>,

						 <&cpu2 2 3>, <&cpu3 2 3>;

			};

			map2 {

				/* Set maximum frequency as 1000MHz  */

				trip = <&apollo_alert_4>;

				cooling-device = <&cpu0 3 4>;

				cooling-device = <&cpu0 3 4>, <&cpu1 3 4>,

						 <&cpu2 3 4>, <&cpu3 3 4>;

			};

			map3 {

				/* Set maximum frequency as 900MHz  */

				trip = <&apollo_alert_5>;

				cooling-device = <&cpu0 4 5>;

				cooling-device = <&cpu0 4 5>, <&cpu1 4 5>,

						 <&cpu2 4 5>, <&cpu3 4 5>;

			};

			map4 {

				/* Set maximum frequency as 800MHz  */

				trip = <&apollo_alert_6>;

				cooling-device = <&cpu0 5 9>;

				cooling-device = <&cpu0 5 9>, <&cpu1 5 9>,

						 <&cpu2 5 9>, <&cpu3 5 9>;

			};

		};

	};

arch/arm64/boot/dts/exynos/exynos5433.dtsi

+18 −6
Original line number Diff line number Diff line
@@ -1559,10 +1559,12 @@ 
		};



		usbdrd30: usbdrd {

			compatible = "samsung,exynos5250-dwusb3";

			compatible = "samsung,exynos5433-dwusb3";

			clocks = <&cmu_fsys CLK_ACLK_USBDRD30>,

				<&cmu_fsys CLK_SCLK_USBDRD30>;

			clock-names = "usbdrd30", "usbdrd30_susp_clk";

				<&cmu_fsys CLK_SCLK_USBDRD30>,

				<&cmu_fsys CLK_PHYCLK_USBDRD30_UDRD30_PHYCLOCK>,

				<&cmu_fsys CLK_PHYCLK_USBDRD30_UDRD30_PIPE_PCLK>;

			clock-names = "aclk", "susp_clk", "phyclk", "pipe_pclk";

			#address-cells = <1>;

			#size-cells = <1>;

			ranges;
@@ -1570,6 +1572,10 @@ 


			usbdrd_dwc3: dwc3@15400000 {

				compatible = "snps,dwc3";

				clocks = <&cmu_fsys CLK_SCLK_USBDRD30>,

					<&cmu_fsys CLK_ACLK_USBDRD30>,

					<&cmu_fsys CLK_SCLK_USBDRD30>;

				clock-names = "ref", "bus_early", "suspend";

				reg = <0x15400000 0x10000>;

				interrupts = <GIC_SPI 231 IRQ_TYPE_LEVEL_HIGH>;

				phys = <&usbdrd30_phy 0>, <&usbdrd30_phy 1>;
@@ -1606,10 +1612,12 @@ 
		};



		usbhost30: usbhost {

			compatible = "samsung,exynos5250-dwusb3";

			compatible = "samsung,exynos5433-dwusb3";

			clocks = <&cmu_fsys CLK_ACLK_USBHOST30>,

				<&cmu_fsys CLK_SCLK_USBHOST30>;

			clock-names = "usbdrd30", "usbdrd30_susp_clk";

				<&cmu_fsys CLK_SCLK_USBHOST30>,

				<&cmu_fsys CLK_PHYCLK_USBHOST30_UHOST30_PHYCLOCK>,

				<&cmu_fsys CLK_PHYCLK_USBHOST30_UHOST30_PIPE_PCLK>;

			clock-names = "aclk", "susp_clk", "phyclk", "pipe_pclk";

			#address-cells = <1>;

			#size-cells = <1>;

			ranges;
@@ -1617,6 +1625,10 @@ 


			usbhost_dwc3: dwc3@15a00000 {

				compatible = "snps,dwc3";

				clocks = <&cmu_fsys CLK_SCLK_USBHOST30>,

					<&cmu_fsys CLK_ACLK_USBHOST30>,

					<&cmu_fsys CLK_SCLK_USBHOST30>;

				clock-names = "ref", "bus_early", "suspend";

				reg = <0x15a00000 0x10000>;

				interrupts = <GIC_SPI 244 IRQ_TYPE_LEVEL_HIGH>;

				phys = <&usbhost30_phy 0>, <&usbhost30_phy 1>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE