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

Commit df1a6681 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'at91-soc4' of... 

Merge tag 'at91-soc4' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/soc

Merge "at91: cleanup/soc for 3.20 #4" from Nicolas Ferre:

Fourth cleanup/soc batch for 3.20:
- merge all the at91sam9 code and remove the empty SoC-specific files
- remove the at91_boot_soc that is now useless in a DT context
- move the sram code in PM code as it's now only used there
- some file + function name changes after this big cleanup

* tag 'at91-soc4' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91

:
  ARM: at91/trivial: unify functions and machine names
  ARM: at91: remove at91_dt_initialize and machine init_early()
  ARM: at91: change board files into SoC files
  ARM: at91: remove at91_boot_soc
  ARM: at91: move alternative initial mapping to board-dt-sama5.c
  ARM: at91: merge all SOC_AT91SAM9xxx
  ARM: at91: at91rm9200: set idle and restart from rm9200_dt_device_init()
  ARM: at91: board-dt-sama5: add phy_fixup to override NAND_Tree
  ARM: at91/dt: sam9263: Add missing clocks to lcdc node
  ARM: at91: sama5d3: dt: correct the sound route
  ARM: at91/dt: sama5d4: fix the timer reg length

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents ee481c84 ad3fc3e3

arch/arm/boot/dts/at91sam9263.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -963,6 +963,8 @@ 
			interrupts = <26 IRQ_TYPE_LEVEL_HIGH 3>;

			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_fb>;

			clocks = <&lcd_clk>, <&lcd_clk>;

			clock-names = "lcdc_clk", "hclk";

			status = "disabled";

		};

arch/arm/boot/dts/sama5d3xmb.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ 
			"Headphone Jack", "HPOUTR",

			"IN2L", "Line In Jack",

			"IN2R", "Line In Jack",

			"MICBIAS", "IN1L",

			"Mic", "MICBIAS",

			"IN1L", "Mic";



		atmel,ssc-controller = <&ssc0>;

arch/arm/boot/dts/sama5d4.dtsi

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


			pit: timer@fc068630 {

				compatible = "atmel,at91sam9260-pit";

				reg = <0xfc068630 0xf>;

				reg = <0xfc068630 0x10>;

				interrupts = <3 IRQ_TYPE_LEVEL_HIGH 5>;

				clocks = <&h32ck>;

			};

arch/arm/configs/at91_dt_defconfig

+1 −9
Original line number Diff line number Diff line
@@ -15,15 +15,7 @@ CONFIG_MODULE_UNLOAD=y 
# CONFIG_IOSCHED_CFQ is not set

CONFIG_ARCH_AT91=y

CONFIG_SOC_AT91RM9200=y

CONFIG_SOC_AT91SAM9260=y

CONFIG_SOC_AT91SAM9261=y

CONFIG_SOC_AT91SAM9263=y

CONFIG_SOC_AT91SAM9RL=y

CONFIG_SOC_AT91SAM9G45=y

CONFIG_SOC_AT91SAM9X5=y

CONFIG_SOC_AT91SAM9N12=y

CONFIG_MACH_AT91RM9200_DT=y

CONFIG_MACH_AT91SAM9_DT=y

CONFIG_SOC_AT91SAM9=y

CONFIG_AT91_TIMER_HZ=128

CONFIG_AEABI=y

CONFIG_UACCESS_WITH_MEMCPY=y

arch/arm/mach-at91/Kconfig

+26 −66
Original line number Diff line number Diff line
@@ -16,15 +16,6 @@ config HAVE_AT91_SMD 
config HAVE_AT91_H32MX

	bool



config SOC_AT91SAM9

	bool

	select ATMEL_AIC_IRQ

	select COMMON_CLK_AT91

	select CPU_ARM926T

	select GENERIC_CLOCKEVENTS

	select MEMORY

	select ATMEL_SDRAMC



config SOC_SAMA5

	bool

	select ATMEL_AIC5_IRQ
@@ -92,67 +83,36 @@ config SOC_AT91RM9200 
	select GENERIC_CLOCKEVENTS

	select HAVE_AT91_USB_CLK



config SOC_AT91SAM9260

	bool "AT91SAM9260, AT91SAM9XE or AT91SAM9G20"

	select SOC_AT91SAM9

	select HAVE_AT91_USB_CLK

	help

	  Select this if you are using one of Atmel's AT91SAM9260, AT91SAM9XE

	  or AT91SAM9G20 SoC.



config SOC_AT91SAM9261

	bool "AT91SAM9261 or AT91SAM9G10"

	select HAVE_FB_ATMEL

	select SOC_AT91SAM9

	select HAVE_AT91_USB_CLK

	help

	  Select this if you are using one of Atmel's AT91SAM9261 or AT91SAM9G10 SoC.



config SOC_AT91SAM9263

	bool "AT91SAM9263"

	select HAVE_FB_ATMEL

	select SOC_AT91SAM9

	select HAVE_AT91_USB_CLK



config SOC_AT91SAM9RL

	bool "AT91SAM9RL"

	select HAVE_FB_ATMEL

	select SOC_AT91SAM9

	select HAVE_AT91_UTMI



config SOC_AT91SAM9G45

	bool "AT91SAM9G45 or AT91SAM9M10 families"

	select HAVE_FB_ATMEL

	select SOC_AT91SAM9

	select HAVE_AT91_UTMI

	select HAVE_AT91_USB_CLK

	help

	  Select this if you are using one of Atmel's AT91SAM9G45 family SoC.

	  This support covers AT91SAM9G45, AT91SAM9G46, AT91SAM9M10 and AT91SAM9M11.



config SOC_AT91SAM9X5

	bool "AT91SAM9x5 family"

	select HAVE_FB_ATMEL

	select SOC_AT91SAM9

	select HAVE_AT91_UTMI

config SOC_AT91SAM9

	bool "AT91SAM9"

	select ATMEL_AIC_IRQ

	select ATMEL_SDRAMC

	select COMMON_CLK_AT91

	select CPU_ARM926T

	select GENERIC_CLOCKEVENTS

	select HAVE_AT91_SMD

	select HAVE_AT91_USB_CLK

	help

	  Select this if you are using one of Atmel's AT91SAM9x5 family SoC.

	  This means that your SAM9 name finishes with a '5' (except if it is

	  AT91SAM9G45!).

	  This support covers AT91SAM9G15, AT91SAM9G25, AT91SAM9X25, AT91SAM9G35

	  and AT91SAM9X35.



config SOC_AT91SAM9N12

	bool "AT91SAM9N12 family"

	select HAVE_AT91_UTMI

	select HAVE_FB_ATMEL

	select SOC_AT91SAM9

	select HAVE_AT91_USB_CLK

	select MEMORY

	help

	  Select this if you are using Atmel's AT91SAM9N12 SoC.



# ----------------------------------------------------------

	  Select this if you are using one of those Atmel SoC:

	    AT91SAM9260

	    AT91SAM9261

	    AT91SAM9263

	    AT91SAM9G15

	    AT91SAM9G20

	    AT91SAM9G25

	    AT91SAM9G35

	    AT91SAM9G45

	    AT91SAM9G46

	    AT91SAM9M10

	    AT91SAM9M11

	    AT91SAM9N12

	    AT91SAM9RL

	    AT91SAM9X25

	    AT91SAM9X35

	    AT91SAM9XE

endif # SOC_SAM_V4_V5



comment "AT91 Feature Selections"