Commit 3236013b authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

Samsung DTS ARM changes for v5.9

1. Enable Bluetooth on Artik5 (Exynos3250).
2. Enable accelerometer on Aries boards (Samsung Galaxy S family,
   S5Pv210); multiple fixes.
3. Fix highest frequencies on Exynos5800.
4. Fix rare USB instability on Odroid XU3 family (Exynos5422).
5. Minor DTS fixes and adjustments with dtschema.

* tag 'samsung-dt-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: dts: exynos: Replace HTTP links with HTTPS ones
  ARM: dts: exynos: Disable frequency scaling for FSYS bus on Odroid XU3 family
  ARM: dts: exynos: Define fixed regulators in root node for consistency in SMDK5420
  ARM: dts: exynos: Define fixed regulators in root node for consistency in Arndale
  ARM: dts: exynos: Define fixed regulators in root node for consistency in Origen
  ARM: dts: exynos: Remove DMA controller bus node name to fix dtschema warnings
  ARM: dts: exynos: Fix missing empty reg/ranges property regulators on Trats
  ARM: dts: exynos: Align L2 cache-controller nodename with dtschema
  ARM: dts: s5pv210: Correct BCM4329 bluetooth node
  ARM: dts: s5pv210: Add BMA023 accelerometer support to Aries
  ARM: dts: s5pv210: Add support for GP2A light sensor on Aries
  ARM: dts: s5pv210: Correct fuelgauge definition on Aries
  ARM: dts: s5pv210: Add interrupt-controller property to gph3
  ARM: dts: exynos: Enable Bluetooth support for Artik5 board
  ARM: dts: exynos: Extend all Exynos5800 A15's OPPs with max voltage data

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 42f8362a f37b5d3a

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

+41 −0
Original line number Diff line number Diff line
@@ -352,6 +352,14 @@ 
};



&pinctrl_1 {

	bten: bten {

		samsung,pins ="gpx1-7";

		samsung,pin-function = <EXYNOS_PIN_FUNC_OUTPUT>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_DOWN>;

		samsung,pin-con-pdn = <EXYNOS_PIN_PDN_PREV>;

		samsung,pin-pud-pdn = <EXYNOS_PIN_PULL_DOWN>;

	};



	wlanen: wlanen {

		samsung,pins = "gpx2-3";

		samsung,pin-function = <EXYNOS_PIN_FUNC_OUTPUT>;
@@ -364,6 +372,22 @@ 
		samsung,pins = "gpx3-5";

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

	};



	bthostwake: bthostwake {

		samsung,pins = "gpx3-6";

		samsung,pin-function = <EXYNOS_PIN_FUNC_INPUT>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

		samsung,pin-con-pdn = <EXYNOS_PIN_PDN_INPUT>;

		samsung,pin-pud-pdn = <EXYNOS_PIN_PULL_NONE>;

	};



	btwake: btwake {

		samsung,pins = "gpx3-7";

		samsung,pin-function = <EXYNOS_PIN_FUNC_OUTPUT>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_DOWN>;

		samsung,pin-con-pdn = <EXYNOS_PIN_PDN_OUT0>;

		samsung,pin-pud-pdn = <EXYNOS_PIN_PULL_DOWN>;

	};

};



&rtc {
@@ -372,6 +396,23 @@ 
	status = "okay";

};



&serial_0 {

	assigned-clocks = <&cmu CLK_SCLK_UART0>;

	assigned-clock-rates = <100000000>;

	status = "okay";



	bluetooth {

		compatible = "brcm,bcm4330-bt";

		pinctrl-names = "default";

		pinctrl-0 = <&bten &btwake &bthostwake>;

		max-speed = <3000000>;

		shutdown-gpios = <&gpx1 7 GPIO_ACTIVE_HIGH>;

		device-wakeup-gpios = <&gpx3 7 GPIO_ACTIVE_HIGH>;

		host-wakeup-gpios = <&gpx3 6 GPIO_ACTIVE_HIGH>;

		clocks = <&s2mps14_osc S2MPS11_CLK_BT>;

	};

};



&tmu {

	status = "okay";

};

arch/arm/boot/dts/exynos3250.dtsi

+20 −27
Original line number Diff line number Diff line
@@ -418,12 +418,6 @@ 
			status = "disabled";

		};



		amba {

			compatible = "simple-bus";

			#address-cells = <1>;

			#size-cells = <1>;

			ranges;



		pdma0: pdma@12680000 {

			compatible = "arm,pl330", "arm,primecell";

			reg = <0x12680000 0x1000>;
@@ -445,7 +439,6 @@ 
			#dma-channels = <8>;

			#dma-requests = <32>;

		};

		};



		adc: adc@126c0000 {

			compatible = "samsung,exynos3250-adc";

arch/arm/boot/dts/exynos4.dtsi

+31 −39
Original line number Diff line number Diff line
@@ -669,13 +669,6 @@ 
			status = "disabled";

		};



		amba: amba {

			#address-cells = <1>;

			#size-cells = <1>;

			compatible = "simple-bus";

			interrupt-parent = <&gic>;

			ranges;



		pdma0: pdma@12680000 {

			compatible = "arm,pl330", "arm,primecell";

			reg = <0x12680000 0x1000>;
@@ -708,7 +701,6 @@ 
			#dma-channels = <8>;

			#dma-requests = <1>;

		};

		};



		fimd: fimd@11c00000 {

			compatible = "samsung,exynos4210-fimd";

arch/arm/boot/dts/exynos4210-trats.dts

+47 −51
Original line number Diff line number Diff line
@@ -30,9 +30,6 @@ 
		stdout-path = "serial2:115200n8";

	};



	regulators {

		compatible = "simple-bus";



	vemmc_reg: regulator-0 {

		compatible = "regulator-fixed";

		regulator-name = "VMEM_VDD_2.8V";
@@ -86,7 +83,6 @@ 
		gpio = <&gpe2 2 GPIO_ACTIVE_HIGH>;

		enable-active-high;

	};

	};



	gpio-keys {

		compatible = "gpio-keys";

arch/arm/boot/dts/exynos4210-universal_c210.dts

+14 −14
Original line number Diff line number Diff line
@@ -181,20 +181,6 @@ 
	};

};



&amba {

	mdma0: mdma@12840000 {

		compatible = "arm,pl330", "arm,primecell";

		reg = <0x12840000 0x1000>;

		interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&clock CLK_MDMA>;

		clock-names = "apb_pclk";

		#dma-cells = <1>;

		#dma-channels = <8>;

		#dma-requests = <1>;

		power-domains = <&pd_lcd0>;

	};

};



&camera {

	status = "okay";
@@ -616,6 +602,20 @@ 
	/delete-property/dma-names;

};



&soc {

	mdma0: mdma@12840000 {

		compatible = "arm,pl330", "arm,primecell";

		reg = <0x12840000 0x1000>;

		interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&clock CLK_MDMA>;

		clock-names = "apb_pclk";

		#dma-cells = <1>;

		#dma-channels = <8>;

		#dma-requests = <1>;

		power-domains = <&pd_lcd0>;

	};

};



&sysram {

	smp-sram@0 {

		status = "disabled";

CRA Git | Maintained and supported by SUSTech CRA and CCSE