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

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

Merge tag 'at91-fixes2' of... 

Merge tag 'at91-fixes2' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into fixes

Pull "Second fixes batch for AT91 on 4.0" from Nicolas Ferre:

- little fix for !MMU debug: may also help for randconfig
- fix of 2 errors in LCD clock definitions
- in PM code, not writing the key leads to not execute the action

* tag 'at91-fixes2' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
  ARM: at91/pm: MOR register KEY was missing
  ARM: at91/dt: sama5d4: fix lcdck clock definition
  ARM: at91/dt: sama5d4: rename lcd_clk into lcdc_clk
  ARM: at91: debug: fix non MMU debug
parents 8c113408 5957457a

arch/arm/boot/dts/sama5d4.dtsi

+3 −3
Original line number Original line Diff line number Diff line
@@ -462,8 +462,8 @@ 




					lcdck: lcdck {

					lcdck: lcdck {

						#clock-cells = <0>;

						#clock-cells = <0>;

						reg = <4>;

						reg = <3>;

						clocks = <&smd>;

						clocks = <&mck>;

					};

					};





					smdck: smdck {

					smdck: smdck {
@@ -771,7 +771,7 @@ 
						reg = <50>;

						reg = <50>;

					};

					};





					lcd_clk: lcd_clk {

					lcdc_clk: lcdc_clk {

						#clock-cells = <0>;

						#clock-cells = <0>;

						reg = <51>;

						reg = <51>;

					};

					};

arch/arm/include/debug/at91.S

+4 −1
Original line number Original line Diff line number Diff line
@@ -18,8 +18,11 @@ 
#define AT91_DBGU 0xfc00c000 /* SAMA5D4_BASE_USART3 */

#define AT91_DBGU 0xfc00c000 /* SAMA5D4_BASE_USART3 */

#endif

#endif





/* Keep in sync with mach-at91/include/mach/hardware.h */

#ifdef CONFIG_MMU

#define AT91_IO_P2V(x) ((x) - 0x01000000)

#define AT91_IO_P2V(x) ((x) - 0x01000000)

#else

#define AT91_IO_P2V(x) (x)

#endif





#define AT91_DBGU_SR		(0x14)	/* Status Register */

#define AT91_DBGU_SR		(0x14)	/* Status Register */

#define AT91_DBGU_THR		(0x1c)	/* Transmitter Holding Register */

#define AT91_DBGU_THR		(0x1c)	/* Transmitter Holding Register */

arch/arm/mach-at91/pm_slowclock.S

+2 −0
Original line number Original line Diff line number Diff line
@@ -205,6 +205,7 @@ sdr_sr_done: 
	/* Turn off the main oscillator */

	/* Turn off the main oscillator */

	ldr	tmp1, [pmc, #AT91_CKGR_MOR]

	ldr	tmp1, [pmc, #AT91_CKGR_MOR]

	bic	tmp1, tmp1, #AT91_PMC_MOSCEN

	bic	tmp1, tmp1, #AT91_PMC_MOSCEN

	orr	tmp1, tmp1, #AT91_PMC_KEY

	str	tmp1, [pmc, #AT91_CKGR_MOR]

	str	tmp1, [pmc, #AT91_CKGR_MOR]





	/* Wait for interrupt */

	/* Wait for interrupt */
@@ -213,6 +214,7 @@ sdr_sr_done: 
	/* Turn on the main oscillator */

	/* Turn on the main oscillator */

	ldr	tmp1, [pmc, #AT91_CKGR_MOR]

	ldr	tmp1, [pmc, #AT91_CKGR_MOR]

	orr	tmp1, tmp1, #AT91_PMC_MOSCEN

	orr	tmp1, tmp1, #AT91_PMC_MOSCEN

	orr	tmp1, tmp1, #AT91_PMC_KEY

	str	tmp1, [pmc, #AT91_CKGR_MOR]

	str	tmp1, [pmc, #AT91_CKGR_MOR]





	wait_moscrdy

	wait_moscrdy