Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4eca459b authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'integrator-v3.19-arm-soc-2' of... 

Merge tag 'integrator-v3.19-arm-soc-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/soc

Pull "ARM SoC Integrator updates for v3.19" from Linus Walleij:

Integrator updates for the v3.19 merge cycle on
top of the multiplatform patches, this moves out
some drivers and reduced the amount of code carried
in arch/arm/mach-integrator.

- Move the Integrator/AP timer to drivers/clocksource
- Move the restart functionality to the device tree,
  patches to enable restart for the Integrator have
  been merged to the reset tree (orthogonal)
- Move debug LEDs to device tree (using the syscon
  LED driver merged for v3.18)
- Move core module LEDs to device tree (using the
  syscon LED driver merged for v3.18)
- Move the SoC driver (chip ID etc) to
  drivers/soc/versatile/soc-integrator.c

* tag 'integrator-v3.19-arm-soc-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator

:
  soc: move SoC driver for the ARM Integrator
  ARM: integrator: move core module LED to device tree
  ARM: integrator: move debug LEDs to syscon LED driver
  ARM: integrator: move restart to the device tree
  ARM: integrator: move AP timer to clocksource

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents d686ce42 f956a785

arch/arm/boot/dts/integrator.dtsi

+47 −1
Original line number Original line Diff line number Diff line
@@ -6,8 +6,18 @@ 




/ {

/ {

	core-module@10000000 {

	core-module@10000000 {

		compatible = "arm,core-module-integrator";

		compatible = "arm,core-module-integrator", "syscon";

		reg = <0x10000000 0x200>;

		reg = <0x10000000 0x200>;



		/* Use core module LED to indicate CPU load */

		led@0c.0 {

			compatible = "register-bit-led";

			offset = <0x0c>;

			mask = <0x01>;

			label = "integrator:core_module";

			linux,default-trigger = "cpu0";

			default-state = "on";

		};

	};

	};





	ebi@12000000 {

	ebi@12000000 {
@@ -82,5 +92,41 @@ 
			reg = <0x19000000 0x1000>;

			reg = <0x19000000 0x1000>;

			interrupts = <4>;

			interrupts = <4>;

		};

		};



		syscon {

			/* Debug registers mapped as syscon */

			compatible = "syscon";

			reg = <0x1a000000 0x10>;



			led@04.0 {

				compatible = "register-bit-led";

				offset = <0x04>;

				mask = <0x01>;

				label = "integrator:green0";

				linux,default-trigger = "heartbeat";

				default-state = "on";

			};

			led@04.1 {

				compatible = "register-bit-led";

				offset = <0x04>;

				mask = <0x02>;

				label = "integrator:yellow";

				default-state = "off";

			};

			led@04.2 {

				compatible = "register-bit-led";

				offset = <0x04>;

				mask = <0x04>;

				label = "integrator:red";

				default-state = "off";

			};

			led@04.3 {

				compatible = "register-bit-led";

				offset = <0x04>;

				mask = <0x08>;

				label = "integrator:green1";

				default-state = "off";

			};

		};

	};

	};

};
 
};

arch/arm/mach-integrator/Kconfig

+5 −0
Original line number Original line Diff line number Diff line
@@ -8,8 +8,13 @@ config ARCH_INTEGRATOR 
	select GENERIC_CLOCKEVENTS

	select GENERIC_CLOCKEVENTS

	select HAVE_TCM

	select HAVE_TCM

	select ICST

	select ICST

	select MFD_SYSCON

	select MULTI_IRQ_HANDLER

	select MULTI_IRQ_HANDLER

	select PLAT_VERSATILE

	select PLAT_VERSATILE

	select POWER_RESET

	select POWER_RESET_VERSATILE

	select POWER_SUPPLY

	select SOC_INTEGRATOR_CM

	select SPARSE_IRQ

	select SPARSE_IRQ

	select USE_OF

	select USE_OF

	select VERSATILE_FPGA_IRQ

	select VERSATILE_FPGA_IRQ

arch/arm/mach-integrator/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -4,7 +4,7 @@ 




# Object file lists.

# Object file lists.





obj-y					:= core.o lm.o leds.o

obj-y					:= core.o lm.o

obj-$(CONFIG_ARCH_INTEGRATOR_AP)	+= integrator_ap.o

obj-$(CONFIG_ARCH_INTEGRATOR_AP)	+= integrator_ap.o

obj-$(CONFIG_ARCH_INTEGRATOR_CP)	+= integrator_cp.o

obj-$(CONFIG_ARCH_INTEGRATOR_CP)	+= integrator_cp.o

arch/arm/mach-integrator/cm.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -11,7 +11,6 @@ void cm_clear_irqs(void); 
#define CM_CTRL_LED			(1 << 0)

#define CM_CTRL_LED			(1 << 0)

#define CM_CTRL_nMBDET			(1 << 1)

#define CM_CTRL_nMBDET			(1 << 1)

#define CM_CTRL_REMAP			(1 << 2)

#define CM_CTRL_REMAP			(1 << 2)

#define CM_CTRL_RESET			(1 << 3)





/*

/*

 * Integrator/AP,PP2 specific

 * Integrator/AP,PP2 specific

arch/arm/mach-integrator/common.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -4,5 +4,3 @@ extern struct amba_pl010_data ap_uart_data; 
void integrator_init_early(void);

void integrator_init_early(void);

int integrator_init(bool is_cp);

int integrator_init(bool is_cp);

void integrator_reserve(void);
 
void integrator_reserve(void);
 
void integrator_restart(enum reboot_mode, const char *);

void integrator_init_sysfs(struct device *parent, u32 id);