Unverified Commit b9ca111f authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'ux500-dts-v5.17-1' of... 

Merge tag 'ux500-dts-v5.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into arm/dt

Ux500 DTS updates for the v5.17 kernel series:

- Add reset lines to applicable IP blocks
- Fix the magnetometer in the Gavini device tree

* tag 'ux500-dts-v5.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik:
  ARM: dts: ux500: Fixup Gavini magnetometer
  ARM: dts: ux500: Add reset lines to IP blocks

Link: https://lore.kernel.org/r/CACRpkdZuDPLj5Tcxbyd+JGfvBGQ8RuMP9PAsGsZT7pY8KoyOKg@mail.gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 541b107c 11611eec

arch/arm/boot/dts/ste-dbx5x0.dtsi

+26 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 


#include <dt-bindings/interrupt-controller/irq.h>

#include <dt-bindings/interrupt-controller/arm-gic.h>

#include <dt-bindings/reset/stericsson,db8500-prcc-reset.h>

#include <dt-bindings/mfd/dbx500-prcmu.h>

#include <dt-bindings/arm/ux500_pm_domains.h>

#include <dt-bindings/gpio/gpio.h>
@@ -300,6 +301,10 @@ prcc_kclk: prcc-kernel-clock { 
				#clock-cells = <2>;

			};



			prcc_reset: prcc-reset-controller {

				#reset-cells = <2>;

			};



			rtc_clk: rtc32k-clock {

				#clock-cells = <0>;

			};
@@ -662,6 +667,7 @@ i2c0: i2c@80004000 { 
			clocks = <&prcc_kclk 3 3>, <&prcc_pclk 3 3>;

			clock-names = "i2cclk", "apb_pclk";

			power-domains = <&pm_domains DOMAIN_VAPE>;

			resets = <&prcc_reset DB8500_PRCC_3 DB8500_PRCC_3_RESET_I2C0>;



			status = "disabled";

		};
@@ -680,6 +686,7 @@ i2c1: i2c@80122000 { 
			clocks = <&prcc_kclk 1 2>, <&prcc_pclk 1 2>;

			clock-names = "i2cclk", "apb_pclk";

			power-domains = <&pm_domains DOMAIN_VAPE>;

			resets = <&prcc_reset DB8500_PRCC_1 DB8500_PRCC_1_RESET_I2C1>;



			status = "disabled";

		};
@@ -698,6 +705,7 @@ i2c2: i2c@80128000 { 
			clocks = <&prcc_kclk 1 6>, <&prcc_pclk 1 6>;

			clock-names = "i2cclk", "apb_pclk";

			power-domains = <&pm_domains DOMAIN_VAPE>;

			resets = <&prcc_reset DB8500_PRCC_1 DB8500_PRCC_1_RESET_I2C2>;



			status = "disabled";

		};
@@ -716,6 +724,7 @@ i2c3: i2c@80110000 { 
			clocks = <&prcc_kclk 2 0>, <&prcc_pclk 2 0>;

			clock-names = "i2cclk", "apb_pclk";

			power-domains = <&pm_domains DOMAIN_VAPE>;

			resets = <&prcc_reset DB8500_PRCC_2 DB8500_PRCC_2_RESET_I2C3>;



			status = "disabled";

		};
@@ -734,6 +743,7 @@ i2c4: i2c@8012a000 { 
			clocks = <&prcc_kclk 1 9>, <&prcc_pclk 1 10>;

			clock-names = "i2cclk", "apb_pclk";

			power-domains = <&pm_domains DOMAIN_VAPE>;

			resets = <&prcc_reset DB8500_PRCC_1 DB8500_PRCC_1_RESET_I2C4>;



			status = "disabled";

		};
@@ -750,6 +760,7 @@ ssp0: spi@80002000 { 
			       <&dma 8 0 0x0>; /* Logical - MemToDev */

			dma-names = "rx", "tx";

			power-domains = <&pm_domains DOMAIN_VAPE>;

			resets = <&prcc_reset DB8500_PRCC_3 DB8500_PRCC_3_RESET_SSP0>;



			status = "disabled";

		};
@@ -766,6 +777,7 @@ ssp1: spi@80003000 { 
			       <&dma 9 0 0x0>; /* Logical - MemToDev */

			dma-names = "rx", "tx";

			power-domains = <&pm_domains DOMAIN_VAPE>;

			resets = <&prcc_reset DB8500_PRCC_3 DB8500_PRCC_3_RESET_SSP1>;



			status = "disabled";

		};
@@ -834,6 +846,7 @@ spi3: spi@80129000 { 
			       <&dma 40 0 0x0>; /* Logical - MemToDev */

			dma-names = "rx", "tx";

			power-domains = <&pm_domains DOMAIN_VAPE>;

			resets = <&prcc_reset DB8500_PRCC_1 DB8500_PRCC_1_RESET_SPI3>;



			status = "disabled";

		};
@@ -849,6 +862,7 @@ serial0: uart@80120000 { 


			clocks = <&prcc_kclk 1 0>, <&prcc_pclk 1 0>;

			clock-names = "uart", "apb_pclk";

			resets = <&prcc_reset DB8500_PRCC_1 DB8500_PRCC_1_RESET_UART0>;



			status = "disabled";

		};
@@ -864,6 +878,7 @@ serial1: uart@80121000 { 


			clocks = <&prcc_kclk 1 1>, <&prcc_pclk 1 1>;

			clock-names = "uart", "apb_pclk";

			resets = <&prcc_reset DB8500_PRCC_1 DB8500_PRCC_1_RESET_UART1>;



			status = "disabled";

		};
@@ -879,6 +894,7 @@ serial2: uart@80007000 { 


			clocks = <&prcc_kclk 3 6>, <&prcc_pclk 3 6>;

			clock-names = "uart", "apb_pclk";

			resets = <&prcc_reset DB8500_PRCC_3 DB8500_PRCC_3_RESET_UART2>;



			status = "disabled";

		};
@@ -895,6 +911,7 @@ mmc@80126000 { 
			clocks = <&prcc_kclk 1 5>, <&prcc_pclk 1 5>;

			clock-names = "sdi", "apb_pclk";

			power-domains = <&pm_domains DOMAIN_VAPE>;

			resets = <&prcc_reset DB8500_PRCC_1 DB8500_PRCC_1_RESET_SDI0>;



			status = "disabled";

		};
@@ -911,6 +928,7 @@ mmc@80118000 { 
			clocks = <&prcc_kclk 2 4>, <&prcc_pclk 2 6>;

			clock-names = "sdi", "apb_pclk";

			power-domains = <&pm_domains DOMAIN_VAPE>;

			resets = <&prcc_reset DB8500_PRCC_2 DB8500_PRCC_2_RESET_SDI1>;



			status = "disabled";

		};
@@ -927,6 +945,7 @@ mmc@80005000 { 
			clocks = <&prcc_kclk 3 4>, <&prcc_pclk 3 4>;

			clock-names = "sdi", "apb_pclk";

			power-domains = <&pm_domains DOMAIN_VAPE>;

			resets = <&prcc_reset DB8500_PRCC_3 DB8500_PRCC_3_RESET_SDI2>;



			status = "disabled";

		};
@@ -943,6 +962,7 @@ mmc@80119000 { 
			clocks = <&prcc_kclk 2 5>, <&prcc_pclk 2 7>;

			clock-names = "sdi", "apb_pclk";

			power-domains = <&pm_domains DOMAIN_VAPE>;

			resets = <&prcc_reset DB8500_PRCC_2 DB8500_PRCC_2_RESET_SDI3>;



			status = "disabled";

		};
@@ -959,6 +979,7 @@ mmc@80114000 { 
			clocks = <&prcc_kclk 2 2>, <&prcc_pclk 2 4>;

			clock-names = "sdi", "apb_pclk";

			power-domains = <&pm_domains DOMAIN_VAPE>;

			resets = <&prcc_reset DB8500_PRCC_2 DB8500_PRCC_2_RESET_SDI4>;



			status = "disabled";

		};
@@ -975,6 +996,7 @@ mmc@80008000 { 
			clocks = <&prcc_kclk 3 7>, <&prcc_pclk 3 7>;

			clock-names = "sdi", "apb_pclk";

			power-domains = <&pm_domains DOMAIN_VAPE>;

			resets = <&prcc_reset DB8500_PRCC_3 DB8500_PRCC_3_RESET_SDI5>;



			status = "disabled";

		};
@@ -996,6 +1018,7 @@ msp0: msp@80123000 { 


			clocks = <&prcc_kclk 1 3>, <&prcc_pclk 1 3>;

			clock-names = "msp", "apb_pclk";

			resets = <&prcc_reset DB8500_PRCC_1 DB8500_PRCC_1_RESET_MSP0>;



			status = "disabled";

		};
@@ -1012,6 +1035,7 @@ msp1: msp@80124000 { 


			clocks = <&prcc_kclk 1 4>, <&prcc_pclk 1 4>;

			clock-names = "msp", "apb_pclk";

			resets = <&prcc_reset DB8500_PRCC_1 DB8500_PRCC_1_RESET_MSP1>;



			status = "disabled";

		};
@@ -1030,6 +1054,7 @@ HighPrio - Fixed */ 


			clocks = <&prcc_kclk 2 3>, <&prcc_pclk 2 5>;

			clock-names = "msp", "apb_pclk";

			resets = <&prcc_reset DB8500_PRCC_2 DB8500_PRCC_2_RESET_MSP2>;



			status = "disabled";

		};
@@ -1046,6 +1071,7 @@ msp3: msp@80125000 { 


			clocks = <&prcc_kclk 1 10>, <&prcc_pclk 1 11>;

			clock-names = "msp", "apb_pclk";

			resets = <&prcc_reset DB8500_PRCC_1 DB8500_PRCC_1_RESET_MSP3>;



			status = "disabled";

		};

arch/arm/boot/dts/ste-ux500-samsung-gavini.dts

+19 −20
Original line number Diff line number Diff line
@@ -232,19 +232,18 @@ i2c-gpio-0 { 
		#address-cells = <1>;

		#size-cells = <0>;



		/* TODO: Memsic MMC328 magnetometer */

		magnetometer@30 {

			compatible = "memsic,mmc328";

			reg = <0x30>;

			/* TODO: if you have the schematic, check if both voltages come from AUX2 */

			/* VDA 1.8 V */

			vda-supply = <&ab8500_ldo_aux2_reg>;

			/* VDD 1.8V */

			vdd-supply = <&ab8500_ldo_aux2_reg>;

			/* GPIO204 */

		/* Yamaha YAS530 magnetometer */

		magnetometer@2e {

			compatible = "yamaha,yas530";

			reg = <0x2e>;

			/* VDD 3V */

			vdd-supply = <&ab8500_ldo_aux1_reg>;

			/* IOVDD 1.8V */

			iovdd-supply = <&ab8500_ldo_aux2_reg>;

			/* GPIO204 COMPASS_RST_N */

			reset-gpios = <&gpio6 12 GPIO_ACTIVE_LOW>;

			pinctrl-names = "default";

			pinctrl-0 = <&mmc328_default>;

			pinctrl-0 = <&yas530_default>;

		};

		/* TODO: this should also be used by the NCP6914 Camera power management unit */

	};
@@ -645,6 +644,15 @@ gavini_cfg1 { 
			};

		};

	};

	/* Reset line for the Yamaha YAS530 magnetometer */

	yas530 {

		yas530_default: yas530_janice {

			janice_cfg1 {

				pins = "GPIO204_AF23";

				ste,config = <&gpio_out_hi>;

			};

		};

	};

	/* Flash and torch */

	flash {

		gpio_flash_default_mode: flash_default {
@@ -747,15 +755,6 @@ gavini_cfg1 { 
			};

		};

	};

	/* Reset line for the Memsic MMC328 magnetometer */

	mmc328 {

		mmc328_default: mmc328_gavini {

			gavini_cfg1 {

				pins = "GPIO204_AF23";

				ste,config = <&gpio_out_hi>;

			};

		};

	};

	/* Interrupt line for Invensense MPU3050 gyroscope */

	mpu3050 {

		mpu3050_default: mpu3050 {