aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* ARM: Merge next-samsung-serial1Ben Dooks2010-01-19
|\ | | | | | | Merge branch 'next-samsung-serial1' into next-samsung-try7
| * ARM: SAMSUNG: serial: Modify console initialization.Thomas Abraham2010-01-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch modifies s3c24xx_serial_initconsole function to accept multiple platform UART information structures. This is required on platforms that have differences among the instances of UART ports. As an example, the FIFO sizes could be different for each UART instance and hence multiple platform UART information structures would be needed. This patch also modifies the s3c24xx_console_init macro since it wraps the call to the s3c24xx_serial_initconsole function. Signed-off-by: Thomas Abraham <thomas.ab@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * ARM: Merge next-samsung-clock2Ben Dooks2010-01-19
| |\ | | | | | | | | | Merge branch 'next-samsung-clock2' into next-samsung-try5
| * \ ARM: Merge next-samsung-devupdates1Ben Dooks2010-01-19
| |\ \ | | | | | | | | | | | | Merge branch 'next-samsung-devupdates1' into next-samsung-try5
| * \ \ ARM: Merge next-jassi-spiBen Dooks2010-01-19
| |\ \ \ | | | | | | | | | | | | | | | Merge branch 'next-jassi-spi' into next-samsung-try5
* | \ \ \ ARM: Merge next-samsung-clock2Ben Dooks2010-01-19
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | Merge branch 'next-samsung-clock2' into next-samsung-try7
| * | | | ARM: SAMSUNG: Fix bug in clksrc-clk round_rate call.Ben Dooks2010-01-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The call has been assuming all clksrc-clks' divider size is 4 bits, but this may not be the case anymore. Use the reg_div.size parameter to calculate the maximum value it can take and check against that. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | | | ARM: SAMSUNG: Fix clksrc-clk's checks for bad register settingsBen Dooks2010-01-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The WARN_ON() was only checking the first clock in the array, instead of being executed for each clksrc clock being registered. Since this is an array of clocks, WARN_ON() does not provide a lot of useful information about the problem, so change to using printk(KERN_ERR) to report the problem to the console. As a note, we still try and register the clock even if these problems are present just in case and to avoid changing the behaviour of the registration process. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | | | ARM: SAMSUNG: Add check to ensure that clksrc_clk does have multiple clock ↵Thomas Abraham2010-01-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sources Adds a additional check in s3c_set_clksrc function to ensure that the clksrc_clk does have a choice of multiple clock sources. In addition to this, a check is added to ensure that a parent is assigned to the clksrc_clk in case it does not have a choice of parent clocks. Signed-off-by: Thomas Abraham <thomas.ab@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | | | ARM: S5PC1XX: Register pd0 and hd0 clocks, remove unecessary dummy_enableBen Dooks2010-01-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The clk_hd0 and clk_pd0 where given a local dummy_enable call due to not being registered with the clock code, which they really should have been. Register these two clocks and remove the clk_dummy_enable as this is done by the default clock registration code. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | | | | ARM: Merge next-samsung-devupdates1Ben Dooks2010-01-19
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | Merge branch 'next-samsung-devupdates1' into next-samsung-try7
| * | | | ARM: S3C24XX: Add mci platform data set call s3c24xx_mci_set_platdata().Ben Dooks2010-01-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a s3c24xx_mci_set_platdata() call for all the machine files that have platform data for the MCI driver. This brings the MCI device into line with the other devices with __initdata and a specific call to ensure the right structure type is being passed. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | | | ARM: MINI2440: Remove commented out devices from device arrayBen Dooks2010-01-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's no point in having these in until there is proper support for them, so remove as they only confuse the device changing script. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | | | ARM: SAMSUNG: Add platform data registration for OHCIBen Dooks2010-01-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a platform data helper for the OHCI device Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | | | ARM: SAMSUNG: Make UART device code commonBen Dooks2010-01-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move s3c24xx_uart_devs, s3c24xx_uart_src and the platform devices to a common entry in plat-samsung since they are the same in all the current implementations. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | | | ARM: S3C2412: Fixup commented out device in SMDK2413Ben Dooks2010-01-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The SMDK2413 has a commented out device that does not have any setup data for it, so remove it for now. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | | | ARM: S3C: Rename s3c_device_usb to s3c_device_ohciBen Dooks2010-01-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prepare for the forthcoming device changes by renaming s3c_device_usb to s3c_device_ohci as this is what the device represents. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | | | | ARM: Merge next-jassi-spiBen Dooks2010-01-19
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| | Merge branch 'next-jassi-spi' into next-samsung-try7
| * | | ARM: S3C64XX: SPI: Define SPI controller devicesJassi Brar2010-01-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Platform devices for SPI Controller of S3C64XX are defined and exported for machines to include. Also, controller setup helper functions are defined for machine code to set runtime configuration of the controller and the bus. Signed-off-by: Jassi Brar <jassi.brar@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | | ARM: S3C64XX: SPI: Header for passing platform dataJassi Brar2010-01-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need a way to pass controller specific information to the SPI driver. For that purpose new headers are made. SPI Controller is assumed 'type-s3c64xx' and can be defined for newer SoCs. Hence, that part is placed under plat-samsung to be shared across newer SoCs. SoC specific part - spi source clocks, will be placed under plat-<soc>/include/plat/ Signed-off-by: Jassi Brar <jassi.brar@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | | ARM: S3C64XX: SPI: Define SPI-48M clock sourcesJassi Brar2010-01-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Defined special 48MHz clock sources for SPI-0,1. Signed-off-by: Jassi Brar <jassi.brar@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | | ARM: S3C64XX: SPI: Add SPI controller register baseJassi Brar2010-01-18
| | |/ | |/| | | | | | | | | | | | | | | | Added SPI controller register base. Signed-off-by: Jassi Brar <jassi.brar@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | | ARM: Merge next-s3c6410-andygreenBen Dooks2010-01-19
|\| | | | | | | | | | | Merge branch 'next-s3c6410-andygreen' into next-samsung-try5
| * | ARM: SMDK6410: Add comments on ethernet connectivityAndy Green2010-01-17
| | | | | | | | | | | | | | | | | | | | | | | | LAN9115 Ethernet only works on SMDK6410 if certain switches are set in specific ways. Document the requirement. Signed-off-by: Andy Green <andy@warmcat.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | ARM: S3C64XX: Add virtual mapping for S3C64XX SROM areaAndy Green2010-01-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | This adds the physical address of the SROM unit, and applies a virtual mapping for it to the S3C_VA_MEM slot. Signed-off-by: Andy Green <andy@warmcat.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | ARM: SMDK6410: Add nC1 chipselect SROM setupAndy Green2010-01-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the mach-smdk6410.c file claims it can start up the smsc9115 ethernet device on the board, it should take care about configuring the necessary chip select nCS1 so it can see the chip. The select defaults to 8-bit mode so without config the Ethernet doesn't work. This patch uses the new SROM definitions to set nCS1 to the state found in the Samsung U-Boot port for 6410. It may be more conservative that it needs to be since those settings were marked as for CS8900A also using this chip select. But this change is enough to get the ethernet working when booted with Qi. Signed-off-by: Andy Green <andy@warmcat.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | ARM: S3C64XX: Add SROM register definitionsAndy Green2010-01-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | This introduces a platform file for s3c64xx that defines the SROM unit registers that control chip select characteristics. Signed-off-by: Andy Green <andy@warmcat.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | ARM: Merge next-s3c64xxBen Dooks2010-01-17
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'next-s3c64xx' into next-samsung Conflicts: arch/arm/mach-s3c6400/include/mach/map.h ( ADC and RTC PA merge fixed)
* | | | ARM: Merge next-samsung-mc-adcBen Dooks2010-01-19
|\| | | | |/ / |/| | | | | | | | | | | | | | | | | Merge branch 'next-samsung-mc-adc' into next-samsung-try5 Conflicts: arch/arm/mach-s3c6400/include/mach/map.h (fix ADC and RTC merge)
| * | ARM: S3C64XX: Add S3C64XX support to the generic Samsung ADC driverMaurus Cuelenaere2010-01-17
| | | | | | | | | | | | | | | | | | | | | Add S3C64XX support to the generic Samsung ADC driver Signed-off-by: Maurus Cuelenaere <mcuelenaere@gmail.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | ARM: SAMSUNG: Move S3C24XX ADC driver to plat-samsungMaurus Cuelenaere2010-01-17
| |/ | | | | | | | | | | | | Move S3C24XX ADC driver to plat-samsung Signed-off-by: Maurus Cuelenaere <mcuelenaere@gmail.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | ARM: S3C64XX: Add I2S resources in platform codeJassi Brar2010-01-17
| | | | | | | | | | | | | | | | Define resources needed by the I2S drivers in platform code. Audio cfg_gpio callback and IORESOURCE_DMA are added. Signed-off-by: Jassi Brar <jassi.brar@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | ARM: S3C64XX: Add S3C64XX RTC platform driverMaurus Cuelenaere2010-01-17
|/ | | | | | | Add S3C64XX RTC platform driver Signed-off-by: Maurus Cuelenaere <mcuelenaere@gmail.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* ARM: S5P6440: Add serial port supportKukjin Kim2010-01-15
| | | | | | | | This patch adds UART serial port support for S5P6440 CPU. Most of the serial support of Samsung's 6400 CPU is reused for 6440 CPU. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* ARM: S5P6440: Add configuration fileKukjin Kim2010-01-15
| | | | | | | This patch adds Samsung's S5P6440 default configuration file. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* ARM: S5P6440: Add Board support fileKukjin Kim2010-01-15
| | | | | | | This patch adds Samsung's SMDK6440 board support file. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* ARM: S5P6440: Add new Kconfig and MakefilesKukjin Kim2010-01-15
| | | | | | | | | This patch adds the Kconfig and Makefile for the new S5P6440 machine and platform directories. It also updates arch/arm Kconfig and Makefiles to include the support for the new S5P6440 CPU. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* ARM: S5P6440: Add Timer supportKukjin Kim2010-01-15
| | | | | | | | This patch adds timer support for S5P6440 CPU. Signed-off-by: Atul Dahiya <atul.dahiya@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* ARM: S5P6440: Add IRQ supportKukjin Kim2010-01-15
| | | | | | | | This patch adds IRQ support for S5P6440 CPU. Signed-off-by: Adityapratap Sharma <aditya.ps@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* ARM: S5P6440: Add Clock and PLL supportKukjin Kim2010-01-15
| | | | | | | | | This patch adds clock and pll support for S5P6440. This patch are based on Harald Welte's patches and Ben's plat-samsung. Signed-off-by: Thomas Abraham <thomas.ab@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* ARM: S5P6440: Add new CPU initialization supportKukjin Kim2010-01-15
| | | | | | | This patch adds Samsung's S5P6440 CPU support. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* ARM: S5PC1XX: Use common UART IRQ handling codeBen Dooks2010-01-15
| | | | | | Use the common UART IRQ handling code for the S5PC100 system. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* ARM: S5PC1XX: Move to using standard timer IRQ handling codeBen Dooks2010-01-15
| | | | | | | | | Move to using the standard VIC/Timer IRQ handling code added previously to avoid duplicating code. Thanks to Marek Szyprowski for pointing out dual Kconfig change. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* ARM: S5PC1XX: Remove definitions deleted by previous clksrc changesBen Dooks2010-01-15
| | | | | | | | | | | Remove the definitions we've deleted in the previous updates to the clksrc_clk for arch/arm/plat-s5pc1xx/include/plat/regs-clock.h. Added comments about the removal to the clock header since we only need these defines in one place (and they've now been removed there) we get rid of them from the header. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* ARM: SAMSUNG: Add script to change old clksrc_clk to new register defsBen Dooks2010-01-15
| | | | | | | | This script is used to change the old style clksrc_clk as originally found in plat-s3c64xx to the new style. It is here for reference if needed for future code merges. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* ARM: S5PC1XX: Change clksrc_clks to use array of clocksBen Dooks2010-01-15
| | | | | | | | | | | | | | Remove the individual 'struct clksrc_clks' and place them into an array so that we can simply use s3c_register_clksrcs to register tham all in one go. Since the spdif clock relies on the audio clock, move the audio clocks into their own arrary. Thanks to Marek Szyprowski for testing and pointing out the four clocks what where missed from the clock list. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* ARM: S5PC1XX: Move clock definitions around ready to turn into clksrc arraysBen Dooks2010-01-15
| | | | | | | Move the clock definitions around ready to turn the clocks into an array of clocks and register them in one go. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* ARM: S5PC1XX: Move to using generic clksrc_clk for clock codeBen Dooks2010-01-15
| | | | | | | | | | | Remove the copy of the old s3c64xx struct clksrc_clk and use the new one in plat-samsung. This eliminates a bug in the set_parent() call where it failed to set the clk->parent after sucesfully updating the clock. The script that was used to automate much of the process will be supplied seperately. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* ARM: SAMSUNG: Add config option for number of additional GPIO pins.Kukjin Kim2010-01-15
| | | | | | | | | This patch adds a configuration option for specifing the number of additional GPIO pins to be used in addition to the GPIO pins supported onchip. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* ARM: Add common entry code for system with two VICsBen Dooks2010-01-15
| | | | | | | | | | | | Add a common entry-macro-vic2.S for systems where there are two VICs so that the machine or platform directories just need to setup the correct information before including <asm/entry-macro-vic2.S> into their own entry-macro.S file. Since this code is from the S3C64XX project, we update the S3C64XX machine entry code to use this new header. Signed-off-by: Ben Dooks <ben-linux@fluff.org>