usb: chipidea: usb OTG fsm initialization. (57677be5) · Commits · 戴 / test

drivers/usb/chipidea/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -6,6 +6,7 @@ ci_hdrc-y := core.o otg.o
		ci_hdrc-$(CONFIG_USB_CHIPIDEA_UDC) += udc.o
		ci_hdrc-$(CONFIG_USB_CHIPIDEA_HOST) += host.o
		ci_hdrc-$(CONFIG_USB_CHIPIDEA_DEBUG) += debug.o
		ci_hdrc-$(CONFIG_USB_OTG_FSM) += otg_fsm.o

		# Glue/Bridge layers go here

+17 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		#include <linux/irqreturn.h>
		#include <linux/usb.h>
		#include <linux/usb/gadget.h>
		#include <linux/usb/otg-fsm.h>

		/******************************************************************************
		* DEFINE
		@@ -139,6 +140,7 @@ struct hw_bank {
		* @roles: array of supported roles for this controller
		* @role: current role
		* @is_otg: if the device is otg-capable
		* @fsm: otg finite state machine
		* @work: work for role changing
		* @wq: workqueue thread
		* @qh_pool: allocation pool for queue heads
		@@ -174,6 +176,7 @@ struct ci_hdrc {
		struct ci_role_driver *roles[CI_ROLE_END];
		enum ci_role role;
		bool is_otg;
		struct otg_fsm fsm;
		struct work_struct work;
		struct workqueue_struct *wq;

		@@ -319,6 +322,20 @@ static inline u32 hw_test_and_write(struct ci_hdrc *ci, enum ci_hw_regs reg,
		return (val & mask) >> __ffs(mask);
		}

		/**
		* ci_otg_is_fsm_mode: runtime check if otg controller
		* is in otg fsm mode.
		*/
		static inline bool ci_otg_is_fsm_mode(struct ci_hdrc *ci)
		{
		#ifdef CONFIG_USB_OTG_FSM
		return ci->is_otg && ci->roles[CI_ROLE_HOST] &&
		ci->roles[CI_ROLE_GADGET];
		#else
		return false;
		#endif
		}

		u32 hw_read_intr_enable(struct ci_hdrc *ci);

		u32 hw_read_intr_status(struct ci_hdrc *ci);

+4 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@
		#include "ci.h"
		#include "bits.h"
		#include "otg.h"
		#include "otg_fsm.h"

		/**
		* hw_read_otgsc returns otgsc register bits value.
		@@ -116,6 +117,9 @@ int ci_hdrc_otg_init(struct ci_hdrc *ci)
		return -ENODEV;
		}

		if (ci_otg_is_fsm_mode(ci))
		return ci_hdrc_otg_fsm_init(ci);

		return 0;
		}

0 → 100644

+63 −0

Original line number	Diff line number	Diff line
		/*
		* otg_fsm.c - ChipIdea USB IP core OTG FSM driver
		*
		* Copyright (C) 2014 Freescale Semiconductor, Inc.
		*
		* Author: Jun Li
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 as
		* published by the Free Software Foundation.
		*/

		/*
		* This file mainly handles OTG fsm, it includes OTG fsm operations
		* for HNP and SRP.
		*/

		#include <linux/usb/otg.h>
		#include <linux/usb/gadget.h>
		#include <linux/usb/hcd.h>
		#include <linux/usb/chipidea.h>

		#include "ci.h"
		#include "bits.h"
		#include "otg.h"
		#include "otg_fsm.h"

		int ci_hdrc_otg_fsm_init(struct ci_hdrc *ci)
		{
		struct usb_otg *otg;

		otg = devm_kzalloc(ci->dev,
		sizeof(struct usb_otg), GFP_KERNEL);
		if (!otg) {
		dev_err(ci->dev,
		"Failed to allocate usb_otg structure for ci hdrc otg!\n");
		return -ENOMEM;
		}

		otg->phy = ci->transceiver;
		otg->gadget = &ci->gadget;
		ci->fsm.otg = otg;
		ci->transceiver->otg = ci->fsm.otg;
		ci->fsm.power_up = 1;
		ci->fsm.id = hw_read_otgsc(ci, OTGSC_ID) ? 1 : 0;
		ci->transceiver->state = OTG_STATE_UNDEFINED;

		mutex_init(&ci->fsm.lock);

		/* Enable A vbus valid irq */
		hw_write_otgsc(ci, OTGSC_AVVIE, OTGSC_AVVIE);

		if (ci->fsm.id) {
		ci->fsm.b_ssend_srp =
		hw_read_otgsc(ci, OTGSC_BSV) ? 0 : 1;
		ci->fsm.b_sess_vld =
		hw_read_otgsc(ci, OTGSC_BSV) ? 1 : 0;
		/* Enable BSV irq */
		hw_write_otgsc(ci, OTGSC_BSVIE, OTGSC_BSVIE);
		}

		return 0;
		}

0 → 100644

+29 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2014 Freescale Semiconductor, Inc.
		*
		* Author: Jun Li
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 as
		* published by the Free Software Foundation.
		*/

		#ifndef __DRIVERS_USB_CHIPIDEA_OTG_FSM_H
		#define __DRIVERS_USB_CHIPIDEA_OTG_FSM_H

		#include <linux/usb/otg-fsm.h>

		#ifdef CONFIG_USB_OTG_FSM

		int ci_hdrc_otg_fsm_init(struct ci_hdrc *ci);

		#else

		static inline int ci_hdrc_otg_fsm_init(struct ci_hdrc *ci)
		{
		return 0;
		}

		#endif

		#endif /* __DRIVERS_USB_CHIPIDEA_OTG_FSM_H */