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

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

Samsung DTS ARM changes for v5.1

1. Extend support for Aries family of mobile devices (e.g. Samsung
   Galaxy S) based on S5Pv210 SoC: DRM Rotator, FIMD, PWM vibrator,
   power off, touchscreen, Broadcom BCM4329 Bluetooth and cpufreq.
2. Remove hardcoded bootargs on Galaxy S family (proper support in
   U-Boot).
3. Fix minor DTC warnings.
4. Fix Exynos4412 Odroid X2/U3 conflicting eMMC GPIO settings and regulator
   properties.
5. Fix the eMMC RTSN pin breaking proper reboot on X2.

* tag 'samsung-dt-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux

:
  ARM: dts: exynos: Fix pinctrl definition for eMMC RTSN line on Odroid X2/U3
  ARM: dts: exynos: Fix eMMC regulator properties on Odroid U3 boards
  ARM: dts: exynos: Fix conflicting fixed-regulator GPIO flags and properties
  ARM: dts: s3c2416: Fix xti node's missing reg property warning
  ARM: dts: s5pv210: Fix onenand's unit address format warning
  ARM: dts: s5pv210: Add DMC nodes
  ARM: dts: s5pv210: Add support for more devices present on Aries
  ARM: dts: s5pv210: Add reserved memory for MFC on Aries
  ARM: dts: s5pv210: Remove hardcoded bootargs on Galaxy S and Fascinate 4G
  ARM: dts: s5pv210: Use correct fimd variant
  ARM: dts: s5pv210: Add node for exynos-rotator

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 55b97be8 ec33745b

arch/arm/boot/dts/exynos4412-odroid-common.dtsi

+6 −8
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 
	};



	emmc_pwrseq: pwrseq {

		pinctrl-0 = <&sd1_cd>;

		pinctrl-0 = <&emmc_rstn>;

		pinctrl-names = "default";

		compatible = "mmc-pwrseq-emmc";

		reset-gpios = <&gpk1 2 GPIO_ACTIVE_LOW>;
@@ -165,12 +165,6 @@ 
	cpu0-supply = <&buck2_reg>;

};



/* RSTN signal for eMMC */

&sd1_cd {

	samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

	samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;

};



&pinctrl_1 {

	gpio_power_key: power_key {

		samsung,pins = "gpx1-3";
@@ -188,6 +182,11 @@ 
		samsung,pins = "gpx3-7";

		samsung,pin-pud = <EXYNOS_PIN_PULL_DOWN>;

	};



	emmc_rstn: emmc-rstn {

		samsung,pins = "gpk1-2";

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

	};

};



&ehci {
@@ -390,7 +389,6 @@ 
				regulator-name = "LDO20_1.8V";

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <1800000>;

				regulator-boot-on;

			};



			ldo21_reg: LDO21 {

arch/arm/boot/dts/exynos4412-odroidx.dts

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ 
		regulator-name = "p3v3_en";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		gpio = <&gpa1 1 GPIO_ACTIVE_LOW>;

		gpio = <&gpa1 1 GPIO_ACTIVE_HIGH>;

		enable-active-high;

		regulator-always-on;

	};

arch/arm/boot/dts/exynos5250-arndale.dts

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ 
			regulator-name = "VDD_33ON_2.8V";

			regulator-min-microvolt = <2800000>;

			regulator-max-microvolt = <2800000>;

			gpio = <&gpx1 1 GPIO_ACTIVE_LOW>;

			gpio = <&gpx1 1 GPIO_ACTIVE_HIGH>;

			enable-active-high;

		};

arch/arm/boot/dts/s3c2416-smdk2416.dts

+4 −1
Original line number Diff line number Diff line
@@ -19,9 +19,12 @@ 


	clocks {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <0>;



		xti: xti {

		xti: xti@0 {

			compatible = "fixed-clock";

			reg = <0>;

			clock-frequency = <12000000>;

			clock-output-names = "xti";

			#clock-cells = <0>;

arch/arm/boot/dts/s5pv210-aries.dtsi

+90 −0
Original line number Diff line number Diff line
@@ -23,6 +23,31 @@ 
			0x50000000 0x08000000>;

	};



	reserved-memory {

		#address-cells = <1>;

		#size-cells = <1>;

		ranges;



		mfc_left: region@43000000 {

			compatible = "shared-dma-pool";

			no-map;

			reg = <0x43000000 0x2000000>;

		};



		mfc_right: region@51000000 {

			compatible = "shared-dma-pool";

			no-map;

			reg = <0x51000000 0x2000000>;

		};

	};



	vibrator_pwr: regulator-fixed-0 {

		compatible = "regulator-fixed";

		regulator-name = "vibrator-en";

		enable-active-high;

		gpio = <&gpj1 1 GPIO_ACTIVE_HIGH>;

	};



	wifi_pwrseq: wifi-pwrseq {

		compatible = "mmc-pwrseq-simple";

		reset-gpios = <&gpg1 2 GPIO_ACTIVE_LOW>;
@@ -296,6 +321,22 @@ 
			reg = <0x36>;

		};

	};



	vibrator: pwm-vibrator {

		compatible = "pwm-vibrator";

		pwms = <&pwm 1 44642 0>;

		pwm-names = "enable";

		vcc-supply = <&vibrator_pwr>;

		pinctrl-names = "default";

		pinctrl-0 = <&pwm1_out>;

	};



	poweroff: syscon-poweroff {

		compatible = "syscon-poweroff";

		regmap = <&pmu_syscon>;

		offset = <0x681c>; /* PS_HOLD_CONTROL */

		value = <0x5200>;

	};

};



&fimd {
@@ -329,6 +370,27 @@ 
	status = "okay";

};



&i2c2 {

	samsung,i2c-sda-delay = <100>;

	samsung,i2c-max-bus-freq = <400000>;

	samsung,i2c-slave-addr = <0x10>;

	status = "okay";



	touchscreen@4a {

		compatible = "atmel,maxtouch";

		reg = <0x4a>;

		interrupt-parent = <&gpj0>;

		interrupts = <5 IRQ_TYPE_EDGE_FALLING>;

		pinctrl-names = "default";

		pinctrl-0 = <&ts_irq>;

		reset-gpios = <&gpj1 3 GPIO_ACTIVE_HIGH>;

	};

};



&mfc {

	memory-region = <&mfc_left>, <&mfc_right>;

};



&pinctrl0 {

	wlan_bt_en: wlan-bt-en {

		samsung,pins = "gpb-5";
@@ -350,6 +412,13 @@ 
		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;

	};



	bt_host_wake: bt-host-wake {

		samsung,pins = "gph2-5";

		samsung,pin-function = <EXYNOS_PIN_FUNC_INPUT>;

		samsung,pin-pud = <S3C64XX_PIN_PULL_DOWN>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;

	};



	tf_detect: tf-detect {

		samsung,pins = "gph3-4";

		samsung,pin-function = <EXYNOS_PIN_FUNC_INPUT>;
@@ -362,6 +431,17 @@ 
		samsung,pin-function = <EXYNOS_PIN_FUNC_OUTPUT>;

		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;

	};



	ts_irq: ts-irq {

		samsung,pins = "gpj0-5";

		samsung,pin-function = <EXYNOS_PIN_FUNC_INPUT>;

		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;

	};

};



&pwm {

	samsung,pwm-outputs = <1>;

};



&sdhci1 {
@@ -399,6 +479,16 @@ 


&uart0 {

	status = "okay";



	bluetooth {

		compatible = "brcm,bcm43438-bt";

		max-speed = <115200>;

		pinctrl-names = "default";

		pinctrl-0 = <&uart0_data &uart0_fctl &bt_host_wake>;

		shutdown-gpios = <&gpb 3 GPIO_ACTIVE_HIGH>;

		device-wakeup-gpios = <&gpg3 4 GPIO_ACTIVE_HIGH>;

		host-wakeup-gpios = <&gph2 5 GPIO_ACTIVE_HIGH>;

	};

};



&uart1 {

CRA Git | Maintained and supported by SUSTech CRA and CCSE